Merge branch '20211122' of http://git.shengws.com/csx/XT_New into 20211122

controllers/dialysis_api_controller.go

 	assessment.Fallrisk = data.Fallrisk
 	assessment.MachineRun = data.MachineRun
 	assessment.AfterUrea = data.AfterUrea
+	assessment.PipCoagulation = data.PipCoagulation
 	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.CurrentOrgId, adminUserInfo.AdminUser.Id, adminUserInfo.CurrentAppId)
 
 	if assessment.ID > 0 {
 	estimated_food_intake := c.GetString("estimated_food_intake")
 	blood_pressure_during_dialysis := c.GetString("blood_pressure_during_dialysis")
 	urea_befor := c.GetString("urea_befor")
+	suction := c.GetString("suction")
 	assessmentBeforeDislysis := models.PredialysisEvaluation{
 		DialysisCount:                  dialysis_count,
 		EmergencyTreatment:             emergency_treatment,
 		EstimatedFoodIntake:            estimated_food_intake,
 		BloodPressureDuringDialysis:    blood_pressure_during_dialysis,
 		UreaBefor:                      urea_befor,
+		Suction:                        suction,
 	}
 
 	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.CurrentOrgId, adminUserInfo.AdminUser.Id, adminUserInfo.CurrentAppId)
 				mode_id = 0
 			}
 		}
-		fmt.Println("dialysisPrescribe------------------------------------", dialysisPrescribe)
-		fmt.Println("dialysisSolution------------------------------------", dialysisSolution)
+
 		// 插入透析处方
 		if dialysisPrescribe == nil && dialysisSolution != nil {
 			var newprescribe models.DialysisPrescription

controllers/dialysis_record_api_controller.go

 	UreaMonitoring              float64 `gorm:"column:urea_monitoring" json:"urea_monitoring" form:"urea_monitoring"`
 	BloodThickness              float64 `gorm:"column:blood_thickness" json:"blood_thickness" form:"blood_thickness"`
 	BloodMonitor                float64 `gorm:"column:blood_monitor" json:"blood_monitor" form:"blood_monitor"`
+	HeparinAmount               float64 `gorm:"column:heparin_amount" json:"heparin_amount" form:"heparin_amount"`
+	Dehydration                 float64 `gorm:"column:dehydration" json:"dehydration" form:"dehydration"`
 }
 
 // /api/dislysis/monitor/edit [post]
 			UreaMonitoring:              monitorParam.UreaMonitoring,
 			BloodThickness:              monitorParam.BloodThickness,
 			BloodMonitor:                monitorParam.BloodMonitor,
+			HeparinAmount:               monitorParam.HeparinAmount,
+			Dehydration:                 monitorParam.Dehydration,
 		}
 		createErr := service.CreateMonitor(&monitor)
 		key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(patientID, 10) + ":" + strconv.FormatInt(scheduleDate, 10) + ":monitor_records"
 		monitor.UreaMonitoring = monitorParam.UreaMonitoring
 		monitor.BloodThickness = monitorParam.BloodThickness
 		monitor.BloodMonitor = monitorParam.BloodMonitor
+		monitor.HeparinAmount = monitorParam.HeparinAmount
+		monitor.Dehydration = monitorParam.Dehydration
 		updateErr := service.UpdateMonitor(monitor)
 		key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(patientID, 10) + ":" + strconv.FormatInt(scheduleDate, 10) + ":monitor_records"
 		redis := service.RedisClient()

controllers/gobal_config_api_controller.go

 		id := int64(idsInter.(float64))
 		ids = append(ids, id)
 	}
-	getPrint, err := service.GetPrint(ids, OrgID)
+	getPrint, err := service.GetPrint(ids, OrgID, advice_type, stop_type)
 	c.ServeSuccessJSON(map[string]interface{}{
 		"doctoradvice": getPrint,
 	})

controllers/manager_center_api_controller.go

 	default_count_unit := c.GetString("default_count_unit")
 	is_user, _ := c.GetInt64("is_user")
 	number := c.GetString("number")
+	is_warehouse, _ := c.GetInt64("is_warehouse")
 	adminUserInfo := c.GetAdminUserInfo()
 
 	totals := service.FindGoodInfoByNameTwo(specification_name, adminUserInfo.CurrentOrgId, good_id, good_name)
 		ProvincesCode:               provinces_code,
 		IsUser:                      is_user,
 		Number:                      number,
+		IsWarehouse:                 is_warehouse,
 	}
 	err, goodInfos := service.AddSigleGoodInfo(&goodInfo)
 	if err == nil {
 	register_number := c.GetString("register_number")
 	is_user, _ := c.GetInt64("is_user")
 	number := c.GetString("number")
+	is_warehouse, _ := c.GetInt64("is_warehouse")
 	adminUserInfo := c.GetAdminUserInfo()
 
 	goodInfo := models.GoodInfo{
 		RegisterNumber:              register_number,
 		IsUser:                      is_user,
 		Number:                      number,
+		IsWarehouse:                 is_warehouse,
 	}
 
 	totals := service.FindGoodInfoByNameOne(specification_name, adminUserInfo.CurrentOrgId, good_id, id, good_name)

controllers/mobile_api_controllers/dialysis_api_controller.go

 		err := service.AddSigleDoubleCheck(&doubleCheck)
 		key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":double_check"
 		redis := service.RedisClient()
+
 		defer redis.Close()
 		//清空key 值
 		redis.Set(key, "", time.Second)
 		doubleCheck.ID = check.ID
 		err := service.UpdateDoubleCheck(&doubleCheck)
 		key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":double_check"
+		fmt.Println("key233232232323232323", key)
 		redis := service.RedisClient()
 		defer redis.Close()
 		//清空key 值
 	fallrisk, _ := c.GetInt64("fallrisk")
 	machine_run := c.GetString("machine_run")
 	after_urea := c.GetString("after_urea")
+	pip_coagulation := c.GetString("pip_coagulation")
 	if id <= 0 {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
 		Fallrisk:                     fallrisk,
 		MachineRun:                   machine_run,
 		AfterUrea:                    after_urea,
+		PipCoagulation:               pip_coagulation,
 	}
 
 	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.Org.Id, adminUserInfo.AdminUser.Id, adminUserInfo.App.Id)
 			})
 			return
 		}
+
 	}
 
 	//出库逻辑

controllers/mobile_api_controllers/dialysis_api_controller_extend.go

 	blood_sugar, _ := this.GetFloat("blood_sugar")
 	monitor_anticoagulant, _ := this.GetInt64("monitor_anticoagulant")
 	monitor_anticoagulant_value := this.GetString("monitor_anticoagulant_value")
+	heparin_amount, _ := this.GetFloat("heparin_amount")
 	blood_pressure_monitoring_site, _ := this.GetInt64("blood_pressure_monitoring_site")
 	complication, _ := this.GetInt64("complication")
 	accumulated_blood_volume, _ := this.GetFloat("accumulated_blood_volume")
 	urea_monitoring, _ := this.GetFloat("urea_monitoring")
 	blood_thickness, _ := this.GetFloat("blood_thickness")
 	blood_monitor, _ := this.GetFloat("blood_monitor")
+	dehydration, _ := this.GetFloat("dehydration")
 	adminInfo := this.GetMobileAdminUserInfo()
 	patient, getPatientErr := service.MobileGetPatientById(adminInfo.Org.Id, patientID)
 	if getPatientErr != nil {
 		UreaMonitoring:              urea_monitoring,
 		BloodThickness:              blood_thickness,
 		BloodMonitor:                blood_monitor,
+		HeparinAmount:               heparin_amount,
+		Dehydration:                 dehydration,
 	}
 
 	err := service.CreateMonitor(&record)
 	urea_monitoring, _ := this.GetFloat("urea_monitoring")
 	blood_thickness, _ := this.GetFloat("blood_thickness")
 	blood_monitor, _ := this.GetFloat("blood_monitor")
+	heparin_amount, _ := this.GetFloat("heparin_amount")
+	dehydration, _ := this.GetFloat("dehydration")
+	fmt.Println("id232323233232233223232332233223", id)
 	monitor, err := service.GetMonitor(adminInfo.Org.Id, patientID, id)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 	monitor.UreaMonitoring = urea_monitoring
 	monitor.BloodThickness = blood_thickness
 	monitor.BloodTemperature = blood_temperature
+	monitor.HeparinAmount = heparin_amount
+	monitor.Dehydration = dehydration
 	err = service.UpdateMonitor(monitor)
 	key := strconv.FormatInt(adminInfo.Org.Id, 10) + ":" + strconv.FormatInt(patientID, 10) + ":" + strconv.FormatInt(date, 10) + ":monitor_records"
 	redis := service.RedisClient()

controllers/mobile_api_controllers/patient_api_controller.go

 		urea_befor := dataBody["urea_befor"].(string)
 		evaluation.UreaBefor = urea_befor
 	}
+
+	if dataBody["suction"] != nil && reflect.TypeOf(dataBody["suction"]).String() == "string" {
+		suction := dataBody["suction"].(string)
+
+		evaluation.Suction = suction
+	}
 	return
 }
 

controllers/secondary_order_api_contorller.go

+package controllers
+
+type SecondaryOrderApiController struct {
+	BaseAuthAPIController
+}
+
+func SecondaryOrderApiRegistRouters() {
+
+}

controllers/supply_order_api_contorller.go

 	beego.Router("/api/supply/deletereturnorderbyid", &SupplyOrderApiController{}, "Get:DeleteReturnOrderById")
 	//反审核退货单
 	beego.Router("/api/supply/modefyreturnorder", &SupplyOrderApiController{}, "Get:ModefyReturnOrder")
+
+	//获取采购数据
+	beego.Router("/api/supply/getgoodorderdetaillist", &SupplyOrderApiController{}, "Get:GetGoodOrderDetailList")
 }
 
 //判断前端参数是否为空
 							Number:       number,
 							Bank:         bank,
 							BankAccount:  bankAccount,
+							UserOrgId:    orgId,
 							Status:       1,
 							Mtime:        time.Now().Unix(),
 							Modify:       tmodify,
 	limit, _ := this.GetInt64("limit")
 	orgId := this.GetAdminUserInfo().CurrentOrgId
 	list, total, err := service.GetAllPurchaseOrderList(check_id, startTime, endTime, keyword, page, limit, orgId)
+
 	if err == nil {
 		this.ServeSuccessJSON(map[string]interface{}{
 			"list":  list,
 			}
 
 		}
+		//查询
+		orderInfo, _ := service.GetSupplyWarehousingOrderInfo(warehousing_id)
 		this.ServeSuccessJSON(map[string]interface{}{
 			"warehousingInfo": warehousingInfo,
+			"orderInfo":       orderInfo,
 		})
 
 	}
 	baseList, _ := service.GetSupplyDrugList(orgId)
 
 	goodList, _ := service.GetSupplyGoodList(orgId)
+
 	if err == nil {
 		this.ServeSuccessJSON(map[string]interface{}{
 			"info":       info,
 					GoodNumber:              warehouseOut.GoodNumber,
 					SupplyManufacturer:      supply_manufacturer,
 					MinPrice:                min_price_float,
+					IsWarehosue:             2,
 				}
 				warehousingOut = append(warehousingOut, &order)
 			}
 		//如果是手动新增的，type 等于2
 		if item.WarehouseInfoId == 0 {
 			item.Type = 2
+			service.CreateSupplyWarehousOutOrder(item)
 		}
-		//查询该商品是否来源于采购订单,如果存在则关联， 如果不存在则取消关联
-		_, errcode := service.GetGoodIsSource(warehousing_id, item.ProjectId, orgId)
-		if errcode == gorm.ErrRecordNotFound {
-			item.WarehousingId = 0
-			item.WarehouseInfoId = 0
-			item.OrderNumber = ""
-			item.Type = 2
-			err = service.CreateSupplyWarehousOutOrder(item)
-			//更新采购单
-			service.ModfySupplyWarehouseOut(warehousing_id, orgId)
-		}
-		if errcode == nil {
-			err = service.CreateSupplyWarehousOutOrder(item)
+
+		if item.WarehouseInfoId > 0 {
+			//查询该商品是否来源于采购订单,如果存在则关联， 如果不存在则取消关联
+			_, errcode := service.GetGoodIsSource(warehousing_id, item.ProjectId, orgId)
+
+			if errcode == gorm.ErrRecordNotFound {
+				item.WarehousingId = 0
+				item.WarehouseInfoId = 0
+				item.OrderNumber = ""
+				item.Type = 2
+				err = service.CreateSupplyWarehousOutOrder(item)
+				//更新采购单
+				service.ModfySupplyWarehouseOut(warehousing_id, orgId)
+			}
+			if errcode == nil {
+				err = service.CreateSupplyWarehousOutOrder(item)
+			}
 		}
 
 	}
 	id, _ := this.GetInt64("id")
 	ids := this.GetString("ids")
 	orgId := this.GetAdminUserInfo().CurrentOrgId
+
 	if len(ids) == 0 {
 		out, err := service.GetGoodOrderDetail(id, orgId)
 		list, _ := service.GetSupplyWarehouseOutById(id, orgId)
+		for _, item := range list {
+
+			if item.IsSource == 1 {
+				waresingList, _ := service.GetAllDrugWaresingList(item.ProjectId, orgId)
+				medical, _ := service.GetBaseDrugMedical(item.ProjectId)
+				item.DrugWarehouseInfo = waresingList
+				item.SpBaseDrug = medical
+			}
+			if item.IsSource == 2 {
+				waresingList, _ := service.GetAllGoodWaresingList(item.ProjectId, orgId)
+
+				item.GoodWarehouseInfo = waresingList
+			}
+		}
 		drugList, _ := service.GetSupplyDrugList(orgId)
 		goodList, _ := service.GetSupplyGoodList(orgId)
+		supplyList, _ := service.GetSupplierList(orgId)
 		if err == nil {
 			this.ServeSuccessJSON(map[string]interface{}{
-				"out":      out,
-				"list":     list,
-				"goodList": goodList,
-				"drugList": drugList,
+				"out":        out,
+				"list":       list,
+				"goodList":   goodList,
+				"drugList":   drugList,
+				"supplyList": supplyList,
 			})
 		} else {
 			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 		idArray := strings.Split(ids, ",")
 		out, err := service.GetGoodOrderDetail(id, orgId)
 		list, _ := service.GetSupplyWarehouseOutByIdOne(id, orgId, idArray)
+		for _, item := range list {
+			if item.IsSource == 1 {
+				waresingList, _ := service.GetAllDrugWaresingList(item.ProjectId, orgId)
+				medical, _ := service.GetBaseDrugMedical(item.ProjectId)
+				item.DrugWarehouseInfo = waresingList
+				item.SpBaseDrug = medical
+			}
+			if item.IsSource == 2 {
+				waresingList, _ := service.GetAllGoodWaresingList(item.ProjectId, orgId)
+
+				item.GoodWarehouseInfo = waresingList
+			}
+		}
 		drugList, _ := service.GetSupplyDrugList(orgId)
 		goodList, _ := service.GetSupplyGoodList(orgId)
+		supplyList, _ := service.GetSupplierList(orgId)
 		if err == nil {
 			this.ServeSuccessJSON(map[string]interface{}{
-				"out":      out,
-				"list":     list,
-				"goodList": goodList,
-				"drugList": drugList,
+				"out":        out,
+				"list":       list,
+				"goodList":   goodList,
+				"drugList":   drugList,
+				"supplyList": supplyList,
 			})
 		} else {
 			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 						GoodNumber:              good_number,
 						SupplyManufacturer:      supply_manufacturer,
 						MinPrice:                min_price_float,
+						IsWarehosue:             2,
 					}
 					warehousingOut = append(warehousingOut, &order)
 				}
 		}
 		err = service.CreateSupplyWarehousOutOrder(item)
 	}
+
 	for _, item := range updateWarehout {
-		//查询该商品是否来源于采购订单,如果存在则关联， 如果不存在则取消关联
-		_, errcode := service.GetGoodIsSource(item.WarehousingId, item.ProjectId, orgId)
-		if errcode == gorm.ErrRecordNotFound {
-			item.WarehousingId = 0
-			item.WarehouseInfoId = 0
-			item.Type = 2
-			item.OrderNumber = ""
-			service.UpdateGoodWarehouseOutOrder(item)
-			//更新采购单
-			service.ModfySupplyWarehouseOut(item.WarehousingId, orgId)
-		}
-	}
+		service.UpdateGoodWarehouseOutOrder(item)
+	}
+	//for _, item := range updateWarehout {
+	//	service.UpdateGoodWarehouseOutOrder(item)
+	//	//查询该商品是否来源于采购订单,如果存在则关联， 如果不存在则取消关联
+	//	_, errcode := service.GetGoodIsSource(item.WarehousingId, item.ProjectId, orgId)
+	//	if errcode == gorm.ErrRecordNotFound {
+	//		item.WarehousingId = 0
+	//		item.WarehouseInfoId = 0
+	//		item.Type = 2
+	//		item.OrderNumber = ""
+	//
+	//		//更新采购单
+	//		service.ModfySupplyWarehouseOut(item.WarehousingId, orgId)
+	//	}
+	//}
+	list, _ := service.GetSupplyWarehouseOutById(warehose_out_id, orgId)
 	if err == nil {
 		this.ServeSuccessJSON(map[string]interface{}{
-			"out": out,
+			"out":  out,
+			"list": list,
 		})
 	} else {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 	//获取购货订单的数据
 	purcaseOrder, _ := service.GetAllPurcaseOrderById(id, orgId)
 	//获取购货单的数据
-	goodOrder, err := service.GetAllGoodOrderById(id, orgId)
+	goodOrder, err := service.GetAllGoodOrderByIdSix(id, orgId)
+	fmt.Println("2323232332232323232332", goodOrder)
 	drugList, err := service.GetSupplyDrugList(orgId)
+
 	if err == nil {
 		this.ServeSuccessJSON(map[string]interface{}{
 			"purcaseOrder": purcaseOrder,
 	//获取购货订单的数据
 	purcaseOrder, _ := service.GetAllPurcaseOrderById(warehousing_id, orgId)
 	//获取购货单的数据
-	goodOrder, _ := service.GetAllGoodOrderByIdTwo(warehousing_id, orgId)
+	goodOrder, _ := service.GetAllGoodOrderByIdTwo(id, orgId)
 
 	//查询该购货单是否审核成功
 	detail, _ := service.GetGoodOrderDetail(id, orgId)
 	}
 	//创建入库单
 	errs := service.CreateDrugWarehousingInfoSix(warehouseInfoDetail)
+
+	//改变入库状态
+
 	fmt.Println(errs)
 	for _, items := range drugFlow {
 		drugWarehouseInfo, _ := service.GetLastDrugWarehouseInfo(items.DrugId)
 	service.CreateDrugFlowSix(drugFlow)
 
 	drugList, _ := service.GetSupplyDrugList(orgId)
+
+	for _, items := range goodOrder {
+		service.UpdateWarehouseingById(items.ID)
+	}
 	if err == nil {
 		this.ServeSuccessJSON(map[string]interface{}{
 			"purcaseOrder": purcaseOrder,
 				}
 				supply_count := int64(items["supply_count"].(float64))
 
-				if items["count"] == nil || reflect.TypeOf(items["count"]).String() != "float64" {
+				if items["count"] == nil || reflect.TypeOf(items["count"]).String() != "string" {
 					utils.ErrorLog("count")
 					this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 					return
 				}
-				count := int64(items["count"].(float64))
+				count := items["count"].(string)
 
 				if items["manufacturer_id"] == nil || reflect.TypeOf(items["manufacturer_id"]).String() != "float64" {
 					utils.ErrorLog("manufacturer_id")
 					return
 				}
 				id := int64(items["id"].(float64))
+
+				deposit_rate := items["deposit_rate"].(string)
+
+				deposit_rate_float, _ := strconv.ParseFloat(deposit_rate, 64)
 				cancelOrder := &models.SpSupplierWarehousingCancelOrder{
 					ManufacturerId:            manufacturer_id,
 					OrderNumber:               order_number,
 					ProjectId:                 project_id,
 					GoodNumber:                good_number,
 					IsSource:                  is_source,
-					Count:                     supply_count,
+					Count:                     count,
 					Price:                     price_float,
 					Remark:                    supply_remake,
 					RateOfConcession:          rate_of_concession_float,
 					WarehousingId:             warehousing_id,
 					SourceCount:               count,
 					SupplyWarehouseDetailInfo: id,
+					SupplyCount:               supply_count,
+					DepositRate:               deposit_rate_float,
 				}
 				warehouseCancel = append(warehouseCancel, cancelOrder)
 			}
 	}
 
 	for _, item := range warehouseCancel {
+		if item.SupplyWarehouseDetailInfo > 0 {
+			item.Type = 1
+		} else {
+			item.Type = 2
+		}
 		service.CreateCancelReturnOrder(item)
 		//查询该商品在退库单中是否存在
 		_, errcodes := service.GetSupplyWarehouseOutIsExsit(item.WarehouseOutId, item.ProjectId, orgId)
 		//如果不存在则情况退库单的关联信息
 		if errcodes == gorm.ErrRecordNotFound {
-			service.ModfySupplyCancel(item.WarehouseCancelId, orgId)
+			service.ModfySupplyCancel(item.WarehouseCancelId, orgId, item.ProjectId)
 
 		}
 
 	baseList, _ := service.GetSupplyDrugList(orgId)
 
 	goodList, _ := service.GetSupplyGoodList(orgId)
+	supplyList, _ := service.GetSupplierList(orgId)
 	if err == nil {
 		this.ServeSuccessJSON(map[string]interface{}{
 			"cancelDetail":      detail,
 			"orderCancelDetail": orderDetail,
 			"drugList":          baseList,
 			"goodList":          goodList,
+			"supplyList":        supplyList,
 		})
 	} else {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 				}
 				supply_manufacturer := items["supply_manufacturer"].(string)
 
+				if items["count"] == nil || reflect.TypeOf(items["count"]).String() != "string" {
+					utils.ErrorLog("count")
+					this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+					return
+				}
+				count := items["count"].(string)
+
+				if items["deposit_rate"] == nil || reflect.TypeOf(items["deposit_rate"]).String() != "string" {
+					utils.ErrorLog("deposit_rate")
+					this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+					return
+				}
+				deposit_rate := items["deposit_rate"].(string)
+				deposit_rate_float, _ := strconv.ParseFloat(deposit_rate, 64)
 				if id > 0 {
 					cancelOrder := &models.SpSupplierWarehousingCancelOrder{
 						ID:                      id,
 						ProjectId:               project_id,
 						GoodNumber:              good_number,
 						IsSource:                is_source,
-						Count:                   supply_count,
+						Count:                   count,
 						Price:                   price_float,
 						Remark:                  supply_remake,
 						RateOfConcession:        rate_of_concession_float,
 						Name:                    name,
 						SupplyUnit:              supply_unit,
 						SupplyLicenseNumber:     supply_license_number,
+						SupplyCount:             supply_count,
+						DepositRate:             deposit_rate_float,
 					}
 					updateWarehouseCancel = append(updateWarehouseCancel, cancelOrder)
 				}
 						ProjectId:               project_id,
 						GoodNumber:              good_number,
 						IsSource:                is_source,
-						Count:                   supply_count,
+						Count:                   count,
 						Price:                   price_float,
 						Remark:                  supply_remake,
 						RateOfConcession:        rate_of_concession_float,
 						Status:                  1,
 						Mtime:                   0,
 						WarehouseCancelId:       warehouse_out_id,
-						Type:                    1,
+						Type:                    2,
 						ReturnNumber:            return_number,
 						WarehouseOutId:          warehouse_out_id,
 						SupplySpecificationName: supply_specification_name,
 						Name:                    name,
 						SupplyUnit:              supply_unit,
 						SupplyLicenseNumber:     supply_license_number,
+						SupplyCount:             supply_count,
+						DepositRate:             deposit_rate_float,
 					}
 					warehouseCancel = append(warehouseCancel, cancelOrder)
 				}
 
 		if len(updateWarehouseCancel) > 0 {
 			for _, item := range updateWarehouseCancel {
+
 				service.UpdateWarehouseCancelOrder(item)
 			}
 		}
 		if len(warehouseCancel) > 0 {
 			for _, item := range warehouseCancel {
+
 				service.CreateCancelReturnOrder(item)
 			}
 		}
 func (this *SupplyOrderApiController) ModefyGoodOrder() {
 
 	id, _ := this.GetInt64("id")
+	warehousing_id, _ := this.GetInt64("warehousing_id")
 	orgId := this.GetAdminUserInfo().CurrentOrgId
 
-	//获取购货订单的数据
-	purcaseOrder, _ := service.GetAllPurcaseOrderById(id, orgId)
 	//获取购货单的数据
 	goodOrder, _ := service.GetAllGoodOrderById(id, orgId)
+
+	//判断该订单是否有出库记录
+	for _, it := range goodOrder {
+
+		if it.IsSource == 1 {
+			out, _ := service.GetDrugWarehosueInfoByWarehousingId(it.ProjectId, id, orgId)
+
+			if out.ID > 0 {
+				this.ServeSuccessJSON(map[string]interface{}{
+					"cancelList":   "",
+					"purcaseOrder": "",
+					"goodOrder":    "",
+					"drugList":     "",
+					"msg":          3,
+				})
+				return
+			}
+		}
+		if it.IsSource == 2 {
+			fmt.Println("hh23323233232232332232323232332", it.WarehouseOutId)
+			out, _ := service.GetGoodWarehouseInfoByWarehousingId(it.ProjectId, id, orgId)
+			if out.ID > 0 {
+				this.ServeSuccessJSON(map[string]interface{}{
+					"cancelList":   "",
+					"purcaseOrder": "",
+					"goodOrder":    "",
+					"drugList":     "",
+					"msg":          3,
+				})
+				return
+			}
+		}
+	}
+
+	//获取购货订单的数据
+	purcaseOrder, _ := service.GetAllPurcaseOrderById(warehousing_id, orgId)
+
 	drugList, _ := service.GetSupplyDrugList(orgId)
+
 	//获取已有关联的退货单
 	cancelList, _ := service.GetSupplyCancelWarehouse(id, orgId)
 	//查询是否存在退货单
 		}
 		err := service.UpdateSupplyGoodOrder(id, out)
 
+		for _, its := range goodOrder {
+			//改变采购单状态
+			service.UpdateSupplyOrderListById(its.ID)
+		}
+
 		//查询该订单不是采购入库的数据
 		list, _ := service.GetDrugSupplyWarehousingById(id, orgId)
 		if len(list) == 0 {
 	//获取退库单详情
 	list, _ := service.GetSupplyCancelOrderDetail(id, orgId)
 	for _, item := range list {
-
+		fmt.Println("itme.233232323232323232323232323232232332", item.Type)
 		var total_count int64
 		var prescribing_number_total int64
 		//药品
 		if item.IsSource == 1 {
 
 			//获取药品库存
-			info, _ := service.GetDrugTotalCountTwenTy(item.ProjectId, item.SupplyWarehouseDetailInfo)
+			info, _ := service.GetDrugTotalCountTwenTy(item.ProjectId, item.SupplyWarehouseDetailInfo, item.Type)
 
 			for _, it := range info {
-				total_count += it.StockMaxNumber*it.MinNumber + it.StockMinNumber
+
+				if it.MaxUnit == it.CountUnit {
+					it.StockMaxNumber = it.StockMaxNumber * it.MinNumber
+
+				}
+				total_count += (it.StockMaxNumber + it.StockMinNumber)
 			}
+
 			//查询改药品信息
 			medical, _ := service.GetBaseDrugMedical(item.ProjectId)
 
 			//判断单位是否相等
 			if medical.MaxUnit == item.SupplyUnit {
 				//转化为最小单位
-				prescribing_number_total = item.Count * medical.MinNumber
+				prescribing_number_total = item.SupplyCount * medical.MinNumber
 			}
 			if medical.MinUnit == item.SupplyUnit {
-				prescribing_number_total = item.Count
+				prescribing_number_total = item.SupplyCount
 			}
 
+			fmt.Println("hhhhhadf dafsdfsdfddddfdf", prescribing_number_total)
 			//判断单位
 			if total_count == 0 {
 				goodObj, _ := service.GetDrugByGoodId(item.ProjectId)
 			number, _ := strconv.ParseInt(warehousing_out_order, 10, 64)
 			number = number + total
 			warehousing_out_order = "YPCKD" + strconv.FormatInt(number, 10)
-			operation_time := time.Now().Unix()
+			//operation_time := time.Now().Unix()
 			creater := this.GetAdminUserInfo().AdminUser.Id
 			recordDateStr := time.Now().Format("2006-01-02")
 			recordDate, _ := utils.ParseTimeStringToTime("2006-01-02", recordDateStr)
 			record_date := recordDate.Unix()
 			warehouseOut := models.DrugWarehouseOut{
 				WarehouseOutOrderNumber: warehousing_out_order,
-				OperationTime:           operation_time,
+				OperationTime:           record_date,
 				OrgId:                   orgId,
 				Creater:                 creater,
 				Ctime:                   ctime,
 				WarehouseOutOrderNumber: lastDrug.WarehouseOutOrderNumber,
 				WarehouseOutId:          lastDrug.ID,
 				DrugId:                  item.ProjectId,
-				Count:                   item.Count,
+				Count:                   item.SupplyCount,
 				Price:                   item.Price,
 				Status:                  1,
 				Ctime:                   ctime,
 				WarehouseInfoId:         0,
 				SupplyCancelOutId:       id,
 				SupplyWarehouseId:       warehouse_out_id,
+				SysRecordTime:           record_date,
+				IsSource:                item.Type,
 			}
 
 			drup, _ := service.FindBaseDrugLibRecord(orgId, item.ProjectId)
 			if drup.ID > 0 {
-				prescribingNumber := item.Count
-				service.AutoDrugDeliverInfoNight(orgId, prescribingNumber, &warehouseOut, &drup, warehouseOutInfo)
+				prescribingNumber := item.SupplyCount
+				service.AutoDrugDeliverInfoNight(orgId, prescribingNumber, &warehouseOut, &drup, warehouseOutInfo, warehouse_out_id, id)
 			}
 
 			//修改原数据
-			orderInfo := models.SpSupplierWarehousingCancelOrder{
-				SourceCount: item.Count - item.SourceCount,
-			}
-			service.UpdateSupplyCancelById(item.ID, orderInfo)
+			/*	orderInfo := models.SpSupplierWarehousingCancelOrder{
+					SourceCount: item.SupplyCount - item.SourceCount,
+				}
+				service.UpdateSupplyCancelById(item.ID, orderInfo)*/
 		}
 
 		//耗材
 		if item.IsSource == 2 {
 			// 查询该耗材是否有库存
-			warehouseOne, _ := service.FindWarehousingInfoTwenTy(item.ProjectId, item.SupplyWarehouseDetailInfo)
+			warehouseOne, _ := service.FindWarehousingInfoTwenTy(item.ProjectId, item.SupplyWarehouseDetailInfo, item.Type)
 
 			// 如果出库数量大于该批次剩余库存数量
-			if item.Count > warehouseOne.StockCount {
+			if item.SupplyCount > warehouseOne.StockCount {
 
 				goodObj, _ := service.GetGoodInformationByGoodId(item.ProjectId)
 				this.ServeSuccessJSON(map[string]interface{}{
 			number, _ := strconv.ParseInt(warehousing_out_order, 10, 64)
 			number = number + total
 			warehousing_out_order = "CKD" + strconv.FormatInt(number, 10)
-			operation_time := time.Now().Unix()
+			//operation_time := time.Now().Unix()
 			creater := this.GetAdminUserInfo().AdminUser.Id
 			recordDateStr := time.Now().Format("2006-01-02")
 			recordDate, _ := utils.ParseTimeStringToTime("2006-01-02", recordDateStr)
 			record_date := recordDate.Unix()
 			warehouseOut := models.WarehouseOut{
 				WarehouseOutOrderNumber: warehousing_out_order,
-				OperationTime:           operation_time,
+				OperationTime:           record_date,
 				OrgId:                   orgId,
 				Creater:                 creater,
 				Ctime:                   ctime,
 				IsSys:                   0,
 			}
 			//查询是否生成出库单
-			_, errcodes := service.FindStockOutByIsSys(orgId, 0, operation_time)
+			_, errcodes := service.FindStockOutByIsSys(orgId, 0, record_date)
 			if errcodes == gorm.ErrRecordNotFound {
 				service.AddSigleWarehouseOut(&warehouseOut)
 			}
 			outWarehouse, _ := service.GetlastWarehouseOutById(orgId, record_date)
+			fmt.Println("232332322332232323", outWarehouse)
 			goodObj, _ := service.GetGoodInformationByGoodId(item.ProjectId)
 			info := &models.WarehouseOutInfo{
 				WarehouseOutOrderNumber: outWarehouse.WarehouseOutOrderNumber,
 				WarehouseInfotId:        0,
 				GoodId:                  item.ProjectId,
 				GoodTypeId:              goodObj.GoodTypeId,
-				Count:                   item.Count,
+				Count:                   item.SupplyCount,
 				Price:                   item.Price,
 				TotalPrice:              0,
 				ProductDate:             item.SupplyProductDate,
 				SupplyCancelOutId:       id,
 				OrgId:                   orgId,
 				SupplyWarehouseId:       warehouse_out_id,
+				IsSource:                item.Type,
 			}
 			//出库逻辑
-			parseDateErr := service.ConsumablesDeliveryNight(orgId, record_date, info, &warehouseOut, item.Count, creater, warehouse_out_id, id)
+			parseDateErr := service.ConsumablesDeliveryNight(orgId, record_date, info, &warehouseOut, item.SupplyCount, creater, warehouse_out_id, id)
 
 			if parseDateErr != nil {
 				utils.ErrorLog(parseDateErr.Error())
 				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateStockInFail)
 				return
 			}
-			//更改原退库数据
-			order := models.SpSupplierWarehousingCancelOrder{
-				SourceCount: item.SourceCount - item.Count,
-			}
-			service.UpdateSupplyCancelById(item.ID, order)
 		}
 	}
 	cancel := models.SpSupplierWarehouseCancel{
 		CheckTime: record_date,
 	}
 	err := service.CheckReturnOrder(id, orgId, cancel)
-
+	fmt.Println("3232233232322332232323232323322332232323232323")
 	if err == nil {
 		this.ServeSuccessJSON(map[string]interface{}{
 			"msg":        "1",
 func (this *SupplyOrderApiController) ModefyReturnOrder() {
 	id, _ := this.GetInt64("id")
 	err := service.ModefyReturnOrder(id)
+
+	//获取退库单据日期
+	cancel, _ := service.GetReturnOrderById(id)
 	orgId := this.GetAdminUserInfo().CurrentOrgId
 	if err == nil {
 		//获取退库单详情
 				if item.SupplyUnit == base.MaxUnit {
 					//退库
 					drugInfo := models.DrugWarehouseInfo{
-						StockMaxNumber: item.Count,
+						StockMaxNumber: item.SupplyCount,
 					}
 					service.UpdateDrugWasehousring(item.ProjectId, item.SupplyWarehouseDetailInfo, drugInfo)
 				}
-				if item.SupplyType == base.MinUnit {
+
+				if item.SupplyType == base.MinUnit && base.MaxUnit != base.MinUnit {
 					drugInfo := models.DrugWarehouseInfo{
-						StockMinNumber: item.Count,
+						StockMinNumber: item.SupplyCount,
 					}
 					service.UpdateDrugWasehousringOne(item.ProjectId, item.SupplyWarehouseDetailInfo, drugInfo)
 				}
+
 				//删除流水
 				service.DeleteDrugWarehouseOutNight(item.ProjectId, item.WarehouseCancelId)
+				//查询出库订单
+				drugOut, _ := service.GetDrugWarehouseByDate(cancel.RecordDate, orgId)
+
+				drugOutList, _ := service.GetDrugWarehouseByIdList(drugOut.ID, orgId)
+				if len(drugOutList) == 0 {
+					service.UpdateDrugWarehouseById(drugOut.ID)
+				}
 			}
 			//耗材
 			if item.IsSource == 2 {
-
+				fmt.Println("item2332322323232332", item.SupplyCount)
 				//退库
 				info := models.WarehousingInfo{
-					StockCount: item.Count,
+					StockCount: item.SupplyCount,
 				}
+
 				//更改库存
 				err := service.UpdateWarehousingInfoById(item.ProjectId, item.SupplyWarehouseDetailInfo, info)
-				//删除出库记录
-				service.DeleteGoodWarehouseOut(item.ProjectId, item.WarehouseCancelId)
 				fmt.Println(err)
+				//删除出库记录
+				service.DeleteGoodWarehouseOut(item.ProjectId, item.WarehouseCancelId, orgId)
+
+				//查询今日的出库单是
+				out, _ := service.GetWarehouseOutByDate(cancel.RecordDate, orgId)
+				warehouseOutList, _ := service.GetWarehouseOutById(out.ID, orgId)
+				if len(warehouseOutList) == 0 {
+					//删除出库单
+					service.DeleteWarehouseOutById(out.ID)
+				}
+
 			}
 		}
 	} else {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 	}
 }
+
+func (this *SupplyOrderApiController) GetGoodOrderDetailList() {
+	id, _ := this.GetInt64("id")
+	ids := this.GetString("ids")
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+
+	if len(ids) == 0 {
+		out, err := service.GetGoodOrderDetail(id, orgId)
+		list, _ := service.GetSupplyWarehouseOutById(id, orgId)
+		for _, item := range list {
+
+			if item.IsSource == 1 {
+				waresingList, _ := service.GetAllDrugWaresingList(item.ProjectId, orgId)
+				medical, _ := service.GetBaseDrugMedical(item.ProjectId)
+				item.DrugWarehouseInfo = waresingList
+				item.SpBaseDrug = medical
+			}
+			if item.IsSource == 2 {
+				waresingList, _ := service.GetAllGoodWaresingList(item.ProjectId, orgId)
+
+				item.GoodWarehouseInfo = waresingList
+			}
+		}
+		drugList, _ := service.GetSupplyDrugList(orgId)
+		goodList, _ := service.GetSupplyGoodList(orgId)
+		supplyList, _ := service.GetSupplierList(orgId)
+		if err == nil {
+			this.ServeSuccessJSON(map[string]interface{}{
+				"out":        out,
+				"list":       list,
+				"goodList":   goodList,
+				"drugList":   drugList,
+				"supplyList": supplyList,
+			})
+		} else {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		}
+	}
+	if len(ids) > 0 {
+		idArray := strings.Split(ids, ",")
+		out, err := service.GetGoodOrderDetail(id, orgId)
+		list, _ := service.GetSupplyWarehouseOutByIdOne(id, orgId, idArray)
+		for _, item := range list {
+			if item.IsSource == 1 {
+				waresingList, _ := service.GetAllDrugWaresingList(item.ProjectId, orgId)
+				medical, _ := service.GetBaseDrugMedical(item.ProjectId)
+				item.DrugWarehouseInfo = waresingList
+				item.SpBaseDrug = medical
+			}
+			if item.IsSource == 2 {
+				waresingList, _ := service.GetAllGoodWaresingList(item.ProjectId, orgId)
+
+				item.GoodWarehouseInfo = waresingList
+			}
+		}
+		drugList, _ := service.GetSupplyDrugList(orgId)
+		goodList, _ := service.GetSupplyGoodList(orgId)
+		supplyList, _ := service.GetSupplierList(orgId)
+		if err == nil {
+			this.ServeSuccessJSON(map[string]interface{}{
+				"out":        out,
+				"list":       list,
+				"goodList":   goodList,
+				"drugList":   drugList,
+				"supplyList": supplyList,
+			})
+		} else {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		}
+	}
+}

models/dialysis.go

 	EstimatedFoodIntake            string  `gorm:"column:estimated_food_intake" json:"estimated_food_intake" form:"estimated_food_intake"`
 	BloodPressureDuringDialysis    string  `gorm:"column:blood_pressure_during_dialysis" json:"blood_pressure_during_dialysis" form:"blood_pressure_during_dialysis"`
 	UreaBefor                      string  `gorm:"column:urea_befor" json:"urea_befor" form:"urea_befor"`
+	Suction                        string  `gorm:"column:suction" json:"suction" form:"suction"`
 }
 
 func (PredialysisEvaluation) TableName() string {
 	Fallrisk                        int64   `gorm:"column:fallrisk" json:"fallrisk" form:"fallrisk"`
 	MachineRun                      string  `gorm:"column:machine_run" json:"machine_run" form:"machine_run"`
 	AfterUrea                       string  `gorm:"column:after_urea" json:"after_urea" form:"after_urea"`
+	PipCoagulation                  string  `gorm:"column:pip_coagulation" json:"pip_coagulation" form:"pip_coagulation"`
 }
 
 func (AssessmentAfterDislysis) TableName() string {
 	UreaMonitoring              float64 `gorm:"column:urea_monitoring" json:"urea_monitoring" form:"urea_monitoring"`
 	BloodThickness              float64 `gorm:"column:blood_thickness" json:"blood_thickness" form:"blood_thickness"`
 	BloodMonitor                float64 `gorm:"column:blood_monitor" json:"blood_monitor" form:"blood_monitor"`
+	HeparinAmount               float64 `gorm:"column:heparin_amount" json:"heparin_amount" form:"heparin_amount"`
+	Dehydration                 float64 `gorm:"column:dehydration" json:"dehydration" form:"dehydration"`
 }
 
 func (MonitoringRecord) TableName() string {

models/drug_stock.go

 	AdviceId                int64   `gorm:"column:advice_id" json:"advice_id" form:"advice_id"`
 	SupplyCancelOutId       int64   `gorm:"column:supply_cancel_out_id" json:"supply_cancel_out_id" form:"supply_cancel_out_id"`
 	SupplyWarehouseId       int64   `gorm:"column:supply_warehouse_id" json:"supply_warehouse_id" form:"supply_warehouse_id"`
+	IsSource                int64   `gorm:"column:is_source" json:"is_source" form:"is_source"`
 }
 
 func (DrugWarehouseOutInfo) TableName() string {

models/good_models.go

 	GoodSotckInfo               []*GoodSotckInfo     `gorm:"ForeignKey:GoodId;AssociationForeignKey:ID" json:"good_stock_in"`
 	IsUser                      int64                `gorm:"column:is_user" json:"is_user" form:"is_user"`
 	Number                      string               `gorm:"column:number" json:"number" form:"number"`
+	IsWarehouse                 int64                `gorm:"column:is_warehouse" json:"is_warehouse" form:"is_warehouse"`
 }
 
 func (GoodInfo) TableName() string {

models/secondary_models.go

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

models/self_drug_models.go

 }
 
 type XtDrugWarehouseInfo 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"`
-	StockMaxNumber    int64      `gorm:"column:stock_max_number" json:"stock_max_number"`
-	StockMinNumber    int64      `gorm:"column:stock_min_number" json:"stock_min_number"`
-	BatchNumber       string     `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
-	MinUnit           string     `gorm:"column:min_unit" json:"max_unit" form:"min_unit"`
-	MaxUnit           string     `gorm:"column:max_unit" json:"max_unit" form:"max_unit"`
-	WarehousingInfoId int64      `gorm:"column:warehousing_info_id" json:"warehousing_info_id" form:"warehousing_info_id"`
-	XtBaseDrug        XtBaseDrug `gorm:"ForeignKey:ID;AssociationForeignKey:DrugId" `
+	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"`
+	StockMaxNumber            int64      `gorm:"column:stock_max_number" json:"stock_max_number"`
+	StockMinNumber            int64      `gorm:"column:stock_min_number" json:"stock_min_number"`
+	BatchNumber               string     `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
+	MinUnit                   string     `gorm:"column:min_unit" json:"max_unit" form:"min_unit"`
+	MaxUnit                   string     `gorm:"column:max_unit" json:"max_unit" form:"max_unit"`
+	WarehousingInfoId         int64      `gorm:"column:warehousing_info_id" json:"warehousing_info_id" form:"warehousing_info_id"`
+	XtBaseDrug                XtBaseDrug `gorm:"ForeignKey:ID;AssociationForeignKey:DrugId" `
+	SupplyWarehouseId         int64      `gorm:"column:supply_warehouse_id" json:"supply_warehouse_id" form:"supply_warehouse_id"`
+	SupplyWarehouseDetailInfo int64      `gorm:"column:supply_warehouse_detail_info" json:"supply_warehouse_detail_info" form:"supply_warehouse_detail_info"`
 }
 
 func (XtDrugWarehouseInfo) TableName() string {

models/stock_models.go

 	ProjectId               int64        `gorm:"column:project_id" json:"project_id" form:"project_id"`
 	SupplyCancelOutId       int64        `gorm:"column:supply_cancel_out_id" json:"supply_cancel_out_id" form:"supply_cancel_out_id"`
 	SupplyWarehouseId       int64        `gorm:"column:supply_warehouse_id" json:"supply_warehouse_id" form:"supply_warehouse_id"`
+	IsSource                int64        `gorm:"column:is_source" json:"is_source" form:"is_source"`
 }
 
 func (WarehouseOutInfo) TableName() string {
 	PackingUnit                 string  `gorm:"column:packing_unit" json:"packing_unit" form:"packing_unit"`
 	LicenseNumber               string  `gorm:"column:license_number" json:"license_number" form:"license_number"`
 	SocialSecurityDirectoryCode string  `gorm:"column:social_security_directory_code" json:"social_security_directory_code" form:"social_security_directory_code"`
+	SupplyCancelOutId           int64   `gorm:"column:supply_cancel_out_id" json:"supply_cancel_out_id" form:"supply_cancel_out_id"`
+	SupplyWarehouseId           int64   `gorm:"column:supply_warehouse_id" json:"supply_warehouse_id" form:"supply_warehouse_id"`
 }
 
 type WarehouseOutInfoTwo struct {

models/supply.models.go

 }
 
 type SpWarehouseInfo struct {
-	ID         int64 `gorm:"column:id" json:"id" form:"id"`
-	GoodId     int64 `gorm:"column:good_id" json:"good_id" form:"good_id"`
-	StockCount int64 `gorm:"column:stock_count" json:"stock_count" form:"stock_count"`
-	Status     int64 `gorm:"column:status" json:"status" form:"status"`
-	OrgId      int64 `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	ID                        int64 `gorm:"column:id" json:"id" form:"id"`
+	GoodId                    int64 `gorm:"column:good_id" json:"good_id" form:"good_id"`
+	StockCount                int64 `gorm:"column:stock_count" json:"stock_count" form:"stock_count"`
+	Status                    int64 `gorm:"column:status" json:"status" form:"status"`
+	OrgId                     int64 `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	SupplyWarehouseDetailInfo int64 `gorm:"column:supply_warehouse_detail_info" json:"supply_warehouse_detail_info" form:"supply_warehouse_detail_info"`
+	SupplyWarehouseId         int64 `gorm:"column:supply_warehouse_id" json:"supply_warehouse_id" form:"supply_warehouse_id"`
 }
 
 func (SpWarehouseInfo) TableName() string {
 }
 
 type SpDrugWarehouseInfo struct {
-	ID             int64  `gorm:"column:id" json:"id" form:"id"`
-	DrugId         int64  `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
-	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"`
-	BatchNumber    string `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
-	Status         int64  `gorm:"column:status" json:"status" form:"status"`
-	OrgId          int64  `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	ID                        int64  `gorm:"column:id" json:"id" form:"id"`
+	DrugId                    int64  `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
+	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"`
+	BatchNumber               string `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
+	Status                    int64  `gorm:"column:status" json:"status" form:"status"`
+	OrgId                     int64  `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	SupplyWarehouseDetailInfo int64  `gorm:"column:supply_warehouse_detail_info" json:"supply_warehouse_detail_info" form:"supply_warehouse_detail_info"`
+	SupplyWarehouseId         int64  `gorm:"column:supply_warehouse_id" json:"supply_warehouse_id" form:"supply_warehouse_id"`
 }
 
 func (SpDrugWarehouseInfo) TableName() string {
 }
 
 type SpSupplierWarehousingOutOrder struct {
-	ID                      int64   `gorm:"column:id" json:"id" form:"id"`
-	OrderNumber             string  `gorm:"column:order_number" json:"order_number" form:"order_number"`
-	ProjectId               int64   `gorm:"column:project_id" json:"project_id" form:"project_id"`
-	IsSource                int64   `gorm:"column:is_source" json:"is_source" form:"is_source"`
-	Count                   int64   `gorm:"column:count" json:"count" form:"count"`
-	Price                   float64 `gorm:"column:price" json:"price" form:"price"`
-	Amount                  float64 `gorm:"column:amount" json:"amount" form:"amount"`
-	Remark                  string  `gorm:"column:remark" json:"remark" form:"remark"`
-	IsCheck                 int64   `gorm:"column:is_check" json:"is_check" form:"is_check"`
-	UserOrgId               int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
-	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"`
-	WarehouseOutId          int64   `gorm:"column:warehouse_out_id" json:"warehouse_out_id" form:"warehouse_out_id"`
-	Type                    int64   `gorm:"column:type" json:"type" form:"type"`
-	SupplyBatchNumber       string  `gorm:"column:supply_batch_number" json:"supply_batch_number" form:"supply_batch_number"`
-	SupplyProductDate       int64   `gorm:"column:supply_product_date" json:"supply_product_date" form:"supply_product_date"`
-	SupplyExpiryDate        int64   `gorm:"column:supply_expiry_date" json:"supply_expiry_date" form:"supply_expiry_date"`
-	WarehousingId           int64   `gorm:"column:warehousing_id" json:"warehousing_id" form:"warehousing_id"`
-	WarehouseInfoId         int64   `gorm:"column:warehouse_info_id" json:"warehouse_info_id" form:"warehouse_info_id"`
-	SupplyType              string  `gorm:"column:supply_type" json:"supply_type" form:"supply_type"`
-	SupplySpecificationName string  `gorm:"column:supply_specification_name" json:"supply_specification_name" form:"supply_specification_name"`
-	SupplyTotal             string  `gorm:"column:supply_total" json:"supply_total" form:"supply_total"`
-	SupplyManufacturer      string  `gorm:"column:supply_manufacturer" json:"supply_manufacturer" form:"supply_manufacturer"`
-	Name                    string  `gorm:"column:name" json:"name" form:"name"`
-	SupplyUnit              string  `gorm:"column:supply_unit" json:"supply_unit" form:"supply_unit"`
-	ManufacturerId          int64   `gorm:"column:manufacturer_id" json:"manufacturer_id" form:"manufacturer_id"`
-	SupplyLicenseNumber     string  `gorm:"column:supply_license_number" json:"supply_license_number" form:"supply_license_number"`
-	GoodNumber              string  `gorm:"column:good_number" json:"good_number" form:"good_number"`
-	MinPrice                float64 `gorm:"column:min_price" json:"min_price" form:"min_price"`
+	ID                      int64                  `gorm:"column:id" json:"id" form:"id"`
+	OrderNumber             string                 `gorm:"column:order_number" json:"order_number" form:"order_number"`
+	ProjectId               int64                  `gorm:"column:project_id" json:"project_id" form:"project_id"`
+	IsSource                int64                  `gorm:"column:is_source" json:"is_source" form:"is_source"`
+	Count                   int64                  `gorm:"column:count" json:"count" form:"count"`
+	Price                   float64                `gorm:"column:price" json:"price" form:"price"`
+	Amount                  float64                `gorm:"column:amount" json:"amount" form:"amount"`
+	Remark                  string                 `gorm:"column:remark" json:"remark" form:"remark"`
+	IsCheck                 int64                  `gorm:"column:is_check" json:"is_check" form:"is_check"`
+	UserOrgId               int64                  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	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"`
+	WarehouseOutId          int64                  `gorm:"column:warehouse_out_id" json:"warehouse_out_id" form:"warehouse_out_id"`
+	Type                    int64                  `gorm:"column:type" json:"type" form:"type"`
+	SupplyBatchNumber       string                 `gorm:"column:supply_batch_number" json:"supply_batch_number" form:"supply_batch_number"`
+	SupplyProductDate       int64                  `gorm:"column:supply_product_date" json:"supply_product_date" form:"supply_product_date"`
+	SupplyExpiryDate        int64                  `gorm:"column:supply_expiry_date" json:"supply_expiry_date" form:"supply_expiry_date"`
+	WarehousingId           int64                  `gorm:"column:warehousing_id" json:"warehousing_id" form:"warehousing_id"`
+	WarehouseInfoId         int64                  `gorm:"column:warehouse_info_id" json:"warehouse_info_id" form:"warehouse_info_id"`
+	SupplyType              string                 `gorm:"column:supply_type" json:"supply_type" form:"supply_type"`
+	SupplySpecificationName string                 `gorm:"column:supply_specification_name" json:"supply_specification_name" form:"supply_specification_name"`
+	SupplyTotal             string                 `gorm:"column:supply_total" json:"supply_total" form:"supply_total"`
+	SupplyManufacturer      string                 `gorm:"column:supply_manufacturer" json:"supply_manufacturer" form:"supply_manufacturer"`
+	Name                    string                 `gorm:"column:name" json:"name" form:"name"`
+	SupplyUnit              string                 `gorm:"column:supply_unit" json:"supply_unit" form:"supply_unit"`
+	ManufacturerId          int64                  `gorm:"column:manufacturer_id" json:"manufacturer_id" form:"manufacturer_id"`
+	SupplyLicenseNumber     string                 `gorm:"column:supply_license_number" json:"supply_license_number" form:"supply_license_number"`
+	GoodNumber              string                 `gorm:"column:good_number" json:"good_number" form:"good_number"`
+	MinPrice                float64                `gorm:"column:min_price" json:"min_price" form:"min_price"`
+	IsWarehosue             int64                  `gorm:"column:is_warehouse" json:"is_warehouse" form:"is_warehouse"`
+	GoodWarehouseInfo       []*SpWarehouseInfo     `gorm:"ForeignKey:ProjectId;AssociationForeignKey:GoodId" json:"good_warehouse_info"`
+	DrugWarehouseInfo       []*SpDrugWarehouseInfo `gorm:"ForeignKey:ProjectId;AssociationForeignKey:DrugId" json:"drug_warehouse_info"`
+	SpBaseDrug              XtBaseDrug             `gorm:"ForeignKey:ProjectId;AssociationForeignKey:ID" json:"drug"`
 }
 
 func (SpSupplierWarehousingOutOrder) TableName() string {
 }
 
 type SpSupplierWarehouseOut struct {
-	ID               int64   `gorm:"column:id" json:"id" form:"id"`
-	Number           string  `gorm:"column:number" json:"number" form:"number"`
-	UserOrgId        int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
-	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"`
-	RecordDate       int64   `gorm:"column:record_date" json:"record_date" form:"record_date"`
-	IsCheck          int64   `gorm:"column:is_check" json:"is_check" form:"is_check"`
-	WarehousingId    int64   `gorm:"column:warehousing_id" json:"warehousing_id" form:"warehousing_id"`
-	GoodNumber       string  `gorm:"column:good_number" json:"good_number" form:"good_number"`
-	Arrearage        float64 `gorm:"column:arrearage" json:"arrearage" form:"arrearage"`
-	Payment          float64 `gorm:"column:payment" json:"payment" form:"payment"`
-	RateOfConcession float64 `gorm:"column:rate_of_concession" json:"rate_of_concession" form:"rate_of_concession"`
-	DiscountAmount   float64 `gorm:"column:discount_amount" json:"discount_amount" form:"discount_amount"`
-	DocumentDate     int64   `gorm:"column:document_date" json:"document_date" form:"document_date"`
-	SupplierId       int64   `gorm:"column:supplier_id" json:"supplier_id" form:"supplier_id"`
-	Checker          int64   `gorm:"column:checker" json:"checker" form:"checker"`
-	CheckTime        int64   `gorm:"column:check_time" json:"check_time" form:"check_time"`
-	ReturnRemake     string  `gorm:"column:return_remake" json:"return_remake" form:"return_remake"`
+	ID                            int64                            `gorm:"column:id" json:"id" form:"id"`
+	Number                        string                           `gorm:"column:number" json:"number" form:"number"`
+	UserOrgId                     int64                            `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	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"`
+	RecordDate                    int64                            `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	IsCheck                       int64                            `gorm:"column:is_check" json:"is_check" form:"is_check"`
+	WarehousingId                 int64                            `gorm:"column:warehousing_id" json:"warehousing_id" form:"warehousing_id"`
+	GoodNumber                    string                           `gorm:"column:good_number" json:"good_number" form:"good_number"`
+	Arrearage                     float64                          `gorm:"column:arrearage" json:"arrearage" form:"arrearage"`
+	Payment                       float64                          `gorm:"column:payment" json:"payment" form:"payment"`
+	RateOfConcession              float64                          `gorm:"column:rate_of_concession" json:"rate_of_concession" form:"rate_of_concession"`
+	DiscountAmount                float64                          `gorm:"column:discount_amount" json:"discount_amount" form:"discount_amount"`
+	DocumentDate                  int64                            `gorm:"column:document_date" json:"document_date" form:"document_date"`
+	SupplierId                    int64                            `gorm:"column:supplier_id" json:"supplier_id" form:"supplier_id"`
+	Checker                       int64                            `gorm:"column:checker" json:"checker" form:"checker"`
+	CheckTime                     int64                            `gorm:"column:check_time" json:"check_time" form:"check_time"`
+	ReturnRemake                  string                           `gorm:"column:return_remake" json:"return_remake" form:"return_remake"`
+	SpSupplierWarehousingOutOrder []*SpSupplierWarehousingOutOrder `gorm:"ForeignKey:warehouse_out_id;AssociationForeignKey:ID" json:"order"`
 }
 
 func (SpSupplierWarehouseOut) TableName() string {
 }
 
 type VSpSupplierWarehousingOutOrder struct {
-	ID          int64  `gorm:"column:id" json:"id" form:"id"`
-	OrderNumber string `gorm:"column:order_number" json:"order_number" form:"order_number"`
-	ProjectId   int64  `gorm:"column:project_id" json:"project_id" form:"project_id"`
-	Count       int64  `gorm:"column:count" json:"count" form:"count"`
-	Status      int64  `gorm:"column:status" json:"status" form:"status"`
-	SupplyUnit  string `gorm:"column:supply_unit" json:"supply_unit" form:"supply_unit"`
-	IsSource    int64  `gorm:"column:is_source" json:"is_source" form:"is_source"`
+	ID             int64  `gorm:"column:id" json:"id" form:"id"`
+	OrderNumber    string `gorm:"column:order_number" json:"order_number" form:"order_number"`
+	ProjectId      int64  `gorm:"column:project_id" json:"project_id" form:"project_id"`
+	Count          int64  `gorm:"column:count" json:"count" form:"count"`
+	Status         int64  `gorm:"column:status" json:"status" form:"status"`
+	SupplyUnit     string `gorm:"column:supply_unit" json:"supply_unit" form:"supply_unit"`
+	IsSource       int64  `gorm:"column:is_source" json:"is_source" form:"is_source"`
+	WarehousingId  int64  `gorm:"column:warehousing_id" json:"warehousing_id" form:"warehousing_id"`
+	IsWarehosue    int64  `gorm:"column:is_warehosue" json:"is_warehosue" form:"is_warehosue"`
+	WarehouseOutId int64  `gorm:"column:warehouse_out_id" json:"warehouse_out_id" form:"warehouse_out_id"`
 }
 
 func (VSpSupplierWarehousingOutOrder) TableName() string {
 	ProjectId                 int64   `gorm:"column:project_id" json:"project_id" form:"project_id"`
 	GoodNumber                string  `gorm:"column:good_number" json:"good_number" form:"good_number"`
 	IsSource                  int64   `gorm:"column:is_source" json:"is_source" form:"is_source"`
-	Count                     int64   `gorm:"column:count" json:"count" form:"count"`
+	Count                     string  `gorm:"column:count" json:"count" form:"count"`
 	Price                     float64 `gorm:"column:price" json:"price" form:"price"`
 	Remark                    string  `gorm:"column:remark" json:"remark" form:"remark"`
 	RateOfConcession          float64 `gorm:"column:rate_of_concession" json:"rate_of_concession" form:"rate_of_concession"`
 	SupplyExpiryDate          int64   `gorm:"column:supply_expiry_date" json:"supply_expiry_date" form:"supply_expiry_date"`
 	WarehousingId             int64   `gorm:"column:warehousing_id" json:"warehousing_id" form:"warehousing_id"`
 	WarehouseInfoId           int64   `gorm:"column:warehouse_info_id" json:"warehouse_info_id" form:"warehouse_info_id"`
-	SourceCount               int64   `gorm:"column:source_count" json:"source_count" form:"source_count"`
+	SourceCount               string  `gorm:"column:source_count" json:"source_count" form:"source_count"`
 	SupplyWarehouseDetailInfo int64   `gorm:"column:supply_warehouse_detail_info" json:"supply_warehouse_detail_info" form:"supply_warehouse_detail_info"`
+	SupplyCount               int64   `gorm:"column:supply_count" json:"supply_count" form:"supply_count"`
+	DepositRate               float64 `gorm:"column:deposit_rate" json:"deposit_rate" form:"deposit_rate"`
 }
 
 func (SpSupplierWarehousingCancelOrder) TableName() string {
 }
 
 type VmSpSupplierWarehousingCancelOrder struct {
-	ProjectId  int64  `gorm:"column:project_id" json:"project_id" form:"project_id"`
-	IsSource   int64  `gorm:"column:is_source" json:"is_source" form:"is_source"`
-	Count      int64  `gorm:"column:count" json:"count" form:"count"`
-	SupplyUnit string `gorm:"column:supply_unit" json:"supply_unit" form:"supply_unit"`
+	ProjectId   int64  `gorm:"column:project_id" json:"project_id" form:"project_id"`
+	IsSource    int64  `gorm:"column:is_source" json:"is_source" form:"is_source"`
+	Count       string `gorm:"column:count" json:"count" form:"count"`
+	SupplyUnit  string `gorm:"column:supply_unit" json:"supply_unit" form:"supply_unit"`
+	SupplyCount int64  `gorm:"column:supply_count" json:"supply_count" form:"supply_count"`
 }
 
 func (VmSpSupplierWarehousingCancelOrder) TableName() string {

routers/router.go

 	controllers.GdybRegistRouters()
 
 	controllers.SupplyOrderApiRegistRouters()
+	controllers.SecondaryOrderApiRegistRouters()
 }

service/gobal_config_service.go

 	return
 }
 
-func GetPrint(ids []int64, orgid int64) (doctor []*models.DoctorAdvice, err error) {
-
+func GetPrint(ids []int64, orgid int64, advicetype int64, stoptype int64) (doctor []*models.DoctorAdvice, err error) {
+	db := XTReadDB().Model(&doctor).Where("status =1")
 	if len(ids) == 1 {
-		err = XTReadDB().Model(&doctor).Where("groupno = ? and user_org_id = ? and status = 1", ids[0], orgid).Find(&doctor).Error
+
+		if orgid > 0 {
+			db = db.Where("user_org_id = ?", orgid)
+		}
+		if advicetype > 0 {
+			db = db.Where("advice_type = ?", advicetype)
+		}
+		if stoptype > 0 {
+			db = db.Where("stop_state = ?", stoptype)
+		}
+
+		err = db.Where("groupno = ?", ids[0]).Find(&doctor).Error
 	} else {
-		err = XTReadDB().Model(&doctor).Where("groupno IN(?) and user_org_id = ? and status = 1", ids, orgid).Find(&doctor).Error
+		if orgid > 0 {
+			db = db.Where("user_org_id = ?", orgid)
+		}
+		if advicetype > 0 {
+			db = db.Where("advice_type = ?", advicetype)
+		}
+		if stoptype > 0 {
+			db = db.Where("stop_state = ?", stoptype)
+		}
+		err = db.Where("groupno IN(?)", ids).Find(&doctor).Error
 	}
 
 	return doctor, err
 
 func GetBatchOrderDetail(drugid int64, orgid int64, page int64, limit int64) (drug []*models.DrugWarehouseInfo, total int64, err error) {
 	offset := (page - 1) * limit
-	err = XTReadDB().Model(&drug).Where("drug_id = ? and org_id = ?", drugid, orgid).Count(&total).Offset(offset).Limit(limit).Find(&drug).Error
+	err = XTReadDB().Model(&drug).Where("drug_id = ? and org_id = ? and status = 1", drugid, orgid).Count(&total).Offset(offset).Limit(limit).Find(&drug).Error
 	return drug, total, err
 }
 

service/mobile_dialysis_service.go

 
 func GetHisPrescriptionProject(org_id int64, patient_id int64, record_date int64) (project []*models.HisPrescriptionProject, err error) {
 	err = readDb.Model(&models.HisPrescriptionProject{}).Preload("GoodInfo", func(db *gorm.DB) *gorm.DB {
-		return db.Preload("GoodsType", "status = 1").Where("status = 1 and is_user = 2")
+		return db.Preload("GoodsType", "status = 1").Where("status = 1 and is_warehouse = 1")
 	}).Where("user_org_id = ? AND status = 1 AND record_date = ? AND patient_id = ? AND type = 3", org_id, record_date, patient_id).Find(&project).Error
 
 	return

service/secondary_service.go

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

service/stock_service.go

 }
 
 func AddSigleGoodInfo(goodInfo *models.GoodInfo) (error, *models.GoodInfo) {
-	fmt.Println("goodino232323232323232323", goodInfo.IsUse)
 	err := writeDb.Create(&goodInfo).Error
 	return err, goodInfo
 
 		"provinces_code":                 goodInfo.ProvincesCode,
 		"is_user":                        goodInfo.IsUser,
 		"number":                         goodInfo.Number,
+		"is_warehouse":                   goodInfo.IsWarehouse,
 	}).Error
 
 	writeDb.Model(&models.WarehousingInfo{}).Where("good_id = ? AND org_id = ?", goodInfo.ID, goodInfo.OrgId).Updates(map[string]interface{}{"good_type_id": goodInfo.GoodTypeId})
 }
 
 func FindAllGoodInfo(org_id int64) (goodInfo []*models.GoodInfo, err error) {
-	err = XTReadDB().Model(&models.GoodInfo{}).Where("org_id = ? AND status = 1 and is_user = 2", org_id).Find(&goodInfo).Error
+	err = XTReadDB().Model(&models.GoodInfo{}).Where("org_id = ? AND status = 1 and is_warehouse = 1", org_id).Find(&goodInfo).Error
 	return goodInfo, err
 }
 
 	return info, err
 }
 
+func FindLastDrugWarehousingInfoByIDSix(drug_id int64, warehouse_out_id int64, is_source int64) (info models.XtDrugWarehouseInfo, err error) {
+	if is_source == 1 {
+		err = readDb.Model(&models.XtDrugWarehouseInfo{}).Where("drug_id = ? AND status = 1 AND (stock_max_number > 0 or stock_min_number > 0) and supply_warehouse_id = ? ", drug_id, warehouse_out_id).Order("ctime").First(&info).Error
+	}
+
+	if is_source == 2 || is_source == 0 {
+		err = readDb.Model(&models.XtDrugWarehouseInfo{}).Where("drug_id = ? AND status = 1 AND (stock_max_number > 0 or stock_min_number > 0)", drug_id).Order("ctime").First(&info).Error
+	}
+	return info, err
+}
+
 // 出库时先进先出，找出最先入库的批次
 func FindLastWarehousingInfoByID(drug_id int64) (info models.WarehousingInfo, err error) {
 	err = readDb.Model(&models.WarehousingInfo{}).Where("drup_id = ? AND status = 1 AND (stock_max_number > 0 or stock_min_number > 0) ", drug_id).Order("ctime").First(&info).Error
 	BatchNumber             string  `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
 	Drug                    *Drug   `gorm:"ForeignKey:DrugId;AssociationForeignKey:ID" json:"drug"`
 	WarehouseInfoId         int64   `gorm:"column:warehouse_info_id" json:"warehouse_info_id" form:"warehouse_info_id"`
+	SupplyCancelOutId       int64   `gorm:"column:supply_cancel_out_id" json:"supply_cancel_out_id" form:"supply_cancel_out_id"`
+	SupplyWarehouseId       int64   `gorm:"column:supply_warehouse_id" json:"supply_warehouse_id" form:"supply_warehouse_id"`
 }
 
 func (DrugWarehouseOutInfo) TableName() string {
 	if orgid > 0 {
 		db = db.Where("x.org_id = ?", orgid)
 	}
-	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,x.warehouse_info_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,x.supply_cancel_out_id,x.supply_warehouse_id,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,x.warehouse_info_id").Order("x.ctime desc").Scan(&out).Error
 	return out, err
 }
 

service/supply_service.go

 	if orgid > 0 {
 		db = db.Where("sgj_xt.xt_supplier_warehouse_info.user_org_id = ?", orgid)
 	}
-	err = db.Count(&total).Offset(offset).Limit(limit).Preload("SupplierWarehousingInfoOrder", "status= 1 and user_org_id = ?", orgid).Preload("SpSupplierWarehouseOut", "status = 1 and user_org_id =?", orgid).Order("ctime desc").Find(&info).Error
+	err = db.Count(&total).Offset(offset).Limit(limit).Preload("SupplierWarehousingInfoOrder", "status= 1 and user_org_id = ?", orgid).Preload("SpSupplierWarehouseOut", func(db *gorm.DB) *gorm.DB {
+		return db.Where("status = 1").Preload("SpSupplierWarehousingOutOrder", "status= 1 and user_org_id = ?", orgid)
+	}).Order("ctime desc").Find(&info).Error
 	return info, total, err
 }
 
 }
 
 func GetAllGoodOrderById(id int64, orgid int64) (order []*models.VSpSupplierWarehousingOutOrder, err error) {
+	db := XTReadDB().Table("xt_supplier_warehousing_out_order as o").Where("o.status = 1")
+	if id > 0 {
+		db = db.Where("o.warehouse_out_id = ?", id)
+	}
+	if orgid > 0 {
+		db = db.Where("o.user_org_id =? and o.is_warehouse= 1", orgid)
+	}
+	err = db.Select("o.id,o.order_number,o.project_id,o.count as count,o.supply_unit,o.is_source,o.warehousing_id,o.warehouse_out_id").Find(&order).Error
+	return order, err
+}
+
+func GetAllGoodOrderByIdSix(id int64, orgid int64) (order []*models.VSpSupplierWarehousingOutOrder, err error) {
 	db := XTReadDB().Table("xt_supplier_warehousing_out_order as o").Where("o.status = 1")
 	if id > 0 {
 		db = db.Where("o.warehousing_id = ?", id)
 	}
 	if orgid > 0 {
-		db = db.Where("o.user_org_id =?", orgid)
+		db = db.Where("o.user_org_id =? and o.is_warehouse= 1", orgid)
 	}
 	err = db.Select("o.id,o.order_number,o.project_id,o.count as count,o.supply_unit,o.is_source").Find(&order).Error
 	return order, err
 
 func GetAllGoodOrderByIdTwo(id int64, orgid int64) (order []*models.SpSupplierWarehousingOutOrder, err error) {
 
-	err = XTReadDB().Where("warehousing_id = ? and user_org_id = ? and status = 1", id, orgid).Find(&order).Error
+	err = XTReadDB().Where("warehouse_out_id = ? and user_org_id = ? and status = 1 and is_warehouse = 2", id, orgid).Find(&order).Error
 	return order, err
 }
 
 	return cancel, err
 }
 
-func GetReturnCancelOrderList(id int64, orgid int64) (order models.SpSupplierWarehousingCancelOrder, err error) {
+func GetReturnCancelOrderList(id int64, orgid int64) (order []*models.SpSupplierWarehousingCancelOrder, err error) {
 
 	err = XTReadDB().Where("warehouse_cancel_id = ? and user_org_id =? and status = 1", id, orgid).Find(&order).Error
 	return order, err
 
 func UpdateWarehouseCancelOrder(order *models.SpSupplierWarehousingCancelOrder) error {
 
-	err = XTWriteDB().Model(&order).Where("id = ? and status = 1", order.ID).Updates(map[string]interface{}{"manufacturer_id": order.ManufacturerId, "order_number": order.OrderNumber, "project_id": order.ProjectId, "is_source": order.IsSource, "count": order.Count, "price": order.Price, "remark": order.Remark, "rate_of_concession": order.RateOfConcession, "discount_amount": order.DiscountAmount, "type": order.Type, "supply_specification_name": order.SupplySpecificationName, "supply_type": order.SupplyType, "supply_total": order.SupplyTotal, "supply_manufacturer": order.SupplyManufacturer, "name": order.Name, "supply_unit": order.SupplyUnit, "supply_license_number": order.SupplyLicenseNumber}).Error
+	err = XTWriteDB().Model(&order).Where("id = ? and status = 1", order.ID).Updates(map[string]interface{}{"manufacturer_id": order.ManufacturerId, "order_number": order.OrderNumber, "project_id": order.ProjectId, "is_source": order.IsSource, "count": order.Count, "price": order.Price, "remark": order.Remark, "rate_of_concession": order.RateOfConcession, "discount_amount": order.DiscountAmount, "supply_specification_name": order.SupplySpecificationName, "supply_type": order.SupplyType, "supply_total": order.SupplyTotal, "supply_manufacturer": order.SupplyManufacturer, "name": order.Name, "supply_unit": order.SupplyUnit, "supply_license_number": order.SupplyLicenseNumber, "supply_count": order.SupplyCount, "deposit_rate": order.DepositRate}).Error
 	return err
 }
 
 func UpdateGoodSupplyFlow(id int64, orgid int64) error {
 
 	err := XTWriteDB().Model(&models.WarehousingInfo{}).Where("supply_warehouse_id = ? and org_id = ? and status = 1", id, orgid).Updates(map[string]interface{}{"status": 0}).Error
+	err = XTWriteDB().Model(&models.VmStockFlow{}).Where("supply_warehouse_id =? and user_org_id = ? and status = 1", id, orgid).Updates(map[string]interface{}{"status": 0}).Error
 	return err
 }
 
 func GetlastWarehouseOutById(user_org_id int64, record_date int64) (models.WarehouseOut, error) {
 
 	out := models.WarehouseOut{}
-	err := XTReadDB().Where("org_id = ? and warehouse_out_time = ? and status = 1", user_org_id, record_date).Find(&out).Error
+	err := XTReadDB().Where("org_id = ? and warehouse_out_time = ? and is_sys = 0 and status = 1", user_org_id, record_date).Find(&out).Error
 	return out, err
 }
 
 
 	out := models.DrugWarehouseOut{}
 	var err error
-	err = XTReadDB().Where("org_id = ? and warehouse_out_time = ?", orgid, record_date).Find(&out).Error
+	err = XTReadDB().Where("org_id = ? and warehouse_out_time = ? and status =1 and is_sys = 0", orgid, record_date).Find(&out).Error
 	if err == gorm.ErrRecordNotFound {
 		return nil, err
 	}
 func GetLastDrugWarehouseById(orgid int64, record_date int64) (models.DrugWarehouseOut, error) {
 
 	out := models.DrugWarehouseOut{}
-	err := XTReadDB().Where("org_id = ? and warehouse_out_time =? and status = 1", orgid, record_date).Find(&out).Error
+	err := XTReadDB().Where("org_id = ? and warehouse_out_time =? and status = 1 and is_sys =0 ", orgid, record_date).Last(&out).Error
 	return out, err
 }
 
 
 func UpdateWarehousingInfoById(goodid int64, supply_warehouse_id int64, info models.WarehousingInfo) error {
 
-	err := XTWriteDB().Model(&info).Where("good_id = ? and supply_warehouse_detail_info = ? and status = 1", goodid, supply_warehouse_id).UpdateColumn("stock_count", gorm.Expr("stock_count - ?", info.StockCount)).Error
+	err := XTWriteDB().Model(&info).Where("good_id = ? and supply_warehouse_detail_info = ? and status = 1", goodid, supply_warehouse_id).UpdateColumn("stock_count", gorm.Expr("stock_count + ?", info.StockCount)).Error
 	return err
 }
 
-func DeleteGoodWarehouseOut(goodid int64, supply_warehouse_id int64) error {
+func DeleteGoodWarehouseOut(goodid int64, supply_warehouse_id int64, orgid int64) error {
 
-	err := XTWriteDB().Model(&models.WarehouseOutInfo{}).Where("good_id = ? and supply_cancel_out_id = ? and status = 1", goodid, supply_warehouse_id).Updates(map[string]interface{}{"status": 0}).Error
+	err := XTWriteDB().Model(&models.WarehouseOutInfo{}).Where("good_id = ? and supply_cancel_out_id = ? and status = 1 and org_id = ?", goodid, supply_warehouse_id, orgid).Updates(map[string]interface{}{"status": 0}).Error
 
-	err = XTWriteDB().Model(&models.VmStockFlow{}).Where("good_id = ? and supply_cancel_out_id = ? and status = 1", goodid, supply_warehouse_id).Updates(map[string]interface{}{"status": 0}).Error
+	err = XTWriteDB().Model(&models.VmStockFlow{}).Where("good_id = ? and supply_cancel_out_id = ? and status = 1 and user_org_id =?", goodid, supply_warehouse_id, orgid).Updates(map[string]interface{}{"status": 0}).Error
 
 	return err
 }
 func UpdateDrugWasehousring(goodid int64, supply_warehouse_id int64, info models.DrugWarehouseInfo) error {
 
-	err := XTWriteDB().Model(&info).Where("good_id = ? and supply_cancel_out_id = ? and status = 1", goodid, supply_warehouse_id).UpdateColumn("stock_max_number", gorm.Expr("stock_max_number - ?", info.StockMaxNumber)).Error
+	err := XTWriteDB().Model(&info).Where("drug_id = ? and supply_warehouse_detail_info = ? and status = 1", goodid, supply_warehouse_id).UpdateColumn("stock_max_number", gorm.Expr("stock_max_number + ?", info.StockMaxNumber)).Error
 	return err
 }
 
 func UpdateDrugWasehousringOne(goodid int64, supply_warehouse_id int64, info models.DrugWarehouseInfo) error {
 
-	err := XTWriteDB().Model(&info).Where("good_id = ? and supply_cancel_out_id = ? and status = 1", goodid, supply_warehouse_id).UpdateColumn("stock_min_number", gorm.Expr("stock_min_number - ?", info.StockMinNumber)).Error
+	err := XTWriteDB().Model(&info).Where("drug_id = ? and supply_warehouse_detail_info = ? and status = 1", goodid, supply_warehouse_id).UpdateColumn("stock_min_number", gorm.Expr("stock_min_number + ?", info.StockMinNumber)).Error
 	return err
 }
 
 func DeleteDrugWarehouseOutNight(goodid int64, supply_warehouse_id int64) error {
 
-	err := XTWriteDB().Model(&models.DrugWarehouseOutInfo{}).Where("good_id = ? and supply_cancel_out_id = ? and status = 1", goodid, supply_warehouse_id).Updates(map[string]interface{}{"status": 0}).Error
+	err := XTWriteDB().Model(&models.DrugWarehouseOutInfo{}).Where("drug_id = ? and supply_cancel_out_id = ? and status = 1", goodid, supply_warehouse_id).Updates(map[string]interface{}{"status": 0}).Error
 
-	err = XTWriteDB().Model(&models.DrugFlow{}).Where("good_id = ? and supply_cancel_out_id = ? and status = 1", goodid, supply_warehouse_id).Updates(map[string]interface{}{"status": 0}).Error
+	err = XTWriteDB().Model(&models.DrugFlow{}).Where("drug_id = ? and supply_cancel_out_id = ? and status = 1", goodid, supply_warehouse_id).Updates(map[string]interface{}{"status": 0}).Error
 
 	return err
 }
 	return err
 }
 
-func FindWarehousingInfoTwenTy(goodId int64, supply_warehouse_detail_info int64) (models.WarehousingInfo, error) {
+func FindWarehousingInfoTwenTy(goodId int64, supply_warehouse_detail_info int64, source int64) (models.WarehousingInfo, error) {
+	fmt.Println("source232232332232323232323", source)
 	info := models.WarehousingInfo{}
-	err := XTReadDB().Select(" good_id,sum(stock_count) as stock_count").Where("good_id = ? and status = 1 and supply_warehouse_detail_info =?", goodId, supply_warehouse_detail_info).Find(&info).Error
+	var err error
+	if source == 1 {
+		err = XTReadDB().Select(" good_id,sum(stock_count) as stock_count").Where("good_id = ? and status = 1 and supply_warehouse_detail_info =?", goodId, supply_warehouse_detail_info).Find(&info).Error
+
+	}
+	if source == 2 {
+		err = XTReadDB().Select(" good_id,sum(stock_count) as stock_count").Where("good_id = ? and status = 1", goodId).Find(&info).Error
+
+	}
 	return info, err
 }
 
-func GetDrugTotalCountTwenTy(drugid int64, supply_warehouse_detail_info int64) (list []*models.VmDrugWarehouseInfo, err error) {
+func GetDrugTotalCountTwenTy(drugid int64, supply_warehouse_detail_info int64, source int64) (list []*models.VmDrugWarehouseInfo, err error) {
 
-	db := XTReadDB().Table("xt_drug_warehouse_info as x").Where("x.status = 1")
-	table := XTReadDB().Table("xt_base_drug as d").Where("d.status = 1")
-	fmt.Println(table)
-	if drugid > 0 {
-		db = db.Where("x.drug_id = ?", drugid)
-	}
-	if supply_warehouse_detail_info > 0 {
-		db = db.Where("x.supply_warehouse_detail_info = ?", supply_warehouse_detail_info)
+	if source == 1 {
+		db := XTReadDB().Table("xt_drug_warehouse_info as x").Where("x.status = 1")
+		table := XTReadDB().Table("xt_base_drug as d").Where("d.status = 1")
+		fmt.Println(table)
+		if drugid > 0 {
+			db = db.Where("x.drug_id = ?", drugid)
+		}
+		if supply_warehouse_detail_info > 0 {
+			db = db.Where("x.supply_warehouse_detail_info = ?", supply_warehouse_detail_info)
+		}
+		err = db.Select("x.drug_id,x.stock_max_number,x.stock_min_number,d.min_number,d.max_unit,d.min_unit,x.max_unit as count_unit,x.supply_warehouse_detail_info").Joins("left join xt_base_drug as d on d.id = x.drug_id").Scan(&list).Error
 	}
-	err = db.Select("x.drug_id,x.stock_max_number,x.stock_min_number,d.min_number").Joins("left join xt_base_drug as d on d.id = x.drug_id").Scan(&list).Error
 
+	if source == 2 {
+		db := XTReadDB().Table("xt_drug_warehouse_info as x").Where("x.status = 1")
+		table := XTReadDB().Table("xt_base_drug as d").Where("d.status = 1")
+		fmt.Println(table)
+		if drugid > 0 {
+			db = db.Where("x.drug_id = ?", drugid)
+		}
+		err = db.Select("x.drug_id,x.stock_max_number,x.stock_min_number,d.min_number,d.max_unit,d.min_unit,x.max_unit as count_unit,x.supply_warehouse_detail_info").Joins("left join xt_base_drug as d on d.id = x.drug_id").Scan(&list).Error
+
+	}
 	return list, err
 }
 
 	return &out, nil
 }
 
-func ModfySupplyCancel(id int64, orgid int64) error {
+func ModfySupplyCancel(id int64, orgid int64, project_id int64) error {
 
 	err := XTWriteDB().Model(models.SpSupplierWarehouseCancel{}).Where("id = ? and user_org_id = ? and status = 1", id, orgid).Updates(map[string]interface{}{"warehouse_out_id": 0}).Error
 
-	err = XTWriteDB().Model(models.SpSupplierWarehousingCancelOrder{}).Where("warehouse_cancel_id = ? and user_org_id = ? and status = 1", id, orgid).Updates(map[string]interface{}{"warehouse_info_id": 0, "warehouse_out_id": 0, "warehousing_id": 0, "good_number": "", "order_number": ""}).Error
+	err = XTWriteDB().Model(models.SpSupplierWarehousingCancelOrder{}).Where("warehouse_cancel_id = ? and user_org_id = ? and status = 1 and project_id = ?", id, orgid, project_id).Updates(map[string]interface{}{"warehouse_info_id": 0, "warehouse_out_id": 0, "warehousing_id": 0, "good_number": "", "order_number": ""}).Error
+	return err
+}
+
+func UpdateSupplyWarehouseInfo(id int64) error {
+
+	err = XTWriteDB().Model(&models.SupplierWarehouseInfo{}).Where("id = ? and status= 1").Updates(map[string]interface{}{"is_warehouse": 2}).Error
+	return err
+}
+
+func GetDrugWarehosueInfoByWarehousingId(drug_id int64, supply_warehouse_id int64, orgid int64) (models.DrugWarehouseOutInfo, error) {
+
+	info := models.DrugWarehouseOutInfo{}
+	err := XTReadDB().Where("drug_id = ? and supply_warehouse_id = ? and org_id = ? and status = 1", drug_id, supply_warehouse_id, orgid).Last(&info).Error
+	return info, err
+}
+
+func GetGoodWarehouseInfoByWarehousingId(good_id int64, supply_warehouse_id int64, orgid int64) (models.WarehouseOutInfo, error) {
+
+	info := models.WarehouseOutInfo{}
+	err := XTReadDB().Where("good_id = ? and supply_warehouse_id = ? and org_id = ? and status = 1", good_id, supply_warehouse_id, orgid).Last(&info).Error
+	return info, err
+}
+
+func GetAllDrugWaresingList(drug_id int64, org_id int64) (info []*models.SpDrugWarehouseInfo, err error) {
+
+	err = XTReadDB().Where("drug_id = ? and org_id = ? and status = 1 and (stock_max_number>0 or stock_min_number > 0)", drug_id, org_id).Find(&info).Error
+	return info, err
+}
+
+func GetAllGoodWaresingList(good_id int64, org_id int64) (info []*models.SpWarehouseInfo, err error) {
+
+	err = XTReadDB().Where("good_id = ? and org_id =? and status = 1 and stock_count>0", good_id, org_id).Find(&info).Error
+	return info, err
+}
+
+func GetReturnOrderById(id int64) (models.SpSupplierWarehouseCancel, error) {
+
+	order := models.SpSupplierWarehouseCancel{}
+	err := XTReadDB().Where("id = ? and status = 1", id).Find(&order).Error
+	return order, err
+}
+
+func GetWarehouseOutByDate(operation_time int64, orgid int64) (models.WarehouseOut, error) {
+	out := models.WarehouseOut{}
+	err := XTReadDB().Where("warehouse_out_time = ? and org_id = ? and status = 1 and is_sys= 0", operation_time, orgid).Find(&out).Error
+	return out, err
+}
+
+func GetWarehouseOutById(id int64, orgid int64) (out []*models.WarehouseOutInfo, err error) {
+
+	err = XTReadDB().Where("warehouse_out_id = ? and status= 1 and org_id = ?", id, orgid).Find(&out).Error
+	return out, err
+}
+
+func DeleteWarehouseOutById(id int64) error {
+
+	err := XTWriteDB().Model(&models.WarehouseOut{}).Where("id = ? and status = 1", id).Updates(map[string]interface{}{"status": 0}).Error
 	return err
 }
+
+func GetDrugWarehouseByDate(operation_time int64, orgid int64) (models.DrugWarehouseOut, error) {
+
+	out := models.DrugWarehouseOut{}
+	err := XTReadDB().Where("warehouse_out_time = ? and org_id = ? and status =1 and is_sys =0 ", operation_time, orgid).Find(&out).Error
+	return out, err
+}
+
+func GetDrugWarehouseByIdList(id int64, orgid int64) (info []*models.DrugWarehouseOutInfo, err error) {
+
+	err = XTReadDB().Where("warehouse_out_id = ? and status = 1 and org_id = ?", id, orgid).Find(&info).Error
+	return info, err
+}
+
+func UpdateDrugWarehouseById(id int64) error {
+
+	err := XTWriteDB().Model(&models.DrugWarehouseOut{}).Where("id = ? and status = 1", id).Updates(map[string]interface{}{"status": 0}).Error
+	return err
+}
+
+func UpdateWarehouseingById(id int64) error {
+
+	err := XTWriteDB().Model(&models.SpSupplierWarehousingOutOrder{}).Where("id = ? and status = 1", id).Updates(map[string]interface{}{"is_warehouse": 1}).Error
+	return err
+}
+
+func UpdateSupplyOrderListById(id int64) error {
+
+	err := XTWriteDB().Model(models.SpSupplierWarehousingOutOrder{}).Where("id = ? and status = 1", id).Updates(map[string]interface{}{"is_warehouse": 2}).Error
+	return err
+}
+
+func GetAllDrugWarehouseInfo(orgid int64) (info []*models.DrugWarehouseInfo, err error) {
+
+	err = XTReadDB().Where("org_id = ? and status = 1 and supply_warehouse_id>0", orgid).Find(&info).Error
+	return info, err
+}
+
+func GetAllGoodWarehouseInfo(orgid int64) (info []*models.WarehousingInfo, err error) {
+	err = XTReadDB().Where("org_id = ? and status = 1 and supply_warehouse_id>0", orgid).Find(&info).Error
+	return info, err
+}
+
+func GetLastDrugWarehosueInfoByWarehouseOutId(orgid int64, warehouse_out_id int64) (models.XtDrugWarehouseInfo, error) {
+	info := models.XtDrugWarehouseInfo{}
+	err := XTReadDB().Model(&info).Where("user_org_id = ? and status = 1 and supply_warehouse_id = ?", orgid, warehouse_out_id).Find(&info).Error
+	return info, err
+}

service/warhouse_service.go

 			PatientId:               advice.PatientId,
 			Count:                   deliver_number, //出最小单位
 			WarehouseInfoId:         warehouse.ID,
+			SupplyWarehouseId:       warehouse.SupplyWarehouseId,
 		}
 
 		drugflow := models.DrugFlow{
 			PatientId:               advice.PatientId,
 			SystemTime:              advice.AdviceDate,
 			WarehousingDetailId:     warehouse.ID,
+			SupplyWarehouseId:       warehouse.SupplyWarehouseId,
 		}
 
 		CreateDrugFlowOne(drugflow)
 			PatientId:               advice.PatientId,
 			Count:                   deliver_number,
 			WarehouseInfoId:         warehouse.ID,
+			SupplyWarehouseId:       warehouse.SupplyWarehouseId,
 		}
 		errOne := AddSigleDrugWarehouseOutInfo(warehouseOutInfo)
 		if errOne != nil {
 			BatchNumber:       warehouse.BatchNumber,
 			MaxUnit:           warehouse.MaxUnit,
 			WarehousingInfoId: warehouse.WarehousingInfoId,
+			SupplyWarehouseId: warehouse.SupplyWarehouseId,
 		}
 		//扣减库存
 		errThree := UpDateDrugWarehouseInfoByStock(&info)
 			IsSys:                   1,
 			PatientId:               advice.PatientId,
 			WarehousingDetailId:     warehouse.ID,
+			SupplyWarehouseId:       warehouse.SupplyWarehouseId,
 		}
 
 		CreateDrugFlowOne(drugflow)
 
 	fmt.Println("库存1", stock_number)
 	fmt.Println("c出库数量", deliver_number)
+
 	// 当库存数量大于或等于出库数量的话，则正常出库该批次
 	if stock_number >= deliver_number {
 
 			WarehouseInfoId:         warehouse.ID,
 			CountUnit:               drup.MinUnit,
 			AdviceId:                advice.ID,
+			SupplyWarehouseId:       warehouse.SupplyWarehouseId,
 		}
 
 		warehouseOutInfo.Count = prescribingNumber
 			IsSys:                   0,
 			WarehouseOutDetailId:    drugWareInfo.ID,
 			AdviceId:                advice.ID,
+			SupplyWarehouseId:       warehouse.SupplyWarehouseId,
 		}
 
 		CreateDrugFlowOne(drugflow)
 		if advice.CountUnit == drup.MinUnit {
 			maxNumber = prescribingNumber / drup.MinNumber
 			minNumber = prescribingNumber % drup.MinNumber
+			if warehouse.StockMaxNumber == 0 && drup.MaxUnit == drup.MinUnit {
+				minNumber = maxNumber
+			}
 		} else {
 			maxNumber = prescribingNumber
 		}
 		} else {
 			warehouse.StockMinNumber = warehouse.StockMinNumber - minNumber
 		}
+		fmt.Println("ware233232322332323232", warehouse.StockMaxNumber)
+		fmt.Println("ware233232322332323232", warehouse.StockMinNumber)
+		if warehouse.StockMaxNumber == 1 && warehouse.StockMinNumber == 1 && drup.MaxUnit == drup.MinUnit {
+			warehouse.StockMinNumber = 0
+		}
 
 		if warehouse.StockMaxNumber < 0 {
 			return errors.New("库存数量不足")
 			WarehouseInfoId:         warehouse.ID,
 			CountUnit:               drup.MinUnit,
 			AdviceId:                advice.ID,
+			SupplyWarehouseId:       warehouse.SupplyWarehouseId,
 		}
 		warehouseOutInfo.Count = stock_number
 
 			IsSys:                   0,
 			WarehouseOutDetailId:    drugWareInfo.ID,
 			AdviceId:                advice.ID,
+			SupplyWarehouseId:       warehouse.SupplyWarehouseId,
 		}
 		CreateDrugFlowOne(drugflow)
 		// 出库完成后，要将该批次库存清零
 			ExpiryDate:              warehouse.ExpiryDate,
 			ProductDate:             warehouse.ProductDate,
 			ProjectId:               goods.ProjectId,
+			SupplyWarehouseId:       warehouse.SupplyWarehouseId,
 		}
 		warehouseOutInfo.Count = count
 
 				IsSys:                   1,
 				PatientId:               patient_id,
 				ProjectId:               goods.ProjectId,
+				SupplyWarehouseId:       warehouse.SupplyWarehouseId,
 			}
 			//查询流水是否存在
 			exsit, errflow := GetStockFlowIsExsit(warehouse.ID, patient_id, record_time, goods.GoodId)
 				IsSys:                   1,
 				PatientId:               patient_id,
 				ProjectId:               goods.ProjectId,
+				SupplyWarehouseId:       warehouse.SupplyWarehouseId,
 			}
 			//查询流水是否存在
 			exsit, errflow := GetStockFlowIsExsit(warehouse.ID, patient_id, record_time, goods.GoodId)
 					PatientId:               patient_id,
 					ReturnCount:             exsit.Count + (exsit.Count + deliver_number),
 					ProjectId:               goods.ProjectId,
+					SupplyWarehouseId:       warehouse.SupplyWarehouseId,
 				}
 				//UpdatedStockFlow(flow)
 				UpdatedStockFlowOne(flow, warehouse.ID, patient_id, record_time, goods.GoodId)
 			ExpiryDate:              warehouse.ExpiryDate,
 			ProductDate:             warehouse.ProductDate,
 			ProjectId:               goods.ProjectId,
+			SupplyWarehouseId:       warehouse.SupplyWarehouseId,
 		}
 		warehouseOutInfo.Count = stock_number
 
 				IsSys:                   1,
 				PatientId:               patient_id,
 				ProjectId:               goods.ProjectId,
+				SupplyWarehouseId:       warehouse.SupplyWarehouseId,
 			}
 			//查询流水是否存在
 			exsit, errflows := GetStockFlowIsExsit(warehouse.ID, patient_id, record_time, goods.GoodId)
 					PatientId:               patient_id,
 					ReturnCount:             exsit.Count + (exsit.Count + deliver_number),
 					ProjectId:               goods.ProjectId,
+					SupplyWarehouseId:       warehouse.SupplyWarehouseId,
 				}
 				//UpdatedStockFlow(flow)
 				UpdatedStockFlowOne(flow, warehouse.ID, patient_id, record_time, goods.GoodId)
 				IsSys:                   1,
 				PatientId:               patient_id,
 				ProjectId:               goods.ProjectId,
+				SupplyWarehouseId:       warehouse.SupplyWarehouseId,
 			}
 			//查询流水是否存在
 			exsit, errflows := GetStockFlowIsExsit(warehouse.ID, patient_id, record_time, goods.GoodId)
 					IsSys:                   1,
 					PatientId:               patient_id,
 					ProjectId:               goods.ProjectId,
+					SupplyWarehouseId:       warehouse.SupplyWarehouseId,
 				}
 				//UpdatedStockFlow(flow)
 				UpdatedStockFlowOne(flow, warehouse.ID, patient_id, record_time, goods.GoodId)
 			Number:                  warehouse.Number,
 			Price:                   goods.Price,
 			LicenseNumber:           goods.LicenseNumber,
+			SupplyWarehouseId:       warehouse.SupplyWarehouseId,
 		}
 		warehouseOutInfo.Count = goods.Count
 		//添加出库单详情
 			CancelOutDetailId:       0,
 			ProductDate:             goods.ProductDate,
 			ExpireDate:              goods.ExpiryDate,
+			SupplyWarehouseId:       warehouse.SupplyWarehouseId,
 		}
 
 		//创建出库流水
 			Number:                  warehouse.Number,
 			Price:                   warehouse.PackingPrice,
 			LicenseNumber:           goods.LicenseNumber,
+			SupplyWarehouseId:       warehouse.SupplyWarehouseId,
 		}
 		warehouseOutInfo.Count = stock_number
 
 			CancelOutDetailId:       0,
 			ProductDate:             goods.ProductDate,
 			ExpireDate:              goods.ExpiryDate,
+			SupplyWarehouseId:       warehouse.SupplyWarehouseId,
 		}
 
 		//创建出库明细
 			Count:                   deliver_number, //出最小单位
 			WarehouseInfoId:         warehouse.ID,
 			AdviceId:                advice.ID,
+			SupplyWarehouseId:       warehouse.SupplyWarehouseId,
 		}
 
 		drugflow := models.DrugFlow{
 			PatientId:               advice.PatientId,
 			WarehousingDetailId:     warehouse.ID,
 			AdviceId:                advice.ID,
+			SupplyWarehouseId:       warehouse.SupplyWarehouseId,
 		}
 
 		CreateDrugFlowOne(drugflow)
 			BatchNumber:       warehouse.BatchNumber,
 			MaxUnit:           warehouse.MaxUnit,
 			WarehousingInfoId: warehouse.WarehousingInfoId,
+			SupplyWarehouseId: warehouse.SupplyWarehouseId,
 		}
 		//扣减库存
 		errThree := UpDateDrugWarehouseInfoByStock(&info)
 			PatientId:               advice.PatientId,
 			WarehousingDetailId:     warehouse.ID,
 			AdviceId:                advice.ID,
+			SupplyWarehouseId:       warehouse.SupplyWarehouseId,
 		}
 
 		CreateDrugFlowOne(drugflow)
 		}
 
 		warehouse.StockMaxNumber = warehouse.StockMaxNumber - maxNumber
+		if warehouse.StockMaxNumber < 0 {
+			warehouse.StockMaxNumber = 0
+		}
 		warehouse.Mtime = time.Now().Unix()
 
 		if warehouse.StockMinNumber < minNumber {
+			fmt.Println("233323232233223")
 			warehouse.StockMaxNumber = warehouse.StockMaxNumber - 1
 			warehouse.StockMinNumber = warehouse.StockMinNumber + drup.MinNumber - minNumber
 		} else {
 	// 根据先进先出原则，查询最先入库的批次，进行出库
 
 	// 如果没有对应的库存，则报错
-	warehouse, err := FindFirstWarehousingInfoByStockNight(goods.GoodId, goods.GoodTypeId, warehouse_out_id)
+	warehouse, err := FindFirstWarehousingInfoByStockNight(goods.GoodId, goods.GoodTypeId, warehouse_out_id, goods.IsSource)
 	if err != nil {
 
 		return err
 
 		warehouseOutInfo := &models.WarehouseOutInfo{
 			WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
-			WarehouseOutId:          warehouseOut.ID,
+			WarehouseOutId:          goods.WarehouseOutId,
 			WarehouseInfotId:        warehouse.ID,
 			Status:                  1,
 			Ctime:                   time.Now().Unix(),
 			ConsumableType:          2,
 			IsSys:                   goods.IsSys,
 			WarehousingOrder:        "",
-			WarehouseOutId:          warehouseOut.ID,
+			WarehouseOutId:          goods.WarehouseOutId,
 			WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
 			IsEdit:                  1,
 			CancelStockId:           0,
 		// 当该批次的库存数量小于出库数量的话，则先把该批次出库完后，再进行递归出库
 		warehouseOutInfo := &models.WarehouseOutInfo{
 			WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
-			WarehouseOutId:          warehouseOut.ID,
+			WarehouseOutId:          goods.WarehouseOutId,
 			WarehouseInfotId:        warehouse.ID,
 			Status:                  1,
 			Ctime:                   time.Now().Unix(),
 			ConsumableType:          2,
 			IsSys:                   0,
 			WarehousingOrder:        "",
-			WarehouseOutId:          warehouseOut.ID,
+			WarehouseOutId:          goods.WarehouseOutId,
 			WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
 			IsEdit:                  1,
 			CancelStockId:           0,
 	return nil
 }
 
-func FindFirstWarehousingInfoByStockNight(good_id int64, good_type_id int64, warehouse_out_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 and supply_warehouse_id = ?", good_id, good_type_id, warehouse_out_id).Order("ctime").First(&info).Error
+func FindFirstWarehousingInfoByStockNight(good_id int64, good_type_id int64, warehouse_out_id int64, is_source int64) (info models.WarehousingInfo, err error) {
+
+	fmt.Println("is_source2233232233232323232232323", is_source)
+	if is_source == 1 {
+		err = readDb.Model(&models.WarehousingInfo{}).Where("good_id = ? AND good_type_id = ? AND status = 1 and stock_count > 0 and supply_warehouse_id = ?", good_id, good_type_id, warehouse_out_id).Order("ctime").First(&info).Error
+
+	}
+	if is_source == 2 || is_source == 0 {
+		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
 }
 
 // 药品出库 递归方式
-func AutoDrugDeliverInfoNight(orgID int64, prescribingNumber int64, warehouseout *models.DrugWarehouseOut, drup *models.BaseDrugLib, advice *models.DrugWarehouseOutInfo) (err error) {
+func AutoDrugDeliverInfoNight(orgID int64, prescribingNumber int64, warehouseout *models.DrugWarehouseOut, drup *models.BaseDrugLib, advice *models.DrugWarehouseOutInfo, warehouse_out_id int64, cancel_out_id int64) (err error) {
 
 	// 判断处方里药品单位是拆零单位还是包装单位,	如果是包装单位，则根据规格，将包装数量转为拆零数量
 	var deliver_number int64 = 0
 	// 如果没有对应的库存，则报错
 	//开启事物
 
-	warehouse, err := FindLastDrugWarehousingInfoByID(advice.DrugId)
+	warehouse, err := FindLastDrugWarehousingInfoByIDSix(advice.DrugId, warehouse_out_id, advice.IsSource)
 
 	if err != nil {
 
 
 		warehouseOutInfo := &models.DrugWarehouseOutInfo{
 			WarehouseOutOrderNumber: warehouseout.WarehouseOutOrderNumber,
-			WarehouseOutId:          warehouseout.ID,
+			WarehouseOutId:          advice.WarehouseOutId,
 			Status:                  1,
 			Ctime:                   time.Now().Unix(),
 			Remark:                  advice.Remark,
 			Manufacturer:            advice.Manufacturer,
 			Dealer:                  warehouse.Dealer,
 			IsSys:                   0,
-			SysRecordTime:           advice.Ctime,
+			SysRecordTime:           advice.SysRecordTime,
 			DrugId:                  advice.DrugId,
 			ExpiryDate:              advice.ExpiryDate,
 			ProductDate:             advice.ProductDate,
 
 		drugWareInfo, _ := GetLastWarehouseOutInfoById(advice.DrugId)
 		drugflow := models.DrugFlow{
-			WarehouseOutId:          warehouseout.ID,
+			WarehouseOutId:          advice.WarehouseOutId,
 			WarehouseOutOrderNumber: warehouseout.WarehouseOutOrderNumber,
 			DrugId:                  advice.DrugId,
 			Number:                  warehouse.Number,
 			AdviceId:                advice.ID,
 			SupplyCancelOutId:       warehouseout.SupplyCancelOutId,
 			SupplyWarehouseId:       warehouseout.SupplyWarehouseId,
+			SystemTime:              advice.SysRecordTime,
 		}
 
 		CreateDrugFlowOne(drugflow)
 		if advice.CountUnit == drup.MinUnit {
 			maxNumber = prescribingNumber / drup.MinNumber
 			minNumber = prescribingNumber % drup.MinNumber
+			if warehouse.StockMaxNumber == 0 && drup.MaxUnit == drup.MinUnit {
+				minNumber = maxNumber
+			}
 		} else {
 			maxNumber = prescribingNumber
 		}
-
+		fmt.Println("maxNUMBER23323232323323322323", maxNumber)
+		fmt.Println("MIN_NUMBWEEEWEWEWWEEWEWEWWE", minNumber)
+		fmt.Println("编辑55555555555555")
 		if warehouse.StockMaxNumber < maxNumber {
 
 			return errors.New("库存数量不足")
 		}
 
 		warehouse.StockMaxNumber = warehouse.StockMaxNumber - maxNumber
+		if warehouse.StockMaxNumber < 0 {
+			warehouse.StockMaxNumber = 0
+		}
+
 		warehouse.Mtime = time.Now().Unix()
 
 		if warehouse.StockMinNumber < minNumber {
 		if warehouse.StockMaxNumber < 0 {
 			return errors.New("库存数量不足")
 		}
+		if warehouse.StockMaxNumber == 1 && warehouse.StockMinNumber == 1 && drup.MaxUnit == drup.MinUnit {
+			warehouse.StockMinNumber = 0
+		}
 
 		errThree := UpDateDrugWarehouseInfoByStock(&warehouse)
 		if errThree != nil {
 		// 当该批次的库存数量小于出库数量的话，则先把该批次出库完后，再进行递归出库
 		warehouseOutInfo := &models.DrugWarehouseOutInfo{
 			WarehouseOutOrderNumber: warehouseout.WarehouseOutOrderNumber,
-			WarehouseOutId:          warehouseout.ID,
+			WarehouseOutId:          advice.WarehouseOutId,
 			Status:                  1,
 			Ctime:                   time.Now().Unix(),
 			Remark:                  advice.Remark,
 			Manufacturer:            advice.Manufacturer,
 			Dealer:                  warehouse.Dealer,
 			IsSys:                   0,
-			SysRecordTime:           advice.Ctime,
+			SysRecordTime:           advice.SysRecordTime,
 			DrugId:                  advice.DrugId,
 			ExpiryDate:              warehouse.ExpiryDate,
 			ProductDate:             warehouse.ProductDate,
 		}
 		drugWareInfo, _ := GetLastWarehouseOutInfoById(advice.DrugId)
 		drugflow := models.DrugFlow{
-			WarehouseOutId:          warehouseout.ID,
+			WarehouseOutId:          advice.WarehouseOutId,
 			WarehouseOutOrderNumber: warehouseout.WarehouseOutOrderNumber,
 			DrugId:                  advice.DrugId,
 			Number:                  warehouse.Number,
 			AdviceId:                advice.ID,
 			SupplyCancelOutId:       warehouseout.SupplyCancelOutId,
 			SupplyWarehouseId:       warehouseout.SupplyWarehouseId,
+			SystemTime:              advice.SysRecordTime,
 		}
 		CreateDrugFlowOne(drugflow)
 		// 出库完成后，要将该批次库存清零
 		prescribingNumber_two_temp := deliver_number - stock_number
 		advice.CountUnit = drup.MinUnit
 
-		AutoDrugDeliverInfoNight(orgID, prescribingNumber_two_temp, warehouseout, drup, advice)
+		AutoDrugDeliverInfoNight(orgID, prescribingNumber_two_temp, warehouseout, drup, advice, warehouse_out_id, cancel_out_id)
 	}
 
 	return