Browse Source

11月8日库存管理

XMLWAN 3 years ago
parent
commit
10c7f4b9a7
3 changed files with 18 additions and 3 deletions
  1. 1 1
      conf/app.conf
  2. 5 2
      controllers/drug_stock_api_contorller.go
  3. 12 0
      service/stock_service.go

+ 1 - 1
conf/app.conf View File

@@ -1,5 +1,5 @@
1 1
 appname = 血透
2
-httpport = 9531
2
+httpport = 9529
3 3
 runmode = dev
4 4
 
5 5
 #

+ 5 - 2
controllers/drug_stock_api_contorller.go View File

@@ -568,6 +568,7 @@ func (c *StockDrugApiController) EditDrugWarehouse() {
568 568
 					warehousingInfo = append(warehousingInfo, warehouseInfo)
569 569
 
570 570
 				} else {
571
+
571 572
 					warehouseInfo := &models.DrugWarehouseInfo{
572 573
 						ID:               id,
573 574
 						WarehousingOrder: warehouse.WarehousingOrder,
@@ -633,7 +634,7 @@ func (c *StockDrugApiController) EditDrugWarehouse() {
633 634
 				info, _ := service.GetLastDrugWarehouseInfSix(it.DrugId)
634 635
 				flows := models.DrugFlow{
635 636
 					WarehousingOrder: info.WarehousingOrder,
636
-					WarehousingId:    info.ID,
637
+					WarehousingId:    info.WarehousingId,
637 638
 					DrugId:           info.DrugId,
638 639
 					Number:           info.Number,
639 640
 					ProductDate:      info.ProductDate,
@@ -754,7 +755,9 @@ func (c *StockDrugApiController) EditDrugWarehouse() {
754 755
 			}
755 756
 
756 757
 			if item.WarehousingCount == warehouseInfo.WarehousingCount {
757
-				errs = service.UpDateDrugWarehousingInfo(item)
758
+				item.OrgId = item.OrgId
759
+
760
+				errs = service.UpDateDrugWarehousingInfoTwo(item.ID, item)
758 761
 			}
759 762
 		}
760 763
 	}

+ 12 - 0
service/stock_service.go View File

@@ -1912,6 +1912,11 @@ func UpDateDrugWarehousingInfo(info *models.DrugWarehouseInfo) (err error) {
1912 1912
 	return err
1913 1913
 }
1914 1914
 
1915
+func UpDateDrugWarehousingInfoTwo(id int64, info *models.DrugWarehouseInfo) (err error) {
1916
+	err = writeDb.Model(&info).Where("id= ? and status = 1", id).Updates(map[string]interface{}{"org_id": info.OrgId}).Error
1917
+	return err
1918
+}
1919
+
1915 1920
 func GetDrugWarehouseOrderOne(id int64, drug_id int64) (models.DrugWarehouseInfo, error) {
1916 1921
 
1917 1922
 	info := models.DrugWarehouseInfo{}
@@ -5033,3 +5038,10 @@ func GetInventoryExportList(orgid int64) (info []*models.PatientWarehouseInfo, e
5033 5038
 	err = db.Select("x.id,x.good_id,x.number,x.number,x.product_date,x.expiry_date,x.warehousing_unit,x.dealer,x.manufacturer,t.good_name,t.specification_name,t.packing_unit,t.remark").Joins("left join xt_good_information as t on t.id = x.good_id").Group("x.good_id,x.number").Scan(&info).Error
5034 5039
 	return info, err
5035 5040
 }
5041
+
5042
+func GetDrugWarehouseingInfo(id int64) (models.XtDrugWarehouseInfo, error) {
5043
+
5044
+	info := models.XtDrugWarehouseInfo{}
5045
+	err := XTReadDB().Where("id=? and status = 1", id).Find(&info).Error
5046
+	return info, err
5047
+}