耗材参数

controllers/data_api_controller.go

@@ -400,7 +400,7 @@ func configFormData(dataconfig *models.Dataconfig, data []byte) (code int) {
 	}
 	dataconfig.Module = module
 
-	if module == "education" || module == "summary" || module == "course_disease" || module == "rescue_record" || module == "nursing_record" || module == "special_record" || module == "special_treatment" {
+	if module == "education" || module == "summary" || module == "course_disease" || module == "rescue_record" || module == "nursing_record" || module == "special_record" || module == "special_treatment" || module == "template_summary" || module == "template_plan" {
 		if configBody["title"] == nil || reflect.TypeOf(configBody["title"]).String() != "string" {
 			utils.ErrorLog("title")
 			code = enums.ErrorCodeParamWrong

controllers/drug_stock_api_contorller.go

@@ -1237,12 +1237,42 @@ func (c *StockDrugApiController) CreateDrugWarehouseOut() {
 			}
 		}
 	}
-
+	var total_count int64
+	var prescribing_number_total int64
 	//调用出库逻辑
 	for _, item := range warehousingOutInfo {
 		//获取药品库存
 		info, _ := service.GetDrugTotalCount(item.DrugId, item.OrgId)
-		if item.Count > info.Count {
+		//查询改药品信息
+		medical, _ := service.GetBaseDrugMedical(item.DrugId)
+		//判断单位是否相等
+		if medical.MaxUnit == item.CountUnit {
+			//转化为最小单位
+			total_count = info.Count * medical.MinNumber
+			prescribing_number_total = item.Count * medical.MinNumber
+		}
+		if medical.MinUnit == item.CountUnit {
+			total_count = info.Count
+			prescribing_number_total = item.Count
+		}
+
+		fmt.Println("数量一", prescribing_number_total)
+		fmt.Println("数量二", total_count)
+		//判断单位
+		if total_count == 0 {
+			goodObj, _ := service.GetDrugByGoodId(item.DrugId)
+			c.ServeSuccessJSON(map[string]interface{}{
+				"msg":        "1",
+				"drug_name":  goodObj.DrugName,
+				"dose":       goodObj.Dose,
+				"dose_unit":  goodObj.DoseUnit,
+				"min_number": goodObj.MinNumber,
+				"min_unit":   goodObj.MinUnit,
+				"max_unit":   goodObj.MaxUnit,
+			})
+			return
+		}
+		if prescribing_number_total > total_count {
 
 			goodObj, _ := service.GetDrugByGoodId(item.DrugId)
 			c.ServeSuccessJSON(map[string]interface{}{
@@ -1269,14 +1299,6 @@ func (c *StockDrugApiController) CreateDrugWarehouseOut() {
 
 	}
 
-	//errs := service.CreateDrugWarehousingOutInfo(warehousingOutInfo)
-	//info, _ := service.FindLastDrugWarehousingOutInfo(warehouseOut.WarehouseOutOrderNumber)
-	//if errs != nil {
-	//	utils.ErrorLog(errs.Error())
-	//	c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateStockOutFail)
-	//	return
-	//}
-
 	c.ServeSuccessJSON(map[string]interface{}{
 		"msg":        "2",
 		"drug_name":  "",
@@ -1442,7 +1464,8 @@ func (c *StockDrugApiController) EditDrugWarehouseOut() {
 
 	var warehousingOutInfo []*models.DrugWarehouseOutInfo
 	var upDateWarehouseOutInfos []*models.DrugWarehouseOutInfo
-	//var drugFlow  []*models.DrugFlow
+
+	var drugFlow []*models.DrugFlow
 	if dataBody["stockOut"] != nil && reflect.TypeOf(dataBody["stockOut"]).String() == "[]interface {}" {
 		thisStockOut, _ := dataBody["stockOut"].([]interface{})
 		if len(thisStockOut) > 0 {
@@ -1497,6 +1520,7 @@ func (c *StockDrugApiController) EditDrugWarehouseOut() {
 
 				batch_number := items["batch_number"].(string)
 				number := items["number"].(string)
+				max_unit := items["count_unit"].(string)
 
 				var productDates int64
 				var expiryDates int64
@@ -1527,6 +1551,8 @@ func (c *StockDrugApiController) EditDrugWarehouseOut() {
 					}
 
 				}
+				fmt.Println("生产日期22222222222222222222222222", expiryDates)
+				fmt.Println("生产日期22222222222222222222222222", productDates)
 				if id == 0 {
 					warehouseOutInfo := &models.DrugWarehouseOutInfo{
 						WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
@@ -1554,30 +1580,31 @@ func (c *StockDrugApiController) EditDrugWarehouseOut() {
 					}
 					warehousingOutInfo = append(warehousingOutInfo, warehouseOutInfo)
 
-					//drugflow := &models.DrugFlow{
-					//  WarehousingOrder: warehousing.WarehousingOrder,
-					//  WarehousingId:    warehousing.ID,
-					//  DrugId:           drug_id,
-					//  Number:           number,
-					//  ProductDate:      productDates,
-					//  ExpireDate:       expiryDates,
-					//  Count:            warehousing_count,
-					//  Price:            last_price,
-					//  Status:           1,
-					//  Ctime:            ctime,
-					//  UserOrgId:        adminUserInfo.CurrentOrgId,
-					//  Manufacturer:     manufacturer,
-					//  Dealer:           dealer,
-					//  BatchNumber:      batch_number,
-					//  MaxUnit:          max_unit,
-					//  MinUnit:          min_unit,
-					//  ConsumableType:   1,
-					//  IsEdit:           1,
-					//  Creator:          adminUserInfo.AdminUser.Id,
-					//  IsSys:0,
-					//}
-					//
-					//drugFlow = append(drugFlow,drugflow)
+					drugflow := &models.DrugFlow{
+						WarehousingOrder:        "",
+						WarehousingId:           0,
+						DrugId:                  drug_id,
+						Number:                  number,
+						ProductDate:             productDates,
+						ExpireDate:              expiryDates,
+						Count:                   count,
+						Price:                   price,
+						Status:                  1,
+						Ctime:                   ctime,
+						UserOrgId:               adminUserInfo.CurrentOrgId,
+						Manufacturer:            manufacturer,
+						Dealer:                  dealer,
+						BatchNumber:             batch_number,
+						MaxUnit:                 max_unit,
+						ConsumableType:          1,
+						IsEdit:                  1,
+						Creator:                 adminUserInfo.AdminUser.Id,
+						IsSys:                   0,
+						WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
+						WarehouseOutId:          warehouseOut.ID,
+					}
+
+					drugFlow = append(drugFlow, drugflow)
 
 				} else {
 					if items["is_sys"] == nil || reflect.TypeOf(items["is_sys"]).String() != "float64" {
@@ -1621,18 +1648,283 @@ func (c *StockDrugApiController) EditDrugWarehouseOut() {
 						CountUnit:               count_unit,
 					}
 					upDateWarehouseOutInfos = append(upDateWarehouseOutInfos, warehouseOutInfo)
+
+					drugflow := &models.DrugFlow{
+						WarehousingOrder:        "",
+						WarehousingId:           0,
+						DrugId:                  drug_id,
+						Number:                  number,
+						ProductDate:             productDates,
+						ExpireDate:              expiryDates,
+						Count:                   count,
+						Price:                   price,
+						Status:                  1,
+						Ctime:                   ctime,
+						UserOrgId:               adminUserInfo.CurrentOrgId,
+						Manufacturer:            manufacturer,
+						Dealer:                  dealer,
+						BatchNumber:             batch_number,
+						MaxUnit:                 max_unit,
+						ConsumableType:          1,
+						IsEdit:                  1,
+						Creator:                 adminUserInfo.AdminUser.Id,
+						IsSys:                   0,
+						WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
+						WarehouseOutId:          warehouseOut.ID,
+					}
+
+					drugFlow = append(drugFlow, drugflow)
 				}
 			}
 		}
 	}
 	var errs error
 	if len(warehousingOutInfo) > 0 {
-		errs = service.CreateDrugWarehousingOutInfo(warehousingOutInfo)
+
+		var total_count int64
+		var prescribing_number_total int64
+		//调用出库逻辑
+		for _, item := range warehousingOutInfo {
+			//获取药品库存
+			info, _ := service.GetDrugTotalCount(item.DrugId, item.OrgId)
+			//查询改药品信息
+			medical, _ := service.GetBaseDrugMedical(item.DrugId)
+			//判断单位是否相等
+			if medical.MaxUnit == item.CountUnit {
+				//转化为最小单位
+				total_count = info.Count * medical.MinNumber
+				prescribing_number_total = item.Count * medical.MinNumber
+			}
+			if medical.MinUnit == item.CountUnit {
+				total_count = info.Count
+				prescribing_number_total = item.Count
+			}
+
+			fmt.Println("数量一", prescribing_number_total)
+			fmt.Println("数量二", total_count)
+			//判断单位
+			if total_count == 0 {
+				goodObj, _ := service.GetDrugByGoodId(item.DrugId)
+				c.ServeSuccessJSON(map[string]interface{}{
+					"msg":        "1",
+					"drug_name":  goodObj.DrugName,
+					"dose":       goodObj.Dose,
+					"dose_unit":  goodObj.DoseUnit,
+					"min_number": goodObj.MinNumber,
+					"min_unit":   goodObj.MinUnit,
+					"max_unit":   goodObj.MaxUnit,
+				})
+				return
+			}
+			if prescribing_number_total > total_count {
+
+				goodObj, _ := service.GetDrugByGoodId(item.DrugId)
+				c.ServeSuccessJSON(map[string]interface{}{
+					"msg":        "1",
+					"drug_name":  goodObj.DrugName,
+					"dose":       goodObj.Dose,
+					"dose_unit":  goodObj.DoseUnit,
+					"min_number": goodObj.MinNumber,
+					"min_unit":   goodObj.MinUnit,
+					"max_unit":   goodObj.MaxUnit,
+				})
+				return
+			} else {
+				errs = service.CreateDrugWarehousingOutInfo(warehousingOutInfo)
+				service.CreateDrugFlow(drugFlow)
+				// 出库流程
+				// 1.查询改药品在药品库的规格信息，并将处方里的规格进行换算（尽量将拆零单位转换成包装单位）
+				drup, _ := service.FindBaseDrugLibRecord(item.OrgId, item.DrugId)
+				if drup.ID > 0 {
+					prescribingNumber := item.Count
+					service.AutoDrugDeliverInfo(item.OrgId, prescribingNumber, &tempWarehouseOut, &drup, item)
+				}
+			}
+
+		}
 	}
 
 	if len(upDateWarehouseOutInfos) > 0 {
 		for _, item := range upDateWarehouseOutInfos {
-			errs = service.UpDateDrugWarehouseOutInfo(item)
+			//获取药品库存
+			info, _ := service.GetDrugTotalCount(item.DrugId, item.OrgId)
+			//查询改药品信息
+			medical, _ := service.GetBaseDrugMedical(item.DrugId)
+			//查询最后一次出库记录
+			outInfo, _ := service.GetLastDrugWarehouseOutInfo(item.DrugId, item.WarehouseOutId, item.OrgId)
+			var min_number int64 //最后一次库存
+			var max_number int64 //当前库存
+			var all_number int64 //总库存
+			var cha_number int64 //库存差
+			var maxNumber int64
+			var minNumber int64
+
+			if medical.MaxUnit == outInfo.CountUnit {
+				//转为最小单位
+				min_number = outInfo.Count * medical.MinNumber
+			}
+
+			if medical.MinUnit == outInfo.CountUnit {
+				min_number = outInfo.Count
+			}
+
+			fmt.Println("单位1", medical.MaxUnit)
+			fmt.Println("单位2", item.CountUnit)
+			if medical.MaxUnit == item.CountUnit {
+				max_number = item.Count * medical.MinNumber
+			}
+
+			if medical.MinUnit == item.CountUnit {
+				max_number = outInfo.Count
+			}
+
+			all_number = info.Count*medical.MinNumber + info.StockMinNumber
+			fmt.Println("总库存223232", all_number)
+			fmt.Println("当前库存", max_number)
+			////比较当前出库数量 和 最后一次出库数量,正常出库
+			if max_number <= min_number {
+				errs = service.UpDateDrugWarehouseOutInfo(item)
+				cha_number = min_number - max_number
+				fmt.Println("差库存", cha_number)
+				fmt.Println("最后一次库存", min_number)
+				if item.CountUnit == medical.MaxUnit {
+					maxNumber = cha_number / medical.MinNumber
+					parseDateErr := service.UpdateWarehouseInfo(maxNumber, item.DrugId, item.OrgId)
+					if parseDateErr != nil {
+						utils.ErrorLog(errs.Error())
+						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateStockOutFail)
+						return
+					}
+
+					c.ServeSuccessJSON(map[string]interface{}{
+						"msg":        "2",
+						"drug_name":  "",
+						"dose":       "",
+						"dose_unit":  "",
+						"min_number": "",
+						"min_unit":   "",
+						"max_unit":   "",
+					})
+					minNumber = cha_number % medical.MinNumber
+					parseDateErr = service.UpdateWarehouseInfoOne(minNumber, item.DrugId, item.OrgId)
+					if parseDateErr != nil {
+						utils.ErrorLog(errs.Error())
+						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateStockOutFail)
+						return
+					}
+
+					c.ServeSuccessJSON(map[string]interface{}{
+						"msg":        "2",
+						"drug_name":  "",
+						"dose":       "",
+						"dose_unit":  "",
+						"min_number": "",
+						"min_unit":   "",
+						"max_unit":   "",
+					})
+				}
+				if item.CountUnit == medical.MinUnit {
+					parseDateErr := service.UpdateWarehouseInfoOne(cha_number, item.DrugId, item.OrgId)
+					if parseDateErr != nil {
+						utils.ErrorLog(errs.Error())
+						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateStockOutFail)
+						return
+					}
+
+					c.ServeSuccessJSON(map[string]interface{}{
+						"msg":        "2",
+						"drug_name":  "",
+						"dose":       "",
+						"dose_unit":  "",
+						"min_number": "",
+						"min_unit":   "",
+						"max_unit":   "",
+					})
+				}
+
+			}
+
+			//退库操作
+			if max_number > min_number {
+				cha_number = min_number - max_number
+				//如果总库存大于差,正常出库
+				if all_number >= cha_number {
+					fmt.Println("金立2323323322323233232323", all_number, cha_number)
+					errs = service.UpDateDrugWarehouseOutInfo(item)
+					fmt.Println("232322332233232", item.CountUnit, medical.MaxUnit)
+					if item.CountUnit == medical.MaxUnit {
+						maxNumber = cha_number / medical.MinNumber
+						fmt.Println("maxNumber232323232323232232", maxNumber)
+						parseDateErr := service.UpdateWarehouseInfo(maxNumber, item.DrugId, item.OrgId)
+						fmt.Println("parseDateErr9999999999999999999999", parseDateErr)
+						if parseDateErr != nil {
+							utils.ErrorLog(errs.Error())
+							c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateStockOutFail)
+							return
+						}
+
+						c.ServeSuccessJSON(map[string]interface{}{
+							"msg":        "2",
+							"drug_name":  "",
+							"dose":       "",
+							"dose_unit":  "",
+							"min_number": "",
+							"min_unit":   "",
+							"max_unit":   "",
+						})
+						minNumber = cha_number % medical.MinNumber
+						parseDateErr = service.UpdateWarehouseInfoOne(minNumber, item.DrugId, item.OrgId)
+						if parseDateErr != nil {
+							utils.ErrorLog(errs.Error())
+							c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateStockOutFail)
+							return
+						}
+
+						c.ServeSuccessJSON(map[string]interface{}{
+							"msg":        "2",
+							"drug_name":  "",
+							"dose":       "",
+							"dose_unit":  "",
+							"min_number": "",
+							"min_unit":   "",
+							"max_unit":   "",
+						})
+					}
+					if item.CountUnit == medical.MinUnit {
+						parseDateErr := service.UpdateWarehouseInfoOne(cha_number, item.DrugId, item.OrgId)
+						if parseDateErr != nil {
+							utils.ErrorLog(errs.Error())
+							c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateStockOutFail)
+							return
+						}
+
+						c.ServeSuccessJSON(map[string]interface{}{
+							"msg":        "2",
+							"drug_name":  "",
+							"dose":       "",
+							"dose_unit":  "",
+							"min_number": "",
+							"min_unit":   "",
+							"max_unit":   "",
+						})
+					}
+				}
+
+				if all_number < cha_number {
+					goodObj, _ := service.GetDrugByGoodId(item.DrugId)
+					c.ServeSuccessJSON(map[string]interface{}{
+						"msg":        "1",
+						"drug_name":  goodObj.DrugName,
+						"dose":       goodObj.Dose,
+						"dose_unit":  goodObj.DoseUnit,
+						"min_number": goodObj.MinNumber,
+						"min_unit":   goodObj.MinUnit,
+						"max_unit":   goodObj.MaxUnit,
+					})
+					return
+				}
+			}
+
 		}
 	}
 
@@ -1643,7 +1935,13 @@ func (c *StockDrugApiController) EditDrugWarehouseOut() {
 	}
 
 	c.ServeSuccessJSON(map[string]interface{}{
-		"msg": "编辑成功",
+		"msg":        "2",
+		"drug_name":  "",
+		"dose":       "",
+		"dose_unit":  "",
+		"min_number": "",
+		"min_unit":   "",
+		"max_unit":   "",
 	})
 
 }
@@ -2239,9 +2537,11 @@ func (c *StockDrugApiController) EditDrugCancelStock() {
 			}
 		}
 	}
+	fmt.Println("cancelStockInfos232323223323223322323223", cancelStockInfos)
+	fmt.Println("cancelStockInfos232323223323223322323223", upDateCancelStockInfos)
+
 	var errs error
 	if len(cancelStockInfos) > 0 {
-		errs = service.CreateDrugCancelStockInfo(cancelStockInfos)
 
 		//扣减库存逻辑
 		for _, item := range cancelStockInfos {

controllers/gobal_config_api_controller.go

@@ -2055,14 +2055,17 @@ func (c *GobalConfigApiController) GetAutoDrugDetail() {
 	list, err, total := service.FindDrugStockUserDetailByIdThree(id, record_time, orgId)
 	//获取手动出库
 	outList, err := service.FindeDrugWarehouserInfo(warehouse_out_id, id, orgId)
+
+	batchNumber, err := service.GetDrugFlowBatch(warehouse_out_id, id, orgId)
 	if err != nil {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateConfig)
 		return
 	}
 	c.ServeSuccessJSON(map[string]interface{}{
-		"list":    list,
-		"total":   total,
-		"outList": outList,
+		"list":        list,
+		"total":       total,
+		"outList":     outList,
+		"batchNumber": batchNumber,
 	})
 }
 

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -3353,7 +3353,8 @@ func (c *DialysisAPIController) CreateConsumables() {
 			}
 		}
 
-		fmt.Println("dialysisBefor9999999999999999999", dialysisBefor)
+		fmt.Println("dialysisBefor9999999999999999999", dialysisBefor, active)
+
 		//新增
 		if active == 1 && len(goods) > 0 {
 			for _, item := range dialysisBefor {
@@ -3376,7 +3377,8 @@ func (c *DialysisAPIController) CreateConsumables() {
 			}
 			if err == nil {
 				c.ServeSuccessJSON(map[string]interface{}{
-					"msg": "保存成功",
+					"msg":     "保存成功",
+					"message": "2",
 				})
 				return
 
@@ -3810,7 +3812,20 @@ func (c *DialysisAPIController) EditConsumables() {
 
 						//查询该批次剩余库存
 						lastInfo, _ := service.GetLastStockOut(goodInfo.WarehouseInfotId)
+						if lastInfo.StockCount == 0 {
+							//查询该耗材的总库存
+							wareinfo, _ := service.GetStockGoodCount(item.GoodId)
+							if wareinfo.StockCount == 0 {
+								goodObj, _ := service.GetGoodInformationByGoodId(item.GoodId)
+								c.ServeSuccessJSON(map[string]interface{}{
+									"message":            "1",
+									"good_name":          goodObj.GoodName,
+									"specification_name": goodObj.SpecificationName,
+								})
+								return
+							}
 
+						}
 						//比较剩余库存 和 当前相差的数量,库存剩余量大于则正常出库
 						fmt.Println("剩余库存", lastInfo.StockCount)
 						fmt.Println("差", last_total)
@@ -4509,6 +4524,7 @@ func ConsumablesDeliveryDeleteFour(orgID int64, record_time int64, good_yc *mode
 	// 先根据相关信息查询当天该耗材的出库信息
 	warehouseOutInfos, err := service.FindStockOutInfoByStockTwo(orgID, good_yc.GoodTypeId, good_yc.GoodId, record_time, good_yc.PatientId)
 	fmt.Println("errr232323232323232323232323232", err)
+
 	if err != nil {
 		return err
 	}
@@ -4541,7 +4557,7 @@ func ConsumablesDeliveryDeleteFour(orgID int64, record_time int64, good_yc *mode
 	warehouseOutInfo.Manufacturer = stockInInfo.Manufacturer
 	warehouseOutInfo.ExpiryDate = stockInInfo.ExpiryDate
 	warehouseOutInfo.ProductDate = stockInInfo.ProductDate
-	warehouseOutInfo.Number = stockInInfo.Number
+	warehouseOutInfo.Number = warehouseOutInfos.Number
 	warehouseOutInfo.LicenseNumber = stockInInfo.LicenseNumber
 	warehouseOutInfo.WarehouseInfotId = stockInInfo.ID
 	//查找当天是否存在出库记录
@@ -4555,7 +4571,7 @@ func ConsumablesDeliveryDeleteFour(orgID int64, record_time int64, good_yc *mode
 			WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
 			WarehouseOutId:          warehouseOut.ID,
 			GoodId:                  good_yc.GoodId,
-			Number:                  stockInInfo.Number,
+			Number:                  warehouseOutInfos.Number,
 			ProductDate:             stockInInfo.ProductDate,
 			ExpireDate:              stockInInfo.ExpiryDate,
 			Count:                   count,
@@ -4573,6 +4589,7 @@ func ConsumablesDeliveryDeleteFour(orgID int64, record_time int64, good_yc *mode
 			WarehousingDetailId:     0,
 			IsSys:                   1,
 			UpdateCreator:           creater,
+			PatientId:               patient_id,
 		}
 		//创建流水表
 		err := service.CreateStockFlowOne(stockFlow)
@@ -4587,7 +4604,7 @@ func ConsumablesDeliveryDeleteFour(orgID int64, record_time int64, good_yc *mode
 			WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
 			WarehouseOutId:          warehouseOut.ID,
 			GoodId:                  good_yc.GoodId,
-			Number:                  stockInInfo.Number,
+			Number:                  warehouseOutInfos.Number,
 			ProductDate:             stockInInfo.ProductDate,
 			ExpireDate:              stockInInfo.ExpiryDate,
 			Count:                   count,
@@ -4605,6 +4622,7 @@ func ConsumablesDeliveryDeleteFour(orgID int64, record_time int64, good_yc *mode
 			WarehousingDetailId:     0,
 			IsSys:                   1,
 			UpdateCreator:           creater,
+			PatientId:               patient_id,
 		}
 		//创建流水表
 		service.CreateStockFlowOne(stockFlow)

controllers/mobile_api_controllers/patient_api_controller.go

@@ -887,18 +887,57 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 			if drugStockConfig.IsOpen == 1 {
 				advice, _ := service.FindHisDoctorAdviceById(adminInfo.Org.Id, advice_id)
 				//查询该药品是否有库存
+				//  list, _ := service.GetDrugTotalCount(advice.DrugId, advice.UserOrgId)
+				//  prescribingNumber_temp := strconv.FormatFloat(math.Abs(advice.PrescribingNumber), 'f', 0, 64)
+				//  count, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
+				//  if list.Count == 0 {
+				//    c.ServeSuccessJSON(map[string]interface{}{
+				//      "msg":    "1",
+				//      "advice": advice,
+				//      "ids":    ids,
+				//    })
+				//    return
+				//  }
+				//  if count > list.Count {
+				//    c.ServeSuccessJSON(map[string]interface{}{
+				//      "msg":    "2",
+				//      "advice": advice,
+				//      "ids":    ids,
+				//    })
+				//    return
+				//}
+				var total int64
+				var prescribing_number_total int64
+				//查询该药品是否有库存
 				list, _ := service.GetDrugTotalCount(advice.DrugId, advice.UserOrgId)
-				prescribingNumber_temp := strconv.FormatFloat(math.Abs(advice.PrescribingNumber), 'f', 0, 64)
-				count, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
+
+				//查询改药品信息
+				medical, _ := service.GetBaseDrugMedical(advice.DrugId)
+				//判断单位是否相等
+				if medical.MaxUnit == advice.PrescribingNumberUnit {
+					prescribingNumber_temp := strconv.FormatFloat(math.Abs(advice.PrescribingNumber), 'f', 0, 64)
+					count, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
+					//转化为最小单位
+					total = list.Count * medical.MinNumber
+					prescribing_number_total = count * medical.MinNumber
+				}
+				if medical.MinUnit == advice.PrescribingNumberUnit {
+					total = list.Count
+					prescribing_number_total = list.Count
+				}
+
+				fmt.Println("数量一", prescribing_number_total)
+				fmt.Println("数量二", total)
+
 				if list.Count == 0 {
 					c.ServeSuccessJSON(map[string]interface{}{
-						"msg":    "1",
+						"msg":    "3",
 						"advice": advice,
 						"ids":    ids,
 					})
 					return
 				}
-				if count > list.Count {
+				if prescribing_number_total > total {
 					c.ServeSuccessJSON(map[string]interface{}{
 						"msg":    "2",
 						"advice": advice,
@@ -906,8 +945,15 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 					})
 					return
 				}
-
-				service.HisDrugsDelivery(adminInfo.Org.Id, creater, &advice)
+				if prescribing_number_total <= total {
+					service.HisDrugsDelivery(adminInfo.Org.Id, creater, &advice)
+					c.ServeSuccessJSON(map[string]interface{}{
+						"msg":    "1",
+						"advice": advice,
+						"ids":    ids,
+					})
+					return
+				}
 			}
 			c.ServeSuccessJSON(map[string]interface{}{
 				"msg":    "ok",
@@ -1124,6 +1170,7 @@ func (c *PatientApiController) CheckDoctorAdvice() {
 			"advice": advice,
 		})
 	} else if origin == 2 {
+		fmt.Println("金鳌地方 大房贷首付地方阿凡达阿方")
 		adminInfo := c.GetMobileAdminUserInfo()
 		advice_id, _ := c.GetInt64("advice_id")
 		advices, _ := service.FindHisDoctorAdviceById(adminInfo.Org.Id, advice_id)

controllers/stock_in_api_controller.go

@@ -1539,6 +1539,8 @@ func (c *StockManagerApiController) EditWarehouseOut() {
 
 			//1.查询该耗材该批次的最后一次出库记录
 			lastGood, _ := service.GetLastGoodInformationByGoodId(item.GoodId, item.WarehouseInfotId, adminUserInfo.CurrentOrgId)
+			fmt.Println("lastGood", lastGood.Count)
+			fmt.Println("item2323232", item.Count)
 
 			// 退库的库存和该耗材该批次最后一次出库数量进行比较
 			//如果退库数量大于 最后一次批次的数量(要么要进行出库)
@@ -1622,7 +1624,7 @@ func (c *StockManagerApiController) EditWarehouseOut() {
 								return
 							}
 							c.ServeSuccessJSON(map[string]interface{}{
-								"msg": "编辑成功",
+								"msg": "1",
 							})
 						} else if errcode == nil {
 							service.UpDateWarehouseOutInfo(item)
@@ -1695,7 +1697,7 @@ func (c *StockManagerApiController) EditWarehouseOut() {
 							return
 						}
 						c.ServeSuccessJSON(map[string]interface{}{
-							"msg": "编辑成功",
+							"msg": "1",
 						})
 					} else if errcode == nil {
 						service.UpDateWarehouseOutInfo(item)
@@ -1713,6 +1715,14 @@ func (c *StockManagerApiController) EditWarehouseOut() {
 
 			if item.Count == lastGood.Count {
 				errs = service.UpDateWarehouseOutInfo(item)
+				if errs != nil {
+					utils.ErrorLog(errs.Error())
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateStockInFail)
+					return
+				}
+				c.ServeSuccessJSON(map[string]interface{}{
+					"msg": "1",
+				})
 			}
 
 		}
@@ -2287,8 +2297,11 @@ func (c *StockManagerApiController) EditCancelStock() {
 		}
 	}
 	var errs error
+	fmt.Println("出库22322333223", cancelStockInfos)
+	fmt.Println("更新23232323232323233", upDateCancelStockInfos)
 	if len(cancelStockInfos) > 0 {
 		errs = service.CreateCancelStockInfo(cancelStockInfos)
+
 		service.CreateStockFlow(stockFlow)
 		// 改变入库单的值
 		for _, item := range cancelStockInfos {
@@ -2316,17 +2329,17 @@ func (c *StockManagerApiController) EditCancelStock() {
 			//调用退库的方法
 			parseDateErr := service.UpdateCancelOut(list, item.Count)
 			fmt.Println("999999999999", parseDateErr)
-
-			if parseDateErr != nil {
-				utils.ErrorLog(errs.Error())
-				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateStockInFail)
-				return
-			}
-
-			c.ServeSuccessJSON(map[string]interface{}{
-				"msg": "编辑成功",
-			})
+			break
+		}
+		if errs != nil {
+			utils.ErrorLog(errs.Error())
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateStockInFail)
+			return
 		}
+
+		c.ServeSuccessJSON(map[string]interface{}{
+			"msg": "编辑成功",
+		})
 	}
 
 	if errs != nil {
@@ -4359,13 +4372,17 @@ func (this *StockManagerApiController) GetOrderDetailById() {
 	orgId := this.GetAdminUserInfo().CurrentOrgId
 	//自动出库
 	userDetails, err, total := service.FindUserDetailByIdOne(good_id, record_time, orgId)
+
 	//手动出库
 	info, _ := service.GetWarehouseOutInfoById(id, good_id)
+
+	stockFlowList, err := service.GetStockFlowBatchNumber(id, good_id)
 	if err == nil {
 		this.ServeSuccessJSON(map[string]interface{}{
-			"list":  userDetails,
-			"total": total,
-			"info":  info,
+			"list":          userDetails,
+			"total":         total,
+			"info":          info,
+			"stockFlowList": stockFlowList,
 		})
 	} else {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)

models/drug_stock.go

@@ -275,8 +275,12 @@ type VmDrugAutomaticReduceDetail struct {
 }
 
 type VmDrugWarehouseInfo struct {
-	DrugId int64 `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
-	Count  int64 `gorm:"column:count" json:"count" form:"count"`
+	DrugId         int64  `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
+	Count          int64  `gorm:"column:count" json:"count" form:"count"`
+	MaxUnit        string `gorm:"column:max_unit" json:"max_unit" form:"max_unit"`
+	MinUnit        string `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
+	StockMinNumber int64  `gorm:"column:stock_min_number" json:"stock_min_number" form:"stock_min_number"`
+	StockMaxNumber int64  `gorm:"column:stock_max_number" json:"stock_max_number" form:"stock_max_number"`
 }
 
 type StDrugWarehouseOutInfo struct {

models/self_drug_models.go

@@ -345,6 +345,10 @@ type XtDrugWarehouseOutInfo struct {
 	SysRecordTime           int64   `gorm:"column:sys_record_time" json:"sys_record_time" form:"sys_record_time"`
 	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"`
+	CountUnit               string  `gorm:"column:count_unit" json:"count_unit" form:"count_unit"`
+	WarehouseInfoId         int64   `gorm:"column:warehouse_info_id" json:"warehouse_info_id" form:"warehouse_info_id"`
+	Number                  string  `gorm:"column:number" json:"number" form:"number"`
+	BatchNumber             string  `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
 }
 
 func (XtDrugWarehouseOutInfo) TableName() string {
@@ -476,8 +480,8 @@ type BloodDrugCancelStockInfo struct {
 	OrgId            int64   `gorm:"column:org_id" json:"org_id" form:"org_id"`
 	OrderNumber      string  `gorm:"column:order_number" json:"order_number" form:"order_number"`
 	Type             int64   `gorm:"column:type" json:"type" form:"type"`
-	Dealer           int64   `gorm:"column:dealer" json:"dealer" form:"dealer"`
-	Manufacturer     int64   `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
+	Dealer           string  `gorm:"column:dealer" json:"dealer" form:"dealer"`
+	Manufacturer     string  `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
 	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"`
 	Number           string  `gorm:"column:number" json:"number" form:"number"`
@@ -486,6 +490,10 @@ type BloodDrugCancelStockInfo struct {
 	DrugSpec         string  `gorm:"column:drug_spec" json:"drug_spec" form:"drug_spec"`
 	Creater          int64   `gorm:"column:creater" json:"creater" form:"creater"`
 	MinUnit          string  `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
+	MaxUnit          string  `json:"max_unit"`
+	MinNumber        int64   `json:"min_number"`
+	Dose             float64 `json:"dose"`
+	DoseUnit         string  `json:"dose_unit"`
 }
 
 type BloodDrugSalesReturnInfo struct {

service/gobal_config_service.go

@@ -364,9 +364,9 @@ func GetDrugCancelOrder(startime int64, endtime int64, orgid int64, orderType in
 	}
 
 	if manufacturerId > 0 {
-		err = db.Select("x.id,x.drug_id,x.cancel_stock_id,x.count,x.price,x.total,x.product_date,x.expiry_date,x.ctime,x.org_id,x.order_number,x.type,x.dealer,x.manufacturer,x.retail_price,x.retail_total_price,x.number,s.drug_name,s.drug_type,s.drug_spec,s.min_unit,t.creater").Joins("left join xt_base_drug as s on s.id = x.drug_id and s.org_id = ? and s.status = 1", orgid).Joins("left join xt_drug_cancel_stock as t on t.id = x.cancel_stock_id and t.org_id = ? and t.status =1", orgid).Where("t.manufacturer = ?", manufacturerId).Order("x.ctime desc").Count(&total).Offset(offset).Limit(limit).Scan(&cancel).Error
+		err = db.Select("x.id,x.drug_id,x.cancel_stock_id,x.count,x.price,x.total,x.product_date,x.expiry_date,x.ctime,x.org_id,x.order_number,x.type,x.dealer,x.manufacturer,x.retail_price,x.retail_total_price,x.number,s.drug_name,s.drug_type,s.drug_spec,s.min_unit,t.creater,s.dose,s.dose_unit,s.min_number,s.max_unit").Joins("left join xt_base_drug as s on s.id = x.drug_id and s.org_id = ? and s.status = 1", orgid).Joins("left join xt_drug_cancel_stock as t on t.id = x.cancel_stock_id and t.org_id = ? and t.status =1", orgid).Where("t.manufacturer = ?", manufacturerId).Order("x.ctime desc").Count(&total).Offset(offset).Limit(limit).Scan(&cancel).Error
 	} else {
-		err = db.Select("x.id,x.drug_id,x.cancel_stock_id,x.count,x.price,x.total,x.product_date,x.expiry_date,x.ctime,x.org_id,x.order_number,x.type,x.dealer,x.manufacturer,x.retail_price,x.retail_total_price,x.number,s.drug_name,s.drug_type,s.drug_spec,s.min_unit,t.creater").Joins("left join xt_base_drug as s on s.id = x.drug_id and s.org_id = ? and s.status = 1", orgid).Joins("left join xt_drug_cancel_stock as t on t.id = x.cancel_stock_id and t.org_id = ? and t.status =1", orgid).Order("x.ctime desc").Count(&total).Offset(offset).Limit(limit).Scan(&cancel).Error
+		err = db.Select("x.id,x.drug_id,x.cancel_stock_id,x.count,x.price,x.total,x.product_date,x.expiry_date,x.ctime,x.org_id,x.order_number,x.type,x.dealer,x.manufacturer,x.retail_price,x.retail_total_price,x.number,s.drug_name,s.drug_type,s.drug_spec,s.min_unit,t.creater,s.dose,s.dose_unit,s.min_number,s.max_unit").Joins("left join xt_base_drug as s on s.id = x.drug_id and s.org_id = ? and s.status = 1", orgid).Joins("left join xt_drug_cancel_stock as t on t.id = x.cancel_stock_id and t.org_id = ? and t.status =1", orgid).Order("x.ctime desc").Count(&total).Offset(offset).Limit(limit).Scan(&cancel).Error
 	}
 
 	return cancel, total, err
@@ -731,3 +731,9 @@ func FindeDrugWarehouserInfo(ware_out_id int64, drug_id int64, orgid int64) (out
 
 	return outInfo, err
 }
+
+func GetDrugFlowBatch(ware_out_id int64, drug_id int64, orgid int64) (flow []*models.DrugFlow, err error) {
+
+	err = XTReadDB().Where("warehouse_out_id = ? and drug_id = ? and user_org_id = ? and status = 1", ware_out_id, drug_id, orgid).Group("number").Find(&flow).Error
+	return flow, err
+}

service/self_drug_service.go

@@ -799,3 +799,12 @@ func GetSelfOutStockQuery(startTime int64, endTime int64, orgid int64) (selfouts
 	err = db.Select("x.drug_name_id,Sum(x.outstore_number) as count").Group("x.drug_name").Scan(&selfoutstock).Error
 	return selfoutstock, err
 }
+
+func GetLastDrugWarehouseOutInfo(drugid int64, warehouseOutId int64, orgid int64) (models.XtDrugWarehouseOutInfo, error) {
+
+	info := models.XtDrugWarehouseOutInfo{}
+
+	err = XTReadDB().Model(&info).Where("drug_id = ? and  warehouse_out_id = ? and org_id = ? and status = 1", drugid, warehouseOutId, orgid).Last(&info).Error
+
+	return info, err
+}

service/stock_service.go

@@ -2454,7 +2454,7 @@ func FindDrugStockOutByIsSys(org_id int64, is_sys int, record_time int64) (out m
 }
 
 func FindLastStockInInfoRecord(good_id int64, org_id int64) (in models.WarehousingInfo, err error) {
-	err = readDb.Model(&models.WarehousingInfo{}).Where("status = 1 AND org_id = ? AND good_id = ?", org_id, good_id).Last(&in).Error
+	err = readDb.Model(&models.WarehousingInfo{}).Where("status = 1 AND org_id = ? AND good_id = ?", org_id, good_id).First(&in).Error
 	return
 }
 
@@ -3509,7 +3509,7 @@ func GetDrugTotalCount(drugid int64, orgid int64) (info models.VmDrugWarehouseIn
 	if orgid > 0 {
 		db = db.Where("x.org_id = ?", orgid)
 	}
-	err = db.Select("x.drug_id,sum(x.stock_max_number) as count").Find(&info).Error
+	err = db.Select("x.drug_id,sum(x.stock_max_number) as count,sum(x.stock_min_number) as stock_min_number,x.max_unit,x.min_unit").Find(&info).Error
 	return info, err
 }
 
@@ -3538,7 +3538,7 @@ func GetWarehoureOrderInfoList(goodid int64, orgid int64) (info []*models.Wareho
 
 func UpdateWarehousingCount(info *models.WarehousingInfo, goodid int64, orgid int64, warehousingId int64) error {
 
-	err := XTWriteDB().Model(&info).Where("good_id = ? and org_id = ? and status =1 and warehousing_id = ?", goodid, orgid, warehousingId).Updates(map[string]interface{}{"stock_count": info.StockCount}).Error
+	err := XTWriteDB().Model(models.WarehousingInfo{}).Where("good_id = ? and org_id = ? and status = 1 and warehousing_id = ?", goodid, orgid, warehousingId).Updates(map[string]interface{}{"stock_count": info.StockCount}).Error
 	return err
 }
 
@@ -3561,8 +3561,9 @@ func UpdateCancelOut(list []*models.WarehousingInfo, count int64) error {
 				WarehousingId: item.WarehousingId,
 				StockCount:    item.StockCount + count,
 			}
-			UpdateWarehousingCount(&info, item.GoodId, item.OrgId, item.WarehousingId)
-			break
+			err2 := UpdateWarehousingCount(&info, item.GoodId, item.OrgId, item.WarehousingId)
+			fmt.Println("2323233232323232323232323232323", err2)
+			return err
 		}
 
 		if (item.WarehousingCount - item.StockCount) < count {
@@ -3678,6 +3679,12 @@ func GetWarehouseOutInfoById(id int64, goodid int64) (info []*models.WarehouseOu
 	return info, err
 }
 
+func GetStockFlowBatchNumber(id int64, goodid int64) (stock []*models.VmStockFlow, err error) {
+
+	err = XTReadDB().Model(&stock).Where("warehouse_out_id = ? and good_id = ? and status = 1", id, goodid).Group("patient_id,number").Find(&stock).Error
+	return stock, err
+}
+
 func GetDrugBatchNumber(drug_id int64, orgid int64) (info []*models.DrugWarehouseInfo, err error) {
 
 	err = XTReadDB().Model(&info).Where("drug_id = ? and org_id = ? and status = 1 and batch_number <>''", drug_id, orgid).Find(&info).Error
@@ -3919,6 +3926,16 @@ func GetLastStockOut(id int64) (models.WarehousingInfo, error) {
 	return info, err
 }
 
+func GetStockGoodCount(good_id int64) (models.WarehousingInfo, error) {
+	info := models.WarehousingInfo{}
+	db := XTReadDB().Model(&info)
+	if good_id > 0 {
+		db = db.Where("good_id = ? and status = 1", good_id)
+	}
+	err := db.Select("sum(stock_count) as stock_count").Find(&info).Error
+	return info, err
+}
+
 func GetDrugFlow(drugid int64, orgid int64, limit int64, page int64, startTime int64, endTime int64, stock_type int64) (drug_flow []*models.DrugFlow, total int64, err error) {
 
 	offset := (page - 1) * limit
@@ -4061,6 +4078,19 @@ func UpdatedDrugInfo(id int64, count int64) (err error) {
 
 func UpdatedDrugInfoOne(id int64, count int64) (err error) {
 
-	err = writeDb.Model(&models.DrugWarehousingInfo{}).Where("id = ?", id).UpdateColumn("stock_min_number", gorm.Expr("stock_min_number + ?", count)).Error
+	err = writeDb.Model(&models.XtDrugWarehouseInfo{}).Where("id = ?", id).UpdateColumn("stock_min_number", gorm.Expr("stock_min_number + ?", count)).Error
+	return err
+}
+
+func UpdateWarehouseInfo(count int64, drugid int64, orgid int64) error {
+
+	err := writeDb.Model(&models.XtDrugWarehouseInfo{}).Where("drug_id = ?  and org_id = ? and status = 1", drugid, orgid).UpdateColumn("stock_max_number", gorm.Expr("stock_max_number + ?", count)).Error
+
+	return err
+}
+
+func UpdateWarehouseInfoOne(count int64, drugid int64, orgid int64) error {
+
+	err := writeDb.Model(&models.XtDrugWarehouseInfo{}).Where("drug_id = ?  and org_id = ? and status = 1", drugid, orgid).UpdateColumn("stock_min_number", gorm.Expr("stock_min_number + ?", count)).Error
 	return err
 }

service/warhouse_service.go

@@ -957,8 +957,8 @@ func ConsumablesDelivery(orgID int64, patient_id int64, record_time int64, goods
 				Number:                  warehouse.Number,
 				ProductDate:             warehouse.ProductDate,
 				ExpireDate:              warehouse.ExpiryDate,
-				Count:                   count,
-				Price:                   warehouse.Price,
+				Count:                   deliver_number,
+				Price:                   info.PackingPrice,
 				Status:                  1,
 				Ctime:                   time.Now().Unix(),
 				UserOrgId:               orgID,
@@ -972,6 +972,7 @@ func ConsumablesDelivery(orgID int64, patient_id int64, record_time int64, goods
 				WarehouseOutDetailId:    warehouseOutInfo.ID,
 				WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
 				IsSys:                   1,
+				PatientId:               patient_id,
 			}
 			CreateStockFlowOne(flow)
 			if errTwo != nil {
@@ -988,8 +989,8 @@ func ConsumablesDelivery(orgID int64, patient_id int64, record_time int64, goods
 				Number:                  warehouse.Number,
 				ProductDate:             warehouse.ProductDate,
 				ExpireDate:              warehouse.ExpiryDate,
-				Count:                   count,
-				Price:                   warehouse.Price,
+				Count:                   deliver_number,
+				Price:                   info.PackingPrice,
 				Status:                  1,
 				Ctime:                   time.Now().Unix(),
 				UserOrgId:               orgID,
@@ -1003,6 +1004,7 @@ func ConsumablesDelivery(orgID int64, patient_id int64, record_time int64, goods
 				WarehouseOutDetailId:    warehouseOutInfo.ID,
 				WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
 				IsSys:                   1,
+				PatientId:               patient_id,
 			}
 			CreateStockFlowOne(flow)
 		}
@@ -1069,7 +1071,7 @@ func ConsumablesDelivery(orgID int64, patient_id int64, record_time int64, goods
 				Number:                  warehouse.Number,
 				ProductDate:             warehouse.ProductDate,
 				ExpireDate:              warehouse.ExpiryDate,
-				Count:                   count,
+				Count:                   stock_number,
 				Price:                   warehouse.Price,
 				Status:                  1,
 				Ctime:                   time.Now().Unix(),
@@ -1084,6 +1086,7 @@ func ConsumablesDelivery(orgID int64, patient_id int64, record_time int64, goods
 				WarehouseOutDetailId:    warehouseOutInfo.ID,
 				WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
 				IsSys:                   1,
+				PatientId:               patient_id,
 			}
 			CreateStockFlowOne(flow)
 		} else if errcodes == nil {
@@ -1099,7 +1102,7 @@ func ConsumablesDelivery(orgID int64, patient_id int64, record_time int64, goods
 				Number:                  warehouse.Number,
 				ProductDate:             warehouse.ProductDate,
 				ExpireDate:              warehouse.ExpiryDate,
-				Count:                   count,
+				Count:                   goods.Count + stock_number,
 				Price:                   warehouse.Price,
 				Status:                  1,
 				Ctime:                   time.Now().Unix(),
@@ -1114,6 +1117,7 @@ func ConsumablesDelivery(orgID int64, patient_id int64, record_time int64, goods
 				WarehouseOutDetailId:    warehouseOutInfo.ID,
 				WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
 				IsSys:                   1,
+				PatientId:               patient_id,
 			}
 			CreateStockFlowOne(flow)
 		}
@@ -1610,7 +1614,7 @@ func ConsumablesDeliveryTwo(orgID int64, goods *models.WarehouseOutInfo, count i
 }
 
 func DeleteWarehouseInfo(id int64) error {
-	err := XTWriteDB().Where("id = ? and status = 1", id).Updates(map[string]interface{}{"stock_count": 0}).Error
+	err := XTWriteDB().Model(models.WarehousingInfo{}).Where("id = ? and status = 1", id).Updates(map[string]interface{}{"stock_count": 0}).Error
 	return err
 }