11月8日库存管理

service/warhouse_service.go

@@ -69,7 +69,7 @@ func DrugsDelivery(orgID int64, creater int64, advice *models.DoctorAdvice) (err
 		drup, _ := FindBaseDrugLibRecord(orgID, advice.DrugId)
 		if drup.ID > 0 {
 			prescribingNumber := advice.PrescribingNumber
-			fmt.Println("出库数量233322332233232233223323232我的", advice.PrescribingNumber, advice.PrescribingNumberUnit)
+
 			DrugDeliverInfo(orgID, prescribingNumber, &out, &drup, advice)
 
 		} else {
@@ -122,8 +122,7 @@ func DrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *model
 		var stockMin int64
 		stockMax = lastWarehouse.StockMinNumber / drup.MinNumber
 		stockMin = lastWarehouse.StockMinNumber % drup.MinNumber
-		fmt.Println("stockMax332332332233232", stockMax)
-		fmt.Println("stockMax332332332233232", stockMin)
+
 		ChangeMaxNumber(lastWarehouse.ID, stockMax)
 		UpdateMinNumber(lastWarehouse.ID, stockMin)
 	}
@@ -142,8 +141,7 @@ func DrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *model
 	//baseInfo, _ := FindBaseDrugLibRecord(advice.UserOrgId, advice.DrugId)
 
 	// 当库存数量大于或等于出库数量的话，则正常出库该批次
-	fmt.Println("剩余库存", stock_number)
-	fmt.Println("出库数量", deliver_number)
+
 	if stock_number >= deliver_number {
 
 		warehouseOutInfo := &models.DrugWarehouseOutInfo{
@@ -206,7 +204,7 @@ func DrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *model
 		errOne := AddSigleDrugWarehouseOutInfo(warehouseOutInfo)
 		fmt.Println(errOne)
 		//查询是否存在数据
-		fmt.Println("deliver_number2o222222222222", deliver_number)
+
 		details := &models.DrugAutomaticReduceDetail{
 			WarehouseOutId:          warehouseout.ID,
 			WarehouseOutOrderNumber: warehouseout.WarehouseOutOrderNumber,
@@ -245,9 +243,6 @@ func DrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *model
 			}
 		}
 
-		fmt.Println("maxNumber", maxNumber)
-		fmt.Println("minNumber", minNumber)
-
 		warehouse.StockMaxNumber = warehouse.StockMaxNumber - maxNumber
 
 		if warehouse.StockMaxNumber < 0 {
@@ -301,7 +296,7 @@ func DrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *model
 
 		return nil
 	} else {
-		fmt.Println("库存数量", stock_number)
+
 		// 当该批次的库存数量小于出库数量的话，则先把该批次出库完后，再进行递归出库
 		warehouseOutInfo := &models.DrugWarehouseOutInfo{
 			WarehouseOutOrderNumber: warehouseout.WarehouseOutOrderNumber,
@@ -422,7 +417,7 @@ func DrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *model
 
 		// 清零完该库存后，还有剩余出库未出完，进行对应的递归操作
 		prescribingNumber_two_temp := deliver_number - stock_number
-		fmt.Println("剩余库存", prescribingNumber_two_temp)
+
 		overPlusNumber := float64(prescribingNumber_two_temp)
 
 		advice.PrescribingNumber = float64(prescribingNumber_two_temp)
@@ -517,8 +512,6 @@ func HisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *mo
 		deliver_number = count
 	}
 
-	fmt.Println("c出库数量", deliver_number)
-
 	var min_price float64
 
 	if advice.PrescribingNumberUnit == drup.MaxUnit {
@@ -543,8 +536,7 @@ func HisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *mo
 		var stockMin int64
 		stockMax = lastWarehouse.StockMinNumber / drup.MinNumber
 		stockMin = lastWarehouse.StockMinNumber % drup.MinNumber
-		fmt.Println("stockMax", stockMax)
-		fmt.Println("stockMin", stockMin)
+
 		ChangeMaxNumber(lastWarehouse.ID, stockMax)
 		UpdateMinNumber(lastWarehouse.ID, stockMin)
 	}
@@ -558,7 +550,6 @@ func HisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *mo
 	// 将该批次的剩余库存数量转换为拆零数量
 
 	stock_number = warehouse.StockMaxNumber*drup.MinNumber + warehouse.StockMinNumber
-	fmt.Println("查询剩余库存", stock_number)
 
 	// 当库存数量大于或等于出库数量的话，则正常出库该批次
 	if stock_number >= deliver_number {
@@ -664,10 +655,8 @@ func HisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *mo
 				return errors.New("库存数量不足")
 			}
 		}
-		fmt.Println("查询库存", warehouse.StockMaxNumber)
-		fmt.Println("扣减库存我的", maxNumber)
+
 		warehouse.StockMaxNumber = warehouse.StockMaxNumber - maxNumber
-		fmt.Println("剩余库存我的", warehouse.StockMaxNumber)
 
 		if warehouse.StockMaxNumber < 0 {
 			warehouse.StockMaxNumber = 0
@@ -4985,7 +4974,7 @@ func AutoDrugDeliverInfoTwentyOne(orgID int64, prescribingNumber int64, warehous
 		}
 		// 清零完该库存后，还有剩余出库未出完，进行对应的递归操作
 		prescribingNumber_two_temp := deliver_number - stock_number
-		fmt.Println("深谷数据", prescribingNumber_two_temp)
+
 		advice.CountUnit = drup.MinUnit
 
 		AutoDrugDeliverInfoTwentyOne(orgID, prescribingNumber_two_temp, warehouseout, drup, advice)
@@ -5172,21 +5161,12 @@ func ConsumablesDeliveryThirty(orgID int64, record_time int64, goods *models.War
 // 药品手动出库 递归方式
 func AutoDrugDeliverInfoFourtyOne(orgID int64, prescribingNumber int64, warehouseout *models.DrugWarehouseOut, drup *models.BaseDrugLib, advice *models.DrugWarehouseOutInfo) (err error) {
 	//开事务
-	//tx := XTWriteDB().Begin()
 	// 判断处方里药品单位是拆零单位还是包装单位,	如果是包装单位，则根据规格，将包装数量转为拆零数量
 	var deliver_number int64 = 0
 	var stock_number int64 = 0
-	//fmt.Println("出库数量",prescribingNumber)
-	//fmt.Println("出库数量",drup.MinNumber)
-	//fmt.Println("dnaeiw",advice.CountUnit)
-	//if advice.CountUnit == drup.MaxUnit {
-	//  deliver_number = prescribingNumber * drup.MinNumber
-	//} else {
+
 	deliver_number = prescribingNumber
-	//}
-	//fmt.Println("出库数量2323223323232322323232323",deliver_number)
-	// 根据先进先出原则，查询最先入库的批次，进行出库
-	// 如果没有对应的库存，则报错
+
 	//开启事物
 	lastWarehouse, _ := FindLastDrugWarehousingInfoByID(advice.DrugId, warehouseout.StorehouseId)
 	if lastWarehouse.StockMinNumber >= drup.MinNumber {