11月9日库存管理

models/his_models.go

@@ -280,7 +280,7 @@ type Drug struct {
 	MaxUnit                     string  `gorm:"column:max_unit" json:"max_unit" form:"max_unit"`
 	MinNumber                   int64   `gorm:"column:min_number" json:"min_number" form:"min_number"`
 	MinUnit                     string  `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
-	Dose                        float64 `gorm:"column:dose" json:"dose" form:"dose"`
+	Dose                        string  `gorm:"column:dose" json:"dose" form:"dose"`
 	DoseUnit                    string  `gorm:"column:dose_unit" json:"dose_unit" form:"dose_unit"`
 	UnitMatrixing               string  `gorm:"column:unit_matrixing" json:"unit_matrixing" form:"unit_matrixing"`
 	RetailPrice                 float64 `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
@@ -673,7 +673,7 @@ type VMDrug struct {
 	MaxUnit                string  `gorm:"column:max_unit" json:"max_unit" form:"max_unit"`
 	MinNumber              int64   `gorm:"column:min_number" json:"min_number" form:"min_number"`
 	MinUnit                string  `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
-	Dose                   float64 `gorm:"column:dose" json:"dose" form:"dose"`
+	Dose                   string  `gorm:"column:dose" json:"dose" form:"dose"`
 	DoseUnit               string  `gorm:"column:dose_unit" json:"dose_unit" form:"dose_unit"`
 	UnitMatrixing          string  `gorm:"column:unit_matrixing" json:"unit_matrixing" form:"unit_matrixing"`
 	RetailPrice            float64 `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`

service/warhouse_service.go

@@ -645,8 +645,8 @@ func HisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *mo
 
 		maxNumber = deliver_number / drup.MinNumber
 		minNumber = deliver_number % drup.MinNumber
-		fmt.Println("maxNumber2323233232323232323232", maxNumber)
-		fmt.Println("minNumber2323233232323232323232", minNumber)
+		//fmt.Println("maxNumber2323233232323232323232", maxNumber)
+		//fmt.Println("minNumber2323233232323232323232", minNumber)
 		if warehouse.StockMaxNumber == 0 && drup.MaxUnit == drup.MinUnit {
 			minNumber = maxNumber
 		}
@@ -667,9 +667,9 @@ func HisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *mo
 		}
 
 		warehouse.Mtime = time.Now().Unix()
-		fmt.Println("warehouse.StockMinNumber", warehouse.StockMinNumber)
-		fmt.Println("minNumber", minNumber)
-		fmt.Println("maxNumber", maxNumber)
+		//fmt.Println("warehouse.StockMinNumber", warehouse.StockMinNumber)
+		//fmt.Println("minNumber", minNumber)
+		//fmt.Println("maxNumber", maxNumber)
 		if warehouse.StockMinNumber < minNumber {
 
 			warehouse.StockMaxNumber = warehouse.StockMaxNumber - 1
@@ -680,7 +680,7 @@ func HisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *mo
 				warehouse.StockMinNumber = warehouse.StockMinNumber - minNumber
 			}
 
-			fmt.Println("warehouse.StockMaxNumber233323232323232", warehouse.StockMaxNumber)
+			//fmt.Println("warehouse.StockMaxNumber233323232323232", warehouse.StockMaxNumber)
 			//出错修改
 			//if minNumber == 0 && maxNumber != 1 && warehouse.StockMaxNumber <= 0 {
 			//	if warehouse.StockMinNumber > 0 {