|
@@ -645,8 +645,8 @@ func HisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *mo
|
645
|
645
|
|
646
|
646
|
maxNumber = deliver_number / drup.MinNumber
|
647
|
647
|
minNumber = deliver_number % drup.MinNumber
|
648
|
|
- //fmt.Println("maxNumber2323233232323232323232", maxNumber)
|
649
|
|
- //fmt.Println("minNumber2323233232323232323232", minNumber)
|
|
648
|
+ fmt.Println("maxNumber2323233232323232323232", maxNumber)
|
|
649
|
+ fmt.Println("minNumber2323233232323232323232", minNumber)
|
650
|
650
|
if warehouse.StockMaxNumber == 0 && drup.MaxUnit == drup.MinUnit {
|
651
|
651
|
minNumber = maxNumber
|
652
|
652
|
}
|
|
@@ -673,7 +673,9 @@ func HisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *mo
|
673
|
673
|
if warehouse.StockMinNumber < minNumber {
|
674
|
674
|
|
675
|
675
|
warehouse.StockMaxNumber = warehouse.StockMaxNumber - 1
|
676
|
|
- warehouse.StockMinNumber = warehouse.StockMinNumber + drup.MinNumber - minNumber
|
|
676
|
+ if warehouse.MaxUnit != warehouse.MinUnit {
|
|
677
|
+ warehouse.StockMinNumber = warehouse.StockMinNumber + drup.MinNumber - minNumber
|
|
678
|
+ }
|
677
|
679
|
} else {
|
678
|
680
|
|
679
|
681
|
if minNumber > 0 {
|