11月8日库存管理

controllers/manager_center_api_controller.go

 	hosp_appr_flag, _ := c.GetInt64("hosp_appr_flag")
 	lmt_used_flag, _ := c.GetInt64("lmt_used_flag")
 	prescribing_number_unit := c.GetString("prescribing_number_unit")
+	is_user, _ := c.GetInt64("is_user")
 	adminInfo := c.GetAdminUserInfo()
 	drugLib := &models.BaseDrugLib{
 		DrugName:                    drug_name,
 		HospApprFlag:                hosp_appr_flag,
 		LmtUsedFlag:                 lmt_used_flag,
 		PrescribingNumberUnit:       prescribing_number_unit,
+		IsUse:                       is_user,
 	}
 
 	total := service.FindAllDrugLibRecordTotal(adminInfo.CurrentOrgId)
 	hosp_appr_flag, _ := c.GetInt64("hosp_appr_flag")
 	lmt_used_flag, _ := c.GetInt64("lmt_used_flag")
 	prescribing_number_unit := c.GetString("prescribing_number_unit")
+	is_user, _ := c.GetInt64("is_user")
 	adminInfo := c.GetAdminUserInfo()
 	drug, _ := service.FindBaseDrugLibRecord(adminInfo.CurrentOrgId, id)
 	drugLib := &models.BaseDrugLib{
 		Total:                       total,
 		SingleDose:                  drug_dose,
 		ProvincesCode:               provinces_code,
+		IsUse:                       is_user,
 	}
 
 	err := service.UpdateBaseDrugLib(drugLib)

controllers/mobile_api_controllers/patient_api_controller.go

 								return
 							}
 							if prescribing_number_total <= total {
-								service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, &item)
-
+								if medical.IsUse == 2 {
+									service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, &item)
+								}
 							}
 
 						}
 							}
 
 							if prescribing_number_total <= total {
-								service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, &item)
-								c.ServeSuccessJSON(map[string]interface{}{
-									"msg":    "1",
-									"advice": advice,
-									"ids":    ids,
-								})
-								return
+								if medical.IsUse == 2 {
+									service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, &item)
+									c.ServeSuccessJSON(map[string]interface{}{
+										"msg":    "1",
+										"advice": advice,
+										"ids":    ids,
+									})
+									return
+								}
+								if medical.IsUse == 1 {
+									c.ServeSuccessJSON(map[string]interface{}{
+										"msg":    "1",
+										"advice": advice,
+										"ids":    ids,
+									})
+									return
+								}
+
 							}
 						}
 					}
 						return
 					}
 					if prescribing_number_total <= total {
-						service.HisDrugsDelivery(adminInfo.Org.Id, creater, &advice)
+						if medical.IsUse == 2 {
+							service.HisDrugsDelivery(adminInfo.Org.Id, creater, &advice)
+						}
 					}
-
 				}
 			}
 			for _, item := range advices {

controllers/patient_api_controller.go

 					return
 				}
 				if prescribing_number_total <= total {
-					service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, item)
-					break
-					c.ServeSuccessJSON(map[string]interface{}{
-						"msg":    "1",
-						"advice": advice,
-					})
-					return
+					if medical.IsUse == 2 {
+						service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, item)
+						break
+						c.ServeSuccessJSON(map[string]interface{}{
+							"msg":    "1",
+							"advice": advice,
+						})
+						return
+					}
+					if medical.IsUse == 1 {
+						c.ServeSuccessJSON(map[string]interface{}{
+							"msg":    "1",
+							"advice": advice,
+						})
+						return
+					}
+
 				}
 
 			}
 					return
 				}
 				if prescribing_number_total <= total {
-					service.HisDrugsDelivery(adminUserInfo.CurrentOrgId, item.ExecutionStaff, item)
-					break
-					c.ServeSuccessJSON(map[string]interface{}{
-						"msg":    "1",
-						"advice": advice,
-					})
-					return
+					if medical.IsUse == 2 {
+						service.HisDrugsDelivery(adminUserInfo.CurrentOrgId, item.ExecutionStaff, item)
+						break
+						c.ServeSuccessJSON(map[string]interface{}{
+							"msg":    "1",
+							"advice": advice,
+						})
+						return
+					}
+
+					if medical.IsUse == 1 {
+						c.ServeSuccessJSON(map[string]interface{}{
+							"msg":    "1",
+							"advice": advice,
+						})
+						return
+					}
+
 				}
 
 			}

models/drug.go

 	Total                 float64                `gorm:"column:total" json:"total" form:"total"`
 	PrescribingNumberUnit string                 `gorm:"column:prescribing_number_unit" json:"prescribing_number_unit" form:"prescribing_number_unit"`
 	DrugWarehouseInfo     []*XtDrugWarehouseInfo `gorm:"ForeignKey:DrugId;AssociationForeignKey:ID" json:"drug_warehouse_info"`
+	IsUse                 int64                  `gorm:"column:is_user" json:"is_user" form:"is_user"`
 }
 
 func (BaseDrugLib) TableName() string {

models/drug_stock.go

 package models
 
 type DrugWarehouse struct {
-	ID               int64  `gorm:"column:id" json:"id" form:"id"`
-	WarehousingOrder string `gorm:"column:warehousing_order" json:"warehousing_order" form:"warehousing_order"`
-	OperationTime    int64  `gorm:"column:operation_time" json:"operation_time" form:"operation_time"`
-	OrgId            int64  `gorm:"column:org_id" json:"org_id" form:"org_id"`
-	Creater          int64  `gorm:"column:creater" json:"creater" form:"creater"`
-	Ctime            int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
-	Modifier         int64  `gorm:"column:modifier" json:"modifier" form:"modifier"`
-	Mtime            int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
-	Status           int64  `gorm:"column:status" json:"status" form:"status"`
-	WarehousingTime  int64  `gorm:"column:warehousing_time" json:"warehousing_time" form:"warehousing_time"`
-	Dealer           int64  `gorm:"column:dealer" json:"dealer" form:"dealer"`
-	Manufacturer     int64  `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
-	Type             int64  `gorm:"column:type" json:"type" form:"type"`
+	ID                int64  `gorm:"column:id" json:"id" form:"id"`
+	WarehousingOrder  string `gorm:"column:warehousing_order" json:"warehousing_order" form:"warehousing_order"`
+	OperationTime     int64  `gorm:"column:operation_time" json:"operation_time" form:"operation_time"`
+	OrgId             int64  `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	Creater           int64  `gorm:"column:creater" json:"creater" form:"creater"`
+	Ctime             int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Modifier          int64  `gorm:"column:modifier" json:"modifier" form:"modifier"`
+	Mtime             int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Status            int64  `gorm:"column:status" json:"status" form:"status"`
+	WarehousingTime   int64  `gorm:"column:warehousing_time" json:"warehousing_time" form:"warehousing_time"`
+	Dealer            int64  `gorm:"column:dealer" json:"dealer" form:"dealer"`
+	Manufacturer      int64  `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
+	Type              int64  `gorm:"column:type" json:"type" form:"type"`
+	SupplyWarehouseId int64  `gorm:"column:supply_warehouse_id" json:"supply_warehouse_id" form:"supply_warehouse_id"`
 }
 
 func (DrugWarehouse) TableName() string {
 	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"`
 	WarehousingInfoId int64   `gorm:"column:warehousing_info_id" json:"warehousing_info_id" form:"warehousing_info_id"`
+	SupplyWarehouseId int64   `gorm:"column:supply_warehouse_id" json:"supply_warehouse_id" form:"supply_warehouse_id"`
 }
 
 func (DrugWarehouseInfo) TableName() string {
 	DrugWarehouseInfo       []*DrugWarehouseInfo `gorm:"ForeignKey:DrugId;AssociationForeignKey:DrugId" `
 	BaseDrugLib             BaseDrugLib          `gorm:"ForeignKey:ID;AssociationForeignKey:DrugId" `
 	AdviceId                int64                `gorm:"column:advice_id" json:"advice_id" form:"advice_id"`
+	SupplyWarehouseId       int64                `gorm:"column:supply_warehouse_id" json:"supply_warehouse_id" form:"supply_warehouse_id"`
 }
 
 func (DrugFlow) TableName() string {

models/self_drug_models.go

 	DoseUnit              string  `gorm:"column:dose_unit" json:"dose_unit" form:"dose_unit"`
 	DrugDay               string  `gorm:"column:drug_day" json:"drug_day" form:"drug_day"`
 	MinPrice              float64 `gorm:"column:min_price" json:"min_price" form:"min_price"`
+	IsUse                 int64   `gorm:"column:is_user" json:"is_user" form:"is_user"`
 }
 
 func (XtBaseDrug) TableName() string {

models/stock_models.go

 }
 
 type Warehousing struct {
-	ID               int64        `gorm:"column:id" json:"id"`
-	WarehousingOrder string       `gorm:"column:warehousing_order" json:"warehousing_order"`
-	OperationTime    int64        `gorm:"column:operation_time" json:"operation_time"`
-	OrgId            int64        `gorm:"column:org_id" json:"org_id"`
-	Creater          int64        `gorm:"column:creater" json:"creater"`
-	Ctime            int64        `gorm:"column:ctime" json:"ctime"`
-	Modifier         int64        `gorm:"column:modifier" json:"modifier"`
-	Mtime            int64        `gorm:"column:mtime" json:"mtime"`
-	Status           int64        `gorm:"column:status" json:"status"`
-	WarehousingTime  int64        `gorm:"column:warehousing_time" json:"warehousing_time"`
-	Dealer           int64        `gorm:"column:dealer" json:"dealer"`
-	Manufacturer     int64        `gorm:"column:manufacturer" json:"manufacturer"`
-	Manufacturers    Manufacturer `gorm:"ForeignKey:ID;AssociationForeignKey:Manufacturer" json:"Manufacturer"`
-	Dealers          Dealer       `gorm:"ForeignKey:ID;AssociationForeignKey:Dealer" json:"Dealer"`
-	Type             int64        `gorm:"column:type" json:"type"`
+	ID                int64        `gorm:"column:id" json:"id"`
+	WarehousingOrder  string       `gorm:"column:warehousing_order" json:"warehousing_order"`
+	OperationTime     int64        `gorm:"column:operation_time" json:"operation_time"`
+	OrgId             int64        `gorm:"column:org_id" json:"org_id"`
+	Creater           int64        `gorm:"column:creater" json:"creater"`
+	Ctime             int64        `gorm:"column:ctime" json:"ctime"`
+	Modifier          int64        `gorm:"column:modifier" json:"modifier"`
+	Mtime             int64        `gorm:"column:mtime" json:"mtime"`
+	Status            int64        `gorm:"column:status" json:"status"`
+	WarehousingTime   int64        `gorm:"column:warehousing_time" json:"warehousing_time"`
+	Dealer            int64        `gorm:"column:dealer" json:"dealer"`
+	Manufacturer      int64        `gorm:"column:manufacturer" json:"manufacturer"`
+	Manufacturers     Manufacturer `gorm:"ForeignKey:ID;AssociationForeignKey:Manufacturer" json:"Manufacturer"`
+	Dealers           Dealer       `gorm:"ForeignKey:ID;AssociationForeignKey:Dealer" json:"Dealer"`
+	Type              int64        `gorm:"column:type" json:"type"`
+	SupplyWarehouseId int64        `gorm:"column:supply_warehouse_id" json:"supply_warehouse_id" form:"supply_warehouse_id"`
 }
 
 func (Warehousing) TableName() string {
 }
 
 type WarehousingInfo struct {
-	ID               int64       `gorm:"column:id" json:"id"`
-	WarehousingId    int64       `gorm:"column:warehousing_id" json:"warehousing_id"`
-	GoodId           int64       `gorm:"column:good_id" json:"good_id"`
-	GoodTypeId       int64       `gorm:"column:good_type_id" json:"good_type_id"`
-	Number           string      `gorm:"column:number" json:"number"`
-	ProductDate      int64       `gorm:"column:product_date" json:"product_date"`
-	ExpiryDate       int64       `gorm:"column:expiry_date" json:"expiry_date"`
-	WarehousingCount int64       `gorm:"column:warehousing_count" json:"warehousing_count"`
-	WarehousingUnit  string      `gorm:"column:warehousing_unit" json:"warehousing_unit"`
-	Price            float64     `gorm:"column:price" json:"price"`
-	TotalPrice       float64     `gorm:"column:total_price" json:"total_price"`
-	Dealer           int64       `gorm:"column:dealer" json:"dealer"`
-	Manufacturer     int64       `gorm:"column:manufacturer" json:"manufacturer"`
-	Remark           string      `gorm:"column:remark" json:"remark"`
-	Ctime            int64       `gorm:"column:ctime" json:"ctime"`
-	Mtime            int64       `gorm:"column:mtime" json:"mtime"`
-	Status           int64       `gorm:"column:status" json:"status"`
-	OrgId            int64       `gorm:"column:org_id" json:"org_id"`
-	IsReturn         int64       `gorm:"column:is_return" json:"is_return"`
-	StockCount       int64       `gorm:"column:stock_count" json:"stock_count" form:"stock_count"`
-	Warehousing      Warehousing `ForeignKey:WarehousingId json:"warehouse"`
-	WarehousingOrder string      `gorm:"column:warehousing_order" json:"warehousing_order"`
-	GoodInfo         GoodInfo    `gorm:"ForeignKey:ID;AssociationForeignKey:GoodId" `
-	Type             int64       `gorm:"column:type" json:"type"`
-	LicenseNumber    string      `gorm:"column:license_number" json:"license_number" form:"license_number"`
-	WarehouseInfoId  int64       `gorm:"column:warehouse_info_id" json:"warehouse_info_id" form:"warehouse_info_id"`
-	PackingPrice     float64     `gorm:"column:packing_price" json:"packing_price" form:"packing_price"`
+	ID                int64       `gorm:"column:id" json:"id"`
+	WarehousingId     int64       `gorm:"column:warehousing_id" json:"warehousing_id"`
+	GoodId            int64       `gorm:"column:good_id" json:"good_id"`
+	GoodTypeId        int64       `gorm:"column:good_type_id" json:"good_type_id"`
+	Number            string      `gorm:"column:number" json:"number"`
+	ProductDate       int64       `gorm:"column:product_date" json:"product_date"`
+	ExpiryDate        int64       `gorm:"column:expiry_date" json:"expiry_date"`
+	WarehousingCount  int64       `gorm:"column:warehousing_count" json:"warehousing_count"`
+	WarehousingUnit   string      `gorm:"column:warehousing_unit" json:"warehousing_unit"`
+	Price             float64     `gorm:"column:price" json:"price"`
+	TotalPrice        float64     `gorm:"column:total_price" json:"total_price"`
+	Dealer            int64       `gorm:"column:dealer" json:"dealer"`
+	Manufacturer      int64       `gorm:"column:manufacturer" json:"manufacturer"`
+	Remark            string      `gorm:"column:remark" json:"remark"`
+	Ctime             int64       `gorm:"column:ctime" json:"ctime"`
+	Mtime             int64       `gorm:"column:mtime" json:"mtime"`
+	Status            int64       `gorm:"column:status" json:"status"`
+	OrgId             int64       `gorm:"column:org_id" json:"org_id"`
+	IsReturn          int64       `gorm:"column:is_return" json:"is_return"`
+	StockCount        int64       `gorm:"column:stock_count" json:"stock_count" form:"stock_count"`
+	Warehousing       Warehousing `ForeignKey:WarehousingId json:"warehouse"`
+	WarehousingOrder  string      `gorm:"column:warehousing_order" json:"warehousing_order"`
+	GoodInfo          GoodInfo    `gorm:"ForeignKey:ID;AssociationForeignKey:GoodId" `
+	Type              int64       `gorm:"column:type" json:"type"`
+	LicenseNumber     string      `gorm:"column:license_number" json:"license_number" form:"license_number"`
+	WarehouseInfoId   int64       `gorm:"column:warehouse_info_id" json:"warehouse_info_id" form:"warehouse_info_id"`
+	PackingPrice      float64     `gorm:"column:packing_price" json:"packing_price" form:"packing_price"`
+	SupplyWarehouseId int64       `gorm:"column:supply_warehouse_id" json:"supply_warehouse_id" form:"supply_warehouse_id"`
 }
 
 func (WarehousingInfo) TableName() string {
 	ExpireDate              int64   `gorm:"column:expire_date" json:"expire_date" form:"expire_date"`
 	ReturnCount             int64   `gorm:"column:return_count" json:"return_count" form:"return_count"`
 	ProjectId               int64   `gorm:"column:project_id" json:"project_id" form:"project_id"`
+	SupplyWarehouseId       int64   `gorm:"column:supply_warehouse_id" json:"supply_warehouse_id" form:"supply_warehouse_id"`
 }
 
 func (VmStockFlow) TableName() string {

models/supply.models.go

 	Checker          int64   `gorm:"column:checker" json:"checker" form:"checker"`
 	CheckTime        int64   `gorm:"column:check_time" json:"check_time" form:"check_time"`
 	IsWarehouse      int64   `gorm:"column:is_warehouse" json:"is_warehouse" form:"is_warehouse"`
+	ReturnRemake     string  `gorm:"column:return_remake" json:"return_remake" form:"return_remake"`
 }
 
 func (SupplierWarehouseInfo) TableName() string {
 	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"`
 }
 
 func (SpSupplierWarehouseOut) TableName() string {
 }
 
 type VmSupplierWarehouseOut 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"`
-	SpSupplierWarehousingOutOrder []*SpSupplierWarehousingOutOrder `gorm:"ForeignKey:warehouse_out_id;AssociationForeignKey:ID" json:"orderOut"`
+	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"`
+	SpSupplierWarehousingOutOrder    []*SpSupplierWarehousingOutOrder    `gorm:"ForeignKey:warehouse_out_id;AssociationForeignKey:ID" json:"orderOut"`
+	SpSupplierWarehousingCancelOrder []*SpSupplierWarehousingCancelOrder `gorm:"ForeignKey:warehouse_out_id;AssociationForeignKey:ID" json:"cancelOut"`
 }
 
 func (VmSupplierWarehouseOut) TableName() string {
 func (VSupplierWarehousingInfoOrder) TableName() string {
 	return "xt_supplier_warehousing_info_order"
 }
+
+type SpSupplierWarehouseCancel 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"`
+	WarehouseOutId   int64   `gorm:"column:warehouse_out_id" json:"warehouse_out_id" form:"warehouse_out_id"`
+	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"`
+	Arrearage        float64 `gorm:"column:arrearage" json:"arrearage" form:"arrearage"`
+	Payment          float64 `gorm:"column:payment" json:"payment" form:"payment"`
+	ReturnRemark     string  `gorm:"column:return_remark" json:"return_remark" form:"return_remark"`
+}
+
+func (SpSupplierWarehouseCancel) TableName() string {
+	return "xt_supplier_warehouse_cancel"
+}
+
+type SpSupplierWarehousingCancelOrder struct {
+	ID                      int64   `gorm:"column:id" json:"id" form:"id"`
+	ManufacturerId          int64   `gorm:"column:manufacturer_id" json:"manufacturer_id" form:"manufacturer_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"`
+	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"`
+	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"`
+	DiscountAmount          float64 `gorm:"column:discount_amount" json:"discount_amount" form:"discount_amount"`
+	UserOrgId               int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Ctime                   int64   `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Status                  int64   `gorm:"column:status" json:"status" form:"status"`
+	Mtime                   int64   `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	WarehouseCancelId       int64   `gorm:"column:warehouse_cancel_id" json:"warehouse_cancel_id" form:"warehouse_cancel_id"`
+	Type                    int64   `gorm:"column:type" json:"type" form:"type"`
+	ReturnNumber            string  `gorm:"column:return_number" json:"return_number" form:"return_number"`
+	WarehouseOutId          int64   `gorm:"column:warehouse_out_id" json:"warehouse_out_id" form:"warehouse_out_id"`
+	SupplySpecificationName string  `gorm:"column:supply_specification_name" json:"supply_specification_name" form:"supply_specification_name"`
+	SupplyType              string  `gorm:"column:supply_type" json:"supply_type" form:"supply_type"`
+	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"`
+	SupplyLicenseNumber     string  `gorm:"column:supply_license_number" json:"supply_license_number" form:"supply_license_number"`
+}
+
+func (SpSupplierWarehousingCancelOrder) TableName() string {
+	return "xt_supplier_warehousing_cancel_order"
+}
+
+type VmSpSupplierWarehouseCancel 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"`
+	WarehouseOutId                   int64                               `gorm:"column:warehouse_out_id" json:"warehouse_out_id" form:"warehouse_out_id"`
+	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"`
+	Arrearage                        float64                             `gorm:"column:arrearage" json:"arrearage" form:"arrearage"`
+	Payment                          float64                             `gorm:"column:payment" json:"payment" form:"payment"`
+	ReturnRemark                     string                              `gorm:"column:return_remark" json:"return_remark" form:"return_remark"`
+	SpSupplierWarehousingCancelOrder []*SpSupplierWarehousingCancelOrder `gorm:"ForeignKey:warehouse_cancel_id;AssociationForeignKey:ID" json:"cancelOrder"`
+}
+
+func (VmSpSupplierWarehouseCancel) TableName() string {
+	return "xt_supplier_warehouse_cancel"
+}
+
+type VmSpSupplierWarehousingOutOrder 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"`
+	WarehouseOutId int64 `gorm:"column:warehouse_out_id" json:"warehouse_out_id" form:"warehouse_out_id"`
+}
+
+func (VmSpSupplierWarehousingOutOrder) TableName() string {
+	return "xt_supplier_warehousing_out_order"
+}
+
+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"`
+}
+
+func (VmSpSupplierWarehousingCancelOrder) TableName() string {
+	return "xt_supplier_warehousing_cancel_order"
+}

service/patientmanage_service.go

 }
 
 func FindPatientByMobileOne(mobile string, orgID int64, id int64) (patient models.XtPatientsNew, err error) {
-	//err = readDb.Model(&models.XtPatientsNew{}).Where(" status=1 and user_org_id=? and   phone=? and id<>?", orgID, mobile, id).First(&patient).Error
-	//return
-	db := readDb.Table("xt_patients_new as x")
-	err = db.Not("phone = ?", mobile).Where("user_org_id = ? and id = ? and status =1", orgID, id).Find(&patient).Error
+	err = readDb.Model(&models.XtPatientsNew{}).Where(" status=1 and user_org_id=? and   phone=? and id<>?", orgID, mobile, id).First(&patient).Error
 	return
+	//db := readDb.Table("xt_patients_new as x")
+	//err = db.Not("phone = ?", mobile).Where("user_org_id = ? and id = ? and status =1", orgID, id).Find(&patient).Error
+	//return
 }
 
 func GetPatientData(phone string, orgid int64) (*models.XtPatientsNew, error) {

service/supply_service.go

 		db = db.Where("x.org_id = ?", orgid)
 	}
 
-	err = db.Preload("DrugWarehouseInfo", "status = 1 and org_id = ?", orgid).Find(&drug).Error
+	err = db.Preload("DrugWarehouseInfo", "status = 1 and org_id = ? and (stock_max_number >0 or stock_min_number>0)", orgid).Find(&drug).Error
 	return drug, err
 }
 
 
 func FindAllSupplyOrder(orgid int64) (total int64, err error) {
 
-	err = XTReadDB().Model(&models.SupplierWarehouseInfo{}).Where("user_org_id = ? and status = 1", orgid).Count(&total).Error
+	err = XTReadDB().Model(&models.SupplierWarehouseInfo{}).Where("user_org_id = ?", orgid).Count(&total).Error
 	return total, err
 }
 
 
 func ModefySupplyWarehouseInfo(id int64, info models.SupplierWarehouseInfo) error {
 
-	err := XTWriteDB().Model(&models.SupplierWarehouseInfo{}).Where("id = ? and status = 1", id).Updates(map[string]interface{}{"rate_of_concession": info.RateOfConcession, "discount_amount": info.DiscountAmount, "document_date": info.DocumentDate, "delivery_date": info.DeliveryDate, "supplier_id": info.SupplierId}).Error
+	err := XTWriteDB().Model(&models.SupplierWarehouseInfo{}).Where("id = ? and status = 1", id).Updates(map[string]interface{}{"rate_of_concession": info.RateOfConcession, "discount_amount": info.DiscountAmount, "document_date": info.DocumentDate, "delivery_date": info.DeliveryDate, "supplier_id": info.SupplierId, "return_remake": info.ReturnRemake}).Error
 	return err
 }
 
 }
 
 func FindAllSupplyWarehouseOutOrder(orgid int64) (total int64, err error) {
-	err = XTReadDB().Model(&models.SpSupplierWarehouseOut{}).Where("user_org_id = ? and status = 1", orgid).Count(&total).Error
+	err = XTReadDB().Model(&models.SpSupplierWarehouseOut{}).Where("user_org_id = ?", orgid).Count(&total).Error
 	return total, err
 }
 
 }
 
 func GetAllGoodOderList(check_id int64, keyword string, page int64, limit int64, startime int64, endtime int64, orgid int64) (out []*models.VmSupplierWarehouseOut, total int64, err error) {
-	db := XTReadDB().Model(&out).Where("status = 1")
+	db := XTReadDB().Model(&out).Where("sgj_xt.xt_supplier_warehouse_out.status = 1")
 	likeKey := "%" + keyword + "%"
 	offset := (page - 1) * limit
 	if check_id > 0 {
-		db = db.Where("xt_supplier_warehouse_out.is_check = ?", check_id)
+		db = db.Where("sgj_xt.xt_supplier_warehouse_out.is_check = ?", check_id)
 	}
 	if startime > 0 {
-		db = db.Where("xt_supplier_warehouse_out.record_date >= ?", startime)
+		db = db.Where("sgj_xt.xt_supplier_warehouse_out.record_date >= ?", startime)
 	}
 	if endtime > 0 {
-		db = db.Where("xt_supplier_warehouse_out.record_date<=?", endtime)
+		db = db.Where("sgj_xt.xt_supplier_warehouse_out.record_date<=?", endtime)
 	}
 
 	if len(keyword) > 0 {
-		db.Joins("join xt_supplier_name on xt_supplier_name.id = xt_supplier_warehouse_out.supplier_id")
-		db = db.Where("xt_supplier_warehouse_out.number like ? or xt_supplier_name.supplier_name like ? ", likeKey, likeKey).Group("xt_supplier_warehouse_out.id")
+		db = db.Joins("join sgj_xt.xt_supplier_name on sgj_xt.xt_supplier_name.id = sgj_xt.xt_supplier_warehouse_out.supplier_id")
+		db = db.Where("sgj_xt.xt_supplier_warehouse_out.good_number like ? or sgj_xt.xt_supplier_name.supplier_name  like ? ", likeKey, likeKey).Group("xt_supplier_warehouse_out.id")
 	}
 	if orgid > 0 {
-		db = db.Where("xt_supplier_warehouse_out.user_org_id = ?", orgid)
+		db = db.Where("sgj_xt.xt_supplier_warehouse_out.user_org_id = ?", orgid)
 	}
-	err = db.Count(&total).Offset(offset).Limit(limit).Preload("SpSupplierWarehousingOutOrder", "status= 1 and user_org_id = ?", orgid).Find(&out).Error
+	err = db.Count(&total).Offset(offset).Limit(limit).Preload("SpSupplierWarehousingOutOrder", "status= 1 and user_org_id = ?", orgid).Preload("SpSupplierWarehousingCancelOrder", "status= 1 and user_org_id = ?", orgid).Find(&out).Error
 	return out, total, err
 }
 
 
 func UpdateGoodWarehouseOut(id int64, out models.SpSupplierWarehouseOut) error {
 
-	err := XTWriteDB().Model(&out).Where("id=? and status = 1", id).Updates(map[string]interface{}{"arrearage": out.Arrearage, "payment": out.Payment, "rate_of_concession": out.RateOfConcession, "discount_amount": out.DiscountAmount, "document_date": out.DocumentDate}).Error
+	err := XTWriteDB().Model(&out).Where("id=? and status = 1", id).Updates(map[string]interface{}{"arrearage": out.Arrearage, "payment": out.Payment, "rate_of_concession": out.RateOfConcession, "discount_amount": out.DiscountAmount, "document_date": out.DocumentDate, "return_remake": out.ReturnRemake}).Error
 	return err
 }
 
 func UpdateGoodWarehouseOutOrder(order *models.SpSupplierWarehousingOutOrder) error {
 
-	err := XTWriteDB().Model(&order).Where("id = ? and status = 1", order.ID).Updates(map[string]interface{}{"project_id": order.ProjectId, "is_source": order.IsSource, "count": order.Count, "price": order.Count, "amount": order.Amount, "remark": order.Amount, "supply_batch_number": order.SupplyBatchNumber, "supply_product_date": order.SupplyProductDate, "supply_expiry_date": order.SupplyExpiryDate, "supply_type": order.SupplyType, "supply_specification_name": order.SupplySpecificationName, "supply_total": order.SupplySpecificationName, "supply_manufacturer": order.SupplyManufacturer, "name": order.Name, "supply_unit": order.SupplyUnit, "manufacturer_id": order.ManufacturerId, "supply_license_number": order.SupplyLicenseNumber}).Error
+	err := XTWriteDB().Model(&order).Where("id = ? and status = 1", order.ID).Updates(map[string]interface{}{"project_id": order.ProjectId, "is_source": order.IsSource, "count": order.Count, "price": order.Count, "remark": order.Remark, "supply_batch_number": order.SupplyBatchNumber, "supply_product_date": order.SupplyProductDate, "supply_expiry_date": order.SupplyExpiryDate, "supply_type": order.SupplyType, "supply_specification_name": order.SupplySpecificationName, "supply_total": order.SupplySpecificationName, "supply_manufacturer": order.SupplyManufacturer, "name": order.Name, "supply_unit": order.SupplyUnit, "manufacturer_id": order.ManufacturerId, "supply_license_number": order.SupplyLicenseNumber, "warehousing_id": order.WarehousingId, "warehouse_info_id": order.WarehouseInfoId}).Error
 	return err
 }
 
 	err := XTWriteDB().Model(&models.SpSupplierWarehouseOut{}).Where("id = ? and user_org_id =? and status = 1", id, orgid).Updates(map[string]interface{}{"is_check": out.IsCheck, "checker": out.Checker, "check_time": out.CheckTime, "mtime": time.Now().Unix()}).Error
 	return err
 }
+
+func ModefySupplyWarehousing(is_warehose int64, warehousing_id int64, orgid int64) error {
+
+	err := XTWriteDB().Model(&models.SupplierWarehouseInfo{}).Where("id = ? and status = 1 and user_org_id =?", warehousing_id, orgid).Updates(map[string]interface{}{"is_warehouse": is_warehose, "mtime": time.Now().Unix()}).Error
+	return err
+}
+
+func GetAllDoctorSix(orgid int64, appid int64) (appRole []*models.App_Role, err error) {
+
+	err = UserReadDB().Where("org_id = ? AND app_id = ? AND status = 1", orgid, appid).Find(&appRole).Error
+	return appRole, err
+}
+
+func GetSingleDrugWarehouseOrder(record_date int64, orgid int64) (*models.DrugWarehouse, error) {
+	warehouse := models.DrugWarehouse{}
+	var err error
+	err = XTReadDB().Model(&warehouse).Where("warehousing_time = ? and org_id = ? and status = 1", record_date, orgid).Find(&warehouse).Error
+	if err == gorm.ErrRecordNotFound {
+		return nil, err
+	}
+	if err != nil {
+		return nil, err
+	}
+	return &warehouse, nil
+}
+
+func GetSindleWarehouse(record_date int64, orgid int64) (*models.Warehousing, error) {
+	warehousing := models.Warehousing{}
+	var err error
+	err = XTReadDB().Model(&warehousing).Where("warehousing_time = ? and org_id = ? and status = 1", record_date, orgid).Find(&warehousing).Error
+	if err == gorm.ErrRecordNotFound {
+		return nil, err
+	}
+	if err != nil {
+		return nil, err
+	}
+	return &warehousing, nil
+}
+
+func GetLastWarehouseInfoByInfo(orgid int64) (models.Warehousing, error) {
+	warehousing := models.Warehousing{}
+	err := XTReadDB().Where("org_id = ? and status = 1", orgid).Find(&warehousing).Error
+	return warehousing, err
+}
+
+func GetSupplyCancelOrder(orgid int64) (total int64, err error) {
+	err = XTReadDB().Model(&models.SpSupplierWarehouseCancel{}).Where("user_org_id = ?", orgid).Count(&total).Error
+	return total, err
+}
+
+func CreateReturnCacelOrder(cancel models.SpSupplierWarehouseCancel) error {
+
+	err := XTWriteDB().Create(&cancel).Error
+	return err
+}
+
+func GetLastReturnCancelOrder(orgid int64) (models.SpSupplierWarehouseCancel, error) {
+
+	cancel := models.SpSupplierWarehouseCancel{}
+	err := XTReadDB().Where("user_org_id =? and status = 1", orgid).Find(&cancel).Error
+	return cancel, err
+}
+
+func CreateCancelReturnOrder(order *models.SpSupplierWarehousingCancelOrder) error {
+
+	err := XTWriteDB().Create(&order).Error
+	return err
+}
+
+func GetReturnCancelOrder(id int64, orgid int64) (models.SpSupplierWarehouseCancel, error) {
+
+	cancel := models.SpSupplierWarehouseCancel{}
+	err := XTReadDB().Where("id = ? and status= 1 and user_org_id =?", id, orgid).Find(&cancel).Error
+	return cancel, err
+}
+
+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 GetAllGoodReturnOrderList(checkid int64, keyword string, page int64, limit int64, startime int64, endtime int64, orgid int64) (order []*models.VmSpSupplierWarehouseCancel, total int64, err error) {
+
+	db := XTReadDB().Table("sgj_xt.xt_supplier_warehouse_cancel").Where("sgj_xt.xt_supplier_warehouse_cancel.status = 1")
+	likeKey := "%" + keyword + "%"
+	offset := (page - 1) * limit
+	if checkid > 0 {
+		db = db.Where("sgj_xt.xt_supplier_warehouse_cancel.is_check = ?", checkid)
+	}
+	if len(keyword) > 0 {
+		db = db.Joins("join sgj_xt.xt_supplier_name on sgj_xt.xt_supplier_name.id = sgj_xt.xt_supplier_warehouse_out.supplier_id")
+		db = db.Where("sgj_xt.xt_supplier_warehouse_cancel.number like ? or sgj_xt.xt_supplier_name.supplier_name  like ? ", likeKey, likeKey).Group("xt_supplier_warehouse_cancel.id")
+	}
+	if startime > 0 {
+		db = db.Where("sgj_xt.xt_supplier_warehouse_cancel.record_date >= ?", startime)
+	}
+
+	if endtime > 0 {
+		db = db.Where("sgj_xt.xt_supplier_warehouse_cancel.record_date <= ?", endtime)
+	}
+	if orgid > 0 {
+		db = db.Where("sgj_xt.xt_supplier_warehouse_cancel.user_org_id = ?", orgid)
+	}
+	err = db.Count(&total).Offset(offset).Limit(limit).Preload("SpSupplierWarehousingCancelOrder", "status= 1 and user_org_id = ?", orgid).Find(&order).Error
+	return order, total, err
+}
+
+func GetGoodReturnDetail(id int64, orgid int64) (models.VmSpSupplierWarehouseCancel, error) {
+	cancel := models.VmSpSupplierWarehouseCancel{}
+	db := XTReadDB().Model(&cancel).Where("status = 1")
+	if id > 0 {
+		db = db.Where("id = ?", id)
+	}
+	if orgid > 0 {
+		db = db.Where("user_org_id = ?", orgid)
+	}
+	err := db.Find(&cancel).Error
+	return cancel, err
+}
+
+func GetGoodReturnOrderDetail(id int64, orgid int64) (order []*models.SpSupplierWarehousingCancelOrder, err error) {
+
+	db := XTReadDB().Model(&order).Where("status =1")
+	if id > 0 {
+		db = db.Where("warehouse_cancel_id = ?", id)
+	}
+	if orgid > 0 {
+		db = db.Where("user_org_id = ?", orgid)
+	}
+	err = db.Find(&order).Error
+	return order, err
+}
+
+func UpdateWarehouseCancelOrder(order *models.SpSupplierWarehousingCancelOrder) error {
+
+	err = XTWriteDB().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
+	return err
+}
+
+func UpdateWarehouseCancel(id int64, cancel models.SpSupplierWarehouseCancel) error {
+
+	err := XTWriteDB().Model(&cancel).Where("id = ? and status = 1", id).Updates(map[string]interface{}{"rate_of_concession": cancel.RateOfConcession, "discount_amount": cancel.DiscountAmount, "document_date": cancel.DocumentDate, "supplier_id": cancel.SupplierId, "arrearage": cancel.Arrearage, "payment": cancel.Payment, "return_remark": cancel.ReturnRemark}).Error
+	return err
+}
+
+func GetSupplyCancelOrderById(warehouse_out_id int64, orgid int64) (*models.SpSupplierWarehouseCancel, error) {
+	cancel := models.SpSupplierWarehouseCancel{}
+	var err error
+	err = XTReadDB().Where("warehouse_out_id = ? and user_org_id = ? and status = 1", warehouse_out_id, orgid).Find(&cancel).Error
+	if err == gorm.ErrRecordNotFound {
+		return nil, err
+	}
+	if err != nil {
+		return nil, err
+	}
+	return &cancel, nil
+}
+
+func UpdateSupplyGoodOrder(id int64, out models.SpSupplierWarehouseOut) error {
+
+	err := XTWriteDB().Model(&models.SpSupplierWarehouseOut{}).Where("id = ? and status = 1", id).Updates(map[string]interface{}{"is_check": out.IsCheck, "checker": out.Checker, "check_time": out.CheckTime}).Error
+	return err
+}
+
+func UpdateDrugSupplyWarehousingInfo(id int64, orgid int64) error {
+
+	err := XTWriteDB().Model(&models.DrugWarehouseInfo{}).Where("supply_warehouse_id = ? and org_id = ? and status = 1", id, orgid).Updates(map[string]interface{}{"status": 0}).Error
+	return err
+}
+
+func UpdateDrugSupplyFlow(id int64, orgid int64) error {
+
+	err := XTWriteDB().Model(&models.DrugFlow{}).Where("supply_warehouse_id = ? and user_org_id = ? and status = 1", id, orgid).Updates(map[string]interface{}{"status": 0}).Error
+	return err
+}
+
+func UpdateGoodSupplyWarehousingInfo(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
+	return err
+}
+
+func UpdateGoodSupplyFlow(id int64, orgid int64) error {
+
+	err := XTWriteDB().Model(&models.WarehousingInfo{}).Where("supply_warehouse_id = ? and user_org_id = ? and status = 1", id, orgid).Updates(map[string]interface{}{"status": 0}).Error
+	return err
+}
+
+func GetDrugSupplyWarehousingById(id int64, orgid int64) (info []*models.DrugWarehouseInfo, err error) {
+
+	err = XTReadDB().Where("supply_warehouse_id <> ? and org_id = ? and status = 1", id, orgid).Find(&info).Error
+	return info, err
+}
+
+func UpdateSupplyWarehousing(id int64, orgid int64) error {
+
+	err := XTWriteDB().Model(&models.DrugWarehouse{}).Where("supply_warehouse_id = ? and org_id = ? and status = 1", id, orgid).Updates(map[string]interface{}{"status": 0}).Error
+	return err
+}
+
+func GetGoodSupplyWarehousingById(id int64, orgid int64) (info []*models.WarehousingInfo, err error) {
+
+	err = XTReadDB().Where("supply_warehouse_id <> ? and org_id = ? and status = 1", id, orgid).Find(&info).Error
+	return info, err
+}
+
+func UpdateGoodWarehousing(id int64, orgid int64) error {
+	err := XTWriteDB().Model(&models.Warehousing{}).Where("supply_warehouse_id = ? and org_id = ? and status = 1", id, orgid).Updates(map[string]interface{}{"status": 0}).Error
+	return err
+}
+
+func UpdateSupplyWarehousingById(id int64, orgid int64) error {
+
+	err := XTWriteDB().Model(&models.SupplierWarehouseInfo{}).Where("id = ? and user_org_id =? and status = 1", id, orgid).Updates(map[string]interface{}{"is_warehouse": 1}).Error
+	return err
+}
+
+func DeleteGoodOrder(id int64, orgid int64) error {
+
+	err := XTWriteDB().Model(&models.SpSupplierWarehouseOut{}).Where("id = ? and status = 1 and user_org_id = ?", id, orgid).Updates(map[string]interface{}{"status": 0}).Error
+
+	err = XTWriteDB().Model(&models.SpSupplierWarehousingOutOrder{}).Where("warehouse_out_id = ? and user_org_id = ? and status = 1", id, orgid).Updates(map[string]interface{}{"status": 0}).Error
+	return err
+}
+func GetSupplyCancelWarehouse(id int64, orgid int64) (cancel []*models.SpSupplierWarehouseCancel, err error) {
+
+	err = XTReadDB().Where("warehouse_out_id = ? and user_org_id = ? and status = 1", id, orgid).Find(&cancel).Error
+	return cancel, err
+}
+
+func GetGoodOrderListById(id int64, orgid int64) (out []*models.VmSpSupplierWarehousingOutOrder, err error) {
+
+	err = XTReadDB().Where("warehouse_out_id = ? and user_org_id = ? and status = 1", id, orgid).Find(&out).Error
+	return out, err
+}
+
+func GetGoodCanceListById(id int64, orgid int64) (cancel []*models.VmSpSupplierWarehousingCancelOrder, err error) {
+
+	err = XTReadDB().Where("warehouse_out_id = ? and user_org_id = ? and status = 1", id, orgid).Find(&cancel).Error
+	return cancel, err
+}