11月8日库存管理

controllers/mobile_api_controllers/check_weight_api_controller.go

@@ -269,8 +269,7 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 
 	template, _ := service.GetOrgInfoTemplate(adminUserInfo.Org.Id)
 
-	if template.TemplateId == 22 || template.TemplateId == 17 || template.TemplateId == 21 || template.TemplateId == 26 || template.TemplateId == 27 || template.TemplateId == 34 || template.TemplateId == 30 || template.TemplateId == 32 || template.TemplateId == 36 || template.TemplateId == 40 || template.TemplateId == 38 || template.TemplateId == 43 || template.TemplateId == 46 || template.TemplateId == 53 {
-	if template.TemplateId == 22 || template.TemplateId == 17 || template.TemplateId == 21 || template.TemplateId == 26 || template.TemplateId == 27 || template.TemplateId == 34 || template.TemplateId == 30 || template.TemplateId == 32 || template.TemplateId == 36 || template.TemplateId == 40 || template.TemplateId == 38 || template.TemplateId == 43 || template.TemplateId == 46 || template.TemplateId == 48 || adminUserInfo.Org.Id == 10345 {
+	if template.TemplateId == 22 || template.TemplateId == 17 || template.TemplateId == 21 || template.TemplateId == 26 || template.TemplateId == 27 || template.TemplateId == 34 || template.TemplateId == 30 || template.TemplateId == 32 || template.TemplateId == 36 || template.TemplateId == 40 || template.TemplateId == 38 || template.TemplateId == 43 || template.TemplateId == 46 || template.TemplateId == 53 || template.TemplateId == 48 || adminUserInfo.Org.Id == 10345 {
 		dewater_amount = dewater_amount * 1000
 	}
 

controllers/stock_in_api_controller.go

@@ -288,8 +288,6 @@ func (c *StockManagerApiController) CreateWarehouse() {
 
 				license_number, _ := items["license_number"].(string)
 
-
-				register_number, _ := items["register_number"].(string)
 				//入库单表格
 				warehouseInfo := &models.WarehousingInfo{
 					ID:               id,
@@ -315,34 +313,9 @@ func (c *StockManagerApiController) CreateWarehouse() {
 					PackingPrice:     packing_price,
 					StorehouseId:     storehouse_id,
 					IsCheck:          2,
-					RegisterNumber:   register_number,
 				}
 				warehousingInfo = append(warehousingInfo, warehouseInfo)
 
-				flow := &models.VmStockFlow{
-					WarehousingOrder:    warehousing.WarehousingOrder,
-					WarehousingId:       warehousing.ID,
-					GoodId:              good_id,
-					Number:              number,
-					ProductDate:         productDates,
-					ExpireDate:          expiryDates,
-					Count:               warehousing_count,
-					Price:               price,
-					Status:              1,
-					Ctime:               ctime,
-					UserOrgId:           adminUserInfo.CurrentOrgId,
-					Manufacturer:        manufacturer,
-					Dealer:              dealer,
-					LicenseNumber:       license_number,
-					IsEdit:              1,
-					Creator:             adminUserInfo.AdminUser.Id,
-					SystemTime:          operation_time,
-					ConsumableType:      1,
-					WarehousingDetailId: warehouseInfo.ID,
-					StorehouseId:        storehouse_id,
-					RegisterNumber:      register_number,
-				}
-				stockFlow = append(stockFlow, flow)
 			}
 		}
 	}
@@ -350,30 +323,6 @@ func (c *StockManagerApiController) CreateWarehouse() {
 	for _, item := range warehousingInfo {
 		if item.ID == 0 {
 			service.CreatedWarehouseingDetail(item)
-		service.CreatedWarehouseingDetail(item)
-		warehousinginfo, _ := service.GetLastWarehousingInfo(item.GoodId)
-		flow := models.VmStockFlow{
-			WarehousingOrder:    item.WarehousingOrder,
-			WarehousingId:       item.WarehousingId,
-			GoodId:              item.GoodId,
-			Number:              item.Number,
-			ProductDate:         item.ProductDate,
-			ExpireDate:          item.ExpiryDate,
-			Count:               item.StockCount,
-			Price:               item.Price,
-			Status:              1,
-			Ctime:               ctime,
-			UserOrgId:           item.OrgId,
-			Manufacturer:        item.Manufacturer,
-			Dealer:              item.Dealer,
-			LicenseNumber:       item.LicenseNumber,
-			IsEdit:              1,
-			Creator:             adminUserInfo.AdminUser.Id,
-			SystemTime:          operation_time,
-			ConsumableType:      1,
-			WarehousingDetailId: warehousinginfo.ID,
-			StorehouseId:        storehouse_id,
-			RegisterNumber:      item.RegisterNumber,
 		}
 		if item.ID > 0 {
 			service.UpdateWarehouseDetail(item, item.ID)
@@ -615,7 +564,6 @@ func (c *StockManagerApiController) EditWarehouse() {
 				manufacturer := int64(items["manufacturer"].(float64))
 				dealer := int64(items["dealer"].(float64))
 				license_number, _ := items["license_number"].(string)
-				register_number, _ := items["register_number"].(string)
 				if items["id"] == nil || reflect.TypeOf(items["id"]).String() != "float64" {
 					utils.ErrorLog("id")
 					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
@@ -647,7 +595,6 @@ func (c *StockManagerApiController) EditWarehouse() {
 						PackingPrice:     packing_price,
 						StorehouseId:     storehouse_id,
 						IsCheck:          2,
-						RegisterNumber:   register_number,
 					}
 					warehousingInfo = append(warehousingInfo, warehouseInfo)
 
@@ -675,7 +622,6 @@ func (c *StockManagerApiController) EditWarehouse() {
 						LicenseNumber:    license_number,
 						PackingPrice:     packing_price,
 						StorehouseId:     storehouse_id,
-						RegisterNumber:   register_number,
 					}
 					upDateWarehousingInfo = append(upDateWarehousingInfo, warehouseInfo)
 
@@ -700,7 +646,6 @@ func (c *StockManagerApiController) EditWarehouse() {
 						ConsumableType:      1,
 						WarehousingDetailId: warehouseInfo.ID,
 						StorehouseId:        storehouse_id,
-						RegisterNumber:      register_number,
 					}
 
 					stockFlow = append(stockFlow, flow)
@@ -711,202 +656,11 @@ func (c *StockManagerApiController) EditWarehouse() {
 	var errs error
 	if len(warehousingInfo) > 0 {
 		errs = service.CreateWarehousingInfo(warehousingInfo)
-
-		for _, its := range warehousingInfo {
-			//查询
-			info, _ := service.GetLastGoodWarehouseInfo(its.GoodId)
-			flows := models.VmStockFlow{
-				WarehousingOrder:    info.WarehousingOrder,
-				WarehousingId:       info.ID,
-				GoodId:              info.GoodId,
-				Number:              info.Number,
-				ProductDate:         info.ProductDate,
-				ExpireDate:          info.ExpiryDate,
-				Count:               info.WarehousingCount,
-				Price:               info.Price,
-				Status:              1,
-				Ctime:               ctime,
-				UserOrgId:           adminUserInfo.CurrentOrgId,
-				Manufacturer:        info.Manufacturer,
-				Dealer:              info.Dealer,
-				LicenseNumber:       info.LicenseNumber,
-				IsEdit:              1,
-				Creator:             adminUserInfo.AdminUser.Id,
-				SystemTime:          ctime,
-				ConsumableType:      1,
-				WarehousingDetailId: info.ID,
-				StorehouseId:        storehouse_id,
-				RegisterNumber:      info.RegisterNumber,
-			}
-			_, errcodescode := service.GetGoodStockFlowInfo(info.ID, info.GoodId)
-
-			if errcodescode == gorm.ErrRecordNotFound {
-				service.CreateStockFlowOne(flows)
-			}
-
-			//改变库存
-			good, _ := service.GetLastInfoMationById(info.GoodId)
-			warhouseCount := strconv.FormatInt(info.WarehousingCount, 10)
-			total, _ := strconv.ParseFloat(warhouseCount, 64)
-			goodInfo := models.GoodInfo{
-				Total: good.Total + total,
-			}
-			errcodescode = service.UpdateGoodInfoMation(info.GoodId, goodInfo)
-			fmt.Println(errcodescode)
-
-			//查询该机构默认仓库
-			storeConfig, _ := service.GetAllStoreHouseConfig(adminUserInfo.CurrentOrgId)
-			//查询剩余库存
-			goodList, _ := service.GetGoodSumCountByStoreId(storeConfig.StorehouseOutInfo, info.GoodId, adminUserInfo.CurrentOrgId)
-			var sum_count int64
-			var sum_in_count int64
-			for _, item := range goodList {
-				sum_count += item.StockCount
-				sum_in_count += item.WarehousingCount
-			}
-			service.UpdateGoodByGoodId(info.GoodId, sum_count, sum_in_count, info.OrgId)
-		}
 	}
 
 	if len(upDateWarehousingInfo) > 0 {
 		for _, item := range upDateWarehousingInfo {
 			service.UpdateWarehouseInfoByGoodIdOne(item, item.ID)
-			var total int64
-			//获取该批次该型号的库存
-			info, _ := service.GetLastWarehousingByIdOne(item.ID, item.GoodId)
-
-			//增加库存
-			if item.WarehousingCount > info.WarehousingCount {
-
-				total = item.WarehousingCount - info.WarehousingCount
-				goodinfo := models.WarehousingInfo{
-					WarehousingCount: item.WarehousingCount,
-					StockCount:       info.StockCount + total,
-					Price:            item.Price,
-					Manufacturer:     item.Manufacturer,
-					Number:           item.Number,
-					ProductDate:      item.ProductDate,
-					ExpiryDate:       item.ExpiryDate,
-					LicenseNumber:    item.LicenseNumber,
-					Dealer:           item.Dealer,
-					Remark:           item.Remark,
-					PackingPrice:     item.PackingPrice,
-					StorehouseId:     storehouse_id,
-					RegisterNumber:   item.RegisterNumber,
-				}
-
-				//改变库存
-				good, _ := service.GetLastInfoMationById(info.GoodId)
-				warhouseCount := strconv.FormatInt(total, 10)
-				all_total, _ := strconv.ParseFloat(warhouseCount, 64)
-				goodInfo := models.GoodInfo{
-					Total: good.Total + all_total,
-				}
-				service.UpdateGoodInfoMation(info.GoodId, goodInfo)
-				service.UpdateWarehouseInfoByGoodIdOne(goodinfo, item.ID)
-				//查询该机构默认仓库
-				storeConfig, _ := service.GetAllStoreHouseConfig(adminUserInfo.CurrentOrgId)
-				//查询剩余库存
-				goodList, _ := service.GetGoodSumCountByStoreId(storeConfig.StorehouseOutInfo, item.GoodId, adminUserInfo.CurrentOrgId)
-				var sum_count int64
-				var sum_in_count int64
-				for _, item := range goodList {
-					sum_count += item.StockCount
-					sum_in_count += item.WarehousingCount
-				}
-				service.UpdateGoodByGoodId(item.GoodId, sum_count, sum_in_count, item.OrgId)
-			}
-
-			if item.WarehousingCount < info.WarehousingCount {
-
-				total = info.WarehousingCount - item.WarehousingCount
-				goodinfo := models.WarehousingInfo{
-					WarehousingCount: item.WarehousingCount,
-					StockCount:       info.StockCount - total,
-					Price:            item.Price,
-					Manufacturer:     item.Manufacturer,
-					Number:           item.Number,
-					ProductDate:      item.ProductDate,
-					ExpiryDate:       item.ExpiryDate,
-					LicenseNumber:    item.LicenseNumber,
-					Dealer:           item.Dealer,
-					Remark:           item.Remark,
-					PackingPrice:     item.PackingPrice,
-					StorehouseId:     storehouse_id,
-					RegisterNumber:   item.RegisterNumber,
-				}
-
-				//改变库存
-				good, _ := service.GetLastInfoMationById(info.GoodId)
-				warhouseCount := strconv.FormatInt(total, 10)
-				all_total, _ := strconv.ParseFloat(warhouseCount, 64)
-				goodInfo := models.GoodInfo{
-					Total: good.Total - all_total,
-				}
-				service.UpdateGoodInfoMation(info.GoodId, goodInfo)
-				service.UpdateWarehouseInfoByGoodIdOne(goodinfo, item.ID)
-				//查询该机构默认仓库
-				storeConfig, _ := service.GetAllStoreHouseConfig(adminUserInfo.CurrentOrgId)
-				//查询剩余库存
-				goodList, _ := service.GetGoodSumCountByStoreId(storeConfig.StorehouseOutInfo, item.GoodId, adminUserInfo.CurrentOrgId)
-				var sum_count int64
-				var sum_in_count int64
-				for _, item := range goodList {
-					sum_count += item.StockCount
-					sum_in_count += item.WarehousingCount
-				}
-				service.UpdateGoodByGoodId(item.GoodId, sum_count, sum_in_count, item.OrgId)
-			}
-
-			if item.WarehousingCount == info.WarehousingCount {
-				goodinfo := models.WarehousingInfo{
-					WarehousingCount: item.WarehousingCount,
-					StockCount:       info.StockCount,
-					Price:            item.Price,
-					Manufacturer:     item.Manufacturer,
-					Number:           item.Number,
-					ProductDate:      item.ProductDate,
-					ExpiryDate:       item.ExpiryDate,
-					LicenseNumber:    item.LicenseNumber,
-					Dealer:           item.Dealer,
-					Remark:           item.Remark,
-					PackingPrice:     item.PackingPrice,
-					StorehouseId:     storehouse_id,
-					RegisterNumber:   item.RegisterNumber,
-				}
-				service.UpdateWarehouseInfoByGoodIdOne(goodinfo, item.ID)
-				//查询该机构默认仓库
-				storeConfig, _ := service.GetAllStoreHouseConfig(adminUserInfo.CurrentOrgId)
-				//查询剩余库存
-				goodList, _ := service.GetGoodSumCountByStoreId(storeConfig.StorehouseOutInfo, item.GoodId, adminUserInfo.CurrentOrgId)
-				var sum_count int64
-				var sum_in_count int64
-				for _, item := range goodList {
-					sum_count += item.StockCount
-					sum_in_count += item.WarehousingCount
-				}
-				service.UpdateGoodByGoodId(item.GoodId, sum_count, sum_in_count, item.OrgId)
-			}
-
-		}
-	}
-
-	if len(stockFlow) > 0 {
-		for _, item := range stockFlow {
-			flow := models.VmStockFlow{
-				Count:          item.Count,
-				Number:         item.Number,
-				ProductDate:    item.ProductDate,
-				ExpireDate:     item.ExpireDate,
-				Price:          item.Price,
-				Manufacturer:   item.Manufacturer,
-				Dealer:         item.Dealer,
-				LicenseNumber:  item.LicenseNumber,
-				StorehouseId:   storehouse_id,
-				RegisterNumber: item.RegisterNumber,
-			}
-			parseDateErr := service.UpdatedStockFlowByGoodIdOne(item.WarehousingId, item.GoodId, flow)
-			fmt.Println(parseDateErr)
 		}
 	}
 
@@ -1466,8 +1220,6 @@ func (c *StockManagerApiController) CreateWarehouseOut() {
 				}
 				license_number := items["license_number"].(string)
 
-
-				register_number := items["register_number"].(string)
 				warehouseOutInfo := &models.WarehouseOutInfo{
 					ID:                      id,
 					WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
@@ -1494,7 +1246,6 @@ func (c *StockManagerApiController) CreateWarehouseOut() {
 					BuyPrice:                buy_price,
 					StockCount:              stock_count,
 					IsCheck:                 2,
-					RegisterNumber:          register_number,
 				}
 				warehousingOutInfo = append(warehousingOutInfo, warehouseOutInfo)
 
@@ -1825,8 +1576,6 @@ func (c *StockManagerApiController) EditWarehouseOut() {
 
 				license_number := items["license_number"].(string)
 
-				register_number := items["register_number"].(string)
-
 				timeLayout := "2006-01-02"
 				loc, _ := time.LoadLocation("Local")
 				expiry_date := items["expiry_date"].(string)
@@ -1939,7 +1688,6 @@ func (c *StockManagerApiController) EditWarehouseOut() {
 						StorehouseId:            storehouse_id,
 						AdminUserId:             admin_user_id,
 						StockCount:              stock_count,
-						RegisterNumber:          register_number,
 					}
 					upDateWarehouseOutInfos = append(upDateWarehouseOutInfos, warehouseOutInfo)
 				}
@@ -2232,276 +1980,6 @@ func (c *StockManagerApiController) EditWarehouseOut() {
 			//}
 			//service.UpdateGoodByGoodId(item.GoodId, sum_count, sum_in_count, item.OrgId)
 
-			//1.查询该耗材该批次的最后一次出库记录
-			lastGood, _ := service.GetLastGoodInformationByGoodId(item.GoodId, item.WarehouseInfotId, item.OrgId)
-
-			//如果出库数量大于 最后一次批次的数量(那么要进行出库)
-
-			if item.Count > lastGood.Count {
-
-				//查询该耗材是否还有库存
-				warehouseinfo, _ := service.GetTotalCountByGoodId(item.GoodId, item.StorehouseId)
-
-				//无库存
-				if warehouseinfo.StockCount <= 0 {
-					c.ServeSuccessJSON(map[string]interface{}{
-						"msg": "5",
-					})
-					return
-				}
-
-				//有库存,进行出库,调用出库接口
-				if warehouseinfo.StockCount > 0 {
-					var total int64
-					var stock_cout int64
-					var total_count int64
-					//计算和最后一次出库数据的差
-					total = item.Count - lastGood.Count
-
-					if total > warehouseinfo.StockCount {
-						c.ServeSuccessJSON(map[string]interface{}{
-							"msg": "6",
-						})
-						return
-					}
-					//获取该耗材该批次的剩余库存量
-					info, _ := service.GetLastGoodCountById(item.GoodId, item.WarehouseInfotId)
-
-					//判断该批次的剩余库存 和出库的库存进行比较
-					//如果出库的库存大于该批次的剩余库存,那么需要出库下一批次的库存
-
-					if total > info.StockCount {
-						//计算出库和该批次相差的库存
-						total_count = item.Count - info.StockCount
-						//清空本批次次库存
-						service.DeleteWarehouseInfo(item.WarehouseInfotId)
-						//调用出库逻辑
-						parseDateErr := service.ConsumablesDeliveryTwo(item.OrgId, item, total_count)
-						if parseDateErr != nil {
-							utils.ErrorLog(errs.Error())
-							c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateStockInFail)
-							return
-						}
-					}
-					//如果与上次比的库存小于或等于于该批次的剩余库存,那么需要该批次出库
-					if total <= info.StockCount {
-						stock_cout = lastGood.Count + total
-						fmt.Println(stock_cout)
-						//扣减库存
-						warehouse := models.WarehousingInfo{
-							StockCount: info.StockCount - total,
-						}
-						errs := service.UpdateWarehousingInfo(warehouse, info.ID)
-
-						warehouseOutInfo := &models.WarehouseOutInfo{
-							WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
-							WarehouseOutId:          id,
-							WarehouseInfotId:        item.WarehouseInfotId,
-							Status:                  1,
-							Ctime:                   time.Now().Unix(),
-							Remark:                  item.Remark,
-							OrgId:                   item.OrgId,
-							Type:                    1,
-							Manufacturer:            item.Manufacturer,
-							Dealer:                  item.Dealer,
-							IsSys:                   0,
-							SysRecordTime:           item.SysRecordTime,
-							GoodTypeId:              item.GoodTypeId,
-							GoodId:                  item.GoodId,
-							ExpiryDate:              item.ExpiryDate,
-							ProductDate:             item.ProductDate,
-							Number:                  item.Number,
-							Price:                   item.Price,
-							LicenseNumber:           item.LicenseNumber,
-							Count:                   item.Count,
-							ConsumableType:          2,
-							StorehouseId:            item.StorehouseId,
-							AdminUserId:             item.AdminUserId,
-							StockCount:              item.StockCount,
-							RegisterNumber:          item.RegisterNumber,
-						}
-
-						//查询是否存在
-						_, errcode := service.GetWarehouseOutInfoIsExist(item.ID)
-						if errcode == gorm.ErrRecordNotFound {
-
-							errOne := service.AddSigleWarehouseOutInfo(warehouseOutInfo)
-							if errOne != nil {
-								utils.ErrorLog(errs.Error())
-								c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateStockInFail)
-								return
-							}
-						} else if errcode == nil {
-							service.UpDateWarehouseOutInfo(item)
-							//更新流水
-							flow := models.VmStockFlow{
-								Number:         item.Number,
-								LicenseNumber:  item.LicenseNumber,
-								Count:          item.Count,
-								Manufacturer:   item.Manufacturer,
-								Dealer:         item.Dealer,
-								ProductDate:    item.ProductDate,
-								ExpireDate:     item.ExpiryDate,
-								Price:          item.Price,
-								StorehouseId:   item.StorehouseId,
-								AdminUserId:    item.AdminUserId,
-								StockCount:     item.StockCount,
-								RegisterNumber: item.RegisterNumber,
-							}
-							service.UpdateStockFlowByDetailId(flow, item.ID)
-
-							goodInfo := models.GoodInfo{
-								Manufacturer: item.Manufacturer,
-								Dealer:       item.Dealer,
-							}
-							service.UpdatedGoodInfo(goodInfo, item.GoodId)
-						}
-					}
-				}
-			}
-
-			var last_count int64
-			var all_total int64
-			var stock_total int64
-			//如果退库数量小于最后一次批次的数量(要么要进行退库)
-			if item.Count < lastGood.Count {
-
-				//退库数量和最后一次出库数据进行计算
-				last_count = lastGood.Count - item.Count
-
-				//获取该耗材该批次的剩余库存量
-				infoInfo, _ := service.GetLastGoodCountById(item.GoodId, item.WarehouseInfotId)
-
-				//退库数量和最后一次出库数据进行计算的差 加上 剩余库存的数量与 该批次的入库数量进行比较
-				all_total = last_count + infoInfo.StockCount
-
-				//如果库存大于总数量，则退回到这个批次
-
-				if infoInfo.WarehousingCount > all_total {
-					stock_total = last_count + infoInfo.StockCount
-
-					//退回该批次,计算数量
-					warehousingInfoOne := models.WarehousingInfo{
-						StockCount:   stock_total,
-						ID:           item.WarehouseInfotId,
-						OrgId:        item.OrgId,
-						StorehouseId: item.StorehouseId,
-					}
-
-					parseDateErr := service.UpdateWarehousingInfo(warehousingInfoOne, item.WarehouseInfotId)
-
-					fmt.Println("parseDateErr", parseDateErr)
-					//插入一条新纪录
-					warehouseOutInfoThree := &models.WarehouseOutInfo{
-						WarehouseOutOrderNumber: item.WarehouseOutOrderNumber,
-						WarehouseOutId:          id,
-						WarehouseInfotId:        item.WarehouseInfotId,
-						Status:                  1,
-						Ctime:                   time.Now().Unix(),
-						Remark:                  item.Remark,
-						OrgId:                   item.OrgId,
-						Type:                    1,
-						Manufacturer:            item.Manufacturer,
-						Dealer:                  item.Dealer,
-						IsSys:                   0,
-						GoodTypeId:              item.GoodTypeId,
-						GoodId:                  item.GoodId,
-						ExpiryDate:              item.ExpiryDate,
-						ProductDate:             item.ProductDate,
-						Number:                  item.Number,
-						Price:                   item.Price,
-						LicenseNumber:           item.LicenseNumber,
-						ConsumableType:          2,
-						Count:                   item.Count,
-						StorehouseId:            item.StorehouseId,
-						AdminUserId:             item.AdminUserId,
-						StockCount:              item.StockCount,
-						RegisterNumber:          item.RegisterNumber,
-					}
-					//查询是否存在
-					_, errcode := service.GetWarehouseOutInfoIsExist(item.ID)
-					if errcode == gorm.ErrRecordNotFound {
-						errOne := service.AddSigleWarehouseOutInfo(warehouseOutInfoThree)
-						if errOne != nil {
-							utils.ErrorLog(errs.Error())
-							c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateStockInFail)
-							return
-						}
-
-					} else if errcode == nil {
-						service.UpDateWarehouseOutInfo(item)
-						flow := models.VmStockFlow{
-							Number:         item.Number,
-							LicenseNumber:  item.LicenseNumber,
-							Count:          item.Count,
-							Manufacturer:   item.Manufacturer,
-							Dealer:         item.Dealer,
-							ProductDate:    item.ProductDate,
-							ExpireDate:     item.ExpiryDate,
-							Price:          item.Price,
-							StorehouseId:   item.StorehouseId,
-							AdminUserId:    item.AdminUserId,
-							StockCount:     item.StockCount,
-							RegisterNumber: item.RegisterNumber,
-						}
-						service.UpdateStockFlowByDetailId(flow, item.ID)
-						goodInfo := models.GoodInfo{
-							Manufacturer: item.Manufacturer,
-							Dealer:       item.Dealer,
-						}
-						service.UpdatedGoodInfo(goodInfo, item.GoodId)
-
-					}
-				}
-
-				//如果库存小于总数量，则报错提醒，该批次的退库数据大于入库数据了无法退库,则需要退库到另一个批次
-				if infoInfo.WarehousingCount < all_total {
-					c.ServeSuccessJSON(map[string]interface{}{
-						"msg": "6",
-					})
-					return
-				}
-			}
-
-			if item.Count == lastGood.Count {
-
-				errs = service.UpDateWarehouseOutInfo(item)
-				flow := models.VmStockFlow{
-					Number:         item.Number,
-					LicenseNumber:  item.LicenseNumber,
-					Count:          item.Count,
-					Manufacturer:   item.Manufacturer,
-					Dealer:         item.Dealer,
-					ProductDate:    item.ProductDate,
-					ExpireDate:     item.ExpiryDate,
-					Price:          item.Price,
-					StorehouseId:   item.StorehouseId,
-					AdminUserId:    item.AdminUserId,
-					BuyPrice:       item.BuyPrice,
-					StockCount:     item.StockCount,
-					RegisterNumber: item.RegisterNumber,
-				}
-				service.UpdateStockFlowByDetailId(flow, item.ID)
-				goodInfo := models.GoodInfo{
-					Manufacturer: item.Manufacturer,
-					Dealer:       item.Dealer,
-				}
-				service.UpdatedGoodInfo(goodInfo, item.GoodId)
-
-			}
-
-			//查询该机构默认仓库
-			storeConfig, _ := service.GetAllStoreHouseConfig(adminUserInfo.CurrentOrgId)
-			//查询剩余库存
-			goodList, _ := service.GetGoodSumCountByStoreId(storeConfig.StorehouseOutInfo, item.GoodId, adminUserInfo.CurrentOrgId)
-			var sum_count int64
-			var sum_in_count int64
-			for _, item := range goodList {
-				sum_count += item.StockCount
-				sum_in_count += item.WarehousingCount
-			}
-			service.UpdateGoodByGoodId(item.GoodId, sum_count, sum_in_count, item.OrgId)
-
 		}
 	}
 

models/drug_stock.go

@@ -508,59 +508,39 @@ func (DrugWarehouseOutInfoTenty) TableName() string {
 }
 
 type DrugWarehouseInfoTwenty struct {
-	ID                        int64       `gorm:"column:id" json:"id" form:"id"`
-	WarehousingId             int64       `gorm:"column:warehousing_id" json:"warehousing_id" form:"warehousing_id"`
-	DrugId                    int64       `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
-	Number                    string      `gorm:"column:number" json:"number" form:"number"`
-	ProductDate               int64       `gorm:"column:product_date" json:"product_date" form:"product_date"`
-	ExpiryDate                int64       `gorm:"column:expiry_date" json:"expiry_date" form:"expiry_date"`
-	WarehousingCount          int64       `gorm:"column:warehousing_count" json:"warehousing_count" form:"warehousing_count"`
-	Price                     float64     `gorm:"column:price" json:"price" form:"price"`
-	TotalPrice                float64     `gorm:"column:total_price" json:"total_price" form:"total_price"`
-	Dealer                    int64       `gorm:"column:dealer" json:"dealer" form:"dealer"`
-	Manufacturer              int64       `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
-	Remark                    string      `gorm:"column:remark" json:"remark" form:"remark"`
-	Ctime                     int64       `gorm:"column:ctime" json:"ctime" form:"ctime"`
-	Mtime                     int64       `gorm:"column:mtime" json:"mtime" form:"mtime"`
-	Status                    int64       `gorm:"column:status" json:"status" form:"status"`
-	OrgId                     int64       `gorm:"column:org_id" json:"org_id" form:"org_id"`
-	IsReturn                  int64       `gorm:"column:is_return" json:"is_return" form:"is_return"`
-	WarehousingOrder          string      `gorm:"column:warehousing_order" json:"warehousing_order" form:"warehousing_order"`
-	Type                      int64       `gorm:"column:type" json:"type" form:"type"`
-	RetailPrice               float64     `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
-	RetailTotalPrice          float64     `gorm:"column:retail_total_price" json:"retail_total_price" form:"retail_total_price"`
-	BatchNumber               string      `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
-	MaxUnit                   string      `gorm:"column:max_unit" json:"max_unit" form:"max_unit"`
-	MinUnit                   string      `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
-	StockMaxNumber            int64       `gorm:"column:stock_max_number" json:"stock_max_number" form:"stock_max_number"`
-	StockMinNumber            int64       `gorm:"column:stock_min_number" json:"stock_min_number" form:"stock_min_number"`
-	WarehousingInfoId         int64       `gorm:"column:warehousing_info_id" json:"warehousing_info_id" form:"warehousing_info_id"`
-	SupplyWarehouseId         int64       `gorm:"column:supply_warehouse_id" json:"supply_warehouse_id" form:"supply_warehouse_id"`
-	SupplyWarehouseDetailInfo int64       `gorm:"column:supply_warehouse_detail_info" json:"supply_warehouse_detail_info" form:"supply_warehouse_detail_info"`
-	StorehouseId              int64       `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
-	SecondWarehouseInfoId     int64       `gorm:"column:second_warehouse_info_id" json:"second_warehouse_info_id" form:"second_warehouse_info_id"`
-	IsCheck                   int64       `gorm:"column:is_check" json:"is_check" form:"is_check"`
-	BaseDrugLib               BaseDrugLib `gorm:"ForeignKey:ID;AssociationForeignKey:DrugId"json:"drug" `
-type DrugWarehouseOutTwenty struct {
 	ID                        int64                        `gorm:"column:id" json:"id" form:"id"`
-	WarehouseOutOrderNumber   string                       `gorm:"column:warehouse_out_order_number" json:"warehouse_out_order_number" form:"warehouse_out_order_number"`
-	OperationTime             int64                        `gorm:"column:operation_time" json:"operation_time" form:"operation_time"`
-	Creater                   int64                        `gorm:"column:creater" json:"creater" form:"creater"`
-	OrgId                     int64                        `gorm:"column:org_id" json:"org_id" form:"org_id"`
-	Modifier                  int64                        `gorm:"column:modifier" json:"modifier" form:"modifier"`
+	WarehousingId             int64                        `gorm:"column:warehousing_id" json:"warehousing_id" form:"warehousing_id"`
+	DrugId                    int64                        `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
+	Number                    string                       `gorm:"column:number" json:"number" form:"number"`
+	ProductDate               int64                        `gorm:"column:product_date" json:"product_date" form:"product_date"`
+	ExpiryDate                int64                        `gorm:"column:expiry_date" json:"expiry_date" form:"expiry_date"`
+	WarehousingCount          int64                        `gorm:"column:warehousing_count" json:"warehousing_count" form:"warehousing_count"`
+	Price                     float64                      `gorm:"column:price" json:"price" form:"price"`
+	TotalPrice                float64                      `gorm:"column:total_price" json:"total_price" form:"total_price"`
+	Dealer                    int64                        `gorm:"column:dealer" json:"dealer" form:"dealer"`
+	Manufacturer              int64                        `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
 	Remark                    string                       `gorm:"column:remark" json:"remark" form:"remark"`
 	Ctime                     int64                        `gorm:"column:ctime" json:"ctime" form:"ctime"`
 	Mtime                     int64                        `gorm:"column:mtime" json:"mtime" form:"mtime"`
 	Status                    int64                        `gorm:"column:status" json:"status" form:"status"`
-	WarehouseOutTime          int64                        `gorm:"column:warehouse_out_time" json:"warehouse_out_time" form:"warehouse_out_time"`
-	Dealer                    int64                        `gorm:"column:dealer" json:"dealer" form:"dealer"`
-	Manufacturer              int64                        `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
+	OrgId                     int64                        `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	IsReturn                  int64                        `gorm:"column:is_return" json:"is_return" form:"is_return"`
+	WarehousingOrder          string                       `gorm:"column:warehousing_order" json:"warehousing_order" form:"warehousing_order"`
 	Type                      int64                        `gorm:"column:type" json:"type" form:"type"`
-	IsSys                     int64                        `gorm:"column:is_sys" json:"is_sys" form:"is_sys"`
-	SupplyCancelOutId         int64                        `gorm:"column:supply_cancel_out_id" json:"supply_cancel_out_id" form:"supply_cancel_out_id"`
+	RetailPrice               float64                      `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
+	RetailTotalPrice          float64                      `gorm:"column:retail_total_price" json:"retail_total_price" form:"retail_total_price"`
+	BatchNumber               string                       `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
+	MaxUnit                   string                       `gorm:"column:max_unit" json:"max_unit" form:"max_unit"`
+	MinUnit                   string                       `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
+	StockMaxNumber            int64                        `gorm:"column:stock_max_number" json:"stock_max_number" form:"stock_max_number"`
+	StockMinNumber            int64                        `gorm:"column:stock_min_number" json:"stock_min_number" form:"stock_min_number"`
+	WarehousingInfoId         int64                        `gorm:"column:warehousing_info_id" json:"warehousing_info_id" form:"warehousing_info_id"`
 	SupplyWarehouseId         int64                        `gorm:"column:supply_warehouse_id" json:"supply_warehouse_id" form:"supply_warehouse_id"`
+	SupplyWarehouseDetailInfo int64                        `gorm:"column:supply_warehouse_detail_info" json:"supply_warehouse_detail_info" form:"supply_warehouse_detail_info"`
 	StorehouseId              int64                        `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
-	SecondWarehouseId         int64                        `gorm:"column:second_warehouse_id" json:"second_warehouse_id" form:"second_warehouse_id"`
+	SecondWarehouseInfoId     int64                        `gorm:"column:second_warehouse_info_id" json:"second_warehouse_info_id" form:"second_warehouse_info_id"`
+	IsCheck                   int64                        `gorm:"column:is_check" json:"is_check" form:"is_check"`
+	BaseDrugLib               BaseDrugLib                  `gorm:"ForeignKey:ID;AssociationForeignKey:DrugId"json:"drug" `
 	DrugWarehouseOutInfoTenty []*DrugWarehouseOutInfoTenty `gorm:"ForeignKey:WarehouseOutId;AssociationForeignKey:ID"json:"xt_drug_warehouse_out_info" `
 }
 

service/stock_service.go

@@ -730,13 +730,6 @@ func CreateDrugFlowOne(flow models.DrugFlow) error {
 }
 
 func UpdateDrugFlowSeven(patientid int64, recorddate int64, drugid int64, advice_id int64, id int64, warhouse_out_id int64) (models.DrugAutomaticReduceDetail, error) {
-//func CreateDrugFlowOneTX(flow models.DrugFlow,tx *gorm.DB) error {
-//	err := tx.Create(&flow).Error
-//	return err
-//}
-
-func UpdateDrugFlowSeven(patientid int64, recorddate int64, drugid int64, advice_id int64) (models.DrugAutomaticReduceDetail, error) {
-
 	detail := models.DrugAutomaticReduceDetail{}
 	err := XTWriteDB().Model(&detail).Where("patient_id = ? and record_time = ? and drug_id = ? and status= 1 and advice_id =? ", patientid, recorddate, drugid, advice_id).Updates(map[string]interface{}{"status": 0}).Error
 	err = XTWriteDB().Model(&models.DrugWarehouseOutInfo{}).Where("patient_id =? and sys_record_time =? and drug_id = ? and status = 1 and advice_id =? and id = ?", patientid, recorddate, drugid, advice_id, id).Updates(map[string]interface{}{"status": 0}).Error

service/warhouse_service.go

@@ -274,9 +274,6 @@ func DrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *model
 				if warehouse.StockMinNumber > 0 {
 					warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
 				}
-				if (warehouse.StockMinNumber - deliver_number) > 0 {
-					warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
-				}
 
 			}
 
@@ -289,12 +286,6 @@ func DrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *model
 				//if warehouse.StockMinNumber == 0 {
 				//  warehouse.StockMaxNumber = stock_max_number
 				//}
-			if (warehouse.StockMinNumber - deliver_number) > 0 {
-				warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
-
-				//if warehouse.StockMinNumber == 0 {
-				//	warehouse.StockMaxNumber = stock_max_number
-				//}
 			}
 
 		}
@@ -539,13 +530,9 @@ func HisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *mo
 	prescribingNumber_temp := strconv.FormatFloat(math.Abs(prescribingNumber), 'f', 0, 64)
 	count, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
 
-	if advice.PrescribingNumberUnit == drup.MaxUnit && drup.MaxUnit != drup.MinUnit {
-		deliver_number = count * drup.MinNumber
-	}
-	if advice.PrescribingNumberUnit == drup.MaxUnit && drup.MaxUnit == drup.MinUnit {
+	if advice.PrescribingNumberUnit == drup.MaxUnit {
 		deliver_number = count * drup.MinNumber
-	}
-	if advice.PrescribingNumberUnit == drup.MinUnit && drup.MaxUnit != drup.MinUnit {
+	} else {
 		deliver_number = count
 	}
 
@@ -583,10 +570,12 @@ func HisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *mo
 	warehouse, err := FindLastDrugWarehousingInfoByID(advice.DrugId, storeConfig.DrugStorehouseOut)
 
 	if err != nil {
+
 		return err
 	}
 
 	// 将该批次的剩余库存数量转换为拆零数量
+
 	stock_number = warehouse.StockMaxNumber*drup.MinNumber + warehouse.StockMinNumber
 	fmt.Println("查询剩余库存", stock_number)
 
@@ -681,9 +670,6 @@ func HisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *mo
 		// 判断处方里药品单位是拆零单位还是包装单位,	如果是拆零单位，则根据规格，将拆零数量转为包装数量
 		var maxNumber int64 = 0
 		var minNumber int64 = 0
-		//var stock_max_number int64 = 0
-		//
-		//stock_max_number = warehouse.StockMaxNumber
 
 		maxNumber = deliver_number / drup.MinNumber
 		minNumber = deliver_number % drup.MinNumber
@@ -697,12 +683,9 @@ func HisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *mo
 				return errors.New("库存数量不足")
 			}
 		}
-		fmt.Println("max_number23323232323232232323", maxNumber)
-		fmt.Println("minNumber", minNumber)
 		fmt.Println("查询库存", warehouse.StockMaxNumber)
 		fmt.Println("扣减库存我的", maxNumber)
 		warehouse.StockMaxNumber = warehouse.StockMaxNumber - maxNumber
-		fmt.Println("max_number23323232323232232323", warehouse.StockMaxNumber)
 		fmt.Println("剩余库存我的", warehouse.StockMaxNumber)
 
 		if warehouse.StockMaxNumber < 0 {
@@ -715,25 +698,20 @@ func HisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *mo
 		warehouse.Mtime = time.Now().Unix()
 
 		if warehouse.StockMinNumber < minNumber {
+
 			warehouse.StockMaxNumber = warehouse.StockMaxNumber - 1
 			warehouse.StockMinNumber = warehouse.StockMinNumber + drup.MinNumber - minNumber
 		} else {
+
 			if minNumber > 0 {
 				warehouse.StockMinNumber = warehouse.StockMinNumber - minNumber
 			}
 
-			fmt.Println("deliver_number2332322323323232", deliver_number)
-
-			fmt.Println("warehouse.StockMinNumber", warehouse.StockMinNumber)
 			if minNumber == 0 && maxNumber != 1 {
 				if warehouse.StockMinNumber > 0 {
 					warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
 				}
 
-				if (warehouse.StockMinNumber - deliver_number) > 0 {
-					warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
-				}
-
 			}
 		}
 
@@ -749,12 +727,6 @@ func HisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *mo
 				//if warehouse.StockMinNumber == 0 {
 				//  warehouse.StockMaxNumber = stock_max_number
 				//}
-			if (warehouse.StockMinNumber - deliver_number) > 0 {
-				warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
-
-				//if warehouse.StockMinNumber == 0 {
-				//	 warehouse.StockMaxNumber = stock_max_number
-				//}
 			}
 
 		}
@@ -767,10 +739,6 @@ func HisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *mo
 		if warehouse.StockMinNumber <= 0 {
 			warehouse.StockMinNumber = 0
 		}
-
-		fmt.Println("warehouse.StockMinNumber 2323323232233", warehouse.StockMinNumber)
-		fmt.Println("warehouse.StockMaxNumber 2323323232233", warehouse.StockMaxNumber)
-
 		fmt.Println("stock_max_233232323223323233223323223", warehouse.StockMinNumber)
 		fmt.Println("stock_max_233232323223323233223323223", warehouse.StockMaxNumber)
 		//扣减库存232332332332
@@ -1935,7 +1903,6 @@ func ConsumablesDeliveryOne(orgID int64, record_time int64, goods *models.Wareho
 			AdminUserId:             goods.AdminUserId,
 			BuyPrice:                warehouse.Price,
 			StockCount:              goods.StockCount,
-			RegisterNumber:          goods.RegisterNumber,
 		}
 		warehouseOutInfo.Count = goods.Count
 		//添加出库单详情
@@ -1979,7 +1946,6 @@ func ConsumablesDeliveryOne(orgID int64, record_time int64, goods *models.Wareho
 			AdminUserId:             goods.AdminUserId,
 			BuyPrice:                warehouse.Price,
 			StockCount:              goods.StockCount,
-			RegisterNumber:          goods.RegisterNumber,
 		}
 
 		//创建出库流水
@@ -2047,7 +2013,6 @@ func ConsumablesDeliveryOne(orgID int64, record_time int64, goods *models.Wareho
 			AdminUserId:             goods.AdminUserId,
 			BuyPrice:                warehouse.Price,
 			StockCount:              goods.StockCount,
-			RegisterNumber:          goods.RegisterNumber,
 		}
 		warehouseOutInfo.Count = stock_number
 
@@ -2100,7 +2065,6 @@ func ConsumablesDeliveryOne(orgID int64, record_time int64, goods *models.Wareho
 			AdminUserId:             goods.AdminUserId,
 			BuyPrice:                warehouse.Price,
 			StockCount:              goods.StockCount,
-			RegisterNumber:          goods.RegisterNumber,
 		}
 
 		//创建出库明细
@@ -2455,9 +2419,6 @@ func NewDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *mo
 					warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
 				}
 
-				if (warehouse.StockMinNumber - deliver_number) > 0 {
-					warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
-				}
 			}
 		}
 
@@ -2468,12 +2429,6 @@ func NewDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *mo
 				//if warehouse.StockMinNumber == 0 {
 				//  warehouse.StockMaxNumber = stock_max_number
 				//}
-			if (warehouse.StockMinNumber - deliver_number) > 0 {
-				warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
-
-				//if warehouse.StockMinNumber == 0 {
-				//	warehouse.StockMaxNumber = stock_max_number
-				//}
 			}
 
 		}
@@ -2831,10 +2786,6 @@ func NewHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout
 					warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
 				}
 
-				if (warehouse.StockMinNumber - deliver_number) > 0 {
-					warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
-				}
-
 			}
 		}
 
@@ -2845,12 +2796,6 @@ func NewHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout
 				//if warehouse.StockMinNumber == 0 {
 				//  warehouse.StockMaxNumber = stock_max_number
 				//}
-			if (warehouse.StockMinNumber - deliver_number) > 0 {
-				warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
-
-				//if warehouse.StockMinNumber == 0 {
-				//	warehouse.StockMaxNumber = stock_max_number
-				//}
 			}
 
 		}
@@ -4597,10 +4542,7 @@ func AutoDrugDeliverInfoTwenty(orgID int64, prescribingNumber int64, warehouseou
 		} else {
 			if minNumber > 0 {
 				if minNumber == 1 && maxNumber == 1 && drup.MaxUnit != drup.MinUnit {
-					if (warehouse.StockMinNumber - deliver_number) > 0 {
-						warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
-					}
-
+					warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
 				} else {
 					warehouse.StockMinNumber = warehouse.StockMinNumber - minNumber
 				}
@@ -4610,9 +4552,6 @@ func AutoDrugDeliverInfoTwenty(orgID int64, prescribingNumber int64, warehouseou
 				if warehouse.StockMinNumber > 0 {
 					warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
 				}
-				if (warehouse.StockMinNumber - deliver_number) > 0 {
-					warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
-				}
 
 			}
 
@@ -4625,12 +4564,6 @@ func AutoDrugDeliverInfoTwenty(orgID int64, prescribingNumber int64, warehouseou
 				//if warehouse.StockMinNumber == 0 {
 				//  warehouse.StockMaxNumber = stock_max_number
 				//}
-			if (warehouse.StockMinNumber - deliver_number) > 0 {
-				warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
-
-				//if warehouse.StockMinNumber == 0 {
-				//	warehouse.StockMaxNumber = stock_max_number
-				//}
 			}
 
 		}
@@ -4853,11 +4786,6 @@ func AutoDrugDeliverInfoTwentyOne(orgID int64, prescribingNumber int64, warehous
 		warehouseOutInfo.Count = prescribingNumber
 		warehouseOutInfo.CountUnit = advice.CountUnit
 
-		errOne := AddSigleDrugWarehouseOutInfo(warehouseOutInfo)
-		if errOne != nil {
-			return errOne
-		}
-
 		drugWareInfo, _ := GetLastWarehouseOutInfoById(advice.DrugId)
 		drugflow := models.DrugFlow{
 			WarehouseOutId:          warehouseout.ID,
@@ -4930,10 +4858,7 @@ func AutoDrugDeliverInfoTwentyOne(orgID int64, prescribingNumber int64, warehous
 		} else {
 			if minNumber > 0 {
 				if minNumber == 1 && maxNumber == 1 && drup.MaxUnit != drup.MinUnit {
-					if (warehouse.StockMinNumber - deliver_number) > 0 {
-						warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
-					}
-
+					warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
 				} else {
 					warehouse.StockMinNumber = warehouse.StockMinNumber - minNumber
 				}
@@ -4943,21 +4868,11 @@ func AutoDrugDeliverInfoTwentyOne(orgID int64, prescribingNumber int64, warehous
 				if warehouse.StockMinNumber > 0 {
 					warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
 				}
-				if (warehouse.StockMinNumber - deliver_number) > 0 {
-					warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
-				}
 
 			}
 
 		}
 
-		}
-
-		fmt.Println("maxNumber2332323233223", maxNumber)
-		fmt.Println("minNumber", minNumber)
-		fmt.Println("warehouse.StockMinNumber2332322323", warehouse.StockMinNumber)
-		fmt.Println("deliver_number233232323233223332", deliver_number)
-
 		if maxNumber == 1 && minNumber == 0 && drup.MaxUnit != drup.MinUnit {
 			if (warehouse.StockMinNumber - deliver_number) > 0 {
 				warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
@@ -4965,12 +4880,6 @@ func AutoDrugDeliverInfoTwentyOne(orgID int64, prescribingNumber int64, warehous
 				//if warehouse.StockMinNumber == 0 {
 				//  warehouse.StockMaxNumber = stock_max_number
 				//}
-			if (warehouse.StockMinNumber - deliver_number) > 0 {
-				warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
-
-				//if warehouse.StockMinNumber == 0 {
-				//	warehouse.StockMaxNumber = stock_max_number
-				//}
 			}
 
 		}