11月9日库存管理

controllers/drug_stock_api_contorller.go

@@ -3806,9 +3806,12 @@ func (c *StockDrugApiController) CheckDrugOut() {
 		stockInfo, _ := service.GetDrugAllStockInfo(storeHouseConfig.DrugStorehouseOut, it.OrgId, it.DrugId)
 		var sum_count int64
 		for _, its := range stockInfo {
-			sum_count += its.StockMaxNumber*medical.MinNumber + its.StockMinNumber
-
+			if its.MaxUnit == medical.MaxUnit {
+				its.StockMaxNumber = its.StockMaxNumber * medical.MinNumber
+			}
+			sum_count += its.StockMaxNumber + its.StockMinNumber
 		}
+
 		service.UpdateBaseDrugSumTwo(it.DrugId, sum_count, it.OrgId)
 
 		////出库数量累加
@@ -3934,7 +3937,11 @@ func (c *StockDrugApiController) ToReturnCheck() {
 		stockInfo, _ := service.GetDrugAllStockInfo(storeHouseConfig.DrugStorehouseOut, item.OrgId, item.DrugId)
 		var sum_count int64
 		for _, its := range stockInfo {
-			sum_count += its.StockMaxNumber*medical.MinNumber + its.StockMinNumber
+			baseDrug, _ := service.GetBaseDrugMedical(its.DrugId)
+			if its.MaxUnit == baseDrug.MaxUnit {
+				its.StockMaxNumber = its.StockMaxNumber * baseDrug.MinNumber
+			}
+			sum_count += its.StockMaxNumber + its.StockMinNumber
 		}
 		service.UpdateBaseDrugSumTwo(item.DrugId, sum_count, item.OrgId)
 
@@ -4137,8 +4144,13 @@ func (c *StockDrugApiController) CheckCancelDrugStock() {
 		stockInfo, _ := service.GetDrugAllStockInfo(storeHouseConfig.DrugStorehouseOut, its.OrgId, its.DrugId)
 		var sum_count int64
 		for _, its := range stockInfo {
-			sum_count += its.StockMaxNumber*medical.MinNumber + its.StockMinNumber
+			baseDrug, _ := service.GetBaseDrugMedical(its.DrugId)
+			if its.MaxUnit == baseDrug.MaxUnit {
+				its.StockMaxNumber = its.StockMaxNumber * baseDrug.MinNumber
+			}
+			sum_count += its.StockMaxNumber + its.StockMinNumber
 		}
+
 		service.UpdateBaseDrugSumTwo(its.DrugId, sum_count, its.OrgId)
 
 		var cancel_count int64
@@ -4154,8 +4166,11 @@ func (c *StockDrugApiController) CheckCancelDrugStock() {
 		}
 		cancelInfo, _ := service.GetDrugAllStockInfo(its.StorehouseId, its.OrgId, its.DrugId)
 		var over_count int64
-		for _, items := range cancelInfo {
-			over_count += items.StockMaxNumber*medical.MinNumber + items.StockMinNumber
+		for _, its := range cancelInfo {
+			if its.MaxUnit == medical.MaxUnit {
+				its.StockMaxNumber = its.StockMaxNumber * medical.MinNumber
+			}
+			over_count += its.StockMaxNumber + its.StockMinNumber
 		}
 		service.AddCancelSumCount(its.StorehouseId, its.DrugId, its.OrgId, cancel_count, over_count)
 
@@ -4218,8 +4233,12 @@ func (c *StockDrugApiController) ReturnDrugCancelStock() {
 		stockInfo, _ := service.GetDrugAllStockInfo(storeHouseConfig.DrugStorehouseOut, item.OrgId, item.DrugId)
 		var sum_count int64
 		for _, its := range stockInfo {
-			sum_count += its.StockMaxNumber*medical.MinNumber + its.StockMinNumber
+			if its.MaxUnit == medical.MaxUnit {
+				its.StockMaxNumber = its.StockMaxNumber * medical.MinNumber
+			}
+			sum_count += its.StockMaxNumber + its.StockMinNumber
 		}
+
 		service.UpdateBaseDrugSumTwo(item.DrugId, sum_count, item.OrgId)
 
 		var cancel_count int64
@@ -4235,9 +4254,13 @@ func (c *StockDrugApiController) ReturnDrugCancelStock() {
 		}
 		cancelInfo, _ := service.GetDrugAllStockInfo(item.StorehouseId, item.OrgId, item.DrugId)
 		var over_count int64
-		for _, items := range cancelInfo {
-			over_count += items.StockMaxNumber*medical.MinNumber + items.StockMinNumber
+		for _, its := range cancelInfo {
+			if its.MaxUnit == medical.MaxUnit {
+				its.StockMaxNumber = its.StockMaxNumber * medical.MinNumber
+			}
+			over_count += its.StockMaxNumber + its.StockMinNumber
 		}
+
 		//退库数量减少，更新剩余库存
 		service.ReduceCancelSumCount(item.StorehouseId, item.DrugId, item.OrgId, cancel_count, over_count)
 	}

controllers/gobal_config_api_controller.go

@@ -2338,12 +2338,14 @@ func (c *GobalConfigApiController) GetExportOutOrderDrugList() {
 	orgId := c.GetAdminUserInfo().CurrentOrgId
 	//list, _ := service.GetExportOutOrderDrugList(ids)
 	list, _ := service.GetExportOutOrderDrugListOne(ids)
+	outInfoList, _ := service.GetDrugOutListFlow(ids, orgId)
 	manufacturerList, _ := service.GetAllManufacturerList(orgId)
 	dealerList, _ := service.GetAllDealerList(orgId)
 	c.ServeSuccessJSON(map[string]interface{}{
 		"list":             list,
 		"manufacturerList": manufacturerList,
 		"dealerList":       dealerList,
+		"outInfoList":      outInfoList,
 	})
 }
 
@@ -2381,6 +2383,7 @@ func (c *GobalConfigApiController) GetDrugFlow() {
 	stock_type, _ := c.GetInt64("stock_type")
 
 	list, total, _ := service.GetDrugFlow(drug_id, orgId, limit, page, startTime, endTime, stock_type)
+	fmt.Println("listwowoowowowowowo", list)
 	manufacturerList, _ := service.GetAllManufacturerList(orgId)
 	dealerList, _ := service.GetAllDealerList(orgId)
 	medical, _ := service.GetBaseDrugMedical(drug_id)

controllers/his_api_controller.go

@@ -1358,8 +1358,12 @@ func (c *HisApiController) CreateHisPrescription() {
 													var sum_count int64
 													stockInfo, _ := service.GetDrugAllStockInfo(storeConfig.DrugStorehouseOut, druginfo.OrgId, drug_id)
 													for _, its := range stockInfo {
-														sum_count += its.StockMaxNumber*drug.MinNumber + its.StockMinNumber
+														if its.MaxUnit == drug.MaxUnit {
+															its.StockMaxNumber = its.StockMaxNumber * drug.MinNumber
+														}
+														sum_count += its.StockMaxNumber + its.StockMinNumber
 													}
+
 													service.UpdateBaseDrugSumTwo(drug_id, sum_count, druginfo.OrgId)
 
 												}
@@ -2570,8 +2574,8 @@ func (c *HisApiController) DeletePrescription() {
 					count, _ := strconv.ParseInt(item.Count, 10, 64)
 					total_count += count
 					//回退库存
-					service.UpDateWarehouseInfoByStockDelete(info.WarehouseInfotId, total_count, info.PatientId, info.SysRecordTime, info.ProjectId)
-					goodList, _ := service.GetSumGoodList(c.GetAdminUserInfo().CurrentOrgId, houseConfig.StorehouseOutInfo, info.ProjectId)
+					service.UpDateWarehouseInfoByStockDelete(info.WarehouseInfotId, total_count, info.PatientId, info.SysRecordTime, item.ProjectId)
+					goodList, _ := service.GetSumGoodList(c.GetAdminUserInfo().CurrentOrgId, houseConfig.StorehouseOutInfo, item.ProjectId)
 					var flush_count int64
 					for _, it := range goodList {
 						flush_count += it.StockCount

controllers/mobile_api_controllers/patient_api_controller.go

@@ -771,7 +771,10 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 											stockInfo, _ := service.GetDrugAllStockInfo(storeHouseConfig.DrugStorehouseOut, item.UserOrgId, item.DrugId)
 											var sum_count int64
 											for _, its := range stockInfo {
-												sum_count += its.StockMaxNumber*medical.MinNumber + its.StockMinNumber
+												if its.MaxUnit == medical.MaxUnit {
+													its.StockMaxNumber = its.StockMaxNumber * medical.MinNumber
+												}
+												sum_count += its.StockMaxNumber + its.StockMinNumber
 											}
 											service.UpdateBaseDrugSumTwo(item.DrugId, sum_count, item.UserOrgId)
 										}
@@ -789,7 +792,10 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 										stockInfo, _ := service.GetDrugAllStockInfo(storeHouseConfig.DrugStorehouseOut, item.UserOrgId, item.DrugId)
 										var sum_count int64
 										for _, its := range stockInfo {
-											sum_count += its.StockMaxNumber*medical.MinNumber + its.StockMinNumber
+											if its.MaxUnit == medical.MaxUnit {
+												its.StockMaxNumber = its.StockMaxNumber * medical.MinNumber
+											}
+											sum_count += its.StockMaxNumber + its.StockMinNumber
 										}
 										service.UpdateBaseDrugSumTwo(item.DrugId, sum_count, item.UserOrgId)
 									}
@@ -886,7 +892,11 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 									stockInfo, _ := service.GetDrugAllStockInfo(storeHouseConfig.DrugStorehouseOut, item.UserOrgId, item.DrugId)
 									var sum_count int64
 									for _, its := range stockInfo {
-										sum_count += its.StockMaxNumber*medical.MinNumber + its.StockMinNumber
+										baseDrug, _ := service.GetBaseDrugMedical(its.DrugId)
+										if its.MaxUnit == baseDrug.MaxUnit {
+											its.StockMaxNumber = its.StockMaxNumber * baseDrug.MinNumber
+										}
+										sum_count += its.StockMaxNumber + its.StockMinNumber
 									}
 									service.UpdateBaseDrugSumTwo(item.DrugId, sum_count, item.UserOrgId)
 									c.ServeSuccessJSON(map[string]interface{}{
@@ -1198,7 +1208,10 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 									stockInfo, _ := service.GetDrugAllStockInfo(storeHouseConfig.DrugStorehouseOut, item.UserOrgId, item.DrugId)
 									var sum_count int64
 									for _, its := range stockInfo {
-										sum_count += its.StockMaxNumber*medical.MinNumber + its.StockMinNumber
+										if its.MaxUnit == medical.MaxUnit {
+											its.StockMaxNumber = its.StockMaxNumber * medical.MinNumber
+										}
+										sum_count += its.StockMaxNumber + its.StockMinNumber
 									}
 									service.UpdateBaseDrugSumTwo(item.DrugId, sum_count, item.UserOrgId)
 								}

controllers/patient_api_controller.go

@@ -1770,8 +1770,12 @@ func (c *PatientApiController) ExecGroupAdvice() {
 					var sum_count int64
 					stockInfo, _ := service.GetDrugAllStockInfo(storeHouseConfig.DrugStorehouseOut, item.UserOrgId, item.DrugId)
 					for _, its := range stockInfo {
-						sum_count += its.StockMaxNumber*medical.MinNumber + its.StockMinNumber
+						if its.MaxUnit == medical.MaxUnit {
+							its.StockMaxNumber = its.StockMaxNumber * medical.MinNumber
+						}
+						sum_count += its.StockMaxNumber + its.StockMinNumber
 					}
+
 					service.UpdateBaseDrugSumTwo(item.DrugId, sum_count, item.UserOrgId)
 					break
 					c.ServeSuccessJSON(map[string]interface{}{
@@ -2007,8 +2011,12 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 								//更新字典里面的库存
 								stockInfo, _ := service.GetDrugAllStockInfo(storeHouseConfig.DrugStorehouseOut, item.UserOrgId, item.DrugId)
 								for _, its := range stockInfo {
-									sum_count += its.StockMaxNumber*medical.MinNumber + its.StockMinNumber
+									if its.MaxUnit == medical.MaxUnit {
+										its.StockMaxNumber = its.StockMaxNumber * medical.MinNumber
+									}
+									sum_count += its.StockMaxNumber + its.StockMinNumber
 								}
+
 								service.UpdateBaseDrugSumTwo(item.DrugId, sum_count, item.UserOrgId)
 								break
 								c.ServeSuccessJSON(map[string]interface{}{
@@ -2049,7 +2057,10 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 							var sum_count int64
 							stockInfo, _ := service.GetDrugAllStockInfo(storeHouseConfig.DrugStorehouseOut, item.UserOrgId, item.DrugId)
 							for _, its := range stockInfo {
-								sum_count += its.StockMaxNumber*medical.MinNumber + its.StockMinNumber
+								if its.MaxUnit == medical.MaxUnit {
+									its.StockMaxNumber = its.StockMaxNumber * medical.MinNumber
+								}
+								sum_count += its.StockMaxNumber + its.StockMinNumber
 							}
 							service.UpdateBaseDrugSumTwo(item.DrugId, sum_count, item.UserOrgId)
 							break
@@ -2342,7 +2353,10 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 								var sum_count int64
 								stockInfo, _ := service.GetDrugAllStockInfo(storeHouseConfig.DrugStorehouseOut, item.UserOrgId, item.DrugId)
 								for _, its := range stockInfo {
-									sum_count += its.StockMaxNumber*medical.MinNumber + its.StockMinNumber
+									if its.MaxUnit == medical.MaxUnit {
+										its.StockMaxNumber = its.StockMaxNumber * medical.MinNumber
+									}
+									sum_count += its.StockMaxNumber + its.StockMinNumber
 								}
 								service.UpdateBaseDrugSumTwo(item.DrugId, sum_count, item.UserOrgId)
 

controllers/secondary_order_api_contorller.go

@@ -1195,7 +1195,11 @@ func (this *SecondaryOrderApiController) CheckSecondOrer() {
 					stockInfo, _ := service.GetDrugAllStockInfo(storeHouseConfig.DrugStorehouseOut, item.UserOrgId, item.ProjectId)
 					var sum_count int64
 					for _, its := range stockInfo {
-						sum_count += its.StockMaxNumber*medical.MinNumber + its.StockMinNumber
+						baseDrug, _ := service.GetBaseDrugMedical(its.DrugId)
+						if its.MaxUnit == baseDrug.MaxUnit {
+							its.StockMaxNumber = its.StockMaxNumber * baseDrug.MinNumber
+						}
+						sum_count += its.StockMaxNumber + its.StockMinNumber
 					}
 					service.UpdateBaseDrugSumTwo(item.ProjectId, sum_count, item.UserOrgId)
 				}
@@ -1605,7 +1609,11 @@ func (this *SecondaryOrderApiController) ReturnCheckSecondOrder() {
 			var sum_count int64
 			stockInfo, _ := service.GetDrugAllStockInfo(storeHouseConfig.DrugStorehouseOut, item.UserOrgId, item.ProjectId)
 			for _, its := range stockInfo {
-				sum_count += its.StockMaxNumber*medical.MinNumber + its.StockMinNumber
+				baseDrug, _ := service.GetBaseDrugMedical(its.DrugId)
+				if its.MaxUnit == baseDrug.MaxUnit {
+					its.StockMaxNumber = its.StockMaxNumber * baseDrug.MinNumber
+				}
+				sum_count += its.StockMaxNumber + its.StockMinNumber
 			}
 			service.UpdateBaseDrugSumTwo(item.ProjectId, sum_count, item.UserOrgId)
 		}

controllers/stock_in_api_controller.go

@@ -4809,6 +4809,7 @@ func (this *StockManagerApiController) GetStockDrugCount() {
 func (this *StockManagerApiController) GetOrderDetialByOrderId() {
 
 	ids := this.GetString("id")
+
 	idsArray := strings.Split(ids, ",")
 	orgId := this.GetAdminUserInfo().CurrentOrgId
 	order, _ := service.GetWarehouseOutOrder(idsArray, orgId)

models/drug_stock.go

@@ -377,62 +377,64 @@ type StDrugWarehouseOutInfo struct {
 	PackingUnit             string  `json:"packing_unit"`
 	Dosage                  int64   `json:"dosage"`
 	ExpireDate              int64   `json:"expire_date"`
+	ConsumableType          int64   `gorm:"column:consumable_type" json:"consumable_type" form:"consumable_type"`
 }
 
 type DrugFlow struct {
-	ID                        int64                `gorm:"column:id" json:"id" form:"id"`
-	WarehousingId             int64                `gorm:"column:warehousing_id" json:"warehousing_id" form:"warehousing_id"`
-	DrugId                    int64                `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
-	Number                    string               `gorm:"column:number" json:"number" form:"number"`
-	BatchNumber               string               `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
-	Count                     int64                `gorm:"column:count" json:"count" form:"count"`
-	UserOrgId                 int64                `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
-	PatientId                 int64                `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
-	SystemTime                int64                `gorm:"column:system_time" json:"system_time" form:"system_time"`
-	ConsumableType            int64                `gorm:"column:consumable_type" json:"consumable_type" form:"consumable_type"`
-	IsSys                     int64                `gorm:"column:is_sys" json:"is_sys" form:"is_sys"`
-	WarehousingOrder          string               `gorm:"column:warehousing_order" json:"warehousing_order" form:"warehousing_order"`
-	WarehouseOutId            int64                `gorm:"column:warehouse_out_id" json:"warehouse_out_id" form:"warehouse_out_id"`
-	WarehouseOutOrderNumber   string               `gorm:"column:warehouse_out_order_number" json:"warehouse_out_order_number" form:"warehouse_out_order_number"`
-	IsEdit                    int64                `gorm:"column:is_edit" json:"is_edit" form:"is_edit"`
-	CancelStockId             int64                `gorm:"column:cancel_stock_id" json:"cancel_stock_id" form:"cancel_stock_id"`
-	CancelOrderNumber         string               `gorm:"column:cancel_order_number" json:"cancel_order_number" form:"cancel_order_number"`
-	Manufacturer              int64                `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
-	Dealer                    int64                `gorm:"column:dealer" json:"dealer" form:"dealer"`
-	Creator                   int64                `gorm:"column:creator" json:"creator" form:"creator"`
-	UpdateCreator             int64                `gorm:"column:update_creator" json:"update_creator" form:"update_creator"`
-	Status                    int64                `gorm:"column:status" json:"status" form:"status"`
-	Ctime                     int64                `gorm:"column:ctime" json:"ctime" form:"ctime"`
-	Mtime                     int64                `gorm:"column:mtime" json:"mtime" form:"mtime"`
-	Price                     float64              `gorm:"column:price" json:"price" form:"price"`
-	WarehousingDetailId       int64                `gorm:"column:warehousing_detail_id" json:"warehousing_detail_id" form:"warehousing_detail_id"`
-	WarehouseOutDetailId      int64                `gorm:"column:warehouse_out_detail_id" json:"warehouse_out_detail_id" form:"warehouse_out_detail_id"`
-	CancelOutDetailId         int64                `gorm:"column:cancel_out_detail_id" json:"cancel_out_detail_id" form:"cancel_out_detail_id"`
-	ExpireDate                int64                `gorm:"column:expire_date" json:"expire_date" form:"expire_date"`
-	ProductDate               int64                `gorm:"column:product_date" json:"product_date" form:"product_date"`
-	MaxUnit                   string               `gorm:"column:max_unit" json:"max_unit" form:"max_unit"`
-	MinUnit                   string               `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
-	StockMaxNumber            int64                `gorm:"column:stock_max_number" json:"stock_max_number" form:"stock_max_number"`
-	StockMinNumber            int64                `gorm:"column:stock_min_number" json:"stock_min_number" form:"stock_min_number"`
-	LastStockMaxNumber        int64                `gorm:"column:last_stock_max_number" json:"last_stock_max_number" form:"last_stock_max_number"`
-	LastStockMinNumber        int64                `gorm:"column:last_stock_min_number" json:"last_stock_min_number" form:"last_stock_min_number"`
-	DrugWarehouseInfo         []*DrugWarehouseInfo `gorm:"ForeignKey:DrugId;AssociationForeignKey:DrugId" `
-	BaseDrugLib               BaseDrugLib          `gorm:"ForeignKey:ID;AssociationForeignKey:DrugId" `
-	AdviceId                  int64                `gorm:"column:advice_id" json:"advice_id" form:"advice_id"`
-	SupplyWarehouseId         int64                `gorm:"column:supply_warehouse_id" json:"supply_warehouse_id" form:"supply_warehouse_id"`
-	SupplyCancelOutId         int64                `gorm:"column:supply_cancel_out_id" json:"supply_cancel_out_id" form:"supply_cancel_out_id"`
-	SupplyWarehouseDetailInfo int64                `gorm:"column:supply_warehouse_detail_info" json:"supply_warehouse_detail_info" form:"supply_warehouse_detail_info"`
-	StorehouseId              int64                `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
-	SecondWarehouseInfoId     int64                `gorm:"column:second_warehouse_info_id" json:"second_warehouse_info_id" form:"second_warehouse_info_id"`
-	AdminUserId               int64                `gorm:"column:admin_user_id" json:"admin_user_id" form:"admin_user_id"`
-	LastPrice                 float64              `gorm:"column:last_price" json:"last_price" form:"last_price"`
-	StockCount                string               `gorm:"column:stock_count" json:"stock_count" form:"stock_count"`
-	PharmacyId                int64                `gorm:"column:pharmacy_id" json:"pharmacy_id" form:"pharmacy_id"`
-	DrugWarehouseInfoOne      DrugWarehouseInfo    `gorm:"ForeignKey:ID;AssociationForeignKey:WarehousingDetailId"json:"xt_drug_warehouse_info" `
-	IsRead                    int64                `gorm:"column:is_read" json:"is_read" form:"is_read"`
-	IsCheck                   int64                `gorm:"column:is_check" json:"is_check" form:"is_check"`
-	OverCount                 int64                `gorm:"column:over_count" json:"over_count" form:"over_count"`
-	RetailPrice               float64              `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
+	ID                        int64                  `gorm:"column:id" json:"id" form:"id"`
+	WarehousingId             int64                  `gorm:"column:warehousing_id" json:"warehousing_id" form:"warehousing_id"`
+	DrugId                    int64                  `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
+	Number                    string                 `gorm:"column:number" json:"number" form:"number"`
+	BatchNumber               string                 `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
+	Count                     int64                  `gorm:"column:count" json:"count" form:"count"`
+	UserOrgId                 int64                  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	PatientId                 int64                  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	SystemTime                int64                  `gorm:"column:system_time" json:"system_time" form:"system_time"`
+	ConsumableType            int64                  `gorm:"column:consumable_type" json:"consumable_type" form:"consumable_type"`
+	IsSys                     int64                  `gorm:"column:is_sys" json:"is_sys" form:"is_sys"`
+	WarehousingOrder          string                 `gorm:"column:warehousing_order" json:"warehousing_order" form:"warehousing_order"`
+	WarehouseOutId            int64                  `gorm:"column:warehouse_out_id" json:"warehouse_out_id" form:"warehouse_out_id"`
+	WarehouseOutOrderNumber   string                 `gorm:"column:warehouse_out_order_number" json:"warehouse_out_order_number" form:"warehouse_out_order_number"`
+	IsEdit                    int64                  `gorm:"column:is_edit" json:"is_edit" form:"is_edit"`
+	CancelStockId             int64                  `gorm:"column:cancel_stock_id" json:"cancel_stock_id" form:"cancel_stock_id"`
+	CancelOrderNumber         string                 `gorm:"column:cancel_order_number" json:"cancel_order_number" form:"cancel_order_number"`
+	Manufacturer              int64                  `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
+	Dealer                    int64                  `gorm:"column:dealer" json:"dealer" form:"dealer"`
+	Creator                   int64                  `gorm:"column:creator" json:"creator" form:"creator"`
+	UpdateCreator             int64                  `gorm:"column:update_creator" json:"update_creator" form:"update_creator"`
+	Status                    int64                  `gorm:"column:status" json:"status" form:"status"`
+	Ctime                     int64                  `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime                     int64                  `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Price                     float64                `gorm:"column:price" json:"price" form:"price"`
+	WarehousingDetailId       int64                  `gorm:"column:warehousing_detail_id" json:"warehousing_detail_id" form:"warehousing_detail_id"`
+	WarehouseOutDetailId      int64                  `gorm:"column:warehouse_out_detail_id" json:"warehouse_out_detail_id" form:"warehouse_out_detail_id"`
+	CancelOutDetailId         int64                  `gorm:"column:cancel_out_detail_id" json:"cancel_out_detail_id" form:"cancel_out_detail_id"`
+	ExpireDate                int64                  `gorm:"column:expire_date" json:"expire_date" form:"expire_date"`
+	ProductDate               int64                  `gorm:"column:product_date" json:"product_date" form:"product_date"`
+	MaxUnit                   string                 `gorm:"column:max_unit" json:"max_unit" form:"max_unit"`
+	MinUnit                   string                 `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
+	StockMaxNumber            int64                  `gorm:"column:stock_max_number" json:"stock_max_number" form:"stock_max_number"`
+	StockMinNumber            int64                  `gorm:"column:stock_min_number" json:"stock_min_number" form:"stock_min_number"`
+	LastStockMaxNumber        int64                  `gorm:"column:last_stock_max_number" json:"last_stock_max_number" form:"last_stock_max_number"`
+	LastStockMinNumber        int64                  `gorm:"column:last_stock_min_number" json:"last_stock_min_number" form:"last_stock_min_number"`
+	DrugWarehouseInfo         []*DrugWarehouseInfo   `gorm:"ForeignKey:DrugId;AssociationForeignKey:DrugId" `
+	BaseDrugLib               BaseDrugLib            `gorm:"ForeignKey:ID;AssociationForeignKey:DrugId" `
+	AdviceId                  int64                  `gorm:"column:advice_id" json:"advice_id" form:"advice_id"`
+	SupplyWarehouseId         int64                  `gorm:"column:supply_warehouse_id" json:"supply_warehouse_id" form:"supply_warehouse_id"`
+	SupplyCancelOutId         int64                  `gorm:"column:supply_cancel_out_id" json:"supply_cancel_out_id" form:"supply_cancel_out_id"`
+	SupplyWarehouseDetailInfo int64                  `gorm:"column:supply_warehouse_detail_info" json:"supply_warehouse_detail_info" form:"supply_warehouse_detail_info"`
+	StorehouseId              int64                  `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
+	SecondWarehouseInfoId     int64                  `gorm:"column:second_warehouse_info_id" json:"second_warehouse_info_id" form:"second_warehouse_info_id"`
+	AdminUserId               int64                  `gorm:"column:admin_user_id" json:"admin_user_id" form:"admin_user_id"`
+	LastPrice                 float64                `gorm:"column:last_price" json:"last_price" form:"last_price"`
+	StockCount                string                 `gorm:"column:stock_count" json:"stock_count" form:"stock_count"`
+	PharmacyId                int64                  `gorm:"column:pharmacy_id" json:"pharmacy_id" form:"pharmacy_id"`
+	DrugWarehouseInfoOne      DrugWarehouseInfo      `gorm:"ForeignKey:ID;AssociationForeignKey:WarehousingDetailId"json:"xt_drug_warehouse_info" `
+	IsRead                    int64                  `gorm:"column:is_read" json:"is_read" form:"is_read"`
+	IsCheck                   int64                  `gorm:"column:is_check" json:"is_check" form:"is_check"`
+	OverCount                 int64                  `gorm:"column:over_count" json:"over_count" form:"over_count"`
+	RetailPrice               float64                `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
+	XtDrugWarehouseOutInfo    XtDrugWarehouseOutInfo `gorm:"ForeignKey:ID;AssociationForeignKey:WarehouseOutDetailId"json:"xt_drug_warehouse_out_info" `
 }
 
 func (DrugFlow) TableName() string {

service/gobal_config_service.go

@@ -974,3 +974,19 @@ func GetDrugFlowBatch(ware_out_id int64, drug_id int64, orgid int64) (flow []*mo
 	err = XTReadDB().Where("warehouse_out_id = ? and drug_id = ? and user_org_id = ? and status = 1", ware_out_id, drug_id, orgid).Find(&flow).Error
 	return flow, err
 }
+
+func GetDrugWarehouseOutInfoFlow(drug_id int64, start_time int64, end_time int64, user_org_id int64) (info []*models.XtDrugWarehouseOutInfo, err error) {
+
+	db := XTReadDB().Model(&info).Where("status = 1")
+	if start_time > 0 {
+		db = db.Where("sys_record_time >=?", start_time)
+	}
+	if end_time > 0 {
+		db = db.Where("sys_record_time <=?", end_time)
+	}
+	if user_org_id > 0 {
+		db = db.Where("user_org_id = ?", user_org_id)
+	}
+	err = db.Find(&info).Error
+	return info, err
+}

service/manage_center_service.go

@@ -825,7 +825,10 @@ func DrugAutoAddCancelInfo(advice *models.HisDoctorAdviceInfo, creater int64) er
 		medical, _ := GetBaseDrugMedical(advice.DrugId)
 		var sum_count_one int64
 		for _, its := range stockInfo {
-			sum_count_one += its.StockMaxNumber*medical.MinNumber + its.StockMinNumber
+			if its.MaxUnit == medical.MaxUnit {
+				its.StockMaxNumber = its.StockMaxNumber * medical.MinNumber
+			}
+			sum_count_one += its.StockMaxNumber + its.StockMinNumber
 		}
 		UpdateBaseDrugSumTwo(advice.DrugId, sum_count_one, advice.UserOrgId)
 

service/new_warehouse_service.go

@@ -85,6 +85,7 @@ func ConsumablesGoodDelivery(orgID int64, patient_id int64, record_time int64, g
 		warehouseOutInfo.Count = count
 
 		_, errcodes := GetWarehouseOutInfoIsExistOne(goods.GoodId, patient_id, record_time, goods.ProjectId)
+		fmt.Println("errcodes2333232233232wode3223", errcodes, goods.ProjectId)
 		if errcodes == gorm.ErrRecordNotFound {
 			errOne := AddSigleWarehouseOutInfo(warehouseOutInfo)
 			if errOne != nil {
@@ -233,8 +234,8 @@ func ConsumablesGoodDelivery(orgID int64, patient_id int64, record_time int64, g
 				ConsumableType:          7,
 				IsSys:                   0,
 				WarehousingOrder:        "",
-				WarehouseOutId:          0,
-				WarehouseOutOrderNumber: "",
+				WarehouseOutId:          lastOut.WarehouseOutId,
+				WarehouseOutOrderNumber: lastOut.WarehouseOutOrderNumber,
 				IsEdit:                  0,
 				CancelStockId:           cancel.ID,
 				CancelOrderNumber:       cancel.OrderNumber,
@@ -330,8 +331,8 @@ func ConsumablesGoodDelivery(orgID int64, patient_id int64, record_time int64, g
 		}
 		warehouseOutInfo.Count = stock_number
 
-		_, errcodes := GetWarehouseOutInfoIsExistOne(goods.GoodId, goods.PatientId, record_time, goods.ProjectId)
-
+		_, errcodes := GetWarehouseOutInfoIsExistOne(goods.GoodId, patient_id, record_time, goods.ProjectId)
+		fmt.Println("errcodes23332322332323223", errcodes, goods.ProjectId)
 		if errcodes == gorm.ErrRecordNotFound {
 			errOne := AddSigleWarehouseOutInfo(warehouseOutInfo)
 			if errOne != nil {
@@ -469,8 +470,8 @@ func ConsumablesGoodDelivery(orgID int64, patient_id int64, record_time int64, g
 				ConsumableType:          7,
 				IsSys:                   0,
 				WarehousingOrder:        "",
-				WarehouseOutId:          0,
-				WarehouseOutOrderNumber: "",
+				WarehouseOutId:          lastOut.WarehouseOutId,
+				WarehouseOutOrderNumber: lastOut.WarehouseOutOrderNumber,
 				IsEdit:                  0,
 				CancelStockId:           cancel.ID,
 				CancelOrderNumber:       cancel.OrderNumber,
@@ -697,7 +698,10 @@ func BloodDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *
 		stockInfo, _ := GetDrugAllStockInfo(storeConfig.DrugStorehouseOut, orgID, advice.DrugId)
 		var sum_count int64
 		for _, its := range stockInfo {
-			sum_count += its.StockMaxNumber*drup.MinNumber + its.StockMinNumber
+			if its.MaxUnit == drup.MaxUnit {
+				its.StockMaxNumber = its.StockMaxNumber * drup.MinNumber
+			}
+			sum_count += its.StockMaxNumber + its.StockMinNumber
 		}
 
 		warehouseOutInfo := &models.DrugWarehouseOutInfo{
@@ -967,7 +971,10 @@ func BloodDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *
 		stockInfo, _ := GetDrugAllStockInfo(storeConfig.DrugStorehouseOut, orgID, advice.DrugId)
 		var sum_count int64
 		for _, its := range stockInfo {
-			sum_count += its.StockMaxNumber*drup.MinNumber + its.StockMinNumber
+			if its.MaxUnit == drup.MaxUnit {
+				its.StockMaxNumber = its.StockMaxNumber * drup.MinNumber
+			}
+			sum_count += its.StockMaxNumber + its.StockMinNumber
 		}
 
 		// 当该批次的库存数量小于出库数量的话，则先把该批次出库完后，再进行递归出库
@@ -1333,7 +1340,10 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 		stockInfo, _ := GetDrugAllStockInfo(storeConfig.DrugStorehouseOut, orgID, advice.DrugId)
 		var sum_count int64
 		for _, its := range stockInfo {
-			sum_count += its.StockMaxNumber*drup.MinNumber + its.StockMinNumber
+			if its.MaxUnit == drup.MaxUnit {
+				its.StockMaxNumber = its.StockMaxNumber * drup.MinNumber
+			}
+			sum_count += its.StockMaxNumber + its.StockMinNumber
 		}
 
 		warehouseOutInfo := &models.DrugWarehouseOutInfo{
@@ -1615,7 +1625,10 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 		stockInfo, _ := GetDrugAllStockInfo(storeConfig.DrugStorehouseOut, orgID, advice.DrugId)
 		var sum_count int64
 		for _, its := range stockInfo {
-			sum_count += its.StockMaxNumber*drup.MinNumber + its.StockMinNumber
+			if its.MaxUnit == drup.MaxUnit {
+				its.StockMaxNumber = its.StockMaxNumber * drup.MinNumber
+			}
+			sum_count += its.StockMaxNumber + its.StockMinNumber
 		}
 
 		// 当该批次的库存数量小于出库数量的话，则先把该批次出库完后，再进行递归出库

service/pharmacy_service.go

@@ -742,15 +742,20 @@ func DrugWithdrawal(orgid, patient_id, stime, etime, creater int64) (err error)
 			err = fmt.Errorf("!:%v", err)
 			return
 		}
-		drug, _ := FindBaseDrugLibRecordSeven(orgid, v.DrugId)
+		//drug, _ := FindBaseDrugLibRecordSeven(orgid, v.DrugId)
 		//查询默认仓库
 		storeHouseConfig, _ := GetAllStoreHouseConfig(orgid)
 		//查询默认仓库剩余多少库存
 		var sum_count int64
 		stockInfo, _ := GetDrugAllStockInfo(storeHouseConfig.DrugStorehouseOut, orgid, v.DrugId)
 		for _, its := range stockInfo {
-			sum_count += its.StockMaxNumber*drug.MinNumber + its.StockMinNumber
+			baseDrug, _ := GetBaseDrugMedical(its.DrugId)
+			if its.MaxUnit == baseDrug.MaxUnit {
+				its.StockMaxNumber = its.StockMaxNumber * baseDrug.MinNumber
+			}
+			sum_count += its.StockMaxNumber + its.StockMinNumber
 		}
+
 		UpdateBaseDrugSumTwo(v.DrugId, sum_count, orgid)
 	}
 
@@ -789,14 +794,18 @@ func DrugWithdrawal(orgid, patient_id, stime, etime, creater int64) (err error)
 			err = fmt.Errorf("!:%v", err)
 			return
 		}
-		drug, _ := FindBaseDrugLibRecordSeven(orgid, v.DrugId)
+		//drug, _ := FindBaseDrugLibRecordSeven(orgid, v.DrugId)
 		//查询默认仓库
 		storeHouseConfig, _ := GetAllStoreHouseConfig(orgid)
 		//查询默认仓库剩余多少库存
 		var sum_count int64
 		stockInfo, _ := GetDrugAllStockInfo(storeHouseConfig.DrugStorehouseOut, orgid, v.DrugId)
 		for _, its := range stockInfo {
-			sum_count += its.StockMaxNumber*drug.MinNumber + its.StockMinNumber
+			baseDrug, _ := GetBaseDrugMedical(its.DrugId)
+			if its.MaxUnit == baseDrug.MaxUnit {
+				its.StockMaxNumber = its.StockMaxNumber * baseDrug.MinNumber
+			}
+			sum_count += its.StockMaxNumber + its.StockMinNumber
 		}
 		UpdateBaseDrugSumTwo(v.DrugId, sum_count, orgid)
 	}
@@ -1084,14 +1093,18 @@ func FenStock(orgid, creater int64, v *models.HisDoctorAdviceInfo) (err error) {
 		err = fmt.Errorf("!:%v", err)
 		return
 	}
-	drug, _ := FindBaseDrugLibRecordSeven(orgid, v.DrugId)
+	//drug, _ := FindBaseDrugLibRecordSeven(orgid, v.DrugId)
 	//查询默认仓库
 	storeHouseConfig, _ := GetAllStoreHouseConfig(orgid)
 	//查询默认仓库剩余多少库存
 	var sum_count int64
 	stockInfo, _ := GetDrugAllStockInfo(storeHouseConfig.DrugStorehouseOut, orgid, v.DrugId)
 	for _, its := range stockInfo {
-		sum_count += its.StockMaxNumber*drug.MinNumber + its.StockMinNumber
+		baseDrug, _ := GetBaseDrugMedical(its.DrugId)
+		if its.MaxUnit == baseDrug.MaxUnit {
+			its.StockMaxNumber = its.StockMaxNumber * baseDrug.MinNumber
+		}
+		sum_count += its.StockMaxNumber + its.StockMinNumber
 	}
 	UpdateBaseDrugSumTwo(v.DrugId, sum_count, orgid)
 	return

service/stock_service.go

@@ -4855,10 +4855,23 @@ func GetExportOutOrderDrugListOne(warehouse_out_id []string) (out []*models.StDr
 	if len(warehouse_out_id) > 0 {
 		db = db.Where("x.warehouse_out_id in(?)", warehouse_out_id)
 	}
-	err = db.Select("x.id,x.warehouse_out_id,x.drug_id,x.count,x.max_unit as count_unit,x.price,x.retail_price,x.product_date,x.expire_date,x.warehouse_out_order_number,x.dealer,x.manufacturer,x.is_sys,x.number,x.batch_number,x.patient_id,x.ctime,b.dose,b.dose_unit,b.min_number,b.min_unit,b.max_unit,b.drug_name,b.drug_type,b.min_price").Joins("left join xt_base_drug as b on b.id = x.drug_id").Scan(&out).Error
+	err = db.Select("x.id,x.warehouse_out_id,x.drug_id,x.count,x.max_unit as count_unit,x.price,x.retail_price,x.product_date,x.expire_date,x.warehouse_out_order_number,x.dealer,x.manufacturer,x.is_sys,x.number,x.batch_number,x.patient_id,x.ctime,x.consumable_type,b.dose,b.dose_unit,b.min_number,b.min_unit,b.max_unit,b.drug_name,b.drug_type,b.min_price").Joins("left join xt_base_drug as b on b.id = x.drug_id").Scan(&out).Error
 	return out, err
 }
 
+func GetDrugOutListFlow(warehouse_out_id []string, orgid int64) (info []*models.XtDrugWarehouseOutInfo, err error) {
+
+	db := XTReadDB().Model(&info).Where("status = 1")
+	if len(warehouse_out_id) > 0 {
+		db = db.Where("warehouse_out_id in(?)", warehouse_out_id)
+	}
+	if orgid > 0 {
+		db = db.Where("org_id = ?", orgid)
+	}
+	err = db.Find(&info).Error
+	return info, err
+}
+
 func GetDrugWarehouseOut(warehouse_out_id []string) (out []*models.StDrugWarehouseOutInfo, err error) {
 
 	err = XTReadDB().Where("warehouse_out_id in(?)", warehouse_out_id).Find(&out).Error
@@ -5239,7 +5252,7 @@ func GetDrugFlow(drugid int64, orgid int64, limit int64, page int64, startTime i
 		}
 
 	}
-	err = db.Count(&total).Offset(offset).Limit(limit).Order("id desc").Preload("BaseDrugLib", "status = 1").Preload("DrugWarehouseInfo", "status = 1").Find(&drug_flow).Error
+	err = db.Count(&total).Offset(offset).Limit(limit).Order("id desc").Preload("BaseDrugLib", "status = 1").Preload("DrugWarehouseInfo", "status = 1").Preload("XtDrugWarehouseOutInfo", "status = 1").Find(&drug_flow).Error
 	return drug_flow, total, err
 }