接口提交

service/warhouse_service.go

@@ -225,8 +225,8 @@ func DrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *model
 
 		var maxNumber int64 = 0
 		var minNumber int64 = 0
-		var stock_max_number int64 = 0
-		stock_max_number = warehouse.StockMaxNumber
+		//var stock_max_number int64 = 0
+		//stock_max_number = warehouse.StockMaxNumber
 
 		maxNumber = deliver_number / drup.MinNumber
 		minNumber = deliver_number % drup.MinNumber
@@ -274,9 +274,9 @@ func DrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *model
 			if (warehouse.StockMinNumber - deliver_number) > 0 {
 				warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
 
-				if warehouse.StockMinNumber == 0 {
-					warehouse.StockMaxNumber = stock_max_number
-				}
+				//if warehouse.StockMinNumber == 0 {
+				//	warehouse.StockMaxNumber = stock_max_number
+				//}
 			}
 
 		}
@@ -549,12 +549,10 @@ func HisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *mo
 	//查找药品信息
 	//baseInfo, _ := FindBaseDrugLibRecord(advice.UserOrgId, advice.DrugId)
 	if err != nil {
-
 		return err
 	}
 
 	// 将该批次的剩余库存数量转换为拆零数量
-
 	stock_number = warehouse.StockMaxNumber*drup.MinNumber + warehouse.StockMinNumber
 
 	// 当库存数量大于或等于出库数量的话，则正常出库该批次
@@ -647,8 +645,9 @@ 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
+		//var stock_max_number int64 = 0
+		//
+		//stock_max_number = warehouse.StockMaxNumber
 
 		maxNumber = deliver_number / drup.MinNumber
 		minNumber = deliver_number % drup.MinNumber
@@ -663,7 +662,7 @@ func HisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *mo
 			}
 		}
 		fmt.Println("max_number23323232323232232323", maxNumber)
-		fmt.Println("max_number23323232323232232323", minNumber)
+		fmt.Println("minNumber", minNumber)
 		warehouse.StockMaxNumber = warehouse.StockMaxNumber - maxNumber
 		fmt.Println("max_number23323232323232232323", warehouse.StockMaxNumber)
 		if warehouse.StockMaxNumber < 0 {
@@ -676,11 +675,9 @@ 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
 			}
@@ -700,9 +697,9 @@ func HisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *mo
 			if (warehouse.StockMinNumber - deliver_number) > 0 {
 				warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
 
-				if warehouse.StockMinNumber == 0 {
-					warehouse.StockMaxNumber = stock_max_number
-				}
+				//if warehouse.StockMinNumber == 0 {
+				//	 warehouse.StockMaxNumber = stock_max_number
+				//}
 			}
 		}
 
@@ -2332,8 +2329,8 @@ func NewDrugDeliverInfo(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
+		//var stock_max_number int64 = 0
+		//stock_max_number = warehouse.StockMaxNumber
 
 		maxNumber = deliver_number / drup.MinNumber
 		minNumber = deliver_number % drup.MinNumber
@@ -2380,9 +2377,9 @@ func NewDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *mo
 			if (warehouse.StockMinNumber - deliver_number) > 0 {
 				warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
 
-				if warehouse.StockMinNumber == 0 {
-					warehouse.StockMaxNumber = stock_max_number
-				}
+				//if warehouse.StockMinNumber == 0 {
+				//	warehouse.StockMaxNumber = stock_max_number
+				//}
 			}
 
 		}
@@ -2688,8 +2685,8 @@ func NewHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout
 
 		var maxNumber int64 = 0
 		var minNumber int64 = 0
-		var stock_max_number int64 = 0
-		stock_max_number = warehouse.StockMaxNumber
+		//var stock_max_number int64 = 0
+		//stock_max_number = warehouse.StockMaxNumber
 
 		maxNumber = deliver_number / drup.MinNumber
 		minNumber = deliver_number % drup.MinNumber
@@ -2737,9 +2734,9 @@ func NewHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout
 			if (warehouse.StockMinNumber - deliver_number) > 0 {
 				warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
 
-				if warehouse.StockMinNumber == 0 {
-					warehouse.StockMaxNumber = stock_max_number
-				}
+				//if warehouse.StockMinNumber == 0 {
+				//	warehouse.StockMaxNumber = stock_max_number
+				//}
 			}
 
 		}
@@ -4405,8 +4402,8 @@ func AutoDrugDeliverInfoTwenty(orgID int64, prescribingNumber int64, warehouseou
 		// 判断处方里药品单位是拆零单位还是包装单位,	如果是拆零单位，则根据规格，将拆零数量转为包装数量
 		var maxNumber int64 = 0
 		var minNumber int64 = 0
-		var stock_max_number int64 = 0
-		stock_max_number = warehouse.StockMaxNumber
+		//var stock_max_number int64 = 0
+		//stock_max_number = warehouse.StockMaxNumber
 
 		maxNumber = deliver_number / drup.MinNumber
 		minNumber = deliver_number % drup.MinNumber
@@ -4461,9 +4458,9 @@ func AutoDrugDeliverInfoTwenty(orgID int64, prescribingNumber int64, warehouseou
 			if (warehouse.StockMinNumber - deliver_number) > 0 {
 				warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
 
-				if warehouse.StockMinNumber == 0 {
-					warehouse.StockMaxNumber = stock_max_number
-				}
+				//if warehouse.StockMinNumber == 0 {
+				//	warehouse.StockMaxNumber = stock_max_number
+				//}
 			}
 
 		}
@@ -4720,8 +4717,8 @@ func AutoDrugDeliverInfoTwentyOne(orgID int64, prescribingNumber int64, warehous
 		// 判断处方里药品单位是拆零单位还是包装单位,	如果是拆零单位，则根据规格，将拆零数量转为包装数量
 		var maxNumber int64 = 0
 		var minNumber int64 = 0
-		var stock_max_number int64 = 0
-		stock_max_number = warehouse.StockMaxNumber
+		//var stock_max_number int64 = 0
+		//stock_max_number = warehouse.StockMaxNumber
 
 		maxNumber = deliver_number / drup.MinNumber
 		minNumber = deliver_number % drup.MinNumber
@@ -4781,9 +4778,9 @@ func AutoDrugDeliverInfoTwentyOne(orgID int64, prescribingNumber int64, warehous
 			if (warehouse.StockMinNumber - deliver_number) > 0 {
 				warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
 
-				if warehouse.StockMinNumber == 0 {
-					warehouse.StockMaxNumber = stock_max_number
-				}
+				//if warehouse.StockMinNumber == 0 {
+				//	warehouse.StockMaxNumber = stock_max_number
+				//}
 			}
 
 		}