Browse Source

接口提交

XMLWAN 2 years ago
parent
commit
2e822ca056
1 changed files with 32 additions and 35 deletions
  1. 32 35
      service/warhouse_service.go

+ 32 - 35
service/warhouse_service.go View File

225
 
225
 
226
 		var maxNumber int64 = 0
226
 		var maxNumber int64 = 0
227
 		var minNumber int64 = 0
227
 		var minNumber int64 = 0
228
-		var stock_max_number int64 = 0
229
-		stock_max_number = warehouse.StockMaxNumber
228
+		//var stock_max_number int64 = 0
229
+		//stock_max_number = warehouse.StockMaxNumber
230
 
230
 
231
 		maxNumber = deliver_number / drup.MinNumber
231
 		maxNumber = deliver_number / drup.MinNumber
232
 		minNumber = deliver_number % drup.MinNumber
232
 		minNumber = deliver_number % drup.MinNumber
274
 			if (warehouse.StockMinNumber - deliver_number) > 0 {
274
 			if (warehouse.StockMinNumber - deliver_number) > 0 {
275
 				warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
275
 				warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
276
 
276
 
277
-				if warehouse.StockMinNumber == 0 {
278
-					warehouse.StockMaxNumber = stock_max_number
279
-				}
277
+				//if warehouse.StockMinNumber == 0 {
278
+				//	warehouse.StockMaxNumber = stock_max_number
279
+				//}
280
 			}
280
 			}
281
 
281
 
282
 		}
282
 		}
549
 	//查找药品信息
549
 	//查找药品信息
550
 	//baseInfo, _ := FindBaseDrugLibRecord(advice.UserOrgId, advice.DrugId)
550
 	//baseInfo, _ := FindBaseDrugLibRecord(advice.UserOrgId, advice.DrugId)
551
 	if err != nil {
551
 	if err != nil {
552
-
553
 		return err
552
 		return err
554
 	}
553
 	}
555
 
554
 
556
 	// 将该批次的剩余库存数量转换为拆零数量
555
 	// 将该批次的剩余库存数量转换为拆零数量
557
-
558
 	stock_number = warehouse.StockMaxNumber*drup.MinNumber + warehouse.StockMinNumber
556
 	stock_number = warehouse.StockMaxNumber*drup.MinNumber + warehouse.StockMinNumber
559
 
557
 
560
 	// 当库存数量大于或等于出库数量的话,则正常出库该批次
558
 	// 当库存数量大于或等于出库数量的话,则正常出库该批次
647
 		// 判断处方里药品单位是拆零单位还是包装单位,	如果是拆零单位,则根据规格,将拆零数量转为包装数量
645
 		// 判断处方里药品单位是拆零单位还是包装单位,	如果是拆零单位,则根据规格,将拆零数量转为包装数量
648
 		var maxNumber int64 = 0
646
 		var maxNumber int64 = 0
649
 		var minNumber int64 = 0
647
 		var minNumber int64 = 0
650
-		var stock_max_number int64 = 0
651
-		stock_max_number = warehouse.StockMaxNumber
648
+		//var stock_max_number int64 = 0
649
+		//
650
+		//stock_max_number = warehouse.StockMaxNumber
652
 
651
 
653
 		maxNumber = deliver_number / drup.MinNumber
652
 		maxNumber = deliver_number / drup.MinNumber
654
 		minNumber = deliver_number % drup.MinNumber
653
 		minNumber = deliver_number % drup.MinNumber
663
 			}
662
 			}
664
 		}
663
 		}
665
 		fmt.Println("max_number23323232323232232323", maxNumber)
664
 		fmt.Println("max_number23323232323232232323", maxNumber)
666
-		fmt.Println("max_number23323232323232232323", minNumber)
665
+		fmt.Println("minNumber", minNumber)
667
 		warehouse.StockMaxNumber = warehouse.StockMaxNumber - maxNumber
666
 		warehouse.StockMaxNumber = warehouse.StockMaxNumber - maxNumber
668
 		fmt.Println("max_number23323232323232232323", warehouse.StockMaxNumber)
667
 		fmt.Println("max_number23323232323232232323", warehouse.StockMaxNumber)
669
 		if warehouse.StockMaxNumber < 0 {
668
 		if warehouse.StockMaxNumber < 0 {
676
 		warehouse.Mtime = time.Now().Unix()
675
 		warehouse.Mtime = time.Now().Unix()
677
 
676
 
678
 		if warehouse.StockMinNumber < minNumber {
677
 		if warehouse.StockMinNumber < minNumber {
679
-
680
 			warehouse.StockMaxNumber = warehouse.StockMaxNumber - 1
678
 			warehouse.StockMaxNumber = warehouse.StockMaxNumber - 1
681
 			warehouse.StockMinNumber = warehouse.StockMinNumber + drup.MinNumber - minNumber
679
 			warehouse.StockMinNumber = warehouse.StockMinNumber + drup.MinNumber - minNumber
682
 		} else {
680
 		} else {
683
-
684
 			if minNumber > 0 {
681
 			if minNumber > 0 {
685
 				warehouse.StockMinNumber = warehouse.StockMinNumber - minNumber
682
 				warehouse.StockMinNumber = warehouse.StockMinNumber - minNumber
686
 			}
683
 			}
700
 			if (warehouse.StockMinNumber - deliver_number) > 0 {
697
 			if (warehouse.StockMinNumber - deliver_number) > 0 {
701
 				warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
698
 				warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
702
 
699
 
703
-				if warehouse.StockMinNumber == 0 {
704
-					warehouse.StockMaxNumber = stock_max_number
705
-				}
700
+				//if warehouse.StockMinNumber == 0 {
701
+				//	 warehouse.StockMaxNumber = stock_max_number
702
+				//}
706
 			}
703
 			}
707
 		}
704
 		}
708
 
705
 
2332
 		// 判断处方里药品单位是拆零单位还是包装单位,	如果是拆零单位,则根据规格,将拆零数量转为包装数量
2329
 		// 判断处方里药品单位是拆零单位还是包装单位,	如果是拆零单位,则根据规格,将拆零数量转为包装数量
2333
 		var maxNumber int64 = 0
2330
 		var maxNumber int64 = 0
2334
 		var minNumber int64 = 0
2331
 		var minNumber int64 = 0
2335
-		var stock_max_number int64 = 0
2336
-		stock_max_number = warehouse.StockMaxNumber
2332
+		//var stock_max_number int64 = 0
2333
+		//stock_max_number = warehouse.StockMaxNumber
2337
 
2334
 
2338
 		maxNumber = deliver_number / drup.MinNumber
2335
 		maxNumber = deliver_number / drup.MinNumber
2339
 		minNumber = deliver_number % drup.MinNumber
2336
 		minNumber = deliver_number % drup.MinNumber
2380
 			if (warehouse.StockMinNumber - deliver_number) > 0 {
2377
 			if (warehouse.StockMinNumber - deliver_number) > 0 {
2381
 				warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
2378
 				warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
2382
 
2379
 
2383
-				if warehouse.StockMinNumber == 0 {
2384
-					warehouse.StockMaxNumber = stock_max_number
2385
-				}
2380
+				//if warehouse.StockMinNumber == 0 {
2381
+				//	warehouse.StockMaxNumber = stock_max_number
2382
+				//}
2386
 			}
2383
 			}
2387
 
2384
 
2388
 		}
2385
 		}
2688
 
2685
 
2689
 		var maxNumber int64 = 0
2686
 		var maxNumber int64 = 0
2690
 		var minNumber int64 = 0
2687
 		var minNumber int64 = 0
2691
-		var stock_max_number int64 = 0
2692
-		stock_max_number = warehouse.StockMaxNumber
2688
+		//var stock_max_number int64 = 0
2689
+		//stock_max_number = warehouse.StockMaxNumber
2693
 
2690
 
2694
 		maxNumber = deliver_number / drup.MinNumber
2691
 		maxNumber = deliver_number / drup.MinNumber
2695
 		minNumber = deliver_number % drup.MinNumber
2692
 		minNumber = deliver_number % drup.MinNumber
2737
 			if (warehouse.StockMinNumber - deliver_number) > 0 {
2734
 			if (warehouse.StockMinNumber - deliver_number) > 0 {
2738
 				warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
2735
 				warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
2739
 
2736
 
2740
-				if warehouse.StockMinNumber == 0 {
2741
-					warehouse.StockMaxNumber = stock_max_number
2742
-				}
2737
+				//if warehouse.StockMinNumber == 0 {
2738
+				//	warehouse.StockMaxNumber = stock_max_number
2739
+				//}
2743
 			}
2740
 			}
2744
 
2741
 
2745
 		}
2742
 		}
4405
 		// 判断处方里药品单位是拆零单位还是包装单位,	如果是拆零单位,则根据规格,将拆零数量转为包装数量
4402
 		// 判断处方里药品单位是拆零单位还是包装单位,	如果是拆零单位,则根据规格,将拆零数量转为包装数量
4406
 		var maxNumber int64 = 0
4403
 		var maxNumber int64 = 0
4407
 		var minNumber int64 = 0
4404
 		var minNumber int64 = 0
4408
-		var stock_max_number int64 = 0
4409
-		stock_max_number = warehouse.StockMaxNumber
4405
+		//var stock_max_number int64 = 0
4406
+		//stock_max_number = warehouse.StockMaxNumber
4410
 
4407
 
4411
 		maxNumber = deliver_number / drup.MinNumber
4408
 		maxNumber = deliver_number / drup.MinNumber
4412
 		minNumber = deliver_number % drup.MinNumber
4409
 		minNumber = deliver_number % drup.MinNumber
4461
 			if (warehouse.StockMinNumber - deliver_number) > 0 {
4458
 			if (warehouse.StockMinNumber - deliver_number) > 0 {
4462
 				warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
4459
 				warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
4463
 
4460
 
4464
-				if warehouse.StockMinNumber == 0 {
4465
-					warehouse.StockMaxNumber = stock_max_number
4466
-				}
4461
+				//if warehouse.StockMinNumber == 0 {
4462
+				//	warehouse.StockMaxNumber = stock_max_number
4463
+				//}
4467
 			}
4464
 			}
4468
 
4465
 
4469
 		}
4466
 		}
4720
 		// 判断处方里药品单位是拆零单位还是包装单位,	如果是拆零单位,则根据规格,将拆零数量转为包装数量
4717
 		// 判断处方里药品单位是拆零单位还是包装单位,	如果是拆零单位,则根据规格,将拆零数量转为包装数量
4721
 		var maxNumber int64 = 0
4718
 		var maxNumber int64 = 0
4722
 		var minNumber int64 = 0
4719
 		var minNumber int64 = 0
4723
-		var stock_max_number int64 = 0
4724
-		stock_max_number = warehouse.StockMaxNumber
4720
+		//var stock_max_number int64 = 0
4721
+		//stock_max_number = warehouse.StockMaxNumber
4725
 
4722
 
4726
 		maxNumber = deliver_number / drup.MinNumber
4723
 		maxNumber = deliver_number / drup.MinNumber
4727
 		minNumber = deliver_number % drup.MinNumber
4724
 		minNumber = deliver_number % drup.MinNumber
4781
 			if (warehouse.StockMinNumber - deliver_number) > 0 {
4778
 			if (warehouse.StockMinNumber - deliver_number) > 0 {
4782
 				warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
4779
 				warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
4783
 
4780
 
4784
-				if warehouse.StockMinNumber == 0 {
4785
-					warehouse.StockMaxNumber = stock_max_number
4786
-				}
4781
+				//if warehouse.StockMinNumber == 0 {
4782
+				//	warehouse.StockMaxNumber = stock_max_number
4783
+				//}
4787
 			}
4784
 			}
4788
 
4785
 
4789
 		}
4786
 		}