XMLWAN преди 2 години
родител
ревизия
bec82d3e60
променени са 2 файла, в които са добавени 8 реда и са изтрити 8 реда
  1. 2 2
      models/his_models.go
  2. 6 6
      service/warhouse_service.go

+ 2 - 2
models/his_models.go Целия файл

280
 	MaxUnit                     string  `gorm:"column:max_unit" json:"max_unit" form:"max_unit"`
280
 	MaxUnit                     string  `gorm:"column:max_unit" json:"max_unit" form:"max_unit"`
281
 	MinNumber                   int64   `gorm:"column:min_number" json:"min_number" form:"min_number"`
281
 	MinNumber                   int64   `gorm:"column:min_number" json:"min_number" form:"min_number"`
282
 	MinUnit                     string  `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
282
 	MinUnit                     string  `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
283
-	Dose                        float64 `gorm:"column:dose" json:"dose" form:"dose"`
283
+	Dose                        string  `gorm:"column:dose" json:"dose" form:"dose"`
284
 	DoseUnit                    string  `gorm:"column:dose_unit" json:"dose_unit" form:"dose_unit"`
284
 	DoseUnit                    string  `gorm:"column:dose_unit" json:"dose_unit" form:"dose_unit"`
285
 	UnitMatrixing               string  `gorm:"column:unit_matrixing" json:"unit_matrixing" form:"unit_matrixing"`
285
 	UnitMatrixing               string  `gorm:"column:unit_matrixing" json:"unit_matrixing" form:"unit_matrixing"`
286
 	RetailPrice                 float64 `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
286
 	RetailPrice                 float64 `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
673
 	MaxUnit                string  `gorm:"column:max_unit" json:"max_unit" form:"max_unit"`
673
 	MaxUnit                string  `gorm:"column:max_unit" json:"max_unit" form:"max_unit"`
674
 	MinNumber              int64   `gorm:"column:min_number" json:"min_number" form:"min_number"`
674
 	MinNumber              int64   `gorm:"column:min_number" json:"min_number" form:"min_number"`
675
 	MinUnit                string  `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
675
 	MinUnit                string  `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
676
-	Dose                   float64 `gorm:"column:dose" json:"dose" form:"dose"`
676
+	Dose                   string  `gorm:"column:dose" json:"dose" form:"dose"`
677
 	DoseUnit               string  `gorm:"column:dose_unit" json:"dose_unit" form:"dose_unit"`
677
 	DoseUnit               string  `gorm:"column:dose_unit" json:"dose_unit" form:"dose_unit"`
678
 	UnitMatrixing          string  `gorm:"column:unit_matrixing" json:"unit_matrixing" form:"unit_matrixing"`
678
 	UnitMatrixing          string  `gorm:"column:unit_matrixing" json:"unit_matrixing" form:"unit_matrixing"`
679
 	RetailPrice            float64 `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
679
 	RetailPrice            float64 `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`

+ 6 - 6
service/warhouse_service.go Целия файл

645
 
645
 
646
 		maxNumber = deliver_number / drup.MinNumber
646
 		maxNumber = deliver_number / drup.MinNumber
647
 		minNumber = deliver_number % drup.MinNumber
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
 		if warehouse.StockMaxNumber == 0 && drup.MaxUnit == drup.MinUnit {
650
 		if warehouse.StockMaxNumber == 0 && drup.MaxUnit == drup.MinUnit {
651
 			minNumber = maxNumber
651
 			minNumber = maxNumber
652
 		}
652
 		}
667
 		}
667
 		}
668
 
668
 
669
 		warehouse.Mtime = time.Now().Unix()
669
 		warehouse.Mtime = time.Now().Unix()
670
-		fmt.Println("warehouse.StockMinNumber", warehouse.StockMinNumber)
671
-		fmt.Println("minNumber", minNumber)
672
-		fmt.Println("maxNumber", maxNumber)
670
+		//fmt.Println("warehouse.StockMinNumber", warehouse.StockMinNumber)
671
+		//fmt.Println("minNumber", minNumber)
672
+		//fmt.Println("maxNumber", maxNumber)
673
 		if warehouse.StockMinNumber < minNumber {
673
 		if warehouse.StockMinNumber < minNumber {
674
 
674
 
675
 			warehouse.StockMaxNumber = warehouse.StockMaxNumber - 1
675
 			warehouse.StockMaxNumber = warehouse.StockMaxNumber - 1
680
 				warehouse.StockMinNumber = warehouse.StockMinNumber - minNumber
680
 				warehouse.StockMinNumber = warehouse.StockMinNumber - minNumber
681
 			}
681
 			}
682
 
682
 
683
-			fmt.Println("warehouse.StockMaxNumber233323232323232", warehouse.StockMaxNumber)
683
+			//fmt.Println("warehouse.StockMaxNumber233323232323232", warehouse.StockMaxNumber)
684
 			//出错修改
684
 			//出错修改
685
 			//if minNumber == 0 && maxNumber != 1 && warehouse.StockMaxNumber <= 0 {
685
 			//if minNumber == 0 && maxNumber != 1 && warehouse.StockMaxNumber <= 0 {
686
 			//	if warehouse.StockMinNumber > 0 {
686
 			//	if warehouse.StockMinNumber > 0 {