耗材参数

controllers/base_api_controller.go

 		userAdmin.Id = 1448
 		userAdmin.Mobile = "13318599895"
 
-		//userAdmin.Id = 597
-		//userAdmin.Mobile = "19874122664"
+		userAdmin.Id = 597
+		userAdmin.Mobile = "19874122664"
 		userAdmin.IsSuperAdmin = false
 		userAdmin.Status = 1
 		userAdmin.CreateTime = 1530786071
 		adminUserInfo.Subscibes = subscibes
 		this.SetSession("admin_user_info", &adminUserInfo)
 
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNotLogin)
-		this.StopRun()
+		//this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNotLogin)
+		//this.StopRun()
 
 	}
 
 		userAdmin.Id = 1448
 		userAdmin.Mobile = "13318599895"
 
-		//userAdmin.Id = 597
-		//userAdmin.Mobile = "19874122664"
+		userAdmin.Id = 597
+		userAdmin.Mobile = "19874122664"
 		userAdmin.IsSuperAdmin = false
 		userAdmin.Status = 1
 		userAdmin.CreateTime = 1530786071

controllers/drug_stock_api_contorller.go

 
 	beego.Router("/api/drugstock/get", &StockDrugApiController{}, "get:GetAllDrugStock")
 
+	beego.Router("/api/drug/getcanceldrugorderprint", &StockDrugApiController{}, "get:GetCancelDrugOrderPrint")
+	beego.Router("/api/drug/drugcancelexportlist", &StockDrugApiController{}, "get:GetDrugCancelExportList")
 }
 
 func (c *StockDrugApiController) CreateDrugWarehouse() {
 	}
 
 	var warehousingInfo []*models.DrugWarehouseInfo
-
+	var drugFlow []*models.DrugFlow
 	if dataBody["stockIn"] != nil && reflect.TypeOf(dataBody["stockIn"]).String() == "[]interface {}" {
 		thisStockIn, _ := dataBody["stockIn"].([]interface{})
 		if len(thisStockIn) > 0 {
 				}
 				warehousingInfo = append(warehousingInfo, warehouseInfo)
 
+				drugflow := &models.DrugFlow{
+					WarehousingOrder: warehousing.WarehousingOrder,
+					WarehousingId:    warehousing.ID,
+					DrugId:           drug_id,
+					Number:           number,
+					ProductDate:      productDates,
+					ExpireDate:       expiryDates,
+					Count:            warehousing_count,
+					Price:            last_price,
+					Status:           1,
+					Ctime:            ctime,
+					UserOrgId:        adminUserInfo.CurrentOrgId,
+					Manufacturer:     manufacturer,
+					Dealer:           dealer,
+					BatchNumber:      batch_number,
+					MaxUnit:          max_unit,
+					MinUnit:          min_unit,
+					ConsumableType:   1,
+					IsEdit:           1,
+					Creator:          adminUserInfo.AdminUser.Id,
+					IsSys:            0,
+				}
+
+				drugFlow = append(drugFlow, drugflow)
+
 			}
 		}
 	}
+	//创建入库单
 	errs := service.CreateDrugWarehousingInfo(warehousingInfo)
+	if errs == nil {
+		//更改库存
+		service.UpdateDrugInfo(warehousingInfo)
+	}
+	//创建流水单
+	service.CreateDrugFlow(drugFlow)
+
 	info, _ := service.FindLastDrugWarehousingInfo(warehousing.WarehousingOrder)
 
 	if errs != nil {
 		"warehousing_order": warehousing_order,
 		"info":              info,
 	})
-	//}
-
-	//else {
-	//	warehouse, err1 := service.FindWareHouseByOrderNumber(warehousing_order)
-	//	if (err1 != nil) {
-	//		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-	//		return
-	//	}
-	//
-	//	dataBody := make(map[string]interface{}, 0)
-	//	err := json.Unmarshal(c.Ctx.Input.RequestBody, &dataBody)
-	//	if err != nil {
-	//		utils.ErrorLog(err.Error())
-	//		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-	//		return
-	//	}
-	//
-	//	var warehousingInfo []*models.WarehousingInfo
-	//
-	//	if dataBody["stockIn"] != nil && reflect.TypeOf(dataBody["stockIn"]).String() == "[]interface {}" {
-	//		thisStockIn, _ := dataBody["stockIn"].([]interface{})
-	//		if len(thisStockIn) > 0 {
-	//			for _, item := range thisStockIn {
-	//				items := item.(map[string]interface{})
-	//
-	//				if items["good_id"] == nil || reflect.TypeOf(items["good_id"]).String() != "float64" {
-	//					utils.ErrorLog("good_id")
-	//					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-	//					return
-	//				}
-	//				good_id := int64(items["good_id"].(float64))
-	//
-	//				if items["good_type_id"] == nil || reflect.TypeOf(items["good_type_id"]).String() != "float64" {
-	//					utils.ErrorLog("good_type_id")
-	//					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-	//					return
-	//				}
-	//				good_type_id := int64(items["good_type_id"].(float64))
-	//
-	//				if items["warehousing_count"] == nil || reflect.TypeOf(items["warehousing_count"]).String() != "string" {
-	//					utils.ErrorLog("warehousing_count")
-	//					c.ServeFailJSONWithSGJErrorCod  Fe(enums.ErrorCodeParamWrong)
-	//					return
-	//				}
-	//
-	//				warehousing_count, _ := strconv.ParseInt(items["warehousing_count"].(string), 10, 64)
-	//
-	//				if items["price"] == nil || reflect.TypeOf(items["price"]).String() != "string" {
-	//					utils.ErrorLog("price")
-	//					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-	//					return
-	//				}
-	//				price, _ := strconv.ParseFloat(items["price"].(string), 64)
-	//				total := float64(warehousing_count) * price
-	//
-	//				if items["expiry_date"] == nil || reflect.TypeOf(items["expiry_date"]).String() != "string" {
-	//					utils.ErrorLog("expiry_date")
-	//					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-	//					return
-	//				}
-	//
-	//				expiryDate, _ := items["expiry_date"].(string)
-	//				if len(expiryDate) == 0 {
-	//					utils.ErrorLog("len(expiry_date) == 0")
-	//					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-	//
-	//					return
-	//				}
-	//
-	//				expiry_date, parseDateErr := utils.ParseTimeStringToTime("2006-01-02", expiryDate)
-	//				if parseDateErr != nil {
-	//					c.ErrorLog("日期(%v)解析错误：%v", expiry_date, parseDateErr)
-	//				}
-	//
-	//				var productDates int64
-	//
-	//				if items["product_date"] == nil || reflect.TypeOf(items["product_date"]).String() != "string" {
-	//					productDates = 0;
-	//				} else {
-	//					productDate, _ := items["product_date"].(string)
-	//					product_date, _ := utils.ParseTimeStringToTime("2006-01-02", productDate)
-	//					productDates = product_date.Unix()
-	//
-	//				}
-	//
-	//				if items["number"] == nil || reflect.TypeOf(items["number"]).String() != "string" {
-	//					utils.ErrorLog("number")
-	//					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-	//					return
-	//				}
-	//				number, _ := items["number"].(string)
-	//
-	//				var remark string
-	//				if items["number"] == nil || reflect.TypeOf(items["number"]).String() != "string" {
-	//					remark = ""
-	//				} else {
-	//					remark = items["remark"].(string)
-	//				}
-	//
-	//				warehouseInfo := &models.WarehousingInfo{
-	//					WarehousingOrder: warehousing_order,
-	//					WarehousingId:    warehouse.ID,
-	//					GoodId:           good_id,
-	//					Number:           number,
-	//					GoodTypeId:       good_type_id,
-	//					ProductDate:      productDates,
-	//					ExpiryDate:       expiry_date.Unix(),
-	//					WarehousingCount: warehousing_count,
-	//					Price:            price,
-	//					TotalPrice:       total,
-	//					Status:           1,
-	//					Ctime:            ctime,
-	//					Remark:           remark,
-	//					OrgId:            adminUserInfo.CurrentOrgId,
-	//				}
-	//				warehousingInfo = append(warehousingInfo, warehouseInfo)
-	//
-	//			}
-	//		}
-	//	}
-	//	errs := service.CreateWarehousingInfo(warehousingInfo)
-	//	info, _ := service.FindLastWarehousingInfo(warehousing_order)
-	//
-	//	if (errs != nil) {
-	//		utils.ErrorLog(errs.Error())
-	//		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateStockInFail)
-	//		return
-	//	}
-	//
-	//	c.ServeSuccessJSON(map[string]interface{}{
-	//		"msg":  "入库成功",
-	//		"info": info,
-	//	})
-	//
-	//}
 
 }
 func (c *StockDrugApiController) GetDrugWarehouseList() {
 
 	var warehousingInfo []*models.DrugWarehouseInfo
 	var upDateWarehousingInfo []*models.DrugWarehouseInfo
-
+	var drugFlow []*models.DrugFlow
 	if dataBody["stockIn"] != nil && reflect.TypeOf(dataBody["stockIn"]).String() == "[]interface {}" {
 		thisStockIn, _ := dataBody["stockIn"].([]interface{})
 
 						BatchNumber:      batch_number,
 					}
 					upDateWarehousingInfo = append(upDateWarehousingInfo, warehouseInfo)
+
+					drugflow := &models.DrugFlow{
+						WarehousingOrder: warehousing.WarehousingOrder,
+						WarehousingId:    warehousing.ID,
+						DrugId:           drug_id,
+						Number:           number,
+						ProductDate:      productDates,
+						ExpireDate:       expiryDates,
+						Count:            warehousing_count,
+						Price:            last_price,
+						Status:           1,
+						Ctime:            ctime,
+						UserOrgId:        adminUserInfo.CurrentOrgId,
+						Manufacturer:     manufacturer,
+						Dealer:           dealer,
+						BatchNumber:      batch_number,
+						MaxUnit:          max_unit,
+						MinUnit:          min_unit,
+						ConsumableType:   1,
+						IsEdit:           1,
+						Creator:          adminUserInfo.AdminUser.Id,
+						IsSys:            0,
+					}
+
+					drugFlow = append(drugFlow, drugflow)
 				}
 			}
 		}
 	}
 	var errs error
 	if len(warehousingInfo) > 0 {
+
 		errs = service.CreateDrugWarehousingInfo(warehousingInfo)
+		if errs == nil {
+			service.CreateDrugFlow(drugFlow)
+			//更改库存
+			service.UpdateDrugInfo(warehousingInfo)
+
+		}
+
 	}
 
 	if len(upDateWarehousingInfo) > 0 {
+		var total int64
+		var minNumber float64
+		var allTotal int64
 		for _, item := range upDateWarehousingInfo {
+			//查询修改的记录
+			orderInfo, _ := service.GetDrugWarehouseOrderOne(id, item.DrugId)
+
+			info, _ := service.FindeDrugInfo(item.DrugId)
+
+			total = orderInfo.StockMaxNumber * info.MinNumber
+
+			allTotal = item.WarehousingCount*info.MinNumber - total
+
+			str := strconv.FormatInt(allTotal, 10)
+			minFloat, _ := strconv.ParseFloat(str, 64)
+
+			minNumber = info.Total + minFloat
+
+			lib := models.BaseDrugLib{
+				Total: minNumber,
+			}
+			service.UpdateBaseDrug(&lib, item.DrugId)
 			errs = service.UpDateDrugWarehousingInfo(item)
+			service.CreateDrugFlow(drugFlow)
 		}
 	}
 
 
 	var warehousingOutInfo []*models.DrugWarehouseOutInfo
 
+	var drugFlow []*models.DrugFlow
+
 	if dataBody["stockOut"] != nil && reflect.TypeOf(dataBody["stockOut"]).String() == "[]interface {}" {
 		thisStockIn, _ := dataBody["stockOut"].([]interface{})
 
 				}
 				warehousingOutInfo = append(warehousingOutInfo, warehouseOutInfo)
 
+				drugflow := &models.DrugFlow{
+					WarehouseOutId:          warehouseOut.ID,
+					WarehouseOutOrderNumber: warehousing_out_order,
+					DrugId:                  drug_id,
+					Number:                  number,
+					ProductDate:             productDates,
+					ExpireDate:              expiryDates,
+					Count:                   count,
+					Price:                   price,
+					Status:                  1,
+					Ctime:                   ctime,
+					UserOrgId:               adminUserInfo.CurrentOrgId,
+					Manufacturer:            manufacturer,
+					Dealer:                  dealer,
+					BatchNumber:             batch_number,
+					MaxUnit:                 max_unit,
+					ConsumableType:          2,
+					IsEdit:                  1,
+					Creator:                 adminUserInfo.AdminUser.Id,
+					IsSys:                   0,
+				}
+				drugFlow = append(drugFlow, drugflow)
 			}
 		}
 	}
 			return
 		} else {
 			service.AddSigleDrugWarehouseOut(&warehouseOut)
+			service.CreateDrugFlow(drugFlow)
 			// 出库流程
 			// 1.查询改药品在药品库的规格信息，并将处方里的规格进行换算（尽量将拆零单位转换成包装单位）
 			drup, _ := service.FindBaseDrugLibRecord(item.OrgId, item.DrugId)
 
 	var warehousingOutInfo []*models.DrugWarehouseOutInfo
 	var upDateWarehouseOutInfos []*models.DrugWarehouseOutInfo
-
+	//var drugFlow  []*models.DrugFlow
 	if dataBody["stockOut"] != nil && reflect.TypeOf(dataBody["stockOut"]).String() == "[]interface {}" {
 		thisStockOut, _ := dataBody["stockOut"].([]interface{})
 		if len(thisStockOut) > 0 {
 
 				count, _ := strconv.ParseInt(items["count"].(string), 10, 64)
 
+				count_unit, _ := items["count_unit"].(string)
+
 				if items["price"] == nil || reflect.TypeOf(items["price"]).String() != "string" {
 					utils.ErrorLog("price")
 					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 					return
 				}
 				price, _ := strconv.ParseFloat(items["price"].(string), 64)
-				fmt.Println("price23223232323232323232323232322322", price)
+
 				if items["retail_price"] == nil || reflect.TypeOf(items["retail_price"]).String() != "string" {
 					utils.ErrorLog("retail_price")
 					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 						Number:                  number,
 						ProductDate:             productDates,
 						ExpiryDate:              expiryDates,
+						CountUnit:               count_unit,
 					}
 					warehousingOutInfo = append(warehousingOutInfo, warehouseOutInfo)
 
+					//drugflow := &models.DrugFlow{
+					//  WarehousingOrder: warehousing.WarehousingOrder,
+					//  WarehousingId:    warehousing.ID,
+					//  DrugId:           drug_id,
+					//  Number:           number,
+					//  ProductDate:      productDates,
+					//  ExpireDate:       expiryDates,
+					//  Count:            warehousing_count,
+					//  Price:            last_price,
+					//  Status:           1,
+					//  Ctime:            ctime,
+					//  UserOrgId:        adminUserInfo.CurrentOrgId,
+					//  Manufacturer:     manufacturer,
+					//  Dealer:           dealer,
+					//  BatchNumber:      batch_number,
+					//  MaxUnit:          max_unit,
+					//  MinUnit:          min_unit,
+					//  ConsumableType:   1,
+					//  IsEdit:           1,
+					//  Creator:          adminUserInfo.AdminUser.Id,
+					//  IsSys:0,
+					//}
+					//
+					//drugFlow = append(drugFlow,drugflow)
+
 				} else {
 					if items["is_sys"] == nil || reflect.TypeOf(items["is_sys"]).String() != "float64" {
 						utils.ErrorLog("is_sys")
 						Number:                  number,
 						ProductDate:             productDates,
 						ExpiryDate:              expiryDates,
+						CountUnit:               count_unit,
 					}
 					upDateWarehouseOutInfos = append(upDateWarehouseOutInfos, warehouseOutInfo)
 				}
 				retail_price, _ := strconv.ParseFloat(items["retail_price"].(string), 64)
 				retail_price_total := float64(count) * retail_price
 
+				register_account, _ := items["register_account"].(string)
+
+				remark, _ := items["remark"].(string)
+
+				var productDates int64
+				var expiryDates int64
+
+				if items["expiry_date"] == nil || reflect.TypeOf(items["expiry_date"]).String() != "string" {
+					expiryDates = 0
+				} else {
+					if len(items["expiry_date"].(string)) == 0 {
+						expiryDates = 0
+
+					} else {
+						expiryDate, _ := items["expiry_date"].(string)
+						expiry_date, _ := utils.ParseTimeStringToTime("2006-01-02", expiryDate)
+						expiryDates = expiry_date.Unix()
+
+					}
+
+				}
+				if items["product_date"] == nil || reflect.TypeOf(items["product_date"]).String() != "string" {
+					productDates = 0
+				} else {
+					if len(items["product_date"].(string)) == 0 {
+						productDates = 0
+
+					} else {
+						productDate, _ := items["product_date"].(string)
+						product_date, _ := utils.ParseTimeStringToTime("2006-01-02", productDate)
+						productDates = product_date.Unix()
+					}
+
+				}
+
+				manufacturer, _ := items["manufacturer"].(string)
+
+				dealer, _ := items["dealer"].(string)
+
+				batch_number := items["batch_number"].(string)
+				max_unit := items["max_unit"].(string)
 				cancelStockInfo := &models.DrugCancelStockInfo{
 					OrderNumber:      cancelStock.OrderNumber,
 					CancelStockId:    cancelStock.ID,
 					Ctime:            ctime,
 					OrgId:            adminUserInfo.CurrentOrgId,
 					Type:             types,
-					Manufacturer:     manufacturer_id,
-					Dealer:           dealer_id,
+					Manufacturer:     manufacturer,
+					Dealer:           dealer,
 					Total:            total,
 					RetailPrice:      retail_price,
 					RetailTotalPrice: retail_price_total,
 					Price:            price,
+					RegisterAccount:  register_account,
+					Remark:           remark,
+					BatchNumber:      batch_number,
+					MaxUnit:          max_unit,
+					ProductDate:      productDates,
+					ExpiryDate:       expiryDates,
 				}
 				cancelStockInfos = append(cancelStockInfos, cancelStockInfo)
 
 
 				count, _ := strconv.ParseInt(items["count"].(string), 10, 64)
 
-				//count, _ := strconv.ParseInt(return_count, 10, 64)
-
 				if items["price"] == nil || reflect.TypeOf(items["price"]).String() != "string" {
 					utils.ErrorLog("price")
 					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 				}
 				id := int64(items["id"].(float64))
 
+				max_unit := items["max_unit"].(string)
+				batch_number := items["batch_number"].(string)
+
+				register_account := items["register_account"].(string)
+
+				remark := items["remark"].(string)
+
+				manufacturer := items["manufacturer"].(string)
+
+				dealer := items["dealer"].(string)
+
+				var productDates int64
+				var expiryDates int64
+
+				if items["expiry_date"] == nil || reflect.TypeOf(items["expiry_date"]).String() != "string" {
+					expiryDates = 0
+				} else {
+					if len(items["expiry_date"].(string)) == 0 {
+						expiryDates = 0
+
+					} else {
+						expiryDate, _ := items["expiry_date"].(string)
+						expiry_date, _ := utils.ParseTimeStringToTime("2006-01-02", expiryDate)
+						expiryDates = expiry_date.Unix()
+
+					}
+
+				}
+				if items["product_date"] == nil || reflect.TypeOf(items["product_date"]).String() != "string" {
+					productDates = 0
+				} else {
+					if len(items["product_date"].(string)) == 0 {
+						productDates = 0
+
+					} else {
+						productDate, _ := items["product_date"].(string)
+						product_date, _ := utils.ParseTimeStringToTime("2006-01-02", productDate)
+						productDates = product_date.Unix()
+					}
+
+				}
+
 				if id == 0 {
 					cancelStockInfo := &models.DrugCancelStockInfo{
 						DrugId:           drug_id,
 						CancelStockId:    cancelStock.ID,
 						Mtime:            time.Now().Unix(),
 						Type:             types,
-						Manufacturer:     manufacturer_id,
-						Dealer:           dealer_id,
 						RetailPrice:      retail_price,
 						RetailTotalPrice: retail_price_total,
 						Price:            price,
 						Total:            total,
+						Manufacturer:     manufacturer,
+						Dealer:           dealer,
+						RegisterAccount:  register_account,
+						MaxUnit:          max_unit,
+						BatchNumber:      batch_number,
+						Remark:           remark,
+						ProductDate:      productDates,
+						ExpiryDate:       expiryDates,
 					}
 					cancelStockInfos = append(cancelStockInfos, cancelStockInfo)
 
 						CancelStockId:    cancelStock.ID,
 						Mtime:            time.Now().Unix(),
 						Type:             types,
-						Manufacturer:     manufacturer_id,
-						Dealer:           dealer_id,
 						RetailPrice:      retail_price,
 						RetailTotalPrice: retail_price_total,
 						Price:            price,
 						Total:            total,
+						Manufacturer:     manufacturer,
+						Dealer:           dealer,
+						RegisterAccount:  register_account,
+						MaxUnit:          max_unit,
+						BatchNumber:      batch_number,
+						Remark:           remark,
+						ProductDate:      productDates,
+						ExpiryDate:       expiryDates,
 					}
 					upDateCancelStockInfos = append(upDateCancelStockInfos, cancelStockInfo)
 				}
 	}
 
 }
+
+func (this *StockDrugApiController) GetCancelDrugOrderPrint() {
+
+	orderId := this.GetString("order_id")
+	ids := strings.Split(orderId, ",")
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+	list, _ := service.GetCancelDrugOrderPrint(ids, orgId)
+	this.ServeSuccessJSON(map[string]interface{}{
+		"list": list,
+	})
+}
+
+func (this *StockDrugApiController) GetDrugCancelExportList() {
+
+	orderId := this.GetString("order_id")
+	fmt.Println("order_id2323232323223", orderId)
+	ids := strings.Split(orderId, ",")
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+	list, _ := service.GetDrugCancelExportList(ids, orgId)
+	this.ServeSuccessJSON(map[string]interface{}{
+		"list": list,
+	})
+}

controllers/gobal_config_api_controller.go

 	beego.Router("/api/drug/getdrugorderinprint", &GobalConfigApiController{}, "Get:GetDrugOrderInPrint")
 	beego.Router("/api/drug/getdrugoutorderdetailprint", &GobalConfigApiController{}, "Get:GetDrugOutOrderPrint")
 	beego.Router("/api/drug/getdrugbatchnumber", &GobalConfigApiController{}, "Get:GetDrugBatchNumber")
+	beego.Router("/api/drug/exportdruglist", &GobalConfigApiController{}, "Get:ExportDrugList")
+	beego.Router("/api/drug/getexportoutorderdruglist", &GobalConfigApiController{}, "Get:GetExportOutOrderDrugList")
+	beego.Router("/api/drug/getdrugflow", &GobalConfigApiController{}, "Get:GetDrugFlow")
+	beego.Router("/api/drug/getcancelstockdetail", &GobalConfigApiController{}, "Get:GetCancelStockDetail")
 }
 
 //provinces, _ := service.GetDistrictsByUpid(0)21
 		"list": list,
 	})
 }
+
+func (c *GobalConfigApiController) ExportDrugList() {
+
+	orderId := c.GetString("order_id")
+	ids := strings.Split(orderId, ",")
+	list, _ := service.ExportDrugList(ids)
+	orgId := c.GetAdminUserInfo().CurrentOrgId
+	manufacturerList, _ := service.GetAllManufacturerList(orgId)
+	dealerList, _ := service.GetAllDealerList(orgId)
+	c.ServeSuccessJSON(map[string]interface{}{
+		"list":             list,
+		"manufacturerList": manufacturerList,
+		"dealerList":       dealerList,
+	})
+}
+
+func (c *GobalConfigApiController) GetExportOutOrderDrugList() {
+
+	orderId := c.GetString("order_id")
+	ids := strings.Split(orderId, ",")
+	orgId := c.GetAdminUserInfo().CurrentOrgId
+	list, _ := service.GetExportOutOrderDrugList(ids)
+	manufacturerList, _ := service.GetAllManufacturerList(orgId)
+	dealerList, _ := service.GetAllDealerList(orgId)
+	c.ServeSuccessJSON(map[string]interface{}{
+		"list":             list,
+		"manufacturerList": manufacturerList,
+		"dealerList":       dealerList,
+	})
+}
+
+func (c *GobalConfigApiController) GetDrugFlow() {
+
+	start_time := c.GetString("start_time")
+	end_time := c.GetString("end_time")
+
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	var startTime int64
+	if len(start_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+		if err != nil {
+			fmt.Println(err)
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		startTime = theTime.Unix()
+	}
+	var endTime int64
+	if len(end_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
+		if err != nil {
+			utils.ErrorLog(err.Error())
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		endTime = theTime.Unix()
+	}
+	orgId := c.GetAdminUserInfo().CurrentOrgId
+	drug_id, _ := c.GetInt64("drug_id")
+	page, _ := c.GetInt64("page")
+	limit, _ := c.GetInt64("limit")
+	stock_type, _ := c.GetInt64("stock_type")
+
+	list, total, _ := service.GetDrugFlow(drug_id, orgId, limit, page, startTime, endTime, stock_type)
+	manufacturerList, _ := service.GetAllManufacturerList(orgId)
+	dealerList, _ := service.GetAllDealerList(orgId)
+	c.ServeSuccessJSON(map[string]interface{}{
+		"list":             list,
+		"total":            total,
+		"manufacturerList": manufacturerList,
+		"dealerList":       dealerList,
+	})
+}
+
+func (c *GobalConfigApiController) GetCancelStockDetail() {
+
+	id, _ := c.GetInt64("id")
+	list, _ := service.GetCancelStockDetail(id)
+	c.ServeSuccessJSON(map[string]interface{}{
+		"list": list,
+	})
+}

controllers/stock_in_api_controller.go

 	beego.Router("/api/stock/getcancelstockorderprint", &StockManagerApiController{}, "Get:GetCancelStockOrderPrint")
 	beego.Router("/api/stock/getstockbatchnumber", &StockManagerApiController{}, "Get:GetStockBatchNumber")
 
+	beego.Router("/api/stock/getstockflow", &StockManagerApiController{}, "Get:GetStockFlow")
+
+	beego.Router("/api/cancel/getcancelexportlist", &StockManagerApiController{}, "Get:GetCancelExportList")
+
 }
 
 func (c *StockManagerApiController) CreateWarehouse() {
 
 	var warehousingInfo []*models.WarehousingInfo
 
+	var stockFlow []*models.VmStockFlow
 	if dataBody["stockIn"] != nil && reflect.TypeOf(dataBody["stockIn"]).String() == "[]interface {}" {
 		thisStockIn, _ := dataBody["stockIn"].([]interface{})
 		if len(thisStockIn) > 0 {
 				var productDates int64
 				var expiryDates int64
 
-				fmt.Println()
-
 				if items["expiry_date"] == nil || reflect.TypeOf(items["expiry_date"]).String() != "string" {
 					expiryDates = 0
 				} else {
 				dealer := int64(items["dealer"].(float64))
 
 				license_number, _ := items["license_number"].(string)
+				//入库单表格
 				warehouseInfo := &models.WarehousingInfo{
 					WarehousingOrder: warehousing.WarehousingOrder,
 					WarehousingId:    warehousing.ID,
 				}
 				warehousingInfo = append(warehousingInfo, warehouseInfo)
 
+				flow := &models.VmStockFlow{
+					WarehousingOrder:    warehousing.WarehousingOrder,
+					WarehousingId:       warehousing.ID,
+					GoodId:              good_id,
+					Number:              number,
+					ProductDate:         productDates,
+					ExpireDate:          expiryDates,
+					Count:               warehousing_count,
+					Price:               price,
+					Status:              1,
+					Ctime:               ctime,
+					UserOrgId:           adminUserInfo.CurrentOrgId,
+					Manufacturer:        manufacturer,
+					Dealer:              dealer,
+					LicenseNumber:       license_number,
+					IsEdit:              1,
+					Creator:             adminUserInfo.AdminUser.Id,
+					SystemTime:          operation_time,
+					ConsumableType:      1,
+					WarehousingDetailId: warehouseInfo.ID,
+				}
+				stockFlow = append(stockFlow, flow)
 			}
 		}
 	}
+
+	//入库单创建成功
 	errs := service.CreateWarehousingInfo(warehousingInfo)
+
+	//创建入库单流水
+	service.CreateStockFlow(stockFlow)
+
 	info, _ := service.FindLastWarehousingInfo(warehousing.WarehousingOrder)
 
 	if errs != nil {
 		"warehousing_order": warehousing_order,
 		"info":              info,
 	})
-	//}
-
-	//else {
-	//	warehouse, err1 := service.FindWareHouseByOrderNumber(warehousing_order)
-	//	if (err1 != nil) {
-	//		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-	//		return
-	//	}
-	//
-	//	dataBody := make(map[string]interface{}, 0)
-	//	err := json.Unmarshal(c.Ctx.Input.RequestBody, &dataBody)
-	//	if err != nil {
-	//		utils.ErrorLog(err.Error())
-	//		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-	//		return
-	//	}
-	//
-	//	var warehousingInfo []*models.WarehousingInfo
-	//
-	//	if dataBody["stockIn"] != nil && reflect.TypeOf(dataBody["stockIn"]).String() == "[]interface {}" {
-	//		thisStockIn, _ := dataBody["stockIn"].([]interface{})
-	//		if len(thisStockIn) > 0 {
-	//			for _, item := range thisStockIn {
-	//				items := item.(map[string]interface{})
-	//
-	//				if items["good_id"] == nil || reflect.TypeOf(items["good_id"]).String() != "float64" {
-	//					utils.ErrorLog("good_id")
-	//					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-	//					return
-	//				}
-	//				good_id := int64(items["good_id"].(float64))
-	//
-	//				if items["good_type_id"] == nil || reflect.TypeOf(items["good_type_id"]).String() != "float64" {
-	//					utils.ErrorLog("good_type_id")
-	//					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-	//					return
-	//				}
-	//				good_type_id := int64(items["good_type_id"].(float64))
-	//
-	//				if items["warehousing_count"] == nil || reflect.TypeOf(items["warehousing_count"]).String() != "string" {
-	//					utils.ErrorLog("warehousing_count")
-	//					c.ServeFailJSONWithSGJErrorCod  Fe(enums.ErrorCodeParamWrong)
-	//					return
-	//				}
-	//
-	//				warehousing_count, _ := strconv.ParseInt(items["warehousing_count"].(string), 10, 64)
-	//
-	//				if items["price"] == nil || reflect.TypeOf(items["price"]).String() != "string" {
-	//					utils.ErrorLog("price")
-	//					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-	//					return
-	//				}
-	//				price, _ := strconv.ParseFloat(items["price"].(string), 64)
-	//				total := float64(warehousing_count) * price
-	//
-	//				if items["expiry_date"] == nil || reflect.TypeOf(items["expiry_date"]).String() != "string" {
-	//					utils.ErrorLog("expiry_date")
-	//					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-	//					return
-	//				}
-	//
-	//				expiryDate, _ := items["expiry_date"].(string)
-	//				if len(expiryDate) == 0 {
-	//					utils.ErrorLog("len(expiry_date) == 0")
-	//					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-	//
-	//					return
-	//				}
-	//
-	//				expiry_date, parseDateErr := utils.ParseTimeStringToTime("2006-01-02", expiryDate)
-	//				if parseDateErr != nil {
-	//					c.ErrorLog("日期(%v)解析错误：%v", expiry_date, parseDateErr)
-	//				}
-	//
-	//				var productDates int64
-	//
-	//				if items["product_date"] == nil || reflect.TypeOf(items["product_date"]).String() != "string" {
-	//					productDates = 0;
-	//				} else {
-	//					productDate, _ := items["product_date"].(string)
-	//					product_date, _ := utils.ParseTimeStringToTime("2006-01-02", productDate)
-	//					productDates = product_date.Unix()
-	//
-	//				}
-	//
-	//				if items["number"] == nil || reflect.TypeOf(items["number"]).String() != "string" {
-	//					utils.ErrorLog("number")
-	//					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-	//					return
-	//				}
-	//				number, _ := items["number"].(string)
-	//
-	//				var remark string
-	//				if items["number"] == nil || reflect.TypeOf(items["number"]).String() != "string" {
-	//					remark = ""
-	//				} else {
-	//					remark = items["remark"].(string)
-	//				}
-	//
-	//				warehouseInfo := &models.WarehousingInfo{
-	//					WarehousingOrder: warehousing_order,
-	//					WarehousingId:    warehouse.ID,
-	//					GoodId:           good_id,
-	//					Number:           number,
-	//					GoodTypeId:       good_type_id,
-	//					ProductDate:      productDates,
-	//					ExpiryDate:       expiry_date.Unix(),
-	//					WarehousingCount: warehousing_count,
-	//					Price:            price,
-	//					TotalPrice:       total,
-	//					Status:           1,
-	//					Ctime:            ctime,
-	//					Remark:           remark,
-	//					OrgId:            adminUserInfo.CurrentOrgId,
-	//				}
-	//				warehousingInfo = append(warehousingInfo, warehouseInfo)
-	//
-	//			}
-	//		}
-	//	}
-	//	errs := service.CreateWarehousingInfo(warehousingInfo)
-	//	info, _ := service.FindLastWarehousingInfo(warehousing_order)
-	//
-	//	if (errs != nil) {
-	//		utils.ErrorLog(errs.Error())
-	//		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateStockInFail)
-	//		return
-	//	}
-	//
-	//	c.ServeSuccessJSON(map[string]interface{}{
-	//		"msg":  "入库成功",
-	//		"info": info,
-	//	})
-	//
-	//}
 
 }
 func (c *StockManagerApiController) GetWarehouseList() {
 
 	var warehousingInfo []*models.WarehousingInfo
 	var upDateWarehousingInfo []*models.WarehousingInfo
+	var stockFlow []*models.VmStockFlow
 
 	if dataBody["stockIn"] != nil && reflect.TypeOf(dataBody["stockIn"]).String() == "[]interface {}" {
 		thisStockIn, _ := dataBody["stockIn"].([]interface{})
 					}
 					warehousingInfo = append(warehousingInfo, warehouseInfo)
 
+					flow := &models.VmStockFlow{
+						WarehousingOrder:    warehousing.WarehousingOrder,
+						WarehousingId:       warehousing.ID,
+						GoodId:              good_id,
+						Number:              number,
+						ProductDate:         productDates,
+						ExpireDate:          expiryDates,
+						Count:               warehousing_count,
+						Price:               price,
+						Status:              1,
+						Ctime:               ctime,
+						UserOrgId:           adminUserInfo.CurrentOrgId,
+						Manufacturer:        manufacturer,
+						Dealer:              dealer,
+						LicenseNumber:       license_number,
+						IsEdit:              1,
+						Creator:             adminUserInfo.AdminUser.Id,
+						SystemTime:          ctime,
+						ConsumableType:      1,
+						WarehousingDetailId: warehouseInfo.ID,
+					}
+
+					stockFlow = append(stockFlow, flow)
+
 				} else {
 					warehouseInfo := &models.WarehousingInfo{
 						ID:               id,
 						LicenseNumber:    license_number,
 					}
 					upDateWarehousingInfo = append(upDateWarehousingInfo, warehouseInfo)
+
+					flow := &models.VmStockFlow{
+						WarehousingOrder:    warehousing.WarehousingOrder,
+						WarehousingId:       warehousing.ID,
+						GoodId:              good_id,
+						Number:              number,
+						ProductDate:         productDates,
+						ExpireDate:          expiryDates,
+						Count:               warehousing_count,
+						Price:               price,
+						Status:              1,
+						Ctime:               ctime,
+						UserOrgId:           adminUserInfo.CurrentOrgId,
+						Manufacturer:        manufacturer,
+						Dealer:              dealer,
+						LicenseNumber:       license_number,
+						IsEdit:              2,
+						Creator:             adminUserInfo.AdminUser.Id,
+						SystemTime:          ctime,
+						ConsumableType:      1,
+						WarehousingDetailId: warehouseInfo.ID,
+					}
+
+					stockFlow = append(stockFlow, flow)
 				}
 			}
 		}
 	var errs error
 	if len(warehousingInfo) > 0 {
 		errs = service.CreateWarehousingInfo(warehousingInfo)
+		service.CreateStockFlow(stockFlow)
 	}
 
 	if len(upDateWarehousingInfo) > 0 {
+
 		for _, item := range upDateWarehousingInfo {
+			var total int64
+			var all_total int64
+			//获取该批次该型号的库存
+			info, _ := service.GetLastWarehousingById(item.WarehousingId, item.GoodId)
+
+			//判断 该批次的入库数量
+			total = item.WarehousingCount - info.WarehousingCount
+
+			all_total = info.StockCount + total
+
+			item.StockCount = all_total
 			errs = service.UpDateWarehousingInfo(item)
+
+			service.CreateStockFlow(stockFlow)
 		}
 	}
 
 	var warehousingOutInfo []*models.WarehouseOutInfo
 	var beforePrepares []*models.DialysisBeforePrepareGoods
 	var newBeforePrepares []*models.NewDialysisBeforePrepareGoods
+
 	if dataBody["stockOut"] != nil && reflect.TypeOf(dataBody["stockOut"]).String() == "[]interface {}" {
 		thisStockIn, _ := dataBody["stockOut"].([]interface{})
 		if len(thisStockIn) > 0 {
 					return
 				}
 				price, _ := strconv.ParseFloat(items["price"].(string), 64)
-				fmt.Println("999999992932323232323223232322323", price)
+
 				count, _ := strconv.ParseInt(items["count"].(string), 10, 64)
 
 				total := float64(count) * price
 			})
 			return
 		} else {
-			fmt.Println("jiage223444444444444444444", item.Price)
+
 			_, errcodes := service.FindStockOutByIsSys(adminUserInfo.CurrentOrgId, 0, operation_time)
 			if errcodes == gorm.ErrRecordNotFound {
 				service.AddSigleWarehouseOut(&warehouseOut)
 			}
-			parseDateErr := service.ConsumablesDeliveryOne(adminUserInfo.CurrentOrgId, warehousingOutDate.Unix(), item, &warehouseOut, item.Count)
+			parseDateErr := service.ConsumablesDeliveryOne(adminUserInfo.CurrentOrgId, warehousingOutDate.Unix(), item, &warehouseOut, item.Count, creater)
 			if parseDateErr != nil {
 				utils.ErrorLog(parseDateErr.Error())
 				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateStockInFail)
 				number := items["number"].(string)
 
 				license_number := items["license_number"].(string)
-				fmt.Println("hhh23h2h32h3h232h3h23h2h3h23h2h3h23h2h3", license_number)
+
 				timeLayout := "2006-01-02"
 				loc, _ := time.LoadLocation("Local")
 				expiry_date := items["expiry_date"].(string)
+
 				var expiryDate int64
 				if len(expiry_date) > 0 {
 					theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", expiry_date+" 00:00:00", loc)
 
 				product_date := items["product_date"].(string)
 
+				warehouse_info_id := int64(items["warehouse_info_id"].(float64))
+
 				var productDate int64
 				if len(product_date) > 0 {
 					theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", expiry_date+" 00:00:00", loc)
 						Dealer:                  dealer,
 						Manufacturer:            manufacturer,
 						LicenseNumber:           license_number,
+						ConsumableType:          1,
+						WarehouseInfotId:        warehouse_info_id,
 					}
 					warehousingOutInfo = append(warehousingOutInfo, warehouseOutInfo)
 
 						ProductDate:             productDate,
 						Dealer:                  dealer,
 						LicenseNumber:           license_number,
+						ConsumableType:          2,
+						WarehouseInfotId:        warehouse_info_id,
 					}
 					upDateWarehouseOutInfos = append(upDateWarehouseOutInfos, warehouseOutInfo)
 				}
 	}
 	var errs error
 	if len(warehousingOutInfo) > 0 {
+
 		errs = service.CreateWarehousingOutInfo(warehousingOutInfo)
 	}
 
 	if len(upDateWarehouseOutInfos) > 0 {
 		for _, item := range upDateWarehouseOutInfos {
-			errs = service.UpDateWarehouseOutInfo(item)
+
+			//1.查询该耗材该批次的最后一次出库记录
+			lastGood, _ := service.GetLastGoodInformationByGoodId(item.GoodId, item.WarehouseInfotId, adminUserInfo.CurrentOrgId)
+
+			// 退库的库存和该耗材该批次最后一次出库数量进行比较
+			//如果退库数量大于 最后一次批次的数量(要么要进行出库)
+
+			if item.Count > lastGood.Count {
+
+				//查询该耗材是否还有库存
+				warehouseinfo, _ := service.GetTotalCountByGoodId(item.GoodId)
+				fmt.Println("hhhhhh23h2323232", warehouseinfo.StockCount)
+				//无库存
+				if warehouseinfo.StockCount <= 0 {
+					c.ServeSuccessJSON(map[string]interface{}{
+						"msg": "5",
+					})
+					return
+				}
+
+				//有库存,进行出库,调用出库接口
+				if warehouseinfo.StockCount > 0 {
+					var total int64
+					var stock_cout int64
+					var total_count int64
+					//计算和最后一次出库数据的差
+					total = item.Count - lastGood.Count
+					fmt.Println("total22323232", total)
+					//获取该耗材该批次的剩余库存量
+					info, _ := service.GetLastGoodCountById(item.GoodId, item.WarehouseInfotId)
+					fmt.Println("info2232323232323", info)
+					//判断该批次的剩余库存 和出库的库存进行比较
+					//如果出库的库存大于该批次的剩余库存,那么需要出库下一批次的库存
+
+					if item.Count > info.StockCount {
+						//计算出库和该批次相差的库存
+						total_count = item.Count - info.StockCount
+						//清空本批次次库存
+						service.DeleteWarehouseInfo(item.WarehouseInfotId)
+						//调用出库逻辑
+						service.ConsumablesDeliveryTwo(item.OrgId, item, total_count)
+					}
+					//如果出库的库存小于或等于于该批次的剩余库存,那么需要该批次出库
+					if item.Count <= info.StockCount {
+						stock_cout = lastGood.Count + total
+						fmt.Println("232323223232323232323232", stock_cout)
+						//扣减库存
+						warehouse := models.WarehousingInfo{
+							StockCount: info.StockCount - total,
+						}
+						errs := service.UpdateWarehousingInfo(warehouse, info.ID)
+
+						warehouseOutInfo := &models.WarehouseOutInfo{
+							WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
+							WarehouseOutId:          id,
+							WarehouseInfotId:        item.WarehouseInfotId,
+							Status:                  1,
+							Ctime:                   time.Now().Unix(),
+							Remark:                  item.Remark,
+							OrgId:                   item.OrgId,
+							Type:                    1,
+							Manufacturer:            item.Manufacturer,
+							Dealer:                  item.Dealer,
+							IsSys:                   0,
+							SysRecordTime:           item.SysRecordTime,
+							GoodTypeId:              item.GoodTypeId,
+							GoodId:                  item.GoodId,
+							ExpiryDate:              item.ExpiryDate,
+							ProductDate:             item.ProductDate,
+							Number:                  item.Number,
+							Price:                   item.Price,
+							LicenseNumber:           item.LicenseNumber,
+							Count:                   item.Count,
+							ConsumableType:          2,
+						}
+
+						//查询是否存在
+						_, errcode := service.GetWarehouseOutInfoIsExist(item.ID)
+						if errcode == gorm.ErrRecordNotFound {
+							errOne := service.AddSigleWarehouseOutInfo(warehouseOutInfo)
+							if errOne != nil {
+								utils.ErrorLog(errs.Error())
+								c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateStockInFail)
+								return
+							}
+							c.ServeSuccessJSON(map[string]interface{}{
+								"msg": "编辑成功",
+							})
+						} else if errcode == nil {
+							service.UpDateWarehouseOutInfo(item)
+						}
+
+					}
+				}
+			}
+
+			var last_count int64
+			var all_total int64
+			var stock_total int64
+			//如果退库数量小于最后一次批次的数量(要么要进行退库)
+			if item.Count < lastGood.Count {
+				fmt.Println("hh232323h2h3hh23hh23hh2h3h23")
+				//退库数量和最后一次出库数据进行计算
+				last_count = lastGood.Count - item.Count
+				fmt.Println("last_count", last_count)
+				//获取该耗材该批次的剩余库存量
+				infoInfo, _ := service.GetLastGoodCountById(item.GoodId, item.WarehouseInfotId)
+
+				//退库数量和最后一次出库数据进行计算的差 加上 剩余库存的数量与 该批次的入库数量进行比较
+				all_total = last_count + infoInfo.StockCount
+				fmt.Println("all_total", all_total)
+				//如果库存大于总数量，则退回到这个批次
+				fmt.Println("inf232323", infoInfo.WarehousingCount)
+
+				if infoInfo.WarehousingCount > all_total {
+					stock_total = last_count + infoInfo.StockCount
+					fmt.Println("经历323232323232232", last_count, stock_total)
+					//退回该批次,计算数量
+					warehousingInfoOne := models.WarehousingInfo{
+						StockCount: stock_total,
+						ID:         item.WarehouseInfotId,
+						OrgId:      item.OrgId,
+					}
+					fmt.Println("********************", warehousingInfoOne, item.WarehouseInfotId)
+					parseDateErr := service.UpdateWarehousingInfo(warehousingInfoOne, item.WarehouseInfotId)
+					fmt.Println("parseDateErr2323232322323", parseDateErr)
+					//插入一条新纪录
+					warehouseOutInfoThree := &models.WarehouseOutInfo{
+						WarehouseOutOrderNumber: item.WarehouseOutOrderNumber,
+						WarehouseOutId:          id,
+						WarehouseInfotId:        item.WarehouseInfotId,
+						Status:                  1,
+						Ctime:                   time.Now().Unix(),
+						Remark:                  item.Remark,
+						OrgId:                   item.OrgId,
+						Type:                    1,
+						Manufacturer:            item.Manufacturer,
+						Dealer:                  item.Dealer,
+						IsSys:                   0,
+						GoodTypeId:              item.GoodTypeId,
+						GoodId:                  item.GoodId,
+						ExpiryDate:              item.ExpiryDate,
+						ProductDate:             item.ProductDate,
+						Number:                  item.Number,
+						Price:                   item.Price,
+						LicenseNumber:           item.LicenseNumber,
+						ConsumableType:          2,
+						Count:                   item.Count,
+					}
+					//查询是否存在
+					_, errcode := service.GetWarehouseOutInfoIsExist(item.ID)
+					if errcode == gorm.ErrRecordNotFound {
+						errOne := service.AddSigleWarehouseOutInfo(warehouseOutInfoThree)
+						if errOne != nil {
+							utils.ErrorLog(errs.Error())
+							c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateStockInFail)
+							return
+						}
+						c.ServeSuccessJSON(map[string]interface{}{
+							"msg": "编辑成功",
+						})
+					} else if errcode == nil {
+						service.UpDateWarehouseOutInfo(item)
+					}
+				}
+
+				//如果库存小于总数量，则报错提醒，该批次的退库数据大于入库数据了无法退库,则需要退库到另一个批次
+				if infoInfo.WarehousingCount < all_total {
+					c.ServeSuccessJSON(map[string]interface{}{
+						"msg": "6",
+					})
+					return
+				}
+			}
+
+			if item.Count == lastGood.Count {
+				errs = service.UpDateWarehouseOutInfo(item)
+			}
+
 		}
 	}
 
 	}
 
 	c.ServeSuccessJSON(map[string]interface{}{
-		"msg": "编辑成功",
+		"msg": "1",
 	})
 
 }
 
 func (c *StockManagerApiController) CreateCancelStock() {
-	dealer_id, _ := c.GetInt64("dealer_id", 0)
-	manufacturer_id, _ := c.GetInt64("manufacturer_id", 0)
+
 	cancel_stock_time := c.GetString("time")
 	types, _ := c.GetInt64("type", 0)
 
 	orderNumber := "CKTKD" + strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + timeArr[0] + timeArr[1] + timeArr[2] + "000" + strconv.FormatInt(total, 10)
 
 	cancelStock := models.CancelStock{
-		OrderNumber:  orderNumber,
-		OperaTime:    operation_time,
-		OrgId:        adminUserInfo.CurrentOrgId,
-		Creater:      creater,
-		Ctime:        ctime,
-		Status:       1,
-		ReturnTime:   cancelStockDate.Unix(),
-		Dealer:       dealer_id,
-		Manufacturer: manufacturer_id,
-		Type:         types,
+		OrderNumber: orderNumber,
+		OperaTime:   operation_time,
+		OrgId:       adminUserInfo.CurrentOrgId,
+		Creater:     creater,
+		Ctime:       ctime,
+		Status:      1,
+		ReturnTime:  cancelStockDate.Unix(),
+		Type:        types,
 	}
 	service.AddSigleCancelStock(&cancelStock)
 	dataBody := make(map[string]interface{}, 0)
 
 				count, _ := strconv.ParseInt(return_count, 10, 64)
 
+				number := items["number"].(string)
+
+				register_account := items["register_account"].(string)
+
+				manufacturer, _ := items["manufacturer"].(string)
+
+				dealer, _ := items["dealer"].(string)
+
+				//productDate, _ := items["product_date"].(string)
+				//product_date, _ := utils.ParseTimeStringToTime("2006-01-02", productDate)
+				//
+				//expiryDate, _ := items["expiry_date"].(string)
+				//expiry_date, _ := utils.ParseTimeStringToTime("2006-01-02", expiryDate)
+				var expiryDates int64
+				if items["expiry_date"] == nil || reflect.TypeOf(items["expiry_date"]).String() != "string" {
+					expiryDates = 0
+				} else {
+					if len(items["expiry_date"].(string)) == 0 {
+						expiryDates = 0
+
+					} else {
+						expiryDate, _ := items["expiry_date"].(string)
+						expiry_date, _ := utils.ParseTimeStringToTime("2006-01-02", expiryDate)
+						expiryDates = expiry_date.Unix()
+
+					}
+				}
+
+				var productDates int64
+				if items["product_date"] == nil || reflect.TypeOf(items["product_date"]).String() != "string" {
+					productDates = 0
+				} else {
+					if len(items["product_date"].(string)) == 0 {
+						productDates = 0
+
+					} else {
+						productDate, _ := items["product_date"].(string)
+						product_date, _ := utils.ParseTimeStringToTime("2006-01-02", productDate)
+						productDates = product_date.Unix()
+
+					}
+				}
+
+				remark := items["remark"].(string)
+
+				retail_prices := items["price"].(string)
+				price, _ := strconv.ParseFloat(retail_prices, 64)
 				cancelStockInfo := &models.CancelStockInfo{
-					OrderNumber:   cancelStock.OrderNumber,
-					CancelStockId: cancelStock.ID,
-					GoodId:        good_id,
-					GoodTypeId:    good_type_id,
-					Count:         count,
-					Status:        1,
-					Ctime:         ctime,
-					OrgId:         adminUserInfo.CurrentOrgId,
-					Type:          types,
-					Manufacturer:  manufacturer_id,
-					Dealer:        dealer_id,
+					OrderNumber:     cancelStock.OrderNumber,
+					CancelStockId:   cancelStock.ID,
+					GoodId:          good_id,
+					GoodTypeId:      good_type_id,
+					Count:           count,
+					Status:          1,
+					Ctime:           ctime,
+					OrgId:           adminUserInfo.CurrentOrgId,
+					Type:            types,
+					Manufacturer:    manufacturer,
+					Dealer:          dealer,
+					Number:          number,
+					ProductDate:     productDates,
+					ExpiryDate:      expiryDates,
+					RegisterAccount: register_account,
+					Remark:          remark,
+					Price:           price,
 				}
 				cancelStockInfos = append(cancelStockInfos, cancelStockInfo)
 
 
 	cancelStockInfoList, _ := service.FindCancelStockInfoById(id)
 	info, _ := service.FindCancelStockById(id, c.GetAdminUserInfo().CurrentOrgId)
-
+	manufacturerList, _ := service.GetAllManufacturerList(c.GetAdminUserInfo().CurrentOrgId)
+	dealerList, _ := service.GetAllDealerList(c.GetAdminUserInfo().CurrentOrgId)
 	c.ServeSuccessJSON(map[string]interface{}{
-		"list": cancelStockInfoList,
-		"info": info,
+		"list":             cancelStockInfoList,
+		"info":             info,
+		"manufacturerList": manufacturerList,
+		"dealerList":       dealerList,
 	})
 
 }
 					return
 				}
 				id := int64(items["id"].(float64))
+				number := items["number"].(string)
+
+				register_account := items["register_account"].(string)
 
+				manufacturer, _ := items["manufacturer"].(string)
+
+				dealer, _ := items["dealer"].(string)
+
+				remark := items["remark"].(string)
+
+				var productDates int64
+				if items["product_date"] == nil || reflect.TypeOf(items["product_date"]).String() != "string" {
+					productDates = 0
+				} else {
+					if len(items["product_date"].(string)) == 0 {
+						productDates = 0
+
+					} else {
+						productDate, _ := items["product_date"].(string)
+						product_date, _ := utils.ParseTimeStringToTime("2006-01-02", productDate)
+						productDates = product_date.Unix()
+
+					}
+
+				}
+				var expiryDates int64
+				if items["expiry_date"] == nil || reflect.TypeOf(items["expiry_date"]).String() != "string" {
+					expiryDates = 0
+				} else {
+					if len(items["expiry_date"].(string)) == 0 {
+						expiryDates = 0
+
+					} else {
+						expiryDate, _ := items["expiry_date"].(string)
+						expiry_date, _ := utils.ParseTimeStringToTime("2006-01-02", expiryDate)
+						expiryDates = expiry_date.Unix()
+
+					}
+
+				}
+
+				if items["price"] == nil || reflect.TypeOf(items["price"]).String() != "string" {
+					utils.ErrorLog("price")
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+					return
+				}
+				price, _ := strconv.ParseFloat(items["price"].(string), 64)
 				if id == 0 {
 					cancelStockInfo := &models.CancelStockInfo{
-						GoodId:        good_id,
-						GoodTypeId:    good_type_id,
-						Count:         count,
-						Status:        1,
-						Ctime:         ctime,
-						OrgId:         adminUserInfo.CurrentOrgId,
-						OrderNumber:   cancelStock.OrderNumber,
-						CancelStockId: cancelStock.ID,
-						Mtime:         time.Now().Unix(),
+						GoodId:          good_id,
+						GoodTypeId:      good_type_id,
+						Count:           count,
+						Status:          1,
+						Ctime:           ctime,
+						OrgId:           adminUserInfo.CurrentOrgId,
+						OrderNumber:     cancelStock.OrderNumber,
+						CancelStockId:   cancelStock.ID,
+						Mtime:           time.Now().Unix(),
+						Number:          number,
+						RegisterAccount: register_account,
+						Manufacturer:    manufacturer,
+						Dealer:          dealer,
+						ProductDate:     productDates,
+						ExpiryDate:      expiryDates,
+						Remark:          remark,
+						Price:           price,
 					}
 					cancelStockInfos = append(cancelStockInfos, cancelStockInfo)
 
 				} else {
 					cancelStockInfo := &models.CancelStockInfo{
-						ID:            id,
-						GoodId:        good_id,
-						GoodTypeId:    good_type_id,
-						Count:         count,
-						Status:        1,
-						Ctime:         ctime,
-						OrgId:         adminUserInfo.CurrentOrgId,
-						OrderNumber:   cancelStock.OrderNumber,
-						CancelStockId: cancelStock.ID,
-						Mtime:         time.Now().Unix(),
+						ID:              id,
+						GoodId:          good_id,
+						GoodTypeId:      good_type_id,
+						Count:           count,
+						Status:          1,
+						Ctime:           ctime,
+						OrgId:           adminUserInfo.CurrentOrgId,
+						OrderNumber:     cancelStock.OrderNumber,
+						CancelStockId:   cancelStock.ID,
+						Mtime:           time.Now().Unix(),
+						Number:          number,
+						RegisterAccount: register_account,
+						Manufacturer:    manufacturer,
+						Dealer:          dealer,
+						ProductDate:     productDates,
+						ExpiryDate:      expiryDates,
+						Remark:          remark,
+						Price:           price,
 					}
 					upDateCancelStockInfos = append(upDateCancelStockInfos, cancelStockInfo)
 				}
 
 func (this *StockManagerApiController) GetOrderDetialByOrderId() {
 
-	//id, _ := this.GetInt64("id")
 	ids := this.GetString("id")
 	idsArray := strings.Split(ids, ",")
 	orgId := this.GetAdminUserInfo().CurrentOrgId
 	order, _ := service.GetWarehouseOutOrder(idsArray, orgId)
 	list, _ := service.GetOrderDetialByOrderIdOne(idsArray, orgId)
+	//获取该耗材的最后一条数据
+	info, _ := service.GetLastWarehouseOutInfo(idsArray, orgId)
+	fmt.Println("info323e2342342342432342342432", info)
 	this.ServeSuccessJSON(map[string]interface{}{
 		"order": order,
 		"list":  list,
+		"info":  info,
 	})
 }
 
 func (this *StockManagerApiController) GetCancelStockOrderPrint() {
 	id := this.GetString("id")
 	idStr := strings.Split(id, ",")
-	list, _ := service.GetCancelStockOrderPrint(idStr)
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+	list, _ := service.GetCancelStockOrderPrintOne(idStr, orgId)
 	this.ServeSuccessJSON(map[string]interface{}{
 		"list": list,
 	})
 		"list": list,
 	})
 }
+
+func (this *StockManagerApiController) GetStockFlow() {
+
+	limit, _ := this.GetInt64("limit")
+	page, _ := this.GetInt64("page")
+	good_id, _ := this.GetInt64("good_id")
+	consumable_type, _ := this.GetInt64("is_sys")
+	adminUserInfo := this.GetAdminUserInfo()
+	orgId := adminUserInfo.CurrentOrgId
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	start_time := this.GetString("start_time")
+	end_time := this.GetString("end_time")
+
+	var startTime int64
+	if len(start_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+		if err != nil {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		startTime = theTime.Unix()
+	}
+	var endTime int64
+	if len(end_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
+		if err != nil {
+			utils.ErrorLog(err.Error())
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		endTime = theTime.Unix()
+	}
+
+	list, total, _ := service.GetStockFlowList(limit, page, consumable_type, orgId, startTime, endTime, good_id)
+	manufacturerList, _ := service.GetAllManufacturerList(orgId)
+	this.ServeSuccessJSON(map[string]interface{}{
+		"list":             list,
+		"total":            total,
+		"manufacturerList": manufacturerList,
+	})
+}
+
+func (this *StockManagerApiController) GetCancelExportList() {
+
+	adminUserInfo := this.GetAdminUserInfo()
+	orgId := adminUserInfo.CurrentOrgId
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	start_time := this.GetString("start_time")
+	end_time := this.GetString("end_time")
+	idArray := this.GetString("order_id")
+	fmt.Println("232323232323232232", idArray)
+	ids := strings.Split(idArray, ",")
+	var startTime int64
+	if len(start_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+		if err != nil {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		startTime = theTime.Unix()
+	}
+	var endTime int64
+	if len(end_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
+		if err != nil {
+			utils.ErrorLog(err.Error())
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		endTime = theTime.Unix()
+	}
+	list, _ := service.GetCancelExportList(startTime, endTime, ids, orgId)
+	this.ServeSuccessJSON(map[string]interface{}{
+		"list": list,
+	})
+}

controllers/stock_warrhouse_contorller.go

+package controllers
+
+func main() {
+
+}

main.go

 	//service.BeginAutoCreatePlanJob()
 	//service.AutoClearSchedules()
 	//service.BeginAutoCreateStaffScheduleJob()
+	//service.BeginAutoCreateDrugJob()
+	//service.BeginAutoCreateStockJob()
 	beego.Run()
 }

models/drug_stock.go

 package models
 
+import "gdyb/models"
+
 type DrugWarehouse struct {
 	ID               int64  `gorm:"column:id" json:"id" form:"id"`
 	WarehousingOrder string `gorm:"column:warehousing_order" json:"warehousing_order" form:"warehousing_order"`
 	return "xt_drug_warehouse"
 }
 
+type DrugWarehouseInfoSix 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"`
+	ProductDate      int64   `gorm:"column:product_date" json:"product_date" form:"product_date"`
+	ExpiryDate       int64   `gorm:"column:expiry_date" json:"expiry_date" form:"expiry_date"`
+	WarehousingCount int64   `gorm:"column:warehousing_count" json:"warehousing_count" form:"warehousing_count"`
+	Price            float64 `gorm:"column:price" json:"price" form:"price"`
+	TotalPrice       float64 `gorm:"column:total_price" json:"total_price" form:"total_price"`
+	Dealer           int64   `gorm:"column:dealer" json:"dealer" form:"dealer"`
+	Manufacturer     int64   `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
+	Remark           string  `gorm:"column:remark" json:"remark" form:"remark"`
+	Ctime            int64   `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime            int64   `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Status           int64   `gorm:"column:status" json:"status" form:"status"`
+	OrgId            int64   `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	IsReturn         int64   `gorm:"column:is_return" json:"is_return" form:"is_return"`
+	WarehousingOrder string  `gorm:"column:warehousing_order" json:"warehousing_order" form:"warehousing_order"`
+	Type             int64   `gorm:"column:type" json:"type" form:"type"`
+	RetailPrice      float64 `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
+	RetailTotalPrice float64 `gorm:"column:retail_total_price" json:"retail_total_price" form:"retail_total_price"`
+	BatchNumber      string  `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
+	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"`
+	MinNumber        int64   `json:"min_number"`
+}
+
 type DrugWarehouseInfo struct {
 	ID               int64   `gorm:"column:id" json:"id" form:"id"`
 	WarehousingId    int64   `gorm:"column:warehousing_id" json:"warehousing_id" form:"warehousing_id"`
 	Number                  string  `gorm:"column:number" json:"number" form:"number"`
 	BatchNumber             string  `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
 	PatientId               int64   `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	WarehouseInfoId         int64   `gorm:"column:warehouse_info_id" json:"warehouse_info_id" form:"warehouse_info_id"`
 }
 
 func (DrugWarehouseOutInfo) TableName() string {
 }
 
 type DrugCancelStock struct {
-	ID            int64         `gorm:"column:id" json:"id" form:"id"`
-	OrderNumber   string        `gorm:"column:order_number" json:"order_number" form:"order_number"`
-	OperaTime     int64         `gorm:"column:opera_time" json:"opera_time" form:"opera_time"`
-	Total         int64         `gorm:"column:total" json:"total" form:"total"`
-	Creater       int64         `gorm:"column:creater" json:"creater" form:"creater"`
-	Ctime         int64         `gorm:"column:ctime" json:"ctime" form:"ctime"`
-	Mtime         int64         `gorm:"column:mtime" json:"mtime" form:"mtime"`
-	Status        int64         `gorm:"column:status" json:"status" form:"status"`
-	OrgId         int64         `gorm:"column:org_id" json:"org_id" form:"org_id"`
-	ReturnTime    int64         `gorm:"column:return_time" json:"return_time" form:"return_time"`
-	Dealer        int64         `gorm:"column:dealer" json:"dealer" form:"dealer"`
-	Manufacturer  int64         `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
-	Type          int64         `gorm:"column:type" json:"type" form:"type"`
-	Manufacturers *Manufacturer `gorm:"ForeignKey:Manufacturer;AssociationForeignKey:ID" json:"manufacturers"`
-	Dealers       *Dealer       `gorm:"ForeignKey:Dealer;AssociationForeignKey:ID" json:"dealers"`
+	ID                  int64                         `gorm:"column:id" json:"id" form:"id"`
+	OrderNumber         string                        `gorm:"column:order_number" json:"order_number" form:"order_number"`
+	OperaTime           int64                         `gorm:"column:opera_time" json:"opera_time" form:"opera_time"`
+	Total               int64                         `gorm:"column:total" json:"total" form:"total"`
+	Creater             int64                         `gorm:"column:creater" json:"creater" form:"creater"`
+	Ctime               int64                         `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime               int64                         `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Status              int64                         `gorm:"column:status" json:"status" form:"status"`
+	OrgId               int64                         `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	ReturnTime          int64                         `gorm:"column:return_time" json:"return_time" form:"return_time"`
+	Dealer              int64                         `gorm:"column:dealer" json:"dealer" form:"dealer"`
+	Manufacturer        int64                         `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
+	Type                int64                         `gorm:"column:type" json:"type" form:"type"`
+	Manufacturers       *Manufacturer                 `gorm:"ForeignKey:Manufacturer;AssociationForeignKey:ID" json:"manufacturers"`
+	Dealers             *Dealer                       `gorm:"ForeignKey:Dealer;AssociationForeignKey:ID" json:"dealers"`
+	DrugCancelStockInfo []*models.DrugCancelStockInfo `gorm:"ForeignKey:CancelStockId;AssociationForeignKey:ID" json:"drugCancelStockInfo"`
 }
 
 func (DrugCancelStock) TableName() string {
 }
 
 type DrugCancelStockInfo struct {
-	ID               int64   `gorm:"column:id" json:"id" form:"id"`
-	DrugId           int64   `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
-	CancelStockId    int64   `gorm:"column:cancel_stock_id" json:"cancel_stock_id" form:"cancel_stock_id"`
-	Count            int64   `gorm:"column:count" json:"count" form:"count"`
-	Price            float64 `gorm:"column:price" json:"price" form:"price"`
-	Total            float64 `gorm:"column:total" json:"total" form:"total"`
-	ProductDate      int64   `gorm:"column:product_date" json:"product_date" form:"product_date"`
-	ExpiryDate       int64   `gorm:"column:expiry_date" json:"expiry_date" form:"expiry_date"`
-	Ctime            int64   `gorm:"column:ctime" json:"ctime" form:"ctime"`
-	Mtime            int64   `gorm:"column:mtime" json:"mtime" form:"mtime"`
-	Status           int64   `gorm:"column:status" json:"status" form:"status"`
-	OrgId            int64   `gorm:"column:org_id" json:"org_id" form:"org_id"`
-	OrderNumber      string  `gorm:"column:order_number" json:"order_number" form:"order_number"`
-	Type             int64   `gorm:"column:type" json:"type" form:"type"`
-	Dealer           int64   `gorm:"column:dealer" json:"dealer" form:"dealer"`
-	Manufacturer     int64   `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
-	RetailPrice      float64 `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
-	RetailTotalPrice float64 `gorm:"column:retail_total_price" json:"retail_total_price" form:"retail_total_price"`
-	Number           string  `gorm:"column:number" json:"number" form:"number"`
+	ID               int64       `gorm:"column:id" json:"id" form:"id"`
+	DrugId           int64       `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
+	CancelStockId    int64       `gorm:"column:cancel_stock_id" json:"cancel_stock_id" form:"cancel_stock_id"`
+	Count            int64       `gorm:"column:count" json:"count" form:"count"`
+	Price            float64     `gorm:"column:price" json:"price" form:"price"`
+	Total            float64     `gorm:"column:total" json:"total" form:"total"`
+	ProductDate      int64       `gorm:"column:product_date" json:"product_date" form:"product_date"`
+	ExpiryDate       int64       `gorm:"column:expiry_date" json:"expiry_date" form:"expiry_date"`
+	Ctime            int64       `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime            int64       `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Status           int64       `gorm:"column:status" json:"status" form:"status"`
+	OrgId            int64       `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	OrderNumber      string      `gorm:"column:order_number" json:"order_number" form:"order_number"`
+	Type             int64       `gorm:"column:type" json:"type" form:"type"`
+	Dealer           string      `gorm:"column:dealer" json:"dealer" form:"dealer"`
+	Manufacturer     string      `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
+	RetailPrice      float64     `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
+	RetailTotalPrice float64     `gorm:"column:retail_total_price" json:"retail_total_price" form:"retail_total_price"`
+	Number           string      `gorm:"column:number" json:"number" form:"number"`
+	RegisterAccount  string      `gorm:"column:register_account" json:"register_account" form:"register_account"`
+	Remark           string      `gorm:"column:remark" json:"remark" form:"remark"`
+	BatchNumber      string      `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
+	MaxUnit          string      `gorm:"column:max_unit" json:"max_unit" form:"max_unit"`
+	BaseDrugLib      BaseDrugLib `gorm:"ForeignKey:ID;AssociationForeignKey:DrugId" `
 }
 
 func (DrugCancelStockInfo) TableName() string {
 	DrugId int64 `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
 	Count  int64 `gorm:"column:count" json:"count" form:"count"`
 }
+
+type StDrugWarehouseOutInfo struct {
+	ID                      int64   `gorm:"column:id" json:"id" form:"id"`
+	WarehouseOutId          int64   `gorm:"column:warehouse_out_id" json:"warehouse_out_id" form:"warehouse_out_id"`
+	DrugId                  int64   `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
+	WarehousingOutTarget    int64   `gorm:"column:warehousing_out_target" json:"warehousing_out_target" form:"warehousing_out_target"`
+	Count                   int64   `gorm:"column:count" json:"count" form:"count"`
+	CountUnit               string  `gorm:"column:count_unit" json:"count_unit" form:"count_unit"`
+	Price                   float64 `gorm:"column:price" json:"price" form:"price"`
+	TotalPrice              float64 `gorm:"column:total_price" json:"total_price" form:"total_price"`
+	ProductDate             int64   `gorm:"column:product_date" json:"product_date" form:"product_date"`
+	ExpiryDate              int64   `gorm:"column:expiry_date" json:"expiry_date" form:"expiry_date"`
+	Mtime                   int64   `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Ctime                   int64   `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Status                  int64   `gorm:"column:status" json:"status" form:"status"`
+	OrgId                   int64   `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	Remark                  string  `gorm:"column:remark" json:"remark" form:"remark"`
+	IsCancel                int64   `gorm:"column:is_cancel" json:"is_cancel" form:"is_cancel"`
+	WarehouseOutOrderNumber string  `gorm:"column:warehouse_out_order_number" json:"warehouse_out_order_number" form:"warehouse_out_order_number"`
+	Type                    int64   `gorm:"column:type" json:"type" form:"type"`
+	Dealer                  int64   `gorm:"column:dealer" json:"dealer" form:"dealer"`
+	Manufacturer            int64   `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
+	IsSys                   int64   `gorm:"column:is_sys" json:"is_sys" form:"is_sys"`
+	SysRecordTime           int64   `gorm:"column:sys_record_time" json:"sys_record_time" form:"sys_record_time"`
+	RetailPrice             float64 `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
+	RetailTotalPrice        float64 `gorm:"column:retail_total_price" json:"retail_total_price" form:"retail_total_price"`
+	Number                  string  `gorm:"column:number" json:"number" form:"number"`
+	BatchNumber             string  `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
+	PatientId               int64   `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	DrugName                string  `json:"drug_name"`
+	DrugType                int64   `json:"drug_type"`
+	MaxUnit                 string  `json:"max_unit"`
+	MinUnit                 string  `json:"min_unit"`
+	MinNumber               int64   `json:"min_number"`
+	MinPrice                float64 `json:"min_price"`
+	Dose                    float64 `json:"dose"`
+	DoseUnit                string  `json:"dose_unit"`
+	LastPrice               string  `json:"last_price"`
+	PackingUnit             string  `json:"packing_unit"`
+	Dosage                  int64   `json:"dosage"`
+}
+
+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       int64   `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"`
+}
+
+func (DrugFlow) TableName() string {
+	return "xt_drug_flow"
+}

models/stock_models.go

 package models
 
+import "XT/models"
+
 type Manufacturer struct {
 	ID               int64  `gorm:"column:id" json:"id"`
 	ManufacturerName string `gorm:"column:manufacturer_name" json:"manufacturer_name"`
 	PatientId               int64        `gorm:"column:patient_id" json:"patient_id"`
 	Number                  string       `gorm:"column:number" json:"number" form:"number"`
 	LicenseNumber           string       `gorm:"column:license_number" json:"license_number" form:"license_number"`
+	ConsumableType          int64        `gorm:"column:consumable_type" json:"consumable_type" form:"consumable_type"`
 }
 
 func (WarehouseOutInfo) TableName() string {
 }
 
 type CancelStockInfo struct {
-	ID            int64       `gorm:"column:id" json:"id"`
-	GoodId        int64       `gorm:"column:good_id" json:"good_id"`
-	CancelStockId int64       `gorm:"column:cancel_stock_id" json:"cancel_stock_id"`
-	GoodTypeId    int64       `gorm:"column:good_type_id" json:"good_type_id"`
-	Count         int64       `gorm:"column:count" json:"count"`
-	Price         float64     `gorm:"column:price" json:"price"`
-	Total         float64     `gorm:"column:total" json:"total"`
-	ProductDate   int64       `gorm:"column:product_date" json:"product_date"`
-	ExpiryDate    int64       `gorm:"column:expiry_date" json:"expiry_date"`
-	Ctime         int64       `gorm:"column:ctime" json:"ctime"`
-	Mtime         int64       `gorm:"column:mtime" json:"mtime"`
-	Status        int64       `gorm:"column:status" json:"status"`
-	OrgId         int64       `gorm:"column:org_id" json:"org_id"`
-	OrderNumber   string      `gorm:"column:order_number" json:"order_number"`
-	Type          int64       `gorm:"column:type" json:"type"`
-	CancelStock   CancelStock `ForeignKey:CancelStockId json:"CancelStock"`
-	Dealer        int64       `gorm:"column:dealer" json:"dealer"`
-	Manufacturer  int64       `gorm:"column:manufacturer" json:"manufacturer"`
-	GoodInfo      GoodInfo    `gorm:"ForeignKey:ID;AssociationForeignKey:GoodId" `
+	ID              int64       `gorm:"column:id" json:"id"`
+	GoodId          int64       `gorm:"column:good_id" json:"good_id"`
+	CancelStockId   int64       `gorm:"column:cancel_stock_id" json:"cancel_stock_id"`
+	GoodTypeId      int64       `gorm:"column:good_type_id" json:"good_type_id"`
+	Count           int64       `gorm:"column:count" json:"count"`
+	Price           float64     `gorm:"column:price" json:"price"`
+	Total           float64     `gorm:"column:total" json:"total"`
+	ProductDate     int64       `gorm:"column:product_date" json:"product_date"`
+	ExpiryDate      int64       `gorm:"column:expiry_date" json:"expiry_date"`
+	Ctime           int64       `gorm:"column:ctime" json:"ctime"`
+	Mtime           int64       `gorm:"column:mtime" json:"mtime"`
+	Status          int64       `gorm:"column:status" json:"status"`
+	OrgId           int64       `gorm:"column:org_id" json:"org_id"`
+	OrderNumber     string      `gorm:"column:order_number" json:"order_number"`
+	Type            int64       `gorm:"column:type" json:"type"`
+	CancelStock     CancelStock `ForeignKey:CancelStockId json:"CancelStock"`
+	Dealer          string      `gorm:"column:dealer" json:"dealer"`
+	Manufacturer    string      `gorm:"column:manufacturer" json:"manufacturer"`
+	GoodInfo        GoodInfo    `gorm:"ForeignKey:ID;AssociationForeignKey:GoodId" `
+	Number          string      `gorm:"column:number" json:"number" form:"number"`
+	RegisterAccount string      `gorm:"column:register_account" json:"register_account" form:"register_account"`
+	Remark          string      `gorm:"column:remark" json:"remark" form:"remark"`
 }
 
 func (CancelStockInfo) TableName() string {
 }
 
 type CancelStock struct {
-	ID           int64  `gorm:"column:id" json:"id"`
-	OrderNumber  string `gorm:"column:order_number" json:"order_number"`
-	OperaTime    int64  `gorm:"column:opera_time" json:"opera_time"`
-	Total        int64  `gorm:"column:total" json:"total"`
-	Creater      int64  `gorm:"column:creater" json:"creater"`
-	Ctime        int64  `gorm:"column:ctime" json:"ctime"`
-	Mtime        int64  `gorm:"column:mtime" json:"mtime"`
-	Status       int64  `gorm:"column:status" json:"status"`
-	OrgId        int64  `gorm:"column:org_id" json:"org_id"`
-	ReturnTime   int64  `gorm:"column:return_time" json:"return_time"`
-	Dealer       int64  `gorm:"column:dealer" json:"dealer"`
-	Manufacturer int64  `gorm:"column:manufacturer" json:"manufacturer"`
-	Type         int64  `gorm:"column:type" json:"type"`
+	ID              int64  `gorm:"column:id" json:"id"`
+	OrderNumber     string `gorm:"column:order_number" json:"order_number"`
+	OperaTime       int64  `gorm:"column:opera_time" json:"opera_time"`
+	Total           int64  `gorm:"column:total" json:"total"`
+	Creater         int64  `gorm:"column:creater" json:"creater"`
+	Ctime           int64  `gorm:"column:ctime" json:"ctime"`
+	Mtime           int64  `gorm:"column:mtime" json:"mtime"`
+	Status          int64  `gorm:"column:status" json:"status"`
+	OrgId           int64  `gorm:"column:org_id" json:"org_id"`
+	ReturnTime      int64  `gorm:"column:return_time" json:"return_time"`
+	Dealer          int64  `gorm:"column:dealer" json:"dealer"`
+	Manufacturer    int64  `gorm:"column:manufacturer" json:"manufacturer"`
+	Type            int64  `gorm:"column:type" json:"type"`
+	CancelStockInfo []*models.CancelStockInfo
 }
 
 func (CancelStock) TableName() string {
 }
 
 type VmWarehouseInfo struct {
-	GoodId int64 `gorm:"column:good_id" json:"good_id"`
-	Count  int64 `gorm:"column:count" json:"count"`
-	OrgId  int64 `gorm:"column:org_id" json:"org_id"`
+	GoodId     int64 `gorm:"column:good_id" json:"good_id"`
+	Count      int64 `gorm:"column:count" json:"count"`
+	OrgId      int64 `gorm:"column:org_id" json:"org_id"`
+	StockCount int64 `gorm:"column:stock_count" json:"stock_count"`
 }
 
 type WarehouseOutInfoOne struct {
 	PackingUnit             string               `gorm:"column:packing_unit" json:"packing_unit" form:"packing_unit"`
 	StWarehousingInfo       []*StWarehousingInfo `gorm:"ForeignKey:good_id;AssociationForeignKey:GoodId" json:"xt_warehouse_info"`
 }
+
+type WarehouseOutInfoSix struct {
+	ID                      int64        `gorm:"column:id" json:"id"`
+	WarehouseOutId          int64        `gorm:"column:warehouse_out_id" json:"warehouse_out_id"`
+	WarehouseInfotId        int64        `gorm:"column:warehouse_info_id" json:"warehouse_info_id"`
+	GoodId                  int64        `gorm:"column:good_id" json:"good_id"`
+	GoodTypeId              int64        `gorm:"column:good_type_id" json:"good_type_id"`
+	WarehousingOutTarget    int64        `gorm:"column:warehousing_out_target" json:"warehousing_out_target"`
+	Count                   int64        `gorm:"column:count" json:"count"`
+	Price                   float64      `gorm:"column:price" json:"price"`
+	TotalPrice              float64      `gorm:"column:total_price" json:"total_price"`
+	ProductDate             int64        `gorm:"column:product_date" json:"product_date"`
+	ExpiryDate              int64        `gorm:"column:expiry_date" json:"expiry_date"`
+	Mtime                   int64        `gorm:"column:mtime" json:"mtime"`
+	Ctime                   int64        `gorm:"column:ctime" json:"ctime"`
+	Status                  int64        `gorm:"column:status" json:"status"`
+	OrgId                   int64        `gorm:"column:org_id" json:"org_id"`
+	Remark                  string       `gorm:"column:remark" json:"remark"`
+	IsCancel                int64        `gorm:"column:is_cancel" json:"is_cancel"`
+	WarehouseOut            WarehouseOut `ForeignKey:WarehouseOutId json:"WarehouseOut"`
+	WarehouseOutOrderNumber string       `gorm:"column:warehouse_out_order_number" json:"warehouse_out_order_number"`
+	Type                    int64        `gorm:"column:type" json:"type"`
+	Dealer                  int64        `gorm:"column:dealer" json:"dealer"`
+	Manufacturer            int64        `gorm:"column:manufacturer" json:"manufacturer"`
+	IsSys                   int64        `gorm:"column:is_sys" json:"is_sys"`
+	SysRecordTime           int64        `gorm:"column:sys_record_time" json:"sys_record_time"`
+	PatientId               int64        `gorm:"column:patient_id" json:"patient_id"`
+	Number                  string       `gorm:"column:number" json:"number" form:"number"`
+	LicenseNumber           string       `gorm:"column:license_number" json:"license_number" form:"license_number"`
+	ConsumableType          int64        `gorm:"column:consumable_type" json:"consumable_type" form:"consumable_type"`
+	GoodInfo                GoodInfo     `gorm:"ForeignKey:GoodId;AssociationForeignKey:ID" json:"info"`
+}
+
+func (WarehouseOutInfoSix) TableName() string {
+	return "xt_warehouse_out_info"
+}
+
+type VmStockFlow struct {
+	ID                      int64   `gorm:"column:id" json:"id" form:"id"`
+	WarehousingId           int64   `gorm:"column:warehousing_id" json:"warehousing_id" form:"warehousing_id"`
+	GoodId                  int64   `gorm:"column:good_id" json:"good_id" form:"good_id"`
+	Number                  string  `gorm:"column:number" json:"number" form:"number"`
+	LicenseNumber           string  `gorm:"column:license_number" json:"license_number" form:"license_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       int64   `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"`
+	ProductDate             int64   `gorm:"column:product_date" json:"product_date" form:"product_date"`
+	ExpireDate              int64   `gorm:"column:expire_date" json:"expire_date" form:"expire_date"`
+}
+
+func (VmStockFlow) TableName() string {
+	return "xt_stock_flow"
+}

service/auto_create_drug.go

+package service
+
+import (
+	"XT_New/models"
+	"XT_New/utils"
+	"fmt"
+	"github.com/robfig/cron"
+	"strconv"
+	"time"
+)
+
+var createDrugCronJob *cron.Cron
+
+func init() {
+	createDrugCronJob = cron.New()
+	utils.InfoLog("开启自动更新药品库存定时任务")
+	spec := "0 */1 * * * ?" // 每1分钟执行一次
+	//spec := "0 55 23 * * ?" // 每天23点55执行一次
+	//spec := "0 0 0 ? * Sun"
+	createDrugCronJob.AddFunc(spec, func() {
+		AutoCreateDrugJob()
+	})
+
+}
+
+func BeginAutoCreateDrugJob() {
+
+	createDrugCronJob.Start()
+}
+
+func AutoCreateDrugJob() {
+
+	timeStr := time.Now().Format("2006-01-02")
+	timeLayout := "2006-01-02 15:04:05"
+	fmt.Println("timeStr:", timeStr)
+	timeStringToTime, _ := utils.ParseTimeStringToTime(timeLayout, timeStr+" 00:00:00")
+	timenow := timeStringToTime.Unix()
+	fmt.Println("timenow是什么", timenow)
+	//查询当天排班所有机构
+	org, errs := GetAllOrgName(timenow)
+	fmt.Print("错误是什么", errs)
+	fmt.Println("查询有机构失败", err)
+
+	var total int64
+	for _, item := range org {
+		fmt.Println("hhhh2h3h2323232323232323", item.UserOrgId)
+		//查询该机构下的所有药品信息
+		list, _ := FindAllDrugList(item.UserOrgId)
+		for _, ite := range list {
+			countList, _ := FindAllDrugTotalCount(ite.ID)
+			for _, it := range countList {
+				if ite.ID == it.DrugId {
+					//转为拆零数量
+					it.StockMaxNumber = it.StockMaxNumber * it.MinNumber
+
+					total = it.StockMaxNumber + it.StockMinNumber
+					fmt.Println(it.StockMaxNumber)
+					fmt.Println(it.StockMinNumber)
+					fmt.Println("total223232323232323232323", total)
+					formatInt := strconv.FormatInt(total, 10)
+					float, _ := strconv.ParseFloat(formatInt, 64)
+					fmt.Println("min_number2323232323232", float)
+					lib := models.BaseDrugLib{
+						Total: float,
+					}
+					UpdateDrugTotal(it.DrugId, lib)
+				}
+			}
+		}
+	}
+
+}
+
+//查询当天有排班的所有机构
+func GetAllOrgName(time int64) (schedule []*models.XtSchedule, err error) {
+
+	err = XTReadDB().Raw("select user_org_id,id,partition_id,bed_id,patient_id,schedule_date,schedule_type,schedule_week,mode_id from xt_schedule where schedule_date = ?  group by user_org_id", time).Scan(&schedule).Error
+
+	return schedule, err
+}
+
+//根据机构ID查询药品信息
+func FindAllDrugList(orgid int64) (lib []*models.BaseDrugLib, err error) {
+
+	err = XTReadDB().Where("org_id = ? and status = 1", orgid).Find(&lib).Error
+	return lib, err
+}
+
+//根据药品ID统计该药品的库存
+func FindAllDrugTotalCount(drug_id int64) (info []*models.DrugWarehouseInfoSix, err error) {
+
+	db := XTReadDB().Table("xt_drug_warehouse_info as x").Where("x.status = 1")
+	table := XTReadDB().Table("xt_base_drug as b").Where("b.status = 1")
+	fmt.Println(table)
+	if drug_id > 0 {
+		db = db.Where("x.drug_id = ?", drug_id)
+	}
+
+	err = db.Select("x.drug_id,sum(x.stock_max_number) as stock_max_number,sum(x.stock_min_number) as stock_min_number,b.min_number").Joins("left join xt_base_drug as b on b.id = x.drug_id").Scan(&info).Error
+
+	return info, err
+}
+
+//更新药品库的total字段
+
+func UpdateDrugTotal(id int64, lib models.BaseDrugLib) error {
+
+	err := XTWriteDB().Model(&lib).Where("id=? and status = 1", id).Updates(map[string]interface{}{"total": lib.Total}).Error
+	return err
+}

service/auto_create_staff_schedule_service.go

 var createStaffScheduleCronJob *cron.Cron
 
 func init() {
+
 	createStaffScheduleCronJob = cron.New()
 	//spec := "0 */1 * * * ?" // 每1分钟执行一次
 	//spec := "0 55 23 * * ?" // 每天23点55执行一次

service/auto_create_stock.go

+package service
+
+import (
+	"XT_New/models"
+	"XT_New/utils"
+	"fmt"
+	"github.com/robfig/cron"
+	"strconv"
+	"time"
+)
+
+var createStockCronJob *cron.Cron
+
+func init() {
+	utils.InfoLog("开启自动更新耗材库存定时任务")
+	createStockCronJob = cron.New()
+	spec := "0 */5 * * * ?" // 每1分钟执行一次
+	//spec := "0 55 23 * * ?" // 每天23点55执行一次
+	//spec := "0 0 0 ? * Sun"
+	createStockCronJob.AddFunc(spec, func() {
+		AutoCreateStockJob()
+	})
+}
+
+func BeginAutoCreateStockJob() {
+
+	createStockCronJob.Start()
+}
+
+func AutoCreateStockJob() {
+
+	timeStr := time.Now().Format("2006-01-02")
+	timeLayout := "2006-01-02 15:04:05"
+	fmt.Println("timeStr:", timeStr)
+	timeStringToTime, _ := utils.ParseTimeStringToTime(timeLayout, timeStr+" 00:00:00")
+	timenow := timeStringToTime.Unix()
+	fmt.Println("timenow是什么", timenow)
+	//查询当天排班所有机构
+	org, errs := GetAllOrgName(timenow)
+	fmt.Print("错误是什么", errs)
+	fmt.Println("查询有机构失败", err)
+
+	for _, item := range org {
+
+		information, _ := FindAlLGoodInformation(item.UserOrgId)
+		for _, ite := range information {
+			countList, _ := FindAllGoodInformationTotalCount(ite.ID)
+			for _, it := range countList {
+				if ite.ID == it.GoodId {
+					formatInt := strconv.FormatInt(it.StockCount, 10)
+					total, _ := strconv.ParseFloat(formatInt, 64)
+					info := models.GoodInfo{
+						Total: total,
+					}
+					UpdateStockTotal(it.GoodId, info)
+				}
+			}
+		}
+
+	}
+}
+
+//查询所有的耗材信息
+func FindAlLGoodInformation(orgid int64) (info []*models.GoodInfo, err error) {
+
+	err = XTReadDB().Where("org_id = ? and status = 1", orgid).Find(&info).Error
+	return info, err
+}
+
+func FindAllGoodInformationTotalCount(good_id int64) (info []*models.WarehousingInfo, err error) {
+
+	db := XTReadDB().Table("xt_warehouse_info as x").Where("x.status =1")
+
+	if good_id > 0 {
+		db = db.Where("x.good_id = ?", good_id)
+	}
+	err = db.Select("x.good_id,sum(x.stock_count) as stock_count,x.warehousing_count").Find(&info).Error
+	return info, err
+}
+
+//更新耗材库的total字段
+
+func UpdateStockTotal(id int64, lib models.GoodInfo) error {
+
+	err := XTWriteDB().Model(&lib).Where("id=? and status = 1", id).Updates(map[string]interface{}{"total": lib.Total}).Error
+	return err
+}

service/drug_stock_service.go

 	err = db.Offset(offset).Limit(limit).Order("ctime desc").Find(&list).Error
 	return
 }
+
+func GetCancelDrugOrderPrint(id []string, orgid int64) (info []*models.DrugCancelStock, err error) {
+
+	db := XTReadDB().Model(&info)
+
+	if len(id) > 0 {
+		db = db.Where("id in(?)", id)
+	}
+	if orgid > 0 {
+		db = db.Where("org_id= ?", orgid)
+	}
+
+	err = db.Preload("DrugCancelStockInfo", func(db *gorm.DB) *gorm.DB {
+		return db.Where("status = 1 AND org_id = ?", orgid).Preload("BaseDrugLib", "status = 1 AND org_id= ?", orgid)
+	}).Find(&info).Error
+
+	return info, err
+}
+
+func GetDrugCancelExportList(orderid []string, orgid int64) (info []*models.DrugCancelStockInfo, err error) {
+
+	db := XTReadDB().Model(&info)
+	if len(orderid) > 0 {
+		db = db.Where("cancel_stock_id in(?)", orderid)
+	}
+	if orgid > 0 {
+		db = db.Where("org_id = ?", orgid)
+	}
+	db = db.Preload("BaseDrugLib", "status = 1 and org_id = ?", orgid)
+	err = db.Find(&info).Error
+	return info, err
+}

service/mobile_dialysis_service.go

 }
 
 func FindConsumablesByDateThree(orgID int64, patient_id int64, recordDate int64) (consumables []*models.BloodAutomaticReduceDetail, err error) {
-	err = readDb.Model(&models.BloodAutomaticReduceDetail{}).Where("user_org_id = ? AND patient_id = ? AND record_time = ? AND status = 1 AND count > 0", orgID, patient_id, recordDate).Find(&consumables).Error
+	err = readDb.Model(&models.BloodAutomaticReduceDetail{}).Where("org_id = ? AND patient_id = ? AND record_time = ? AND status = 1 AND count > 0", orgID, patient_id, recordDate).Find(&consumables).Error
 	return
 }
 

service/stock_service.go

 		utx.Commit()
 	}
 	return
+}
+
+func UpdateDrugInfo(warehousingInfo []*models.DrugWarehouseInfo) (err error) {
+	var total float64
+	var min_number int64
+	for _, item := range warehousingInfo {
+		//查询刚入库耗材的库存
+		count, _ := FindDrugWaresingCount(item.DrugId, item.OrgId)
+		//更新药品库的总量
+		info, _ := FindeDrugInfo(item.DrugId)
+
+		min_number = count.StockMaxNumber * info.MinNumber
+		str := strconv.FormatInt(min_number, 10)
+		minFloat, _ := strconv.ParseFloat(str, 64)
+		total = info.Total + minFloat
+		lib := models.BaseDrugLib{
+			Total: total,
+		}
+		UpdateBaseDrug(&lib, item.ID)
+	}
+	return err
+}
+
+func FindDrugWaresingCount(drug_id int64, orgid int64) (models.XtDrugWarehouseInfo, error) {
+
+	info := models.XtDrugWarehouseInfo{}
+	db := XTReadDB().Table("xt_drug_warehouse_info as x").Where("x.status = 1")
+	err = db.Select("x.stock_max_number,x.drug_id").Where("x.drug_id = ? and x.org_id = ? and x.status =1", drug_id, orgid).Last(&info).Error
+	return info, err
+}
+
+func FindeDrugInfo(drug_id int64) (models.BaseDrugLib, error) {
+
+	lib := models.BaseDrugLib{}
+	err := XTReadDB().Model(&lib).Where("id = ?", drug_id).Find(&lib).Error
+	return lib, err
+}
+
+func UpdateBaseDrug(lib *models.BaseDrugLib, id int64) error {
+
+	err := XTWriteDB().Model(&lib).Where("id = ?", id).Updates(map[string]interface{}{"total": lib.Total}).Error
+	return err
+}
+
+func CreateDrugFlow(drugflow []*models.DrugFlow) (err error) {
+	if len(drugflow) > 0 {
+		utx := writeDb.Begin()
+		if len(drugflow) > 0 {
+			thisSQL := "INSERT INTO xt_drug_flow (warehousing_id, drug_id, number,batch_number,count,user_org_id,patient_id,system_time,consumable_type,is_sys,warehousing_order,warehouse_out_id,warehouse_out_order_number,is_edit,cancel_stock_id,cancel_order_number,manufacturer,dealer,creator,update_creator,status,ctime,mtime,price,warehousing_detail_id,warehouse_out_detail_id,cancel_out_detail_id,expire_date,product_date,max_unit,min_unit ) VALUES "
+			insertParams := make([]string, 0)
+			insertData := make([]interface{}, 0)
+			for _, info := range drugflow {
+				insertParams = append(insertParams, "(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)")
+				insertData = append(insertData, info.WarehousingId)
+				insertData = append(insertData, info.DrugId)
+				insertData = append(insertData, info.Number)
+				insertData = append(insertData, info.BatchNumber)
+				insertData = append(insertData, info.Count)
+				insertData = append(insertData, info.UserOrgId)
+				insertData = append(insertData, info.PatientId)
+				insertData = append(insertData, info.SystemTime)
+				insertData = append(insertData, info.ConsumableType)
+				insertData = append(insertData, info.IsSys)
+				insertData = append(insertData, info.WarehousingOrder)
+				insertData = append(insertData, info.WarehouseOutId)
+				insertData = append(insertData, info.WarehouseOutOrderNumber)
+
+				insertData = append(insertData, info.IsEdit)
+				insertData = append(insertData, info.CancelStockId)
+				insertData = append(insertData, info.CancelOrderNumber)
+				insertData = append(insertData, info.Manufacturer)
+				insertData = append(insertData, info.Dealer)
+				insertData = append(insertData, info.Creator)
+				insertData = append(insertData, info.UpdateCreator)
+				insertData = append(insertData, info.Status)
+				insertData = append(insertData, info.Ctime)
+				insertData = append(insertData, info.Mtime)
+				insertData = append(insertData, info.Price)
+				insertData = append(insertData, info.WarehousingDetailId)
+				insertData = append(insertData, info.WarehouseOutDetailId)
+				insertData = append(insertData, info.CancelOutDetailId)
+				insertData = append(insertData, info.ExpireDate)
+				insertData = append(insertData, info.ProductDate)
+				insertData = append(insertData, info.MaxUnit)
+				insertData = append(insertData, info.MinUnit)
+			}
+			thisSQL += strings.Join(insertParams, ", ")
+			err = utx.Exec(thisSQL, insertData...).Error
+			if err != nil {
+				utx.Rollback()
+				return
+			}
+		}
+		utx.Commit()
+	}
+	return
+}
+
+func CreateDrugFlowOne(flow models.DrugFlow) error {
 
+	err := XTWriteDB().Create(&flow).Error
+	return err
 }
 
 func FindLastWarehousingInfo(order string) (info models.WarehousingInfo, err error) {
 
 }
 
-//func FindFirstWarehousingInfoByStock(good_id int64,good_type_id int64) (info models.WarehousingInfo, err error) {
-//	err = readDb.Model(&models.WarehousingInfo{}).Where("good_id = ? AND good_type_id = ? AND status = 1 and stock_count > 0", order).Order("ctime").First(&info).Error
-//	return info, err
-//}
 func FindFirstWarehousingInfoByStock(good_id int64, good_type_id int64) (info models.WarehousingInfo, err error) {
 	err = readDb.Model(&models.WarehousingInfo{}).Where("good_id = ? AND good_type_id = ? AND status = 1 and stock_count > 0", good_id, good_type_id).Order("ctime").First(&info).Error
 	return info, err
 	OrgId            int64   `gorm:"column:org_id" json:"org_id" form:"org_id"`
 	OrderNumber      string  `gorm:"column:order_number" json:"order_number" form:"order_number"`
 	Type             int64   `gorm:"column:type" json:"type" form:"type"`
-	Dealer           int64   `gorm:"column:dealer" json:"dealer" form:"dealer"`
-	Manufacturer     int64   `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
+	Dealer           string  `gorm:"column:dealer" json:"dealer" form:"dealer"`
+	Manufacturer     string  `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
 	RetailPrice      float64 `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
 	RetailTotalPrice float64 `gorm:"column:retail_total_price" json:"retail_total_price" form:"retail_total_price"`
 	Number           string  `gorm:"column:number" json:"number" form:"number"`
+	RegisterAccount  string  `gorm:"column:register_account" json:"register_account" form:"register_account"`
+	Remark           string  `gorm:"column:remark" json:"remark" form:"remark"`
+	BatchNumber      string  `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
+	MaxUnit          string  `gorm:"column:max_unit" json:"max_unit" form:"max_unit"`
 	Drug             *Drug   `gorm:"ForeignKey:DrugId;AssociationForeignKey:ID" json:"drug"`
 }
 
 	if len(warehouseOutInfo) > 0 {
 		utx := writeDb.Begin()
 		if len(warehouseOutInfo) > 0 {
-			thisSQL := "INSERT INTO xt_drug_warehouse_out_info (warehouse_out_id, drug_id, product_date,expiry_date,count,price,total_price,remark,ctime,status,org_id,warehouse_out_order_number,type,dealer,manufacturer,retail_price,retail_total_price,number,batch_number) VALUES "
+			thisSQL := "INSERT INTO xt_drug_warehouse_out_info (warehouse_out_id, drug_id, product_date,expiry_date,count,price,total_price,remark,ctime,status,org_id,warehouse_out_order_number,type,dealer,manufacturer,retail_price,retail_total_price,number,batch_number,count_unit) VALUES "
 			insertParams := make([]string, 0)
 			insertData := make([]interface{}, 0)
 			for _, info := range warehouseOutInfo {
-				insertParams = append(insertParams, "(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)")
+				insertParams = append(insertParams, "(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)")
 				insertData = append(insertData, info.WarehouseOutId)
 				insertData = append(insertData, info.DrugId)
 				insertData = append(insertData, info.ProductDate)
 				insertData = append(insertData, info.RetailTotalPrice)
 				insertData = append(insertData, info.Number)
 				insertData = append(insertData, info.BatchNumber)
+				insertData = append(insertData, info.CountUnit)
 			}
 			thisSQL += strings.Join(insertParams, ", ")
 			err = utx.Exec(thisSQL, insertData...).Error
 	if len(cancelStockInfo) > 0 {
 		utx := writeDb.Begin()
 		if len(cancelStockInfo) > 0 {
-			thisSQL := "INSERT INTO xt_cancel_stock_info (good_id, cancel_stock_id, good_type_id, count, price,total,ctime,status,org_id,order_number,type,dealer,manufacturer) VALUES "
+			thisSQL := "INSERT INTO xt_cancel_stock_info (good_id, cancel_stock_id, good_type_id, count, price,total,ctime,status,org_id,order_number,type,dealer,manufacturer,number,register_account,remark,product_date,expiry_date) VALUES "
 			insertParams := make([]string, 0)
 			insertData := make([]interface{}, 0)
 			for _, info := range cancelStockInfo {
-				insertParams = append(insertParams, "(?,?,?,?,?,?,?,?,?,?,?,?,?)")
+				insertParams = append(insertParams, "(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)")
 				insertData = append(insertData, info.GoodId)
 				insertData = append(insertData, info.CancelStockId)
 				insertData = append(insertData, info.GoodTypeId)
 				insertData = append(insertData, info.Type)
 				insertData = append(insertData, info.Dealer)
 				insertData = append(insertData, info.Manufacturer)
+				insertData = append(insertData, info.Number)
+				insertData = append(insertData, info.RegisterAccount)
+				insertData = append(insertData, info.Remark)
+				insertData = append(insertData, info.ProductDate)
+				insertData = append(insertData, info.ExpiryDate)
 			}
 			thisSQL += strings.Join(insertParams, ", ")
 			err = utx.Exec(thisSQL, insertData...).Error
 	if len(cancelStockInfo) > 0 {
 		utx := writeDb.Begin()
 		if len(cancelStockInfo) > 0 {
-			thisSQL := "INSERT INTO xt_drug_cancel_stock_info (drug_id,cancel_stock_id, count, price,total,ctime,status,org_id,order_number,type,dealer,manufacturer,retail_price,retail_total_price) VALUES "
+			thisSQL := "INSERT INTO xt_drug_cancel_stock_info (drug_id,cancel_stock_id, count, price,total,ctime,status,org_id,order_number,type,dealer,manufacturer,retail_price,retail_total_price,register_account,batch_number,remark,max_unit,product_date,expiry_date) VALUES "
 			insertParams := make([]string, 0)
 			insertData := make([]interface{}, 0)
 			for _, info := range cancelStockInfo {
-				insertParams = append(insertParams, "(?,?,?,?,?,?,?,?,?,?,?,?,?,?)")
+				insertParams = append(insertParams, "(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)")
 				insertData = append(insertData, info.DrugId)
 				insertData = append(insertData, info.CancelStockId)
 				insertData = append(insertData, info.Count)
 				insertData = append(insertData, info.Manufacturer)
 				insertData = append(insertData, info.RetailPrice)
 				insertData = append(insertData, info.RetailTotalPrice)
-
+				insertData = append(insertData, info.RegisterAccount)
+				insertData = append(insertData, info.BatchNumber)
+				insertData = append(insertData, info.Remark)
+				insertData = append(insertData, info.MaxUnit)
+				insertData = append(insertData, info.ProductDate)
+				insertData = append(insertData, info.ExpiryDate)
 			}
 			thisSQL += strings.Join(insertParams, ", ")
 			err = utx.Exec(thisSQL, insertData...).Error
 	return
 }
 
+func GetLastWarehousingById(warehousing_id int64, orgid int64) (models.WarehousingInfo, error) {
+
+	info := models.WarehousingInfo{}
+	err = XTReadDB().Model(&info).Where("warehousing_id = ? and good_id = ? and status = 1", warehousing_id, orgid).Find(&info).Error
+	return info, err
+}
+
 func UpDateWarehousingInfo(info *models.WarehousingInfo) (err error) {
 	err = writeDb.Save(&info).Error
 	return err
 	return err
 }
 
+func GetDrugWarehouseOrderOne(id int64, drug_id int64) (models.DrugWarehouseInfo, error) {
+
+	info := models.DrugWarehouseInfo{}
+	err = XTReadDB().Model(&info).Where("warehousing_id = ? and drug_id = ?", id, drug_id).Find(&info).Error
+	return info, err
+}
+
+func GetDrugWarehouseOrder(id int64) (models.DrugWarehouseInfo, error) {
+
+	info := models.DrugWarehouseInfo{}
+	err = XTReadDB().Model(&info).Where("id = ?", id).Find(&info).Error
+	return info, err
+}
+
 func EditWarehousing(warehouse models.Warehousing) {
 	err = readDb.Model(&models.Warehousing{}).Where("warehousing_order = ? AND status = 1", warehouse.WarehousingOrder).Update(map[string]interface{}{"mtime": time.Now().Unix(), "warehousing_time": warehouse.WarehousingTime, "modifier": warehouse.Modifier, "dealer": warehouse.Dealer, "manufacturer": warehouse.Manufacturer}).Error
 
 func FindLastStockInInfoRecord(good_id int64, org_id int64) (in models.WarehousingInfo, err error) {
 	err = readDb.Model(&models.WarehousingInfo{}).Where("status = 1 AND org_id = ? AND good_id = ?", org_id, good_id).Last(&in).Error
 	return
-
 }
 
 func FindLastDrugStockInInfoRecord(drug_id int64, org_id int64) (in models.DrugWarehouseOutInfo, err error) {
 	return
 }
 
+func FindStockOutInfoByStockTwo(org_id int64, good_type_id int64, good_id int64, record_date int64, patient_id int64) (models.WarehouseOutInfo, error) {
+	info := models.WarehouseOutInfo{}
+	err = readDb.Model(&info).Where("status = 1 AND org_id = ? AND good_type_id = ? AND good_id = ? AND is_sys = 1 AND sys_record_time = ? and patient_id = ?", org_id, good_type_id, good_id, record_date, patient_id).Order("ctime desc").Find(&info).Error
+	return info, err
+}
+
 func FindDrugStockOutInfoByTypeId(org_id int64, drug_id int64, out_id int64, number string) (out models.DrugWarehouseOutInfo, err error) {
 	err = readDb.Model(&models.DrugWarehouseOutInfo{}).Where("status = 1 AND org_id = ? AND  drug_id = ? AND is_sys = 1 AND  (warehouse_out_id = ? or warehouse_out_order_number = ?)", org_id, drug_id, out_id, number).First(&out).Error
 	return
 	return err
 }
 
+func UpDateWarehouseInfoByStockDeleteOne(id int64, count int64) (err error) {
+	err = writeDb.Model(&models.WarehousingInfo{}).Where("id = ?", id).UpdateColumn("stock_count", gorm.Expr("stock_count - ?", count)).Error
+	return err
+}
+
 func GetAutoDialysisBefor(goodid int64, goodtypeid int64, patientid int64, orgid int64, recorddate int64) (*models.BloodAutomaticReduceDetail, error) {
 
 	var autoreduece models.BloodAutomaticReduceDetail
 	if is_sys == 3 {
 		db = db.Where("x.is_sys = 0")
 	}
-	err = db.Select("x.id,x.warehouse_out_id,x.warehouse_info_id,x.good_id,x.good_type_id,x.warehousing_out_target,x.count,x.price,x.total_price,x.product_date,x.expiry_date,x.ctime,x.org_id,x.warehouse_out_order_number,x.is_sys,x.number,x.dealer,x.manufacturer").Offset(offset).Count(&total).Scan(&info).Error
+	err = db.Select("x.id,x.warehouse_out_id,x.warehouse_info_id,x.good_id,x.good_type_id,x.warehousing_out_target,x.count,x.price,x.total_price,x.product_date,x.expiry_date,x.ctime,x.org_id,x.warehouse_out_order_number,x.is_sys,x.number,x.dealer,x.manufacturer,x.consumable_type").Offset(offset).Count(&total).Scan(&info).Error
 	return info, total, err
 }
 
 		db = db.Where("x.org_id = ?", orgid)
 	}
 
-	err = db.Select("sum(x.warehousing_count) as count,x.good_id").Group("x.good_id").Scan(&info).Error
+	err = db.Select("sum(x.warehousing_count) as count,sum(x.stock_count) as stock_count,x.good_id").Group("x.good_id").Scan(&info).Error
 	return info, err
 }
 
 	if orgid > 0 {
 		db = db.Where("x.org_id = ?", orgid)
 	}
-	err = db.Select("x.id,x.warehouse_out_id,x.good_id,sum(x.count) as count,x.price,x.total_price,x.product_date,x.expiry_date,x.ctime,x.org_id,x.warehouse_out_order_number,x.type,x.dealer,t.manufacturer,x.is_sys,x.sys_record_time,x.number,x.remark,x.license_number,t.good_name,t.good_type_id,t.specification_name,t.min_number,t.packing_unit,t.min_unit").Joins("left join xt_good_information as t on t.id=x.good_id").Group("x.good_id").Order("x.ctime desc").Scan(&out).Error
+	err = db.Select("x.id,x.warehouse_out_id,x.warehouse_info_id,x.good_id,sum(x.count) as count,x.price,x.total_price,x.product_date,x.expiry_date,x.ctime,x.org_id,x.warehouse_out_order_number,x.type,x.dealer,t.manufacturer,x.is_sys,x.sys_record_time,x.number,x.remark,x.license_number,t.good_name,t.good_type_id,t.specification_name,t.min_number,t.packing_unit,t.min_unit").Joins("left join xt_good_information as t on t.id=x.good_id").Group("x.good_id").Order("x.ctime desc").Scan(&out).Error
 	return out, err
 }
 
 	return out, err
 }
 
+func GetLastWarehouseOutInfo(ids []string, orgId int64) (info []*models.WarehouseOutInfoSix, err error) {
+
+	db := XTReadDB().Model(&info)
+	db = db.Preload("GoodInfo", "status = 1")
+	err = db.Raw("select * from(SELECT * FROM xt_warehouse_out_info WHERE warehouse_out_id IN(?) AND org_id = ? and status = 1  ORDER BY id DESC LIMIT 1000) a group by good_id", ids, orgId).Find(&info).Error
+
+	return info, err
+}
+
 func FindUserDetailByIdOne(good_id int64, record_time int64, org_id int64) (user []*models.AutomaticReduceDetail, err error, total int64) {
 	db := readDb.Model(&models.AutomaticReduceDetail{})
 	db = db.Preload("GoodInfo", "org_id = ? AND status = 1", org_id)
 	return info, err
 }
 
+func GetCancelStockOrderPrintOne(idstr []string, orgid int64) (info []*models.CancelStock, err error) {
+
+	if len(idstr) > 0 {
+		err = XTReadDB().Model(&info).Where("id in(?)", idstr).
+			Preload("CancelStockInfo", func(db *gorm.DB) *gorm.DB {
+				return XTReadDB().Where("org_id=? and status = 1", orgid).Preload("GoodInfo", "status = 1 and org_id = ?", orgid)
+			}).Find(&info).Error
+	}
+	return info, err
+}
+
 func GetCancelOutTotalCount(startime int64, endtime int64, orgid int64) (info []*models.VmCancelStockInfo, err error) {
 
 	db := XTReadDB().Table("xt_cancel_stock_info as x").Where("x.status = 1")
 	err = XTReadDB().Model(&info).Where("drug_id = ? and org_id = ? and status = 1 and batch_number <>''", drug_id, orgid).Find(&info).Error
 	return info, err
 }
+
+func ExportDrugList(warehouse_out_id []string) (out []*models.StDrugWarehouseInfo, err error) {
+
+	db := XTReadDB().Table("xt_drug_warehouse_info as x").Where("x.status =1")
+
+	table := XTReadDB().Table("xt_base_drug as b").Where("b.status = 1")
+	fmt.Println("table", table)
+	if len(warehouse_out_id) > 0 {
+		db = db.Where("x.warehousing_id in(?)", warehouse_out_id)
+	}
+	err = db.Select("x.id,x.warehousing_id,x.drug_id,x.number,x.product_date,x.expiry_date,x.warehousing_count,x.warehouseing_unit,x.max_unit,x.min_unit,x.stock_max_number,x.stock_min_number,x.price,x.dealer,x.manufacturer,x.warehousing_order,x.batch_number,b.dose,b.dose_unit,b.min_number,b.min_unit,b.max_unit,b.drug_name,b.drug_type").Joins("left join xt_base_drug as b on b.id = x.drug_id").Scan(&out).Error
+	return out, err
+}
+
+func GetExportOutOrderDrugList(warehouse_out_id []string) (out []*models.StDrugWarehouseOutInfo, err error) {
+
+	db := XTReadDB().Table("xt_drug_warehouse_out_info as x").Where("x.status = 1")
+	table := XTReadDB().Table("xt_base_drug as b").Where("b.status = 1")
+	fmt.Println("table", table)
+	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.count_unit,x.price,x.product_date,x.expiry_date,x.warehouse_out_order_number,x.dealer,x.manufacturer,x.is_sys,x.sys_record_time,x.warehouse_info_id,x.number,x.batch_number,x.patient_id,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 GetLastGoodInformationByGoodId(goodid int64, warehouse_info_id int64, orgid int64) (models.WarehouseOutInfo, error) {
+
+	info := models.WarehouseOutInfo{}
+	err := XTReadDB().Where("good_id = ? and warehouse_info_id= ? and status =1", goodid, warehouse_info_id).Last(&info).Error
+	return info, err
+}
+
+func GetTotalCountByGoodId(goodid int64) (models.WarehousingInfo, error) {
+
+	info := models.WarehousingInfo{}
+
+	db := XTReadDB().Table("xt_warehouse_info as x").Where("x.status = 1")
+	if goodid > 0 {
+		db = db.Where("x.good_id = ?", goodid)
+	}
+
+	err := db.Select("x.good_id,sum(x.stock_count) as stock_count").Scan(&info).Error
+	return info, err
+}
+
+func GetLastGoodCountById(goodid int64, warehouse_info_id int64) (models.WarehousingInfo, error) {
+
+	info := models.WarehousingInfo{}
+
+	err := XTReadDB().Where("good_id = ? and id= ? and status = 1", goodid, warehouse_info_id).First(&info).Error
+	return info, err
+}
+
+func UpdateWarehousingInfo(info models.WarehousingInfo, id int64) error {
+
+	err = XTWriteDB().Model(&info).Where("id = ? and status = 1", id).Updates(map[string]interface{}{"stock_count": info.StockCount}).Error
+	return err
+}
+
+func FindFirstWarehousingInfoByGoodId(good_id int64, id int64) (info models.WarehousingInfo, err error) {
+	err = readDb.Model(&models.WarehousingInfo{}).Where("good_id = ? AND status = 1 and id<>?", good_id, id).Order("ctime").First(&info).Error
+	return info, err
+}
+
+func CreateStockFlow(warehousingInfo []*models.VmStockFlow) (err error) {
+	if len(warehousingInfo) > 0 {
+		utx := writeDb.Begin()
+		if len(warehousingInfo) > 0 {
+			thisSQL := "INSERT INTO xt_stock_flow (warehousing_id, good_id, number, license_number, count,user_org_id,patient_id,system_time,consumable_type,is_sys,warehousing_order,warehouse_out_id,warehouse_out_order_number,is_edit,cancel_stock_id,cancel_order_number,manufacturer,dealer,creator,update_creator,status,ctime,mtime,price,warehousing_detail_id,warehouse_out_detail_id,cancel_out_detail_id,expire_date,product_date) VALUES "
+			insertParams := make([]string, 0)
+			insertData := make([]interface{}, 0)
+			for _, info := range warehousingInfo {
+				insertParams = append(insertParams, "(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)")
+				insertData = append(insertData, info.WarehousingId)
+				insertData = append(insertData, info.GoodId)
+				insertData = append(insertData, info.Number)
+				insertData = append(insertData, info.LicenseNumber)
+				insertData = append(insertData, info.Count)
+				insertData = append(insertData, info.UserOrgId)
+				insertData = append(insertData, info.PatientId)
+				insertData = append(insertData, info.SystemTime)
+				insertData = append(insertData, info.ConsumableType)
+				insertData = append(insertData, info.IsSys)
+				insertData = append(insertData, info.WarehousingOrder)
+				insertData = append(insertData, info.WarehouseOutId)
+				insertData = append(insertData, info.WarehouseOutOrderNumber)
+				insertData = append(insertData, info.IsEdit)
+				insertData = append(insertData, info.CancelStockId)
+				insertData = append(insertData, info.CancelOrderNumber)
+				insertData = append(insertData, info.Manufacturer)
+				insertData = append(insertData, info.Dealer)
+				insertData = append(insertData, info.Creator)
+				insertData = append(insertData, info.UpdateCreator)
+				insertData = append(insertData, info.Status)
+				insertData = append(insertData, info.Ctime)
+				insertData = append(insertData, info.Mtime)
+				insertData = append(insertData, info.Price)
+				insertData = append(insertData, info.WarehousingDetailId)
+				insertData = append(insertData, info.WarehouseOutDetailId)
+				insertData = append(insertData, info.CancelOutDetailId)
+				insertData = append(insertData, info.ExpireDate)
+				insertData = append(insertData, info.ProductDate)
+			}
+			thisSQL += strings.Join(insertParams, ", ")
+			err = utx.Exec(thisSQL, insertData...).Error
+			if err != nil {
+				utx.Rollback()
+				return
+			}
+		}
+		utx.Commit()
+	}
+	return
+
+}
+
+func CreateStockFlowOne(flow models.VmStockFlow) error {
+
+	err := XTWriteDB().Create(&flow).Error
+	return err
+}
+
+func GetWarehouseOutInfoIsExist(id int64) (*models.WarehouseOutInfo, error) {
+
+	info := models.WarehouseOutInfo{}
+	var err error
+	err = XTReadDB().Model(&info).Where("id = ? and status = 1", id).Find(&info).Error
+	if err == gorm.ErrRecordNotFound {
+		return nil, err
+	}
+	if err != nil {
+		return nil, err
+	}
+	return &info, nil
+}
+
+func GetWarehouseOutInfoIsExistOne(good_id int64, patient_id int64, record_time int64) (*models.WarehouseOutInfo, error) {
+
+	info := models.WarehouseOutInfo{}
+	var err error
+	err = XTReadDB().Model(&info).Where("good_id = ? and sys_record_time = ? and status = 1 and patient_id = ?", good_id, record_time, patient_id).Find(&info).Error
+	if err == gorm.ErrRecordNotFound {
+		return nil, err
+	}
+	if err != nil {
+		return nil, err
+	}
+	return &info, nil
+}
+
+func GetStockFlowList(limit int64, page int64, consumable_type int64, orgId int64, startTime int64, endTime int64, good_id int64) (flow []*models.VmStockFlow, total int64, err error) {
+
+	offset := (page - 1) * limit
+	db := XTReadDB().Model(&flow)
+	if consumable_type > 0 {
+		//入库
+		if consumable_type == 1 {
+			db = db.Where("consumable_type = ?", consumable_type)
+		}
+		//2 手动出库
+		if consumable_type == 2 {
+
+			db = db.Where(" consumable_type = ? and is_sys = 0", consumable_type)
+		}
+
+		//3.自动出库
+		if consumable_type == 3 {
+			db = db.Where(" consumable_type = ? and is_sys = 1", consumable_type)
+		}
+	}
+	if orgId > 0 {
+		db = db.Where("user_org_id = ?", orgId)
+	}
+
+	if startTime > 0 {
+		db = db.Where("ctime >= ?", startTime)
+	}
+
+	if endTime > 0 {
+		db = db.Where("ctime<=?", endTime)
+	}
+
+	if good_id > 0 {
+		db = db.Where("good_id = ?", good_id)
+	}
+
+	err = db.Count(&total).Offset(offset).Limit(limit).Find(&flow).Error
+
+	return flow, total, err
+}
+
+func GetLastGoodListByPatientId(recordtime int64, patientid int64, goodid int64, goodtypeid int64) (models.AutomaticReduceDetail, error) {
+
+	detail := models.AutomaticReduceDetail{}
+
+	err := XTReadDB().Model(&detail).Where("record_time = ? and patient_id = ? and good_id = ? and good_type_id = ? and status = 1", recordtime, patientid, goodid, goodtypeid).Last(&detail).Error
+	return detail, err
+}
+
+func GetLastGoodListByPatientIdOne(recordtime int64, patientid int64, goodid int64, goodtypeid int64) (models.WarehouseOutInfo, error) {
+
+	detail := models.WarehouseOutInfo{}
+
+	err := XTReadDB().Model(&detail).Where("sys_record_time = ? and patient_id = ? and good_id = ? and good_type_id = ? and status = 1", recordtime, patientid, goodid, goodtypeid).Last(&detail).Error
+	return detail, err
+}
+
+func UpdatedWarehouseOutInfo(info *models.WarehouseOutInfo, good_id int64, patient_id int64, record_time int64) error {
+
+	outInfo := models.WarehouseOutInfo{}
+	err := XTWriteDB().Model(&outInfo).Where("good_id = ? and patient_id = ? and sys_record_time  =? and status = 1", good_id, patient_id, record_time).Updates(map[string]interface{}{"warehouse_out_id": info.WarehouseOutId, "WarehouseOutOrderNumber": info.WarehouseOutOrderNumber, "sys_record_time": info.SysRecordTime, "good_type_id": info.GoodTypeId, "patient_id": info.PatientId, "consumable_type": info.ConsumableType, "count": info.Count, "price": info.Price, "dealer": info.Dealer, "manufacturer": info.Manufacturer, "number": info.Number, "license_number": info.LicenseNumber}).Error
+	return err
+}
+
+func GetLastWarehouOutInfoByPatientId(orgid int64, patient_id int64, record_time int64, goodid int64, good_type_id int64) (models.WarehouseOutInfo, error) {
+
+	info := models.WarehouseOutInfo{}
+
+	err = XTReadDB().Model(&info).Where("org_id = ? and patient_id = ? and sys_record_time = ? and good_id = ? and good_type_id = ? and status = 1", orgid, patient_id, record_time, goodid, good_type_id).Last(&info).Error
+	return info, err
+}
+
+func GetLastStockOut(id int64) (models.WarehousingInfo, error) {
+
+	info := models.WarehousingInfo{}
+
+	err := XTReadDB().Model(&info).Where("id = ? and status = 1", id).Find(&info).Error
+	return info, err
+}
+
+func GetDrugFlow(drugid int64, orgid int64, limit int64, page int64, startTime int64, endTime int64, stock_type int64) (drug_flow []*models.DrugFlow, total int64, err error) {
+
+	offset := (page - 1) * limit
+	db := XTReadDB().Model(drug_flow)
+	if drugid > 0 {
+		db = db.Where("drug_id = ?", drugid)
+	}
+	if orgid > 0 {
+		db = db.Where("user_org_id = ?", orgid)
+	}
+	if startTime > 0 {
+		db = db.Where("ctime >=? ", startTime)
+	}
+	if endTime > 0 {
+		db = db.Where("ctime<=?", endTime)
+	}
+	if stock_type > 0 {
+
+		//手动入库
+		if stock_type == 1 {
+			db = db.Where("consumable_type = 1")
+		}
+
+		//手动出库
+		if stock_type == 2 {
+			db = db.Where("consumable_type = 2 and is_sys = 0")
+		}
+
+		//自动出库
+		if stock_type == 3 {
+			db = db.Where("consumable_type = 3 and is_sys = 1")
+		}
+	}
+	err = db.Count(&total).Offset(offset).Limit(limit).Order("ctime desc").Find(&drug_flow).Error
+	return drug_flow, total, err
+}
+
+func GetDrugWarehouseOutInfoIsExit(drug_id int64, patient_id int64, recordtime int64) (*models.DrugWarehouseOutInfo, error) {
+
+	outInfo := models.DrugWarehouseOutInfo{}
+	var err error
+	err = XTReadDB().Model(&outInfo).Where("drug_id = ? and patient_id = ? and status = 1 and sys_record_time = ?", drug_id, patient_id, recordtime).Find(&outInfo).Error
+	if err == gorm.ErrRecordNotFound {
+		return nil, err
+	}
+	if err != nil {
+		return nil, err
+	}
+	return &outInfo, nil
+}
+
+func UpdatedDrugWarehouseOutInfo(info *models.DrugWarehouseOutInfo, drug_id int64, patient_id int64, record_date int64, orgid int64) error {
+
+	outInfo := models.DrugWarehouseOutInfo{}
+
+	err := XTWriteDB().Model(&outInfo).Where("drug_id = ? and patient_id = ? and sys_record_time = ? and org_id = ?", drug_id, patient_id, record_date, orgid).Updates(map[string]interface{}{"warehouse_out_id": info.WarehouseOutId, "drug_id": info.DrugId, "count": info.Count, "count_unit": info.CountUnit, "price": info.Price, "product_date": info.ProductDate, "expiry_date": info.ExpiryDate, "mtime": info.Mtime, "ctime": info.Ctime, "org_id": info.OrgId, "warehouse_out_order_number": info.WarehouseOutOrderNumber, "dealer": info.Dealer, "manufacturer": info.Manufacturer, "is_sys": info.IsSys, "sys_record_time": info.SysRecordTime, "warehouse_info_id": info.WarehouseInfoId, "number": info.Number, "batch_number": info.BatchNumber, "patient_id": info.PatientId}).Error
+
+	return err
+}
+
+func GetCancelExportList(startime int64, endtime int64, ids []string, orgid int64) (cancle []*models.CancelStockInfo, err error) {
+
+	db := XTReadDB().Model(&cancle).Where("status = 1")
+	if startime > 0 {
+		db = db.Where("ctime >=?", startime)
+	}
+	if endtime > 0 {
+		db = db.Where("ctime <=?", endtime)
+	}
+	if len(ids) > 0 {
+		db = db.Where("cancel_stock_id in(?)", ids)
+	}
+	if orgid > 0 {
+		db = db.Where("org_id = ?", orgid)
+	}
+	db = db.Preload("GoodInfo", "status =1 and org_id = ?", orgid)
+	err = db.Find(&cancle).Error
+	return cancle, err
+}
+
+func GetCancelStockDetail(id int64) (info []*models.DrugCancelStockInfo, err error) {
+
+	db := XTReadDB().Model(&info)
+	if id > 0 {
+		db = db.Where("cancel_stock_id = ?", id)
+	}
+	db = db.Preload("BaseDrugLib")
+	err = db.Find(&info).Error
+	return info, err
+}