11月8日库存管理

conf/app.conf

@@ -1,6 +1,6 @@
 appname = 血透
-httpport = 9529
-runmode = dev
+httpport = 9531
+runmode = prod
 
 #
 copyrequestbody = true

controllers/supply_order_api_contorller.go

@@ -97,6 +97,12 @@ func SupplyOrderApiRegistRouters() {
 	beego.Router("api/supply/deletepurchaseorder", &SupplyOrderApiController{}, "Get:DeletePurchaseOrder")
 	//删除采购单
 	beego.Router("/api/supply/deletegoodorderbyid", &SupplyOrderApiController{}, "Get:DeleteGoodOrderById")
+	//删除退货单
+	beego.Router("/api/supply/deletereturnorder", &SupplyOrderApiController{}, "Get:DeleteReturnOrder")
+	//删除
+	beego.Router("/api/supply/deletereturnorderbyid", &SupplyOrderApiController{}, "Get:DeleteReturnOrderById")
+	//反审核退货单
+	beego.Router("/api/supply/modefyreturnorder", &SupplyOrderApiController{}, "Get:ModefyReturnOrder")
 }
 
 //判断前端参数是否为空
@@ -2047,29 +2053,30 @@ func (this *SupplyOrderApiController) GetGoodOrderCountList() {
 					drugWarehouseInfo, _ := service.GetLastDrugWarehouse(orgId)
 
 					warehouseInfoDetailOne := &models.DrugWarehouseInfo{
-						WarehousingOrder:  drugWarehouseInfo.WarehousingOrder,
-						WarehousingId:     drugWarehouseInfo.ID,
-						DrugId:            item.ProjectId,
-						Number:            item.SupplyLicenseNumber,
-						ProductDate:       item.SupplyProductDate,
-						ExpiryDate:        item.SupplyExpiryDate,
-						WarehousingCount:  item.Count,
-						Price:             item.Price,
-						TotalPrice:        0,
-						Status:            1,
-						Ctime:             time.Now().Unix(),
-						Remark:            item.Remark,
-						OrgId:             orgId,
-						Type:              1,
-						Manufacturer:      item.ManufacturerId,
-						Dealer:            0,
-						StockMaxNumber:    item.Count,
-						RetailTotalPrice:  0,
-						BatchNumber:       item.SupplyBatchNumber,
-						MaxUnit:           item.SupplyUnit,
-						MinUnit:           item.SupplyUnit,
-						RetailPrice:       medical.MinPrice,
-						SupplyWarehouseId: id,
+						WarehousingOrder:          drugWarehouseInfo.WarehousingOrder,
+						WarehousingId:             drugWarehouseInfo.ID,
+						DrugId:                    item.ProjectId,
+						Number:                    item.SupplyLicenseNumber,
+						ProductDate:               item.SupplyProductDate,
+						ExpiryDate:                item.SupplyExpiryDate,
+						WarehousingCount:          item.Count,
+						Price:                     item.Price,
+						TotalPrice:                0,
+						Status:                    1,
+						Ctime:                     time.Now().Unix(),
+						Remark:                    item.Remark,
+						OrgId:                     orgId,
+						Type:                      1,
+						Manufacturer:              item.ManufacturerId,
+						Dealer:                    0,
+						StockMaxNumber:            item.Count,
+						RetailTotalPrice:          0,
+						BatchNumber:               item.SupplyBatchNumber,
+						MaxUnit:                   item.SupplyUnit,
+						MinUnit:                   item.SupplyUnit,
+						RetailPrice:               medical.MinPrice,
+						SupplyWarehouseId:         id,
+						SupplyWarehouseDetailInfo: item.ID,
 					}
 					if medical.MaxUnit == medical.MinUnit {
 						warehouseInfoDetailOne.StockMaxNumber = item.Count
@@ -2084,27 +2091,28 @@ func (this *SupplyOrderApiController) GetGoodOrderCountList() {
 					warehouseInfoDetail = append(warehouseInfoDetail, warehouseInfoDetailOne)
 
 					drugflow := &models.DrugFlow{
-						WarehousingOrder:  drugWarehouseInfo.WarehousingOrder,
-						WarehousingId:     drugWarehouseInfo.ID,
-						DrugId:            item.ProjectId,
-						Number:            item.SupplyBatchNumber,
-						ProductDate:       item.SupplyProductDate,
-						ExpireDate:        item.SupplyExpiryDate,
-						Count:             item.Count,
-						Price:             item.Price,
-						Status:            1,
-						Ctime:             time.Now().Unix(),
-						UserOrgId:         orgId,
-						Manufacturer:      item.ManufacturerId,
-						Dealer:            0,
-						BatchNumber:       item.SupplyBatchNumber,
-						MaxUnit:           item.SupplyUnit,
-						MinUnit:           item.SupplyUnit,
-						ConsumableType:    1,
-						IsEdit:            1,
-						Creator:           checker,
-						IsSys:             0,
-						SupplyWarehouseId: id,
+						WarehousingOrder:          drugWarehouseInfo.WarehousingOrder,
+						WarehousingId:             drugWarehouseInfo.ID,
+						DrugId:                    item.ProjectId,
+						Number:                    item.SupplyBatchNumber,
+						ProductDate:               item.SupplyProductDate,
+						ExpireDate:                item.SupplyExpiryDate,
+						Count:                     item.Count,
+						Price:                     item.Price,
+						Status:                    1,
+						Ctime:                     time.Now().Unix(),
+						UserOrgId:                 orgId,
+						Manufacturer:              item.ManufacturerId,
+						Dealer:                    0,
+						BatchNumber:               item.SupplyBatchNumber,
+						MaxUnit:                   item.SupplyUnit,
+						MinUnit:                   item.SupplyUnit,
+						ConsumableType:            1,
+						IsEdit:                    1,
+						Creator:                   checker,
+						IsSys:                     0,
+						SupplyWarehouseId:         id,
+						SupplyWarehouseDetailInfo: item.ID,
 					}
 
 					if medical.MaxUnit == medical.MinUnit {
@@ -2147,27 +2155,28 @@ func (this *SupplyOrderApiController) GetGoodOrderCountList() {
 
 					//入库单表格
 					warehouseInfo := &models.WarehousingInfo{
-						WarehousingOrder:  info.WarehousingOrder,
-						WarehousingId:     info.ID,
-						GoodId:            item.ProjectId,
-						Number:            item.SupplyBatchNumber,
-						GoodTypeId:        good.GoodTypeId,
-						ProductDate:       item.SupplyProductDate,
-						ExpiryDate:        item.SupplyExpiryDate,
-						WarehousingCount:  item.Count,
-						Price:             item.Price,
-						TotalPrice:        0,
-						Status:            1,
-						Ctime:             time.Now().Unix(),
-						Remark:            item.Remark,
-						OrgId:             orgId,
-						Type:              1,
-						Manufacturer:      item.ManufacturerId,
-						StockCount:        item.Count,
-						Dealer:            good.Dealer,
-						LicenseNumber:     item.SupplyLicenseNumber,
-						PackingPrice:      good.PackingPrice,
-						SupplyWarehouseId: id,
+						WarehousingOrder:          info.WarehousingOrder,
+						WarehousingId:             info.ID,
+						GoodId:                    item.ProjectId,
+						Number:                    item.SupplyBatchNumber,
+						GoodTypeId:                good.GoodTypeId,
+						ProductDate:               item.SupplyProductDate,
+						ExpiryDate:                item.SupplyExpiryDate,
+						WarehousingCount:          item.Count,
+						Price:                     item.Price,
+						TotalPrice:                0,
+						Status:                    1,
+						Ctime:                     time.Now().Unix(),
+						Remark:                    item.Remark,
+						OrgId:                     orgId,
+						Type:                      1,
+						Manufacturer:              item.ManufacturerId,
+						StockCount:                item.Count,
+						Dealer:                    good.Dealer,
+						LicenseNumber:             item.SupplyLicenseNumber,
+						PackingPrice:              good.PackingPrice,
+						SupplyWarehouseId:         id,
+						SupplyWarehouseDetailInfo: item.ID,
 					}
 					warehousingInfo = append(warehousingInfo, warehouseInfo)
 				}
@@ -2179,26 +2188,27 @@ func (this *SupplyOrderApiController) GetGoodOrderCountList() {
 		service.CreatedWarehouseingDetail(item)
 		warehousinginfo, _ := service.GetLastWarehousingInfo(item.GoodId)
 		flow := models.VmStockFlow{
-			WarehousingOrder:    item.WarehousingOrder,
-			WarehousingId:       item.ID,
-			GoodId:              item.GoodId,
-			Number:              item.Number,
-			ProductDate:         item.ProductDate,
-			ExpireDate:          item.ExpiryDate,
-			Count:               item.WarehousingCount,
-			Price:               item.Price,
-			Status:              1,
-			Ctime:               time.Now().Unix(),
-			UserOrgId:           orgId,
-			Manufacturer:        item.Manufacturer,
-			Dealer:              item.Dealer,
-			LicenseNumber:       item.LicenseNumber,
-			IsEdit:              1,
-			Creator:             checker,
-			SystemTime:          record_date,
-			ConsumableType:      1,
-			WarehousingDetailId: warehousinginfo.ID,
-			SupplyWarehouseId:   id,
+			WarehousingOrder:          item.WarehousingOrder,
+			WarehousingId:             item.ID,
+			GoodId:                    item.GoodId,
+			Number:                    item.Number,
+			ProductDate:               item.ProductDate,
+			ExpireDate:                item.ExpiryDate,
+			Count:                     item.WarehousingCount,
+			Price:                     item.Price,
+			Status:                    1,
+			Ctime:                     time.Now().Unix(),
+			UserOrgId:                 orgId,
+			Manufacturer:              item.Manufacturer,
+			Dealer:                    item.Dealer,
+			LicenseNumber:             item.LicenseNumber,
+			IsEdit:                    1,
+			Creator:                   checker,
+			SystemTime:                record_date,
+			ConsumableType:            1,
+			WarehousingDetailId:       warehousinginfo.ID,
+			SupplyWarehouseId:         id,
+			SupplyWarehouseDetailInfo: item.ID,
 		}
 		service.CreateStockFlowOne(flow)
 	}
@@ -2320,6 +2330,13 @@ func (this *SupplyOrderApiController) SaveGoodReturnOrder() {
 				}
 				supply_count := int64(items["supply_count"].(float64))
 
+				if items["count"] == nil || reflect.TypeOf(items["count"]).String() != "float64" {
+					utils.ErrorLog("count")
+					this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+					return
+				}
+				count := int64(items["count"].(float64))
+
 				if items["manufacturer_id"] == nil || reflect.TypeOf(items["manufacturer_id"]).String() != "float64" {
 					utils.ErrorLog("manufacturer_id")
 					this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
@@ -2454,37 +2471,46 @@ func (this *SupplyOrderApiController) SaveGoodReturnOrder() {
 					return
 				}
 				warehouse_info_id := int64(items["warehouse_info_id"].(float64))
+
+				if items["id"] == nil || reflect.TypeOf(items["id"]).String() != "float64" {
+					utils.ErrorLog("id")
+					this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+					return
+				}
+				id := int64(items["id"].(float64))
 				cancelOrder := &models.SpSupplierWarehousingCancelOrder{
-					ManufacturerId:          manufacturer_id,
-					OrderNumber:             order_number,
-					ProjectId:               project_id,
-					GoodNumber:              good_number,
-					IsSource:                is_source,
-					Count:                   supply_count,
-					Price:                   price_float,
-					Remark:                  supply_remake,
-					RateOfConcession:        rate_of_concession_float,
-					DiscountAmount:          discount_amount_float,
-					UserOrgId:               orgId,
-					Ctime:                   time.Now().Unix(),
-					Status:                  1,
-					Mtime:                   0,
-					WarehouseCancelId:       order.ID,
-					Type:                    1,
-					ReturnNumber:            order.Number,
-					WarehouseOutId:          warehouse_out_id,
-					SupplySpecificationName: supply_specification_name,
-					SupplyType:              supply_type,
-					SupplyTotal:             supply_total,
-					SupplyManufacturer:      supply_manufacturer,
-					Name:                    name,
-					SupplyUnit:              supply_unit,
-					SupplyLicenseNumber:     supply_license_number,
-					SupplyBatchNumber:       supply_batch_number,
-					SupplyExpiryDate:        supply_expiry_date,
-					SupplyProductDate:       supply_product_date,
-					WarehouseInfoId:         warehouse_info_id,
-					WarehousingId:           warehousing_id,
+					ManufacturerId:            manufacturer_id,
+					OrderNumber:               order_number,
+					ProjectId:                 project_id,
+					GoodNumber:                good_number,
+					IsSource:                  is_source,
+					Count:                     supply_count,
+					Price:                     price_float,
+					Remark:                    supply_remake,
+					RateOfConcession:          rate_of_concession_float,
+					DiscountAmount:            discount_amount_float,
+					UserOrgId:                 orgId,
+					Ctime:                     time.Now().Unix(),
+					Status:                    1,
+					Mtime:                     0,
+					WarehouseCancelId:         order.ID,
+					Type:                      1,
+					ReturnNumber:              order.Number,
+					WarehouseOutId:            warehouse_out_id,
+					SupplySpecificationName:   supply_specification_name,
+					SupplyType:                supply_type,
+					SupplyTotal:               supply_total,
+					SupplyManufacturer:        supply_manufacturer,
+					Name:                      name,
+					SupplyUnit:                supply_unit,
+					SupplyLicenseNumber:       supply_license_number,
+					SupplyBatchNumber:         supply_batch_number,
+					SupplyExpiryDate:          supply_expiry_date,
+					SupplyProductDate:         supply_product_date,
+					WarehouseInfoId:           warehouse_info_id,
+					WarehousingId:             warehousing_id,
+					SourceCount:               count,
+					SupplyWarehouseDetailInfo: id,
 				}
 				warehouseCancel = append(warehouseCancel, cancelOrder)
 			}
@@ -2626,6 +2652,7 @@ func (this *SupplyOrderApiController) UpdateGoodReturn() {
 	var updateWarehouseCancel []*models.SpSupplierWarehousingCancelOrder
 	if dataBody["stockIn"] != nil && reflect.TypeOf(dataBody["stockIn"]).String() == "[]interface {}" {
 		thisStockIn, _ := dataBody["stockIn"].([]interface{})
+
 		if len(thisStockIn) > 0 {
 			for _, item := range thisStockIn {
 				items := item.(map[string]interface{})
@@ -2744,6 +2771,7 @@ func (this *SupplyOrderApiController) UpdateGoodReturn() {
 
 				if id > 0 {
 					cancelOrder := &models.SpSupplierWarehousingCancelOrder{
+						ID:                      id,
 						ManufacturerId:          manufacturer_id,
 						OrderNumber:             order_number,
 						ProjectId:               project_id,
@@ -2807,7 +2835,7 @@ func (this *SupplyOrderApiController) UpdateGoodReturn() {
 		}
 
 		if len(updateWarehouseCancel) > 0 {
-			for _, item := range warehouseCancel {
+			for _, item := range updateWarehouseCancel {
 				service.UpdateWarehouseCancelOrder(item)
 			}
 		}
@@ -3024,6 +3052,8 @@ func (this *SupplyOrderApiController) CheckReturnOrder() {
 					Status:                  1,
 					WarehouseOutTime:        record_date,
 					Type:                    1,
+					SupplyCancelOutId:       id,
+					SupplyWarehouseId:       warehouse_out_id,
 				}
 				// 查询今日是否存在出库单
 				_, errcodes := service.GetDrugWarehouseOutById(orgId, record_date)
@@ -3055,6 +3085,8 @@ func (this *SupplyOrderApiController) CheckReturnOrder() {
 					BatchNumber:             item.SupplyBatchNumber,
 					IsSys:                   0,
 					WarehouseInfoId:         0,
+					SupplyCancelOutId:       id,
+					SupplyWarehouseId:       warehouse_out_id,
 				}
 
 				drup, _ := service.FindBaseDrugLibRecord(orgId, item.ProjectId)
@@ -3063,6 +3095,11 @@ func (this *SupplyOrderApiController) CheckReturnOrder() {
 					service.AutoDrugDeliverInfoNight(orgId, prescribingNumber, &warehouseOut, &drup, warehouseOutInfo)
 				}
 
+				//修改原数据
+				orderInfo := models.SpSupplierWarehousingCancelOrder{
+					SourceCount: item.Count - item.SourceCount,
+				}
+				service.UpdateSupplyCancelById(item.ID, orderInfo)
 			}
 
 			//耗材
@@ -3094,6 +3131,9 @@ func (this *SupplyOrderApiController) CheckReturnOrder() {
 					Status:                  1,
 					WarehouseOutTime:        record_date,
 					Type:                    1,
+					SupplyCancelOutId:       id,
+					SupplyWarehouseId:       warehouse_out_id,
+					IsSys:                   0,
 				}
 				//查询是否生成出库单
 				_, errcodes := service.FindStockOutByIsSys(orgId, 0, operation_time)
@@ -3101,12 +3141,13 @@ func (this *SupplyOrderApiController) CheckReturnOrder() {
 					service.AddSigleWarehouseOut(&warehouseOut)
 				}
 				outWarehouse, _ := service.GetlastWarehouseOutById(orgId, record_date)
+				goodObj, _ := service.GetGoodInformationByGoodId(item.ProjectId)
 				info := &models.WarehouseOutInfo{
 					WarehouseOutOrderNumber: outWarehouse.WarehouseOutOrderNumber,
 					WarehouseOutId:          outWarehouse.ID,
 					WarehouseInfotId:        0,
 					GoodId:                  item.ProjectId,
-					GoodTypeId:              0,
+					GoodTypeId:              goodObj.GoodTypeId,
 					Count:                   item.Count,
 					Price:                   item.Price,
 					TotalPrice:              0,
@@ -3121,14 +3162,22 @@ func (this *SupplyOrderApiController) CheckReturnOrder() {
 					LicenseNumber:           item.SupplyLicenseNumber,
 					ConsumableType:          0,
 					SupplyCancelOutId:       id,
+					OrgId:                   orgId,
+					SupplyWarehouseId:       warehouse_out_id,
 				}
 				//出库逻辑
 				parseDateErr := service.ConsumablesDeliveryNight(orgId, record_date, info, &warehouseOut, item.Count, 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)
 			}
 		}
 	}
@@ -3171,3 +3220,61 @@ func (this *SupplyOrderApiController) DeleteGoodOrderById() {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 	}
 }
+
+func (this *SupplyOrderApiController) DeleteReturnOrder() {
+
+	id, _ := this.GetInt64("id")
+	err := service.DeleteReturnOrder(id)
+	if err == nil {
+		returnData := make(map[string]interface{}, 0)
+		returnData["msg"] = "ok"
+		this.ServeSuccessJSON(returnData)
+		return
+	} else {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+	}
+}
+
+func (this *SupplyOrderApiController) DeleteReturnOrderById() {
+
+	id, _ := this.GetInt64("id")
+	err := service.DeleteReturnOrderById(id)
+	if err == nil {
+		returnData := make(map[string]interface{}, 0)
+		returnData["msg"] = "ok"
+		this.ServeSuccessJSON(returnData)
+		return
+	} else {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+	}
+}
+
+func (this *SupplyOrderApiController) ModefyReturnOrder() {
+	id, _ := this.GetInt64("id")
+	err := service.ModefyReturnOrder(id)
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+	if err == nil {
+		//获取退库单详情
+		list, _ := service.GetSupplyCancelOrderDetail(id, orgId)
+		for _, item := range list {
+
+			//药品
+			if item.IsSource == 2 {
+
+			}
+			//耗材
+			if item.IsSource == 1 {
+
+				//退库
+				info := models.WarehousingInfo{
+					StockCount: item.Count,
+				}
+				//更改库存
+				err := service.UpdateWarehousingInfoById(item.ProjectId, item.WarehouseInfoId, info)
+				fmt.Println(err)
+			}
+		}
+	} else {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+	}
+}

models/drug_stock.go

@@ -52,34 +52,35 @@ type DrugWarehouseInfoSix struct {
 }
 
 type DrugWarehouseInfo struct {
-	ID                int64   `gorm:"column:id" json:"id" form:"id"`
-	WarehousingId     int64   `gorm:"column:warehousing_id" json:"warehousing_id" form:"warehousing_id"`
-	DrugId            int64   `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
-	Number            string  `gorm:"column:number" json:"number" form:"number"`
-	ProductDate       int64   `gorm:"column:product_date" json:"product_date" form:"product_date"`
-	ExpiryDate        int64   `gorm:"column:expiry_date" json:"expiry_date" form:"expiry_date"`
-	WarehousingCount  int64   `gorm:"column:warehousing_count" json:"warehousing_count" form:"warehousing_count"`
-	Price             float64 `gorm:"column:price" json:"price" form:"price"`
-	TotalPrice        float64 `gorm:"column:total_price" json:"total_price" form:"total_price"`
-	Dealer            int64   `gorm:"column:dealer" json:"dealer" form:"dealer"`
-	Manufacturer      int64   `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
-	Remark            string  `gorm:"column:remark" json:"remark" form:"remark"`
-	Ctime             int64   `gorm:"column:ctime" json:"ctime" form:"ctime"`
-	Mtime             int64   `gorm:"column:mtime" json:"mtime" form:"mtime"`
-	Status            int64   `gorm:"column:status" json:"status" form:"status"`
-	OrgId             int64   `gorm:"column:org_id" json:"org_id" form:"org_id"`
-	IsReturn          int64   `gorm:"column:is_return" json:"is_return" form:"is_return"`
-	WarehousingOrder  string  `gorm:"column:warehousing_order" json:"warehousing_order" form:"warehousing_order"`
-	Type              int64   `gorm:"column:type" json:"type" form:"type"`
-	RetailPrice       float64 `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
-	RetailTotalPrice  float64 `gorm:"column:retail_total_price" json:"retail_total_price" form:"retail_total_price"`
-	BatchNumber       string  `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
-	MaxUnit           string  `gorm:"column:max_unit" json:"max_unit" form:"max_unit"`
-	MinUnit           string  `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
-	StockMaxNumber    int64   `gorm:"column:stock_max_number" json:"stock_max_number" form:"stock_max_number"`
-	StockMinNumber    int64   `gorm:"column:stock_min_number" json:"stock_min_number" form:"stock_min_number"`
-	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"`
+	ID                        int64   `gorm:"column:id" json:"id" form:"id"`
+	WarehousingId             int64   `gorm:"column:warehousing_id" json:"warehousing_id" form:"warehousing_id"`
+	DrugId                    int64   `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
+	Number                    string  `gorm:"column:number" json:"number" form:"number"`
+	ProductDate               int64   `gorm:"column:product_date" json:"product_date" form:"product_date"`
+	ExpiryDate                int64   `gorm:"column:expiry_date" json:"expiry_date" form:"expiry_date"`
+	WarehousingCount          int64   `gorm:"column:warehousing_count" json:"warehousing_count" form:"warehousing_count"`
+	Price                     float64 `gorm:"column:price" json:"price" form:"price"`
+	TotalPrice                float64 `gorm:"column:total_price" json:"total_price" form:"total_price"`
+	Dealer                    int64   `gorm:"column:dealer" json:"dealer" form:"dealer"`
+	Manufacturer              int64   `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
+	Remark                    string  `gorm:"column:remark" json:"remark" form:"remark"`
+	Ctime                     int64   `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime                     int64   `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Status                    int64   `gorm:"column:status" json:"status" form:"status"`
+	OrgId                     int64   `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	IsReturn                  int64   `gorm:"column:is_return" json:"is_return" form:"is_return"`
+	WarehousingOrder          string  `gorm:"column:warehousing_order" json:"warehousing_order" form:"warehousing_order"`
+	Type                      int64   `gorm:"column:type" json:"type" form:"type"`
+	RetailPrice               float64 `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
+	RetailTotalPrice          float64 `gorm:"column:retail_total_price" json:"retail_total_price" form:"retail_total_price"`
+	BatchNumber               string  `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
+	MaxUnit                   string  `gorm:"column:max_unit" json:"max_unit" form:"max_unit"`
+	MinUnit                   string  `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
+	StockMaxNumber            int64   `gorm:"column:stock_max_number" json:"stock_max_number" form:"stock_max_number"`
+	StockMinNumber            int64   `gorm:"column:stock_min_number" json:"stock_min_number" form:"stock_min_number"`
+	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"`
+	SupplyWarehouseDetailInfo int64   `gorm:"column:supply_warehouse_detail_info" json:"supply_warehouse_detail_info" form:"supply_warehouse_detail_info"`
 }
 
 func (DrugWarehouseInfo) TableName() string {
@@ -113,6 +114,8 @@ type DrugWarehouseOut struct {
 	IsSys                   int64         `gorm:"column:is_sys" json:"is_sys" form:"is_sys"`
 	Manufacturers           *Manufacturer `gorm:"ForeignKey:Manufacturer;AssociationForeignKey:ID" json:"manufacturers"`
 	Dealers                 *Dealer       `gorm:"ForeignKey:Dealer;AssociationForeignKey:ID" json:"dealers"`
+	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 (DrugWarehouseOut) TableName() string {
@@ -149,6 +152,8 @@ type DrugWarehouseOutInfo struct {
 	PatientId               int64   `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
 	WarehouseInfoId         int64   `gorm:"column:warehouse_info_id" json:"warehouse_info_id" form:"warehouse_info_id"`
 	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"`
 }
 
 func (DrugWarehouseOutInfo) TableName() string {
@@ -343,46 +348,48 @@ type StDrugWarehouseOutInfo struct {
 }
 
 type DrugFlow struct {
-	ID                      int64                `gorm:"column:id" json:"id" form:"id"`
-	WarehousingId           int64                `gorm:"column:warehousing_id" json:"warehousing_id" form:"warehousing_id"`
-	DrugId                  int64                `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
-	Number                  string               `gorm:"column:number" json:"number" form:"number"`
-	BatchNumber             string               `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
-	Count                   int64                `gorm:"column:count" json:"count" form:"count"`
-	UserOrgId               int64                `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
-	PatientId               int64                `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
-	SystemTime              int64                `gorm:"column:system_time" json:"system_time" form:"system_time"`
-	ConsumableType          int64                `gorm:"column:consumable_type" json:"consumable_type" form:"consumable_type"`
-	IsSys                   int64                `gorm:"column:is_sys" json:"is_sys" form:"is_sys"`
-	WarehousingOrder        string               `gorm:"column:warehousing_order" json:"warehousing_order" form:"warehousing_order"`
-	WarehouseOutId          int64                `gorm:"column:warehouse_out_id" json:"warehouse_out_id" form:"warehouse_out_id"`
-	WarehouseOutOrderNumber string               `gorm:"column:warehouse_out_order_number" json:"warehouse_out_order_number" form:"warehouse_out_order_number"`
-	IsEdit                  int64                `gorm:"column:is_edit" json:"is_edit" form:"is_edit"`
-	CancelStockId           int64                `gorm:"column:cancel_stock_id" json:"cancel_stock_id" form:"cancel_stock_id"`
-	CancelOrderNumber       string               `gorm:"column:cancel_order_number" json:"cancel_order_number" form:"cancel_order_number"`
-	Manufacturer            int64                `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
-	Dealer                  int64                `gorm:"column:dealer" json:"dealer" form:"dealer"`
-	Creator                 int64                `gorm:"column:creator" json:"creator" form:"creator"`
-	UpdateCreator           int64                `gorm:"column:update_creator" json:"update_creator" form:"update_creator"`
-	Status                  int64                `gorm:"column:status" json:"status" form:"status"`
-	Ctime                   int64                `gorm:"column:ctime" json:"ctime" form:"ctime"`
-	Mtime                   int64                `gorm:"column:mtime" json:"mtime" form:"mtime"`
-	Price                   float64              `gorm:"column:price" json:"price" form:"price"`
-	WarehousingDetailId     int64                `gorm:"column:warehousing_detail_id" json:"warehousing_detail_id" form:"warehousing_detail_id"`
-	WarehouseOutDetailId    int64                `gorm:"column:warehouse_out_detail_id" json:"warehouse_out_detail_id" form:"warehouse_out_detail_id"`
-	CancelOutDetailId       int64                `gorm:"column:cancel_out_detail_id" json:"cancel_out_detail_id" form:"cancel_out_detail_id"`
-	ExpireDate              int64                `gorm:"column:expire_date" json:"expire_date" form:"expire_date"`
-	ProductDate             int64                `gorm:"column:product_date" json:"product_date" form:"product_date"`
-	MaxUnit                 string               `gorm:"column:max_unit" json:"max_unit" form:"max_unit"`
-	MinUnit                 string               `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
-	StockMaxNumber          int64                `gorm:"column:stock_max_number" json:"stock_max_number" form:"stock_max_number"`
-	StockMinNumber          int64                `gorm:"column:stock_min_number" json:"stock_min_number" form:"stock_min_number"`
-	LastStockMaxNumber      int64                `gorm:"column:last_stock_max_number" json:"last_stock_max_number" form:"last_stock_max_number"`
-	LastStockMinNumber      int64                `gorm:"column:last_stock_min_number" json:"last_stock_min_number" form:"last_stock_min_number"`
-	DrugWarehouseInfo       []*DrugWarehouseInfo `gorm:"ForeignKey:DrugId;AssociationForeignKey:DrugId" `
-	BaseDrugLib             BaseDrugLib          `gorm:"ForeignKey:ID;AssociationForeignKey:DrugId" `
-	AdviceId                int64                `gorm:"column:advice_id" json:"advice_id" form:"advice_id"`
-	SupplyWarehouseId       int64                `gorm:"column:supply_warehouse_id" json:"supply_warehouse_id" form:"supply_warehouse_id"`
+	ID                        int64                `gorm:"column:id" json:"id" form:"id"`
+	WarehousingId             int64                `gorm:"column:warehousing_id" json:"warehousing_id" form:"warehousing_id"`
+	DrugId                    int64                `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
+	Number                    string               `gorm:"column:number" json:"number" form:"number"`
+	BatchNumber               string               `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
+	Count                     int64                `gorm:"column:count" json:"count" form:"count"`
+	UserOrgId                 int64                `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	PatientId                 int64                `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	SystemTime                int64                `gorm:"column:system_time" json:"system_time" form:"system_time"`
+	ConsumableType            int64                `gorm:"column:consumable_type" json:"consumable_type" form:"consumable_type"`
+	IsSys                     int64                `gorm:"column:is_sys" json:"is_sys" form:"is_sys"`
+	WarehousingOrder          string               `gorm:"column:warehousing_order" json:"warehousing_order" form:"warehousing_order"`
+	WarehouseOutId            int64                `gorm:"column:warehouse_out_id" json:"warehouse_out_id" form:"warehouse_out_id"`
+	WarehouseOutOrderNumber   string               `gorm:"column:warehouse_out_order_number" json:"warehouse_out_order_number" form:"warehouse_out_order_number"`
+	IsEdit                    int64                `gorm:"column:is_edit" json:"is_edit" form:"is_edit"`
+	CancelStockId             int64                `gorm:"column:cancel_stock_id" json:"cancel_stock_id" form:"cancel_stock_id"`
+	CancelOrderNumber         string               `gorm:"column:cancel_order_number" json:"cancel_order_number" form:"cancel_order_number"`
+	Manufacturer              int64                `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
+	Dealer                    int64                `gorm:"column:dealer" json:"dealer" form:"dealer"`
+	Creator                   int64                `gorm:"column:creator" json:"creator" form:"creator"`
+	UpdateCreator             int64                `gorm:"column:update_creator" json:"update_creator" form:"update_creator"`
+	Status                    int64                `gorm:"column:status" json:"status" form:"status"`
+	Ctime                     int64                `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime                     int64                `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Price                     float64              `gorm:"column:price" json:"price" form:"price"`
+	WarehousingDetailId       int64                `gorm:"column:warehousing_detail_id" json:"warehousing_detail_id" form:"warehousing_detail_id"`
+	WarehouseOutDetailId      int64                `gorm:"column:warehouse_out_detail_id" json:"warehouse_out_detail_id" form:"warehouse_out_detail_id"`
+	CancelOutDetailId         int64                `gorm:"column:cancel_out_detail_id" json:"cancel_out_detail_id" form:"cancel_out_detail_id"`
+	ExpireDate                int64                `gorm:"column:expire_date" json:"expire_date" form:"expire_date"`
+	ProductDate               int64                `gorm:"column:product_date" json:"product_date" form:"product_date"`
+	MaxUnit                   string               `gorm:"column:max_unit" json:"max_unit" form:"max_unit"`
+	MinUnit                   string               `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
+	StockMaxNumber            int64                `gorm:"column:stock_max_number" json:"stock_max_number" form:"stock_max_number"`
+	StockMinNumber            int64                `gorm:"column:stock_min_number" json:"stock_min_number" form:"stock_min_number"`
+	LastStockMaxNumber        int64                `gorm:"column:last_stock_max_number" json:"last_stock_max_number" form:"last_stock_max_number"`
+	LastStockMinNumber        int64                `gorm:"column:last_stock_min_number" json:"last_stock_min_number" form:"last_stock_min_number"`
+	DrugWarehouseInfo         []*DrugWarehouseInfo `gorm:"ForeignKey:DrugId;AssociationForeignKey:DrugId" `
+	BaseDrugLib               BaseDrugLib          `gorm:"ForeignKey:ID;AssociationForeignKey:DrugId" `
+	AdviceId                  int64                `gorm:"column:advice_id" json:"advice_id" form:"advice_id"`
+	SupplyWarehouseId         int64                `gorm:"column:supply_warehouse_id" json:"supply_warehouse_id" form:"supply_warehouse_id"`
+	SupplyCancelOutId         int64                `gorm:"column:supply_cancel_out_id" json:"supply_cancel_out_id" form:"supply_cancel_out_id"`
+	SupplyWarehouseDetailInfo int64                `gorm:"column:supply_warehouse_detail_info" json:"supply_warehouse_detail_info" form:"supply_warehouse_detail_info"`
 }
 
 func (DrugFlow) TableName() string {

models/stock_models.go

@@ -106,34 +106,35 @@ func (StWarehousingInfo) 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"`
-	SupplyWarehouseId int64       `gorm:"column:supply_warehouse_id" json:"supply_warehouse_id" form:"supply_warehouse_id"`
+	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"`
+	SupplyWarehouseDetailInfo int64       `gorm:"column:supply_warehouse_detail_info" json:"supply_warehouse_detail_info" form:"supply_warehouse_detail_info"`
 }
 
 func (WarehousingInfo) TableName() string {
@@ -200,6 +201,8 @@ type WarehouseOut struct {
 	Dealers                 Dealer       `gorm:"ForeignKey:ID;AssociationForeignKey:Dealer" json:"Dealer"`
 	Type                    int64        `gorm:"column:type" json:"type"`
 	IsSys                   int64        `gorm:"column:is_sys" json:"is_sys"`
+	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 (WarehouseOut) TableName() string {
@@ -238,6 +241,7 @@ type WarehouseOutInfo struct {
 	ConsumableType          int64        `gorm:"column:consumable_type" json:"consumable_type" form:"consumable_type"`
 	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"`
 }
 
 func (WarehouseOutInfo) TableName() string {
@@ -554,39 +558,41 @@ func (WarehouseOutInfoSix) TableName() string {
 }
 
 type VmStockFlow struct {
-	ID                      int64   `gorm:"column:id" json:"id" form:"id"`
-	WarehousingId           int64   `gorm:"column:warehousing_id" json:"warehousing_id" form:"warehousing_id"`
-	GoodId                  int64   `gorm:"column:good_id" json:"good_id" form:"good_id"`
-	Number                  string  `gorm:"column:number" json:"number" form:"number"`
-	LicenseNumber           string  `gorm:"column:license_number" json:"license_number" form:"license_number"`
-	Count                   int64   `gorm:"column:count" json:"count" form:"count"`
-	UserOrgId               int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
-	PatientId               int64   `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
-	SystemTime              int64   `gorm:"column:system_time" json:"system_time" form:"system_time"`
-	ConsumableType          int64   `gorm:"column:consumable_type" json:"consumable_type" form:"consumable_type"`
-	IsSys                   int64   `gorm:"column:is_sys" json:"is_sys" form:"is_sys"`
-	WarehousingOrder        string  `gorm:"column:warehousing_order" json:"warehousing_order" form:"warehousing_order"`
-	WarehouseOutId          int64   `gorm:"column:warehouse_out_id" json:"warehouse_out_id" form:"warehouse_out_id"`
-	WarehouseOutOrderNumber string  `gorm:"column:warehouse_out_order_number" json:"warehouse_out_order_number" form:"warehouse_out_order_number"`
-	IsEdit                  int64   `gorm:"column:is_edit" json:"is_edit" form:"is_edit"`
-	CancelStockId           int64   `gorm:"column:cancel_stock_id" json:"cancel_stock_id" form:"cancel_stock_id"`
-	CancelOrderNumber       string  `gorm:"column:cancel_order_number" json:"cancel_order_number" form:"cancel_order_number"`
-	Manufacturer            int64   `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
-	Dealer                  int64   `gorm:"column:dealer" json:"dealer" form:"dealer"`
-	Creator                 int64   `gorm:"column:creator" json:"creator" form:"creator"`
-	UpdateCreator           int64   `gorm:"column:update_creator" json:"update_creator" form:"update_creator"`
-	Status                  int64   `gorm:"column:status" json:"status" form:"status"`
-	Ctime                   int64   `gorm:"column:ctime" json:"ctime" form:"ctime"`
-	Mtime                   int64   `gorm:"column:mtime" json:"mtime" form:"mtime"`
-	Price                   float64 `gorm:"column:price" json:"price" form:"price"`
-	WarehousingDetailId     int64   `gorm:"column:warehousing_detail_id" json:"warehousing_detail_id" form:"warehousing_detail_id"`
-	WarehouseOutDetailId    int64   `gorm:"column:warehouse_out_detail_id" json:"warehouse_out_detail_id" form:"warehouse_out_detail_id"`
-	CancelOutDetailId       int64   `gorm:"column:cancel_out_detail_id" json:"cancel_out_detail_id" form:"cancel_out_detail_id"`
-	ProductDate             int64   `gorm:"column:product_date" json:"product_date" form:"product_date"`
-	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"`
+	ID                        int64   `gorm:"column:id" json:"id" form:"id"`
+	WarehousingId             int64   `gorm:"column:warehousing_id" json:"warehousing_id" form:"warehousing_id"`
+	GoodId                    int64   `gorm:"column:good_id" json:"good_id" form:"good_id"`
+	Number                    string  `gorm:"column:number" json:"number" form:"number"`
+	LicenseNumber             string  `gorm:"column:license_number" json:"license_number" form:"license_number"`
+	Count                     int64   `gorm:"column:count" json:"count" form:"count"`
+	UserOrgId                 int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	PatientId                 int64   `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	SystemTime                int64   `gorm:"column:system_time" json:"system_time" form:"system_time"`
+	ConsumableType            int64   `gorm:"column:consumable_type" json:"consumable_type" form:"consumable_type"`
+	IsSys                     int64   `gorm:"column:is_sys" json:"is_sys" form:"is_sys"`
+	WarehousingOrder          string  `gorm:"column:warehousing_order" json:"warehousing_order" form:"warehousing_order"`
+	WarehouseOutId            int64   `gorm:"column:warehouse_out_id" json:"warehouse_out_id" form:"warehouse_out_id"`
+	WarehouseOutOrderNumber   string  `gorm:"column:warehouse_out_order_number" json:"warehouse_out_order_number" form:"warehouse_out_order_number"`
+	IsEdit                    int64   `gorm:"column:is_edit" json:"is_edit" form:"is_edit"`
+	CancelStockId             int64   `gorm:"column:cancel_stock_id" json:"cancel_stock_id" form:"cancel_stock_id"`
+	CancelOrderNumber         string  `gorm:"column:cancel_order_number" json:"cancel_order_number" form:"cancel_order_number"`
+	Manufacturer              int64   `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
+	Dealer                    int64   `gorm:"column:dealer" json:"dealer" form:"dealer"`
+	Creator                   int64   `gorm:"column:creator" json:"creator" form:"creator"`
+	UpdateCreator             int64   `gorm:"column:update_creator" json:"update_creator" form:"update_creator"`
+	Status                    int64   `gorm:"column:status" json:"status" form:"status"`
+	Ctime                     int64   `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime                     int64   `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Price                     float64 `gorm:"column:price" json:"price" form:"price"`
+	WarehousingDetailId       int64   `gorm:"column:warehousing_detail_id" json:"warehousing_detail_id" form:"warehousing_detail_id"`
+	WarehouseOutDetailId      int64   `gorm:"column:warehouse_out_detail_id" json:"warehouse_out_detail_id" form:"warehouse_out_detail_id"`
+	CancelOutDetailId         int64   `gorm:"column:cancel_out_detail_id" json:"cancel_out_detail_id" form:"cancel_out_detail_id"`
+	ProductDate               int64   `gorm:"column:product_date" json:"product_date" form:"product_date"`
+	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"`
+	SupplyCancelOutId         int64   `gorm:"column:supply_cancel_out_id" json:"supply_cancel_out_id" form:"supply_cancel_out_id"`
+	SupplyWarehouseDetailInfo int64   `gorm:"column:supply_warehouse_detail_info" json:"supply_warehouse_detail_info" form:"supply_warehouse_detail_info"`
 }
 
 func (VmStockFlow) TableName() string {

models/supply.models.go

@@ -331,37 +331,39 @@ func (SpSupplierWarehouseCancel) TableName() string {
 }
 
 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"`
-	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"`
+	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"`
+	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"`
+	SourceCount               int64   `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"`
 }
 
 func (SpSupplierWarehousingCancelOrder) TableName() string {

service/stock_service.go

@@ -504,11 +504,11 @@ func CreateDrugWarehousingInfoSix(warehousingInfo []*models.DrugWarehouseInfo) (
 	if len(warehousingInfo) > 0 {
 		utx := writeDb.Begin()
 		if len(warehousingInfo) > 0 {
-			thisSQL := "INSERT INTO xt_drug_warehouse_info (warehousing_id, drug_id, number, product_date,expiry_date,warehousing_count,price,total_price,dealer,manufacturer,remark,ctime,mtime,status,org_id,warehousing_order,type,retail_price,retail_total_price,stock_max_number,max_unit,min_unit,batch_number,stock_min_number,supply_warehouse_id) VALUES "
+			thisSQL := "INSERT INTO xt_drug_warehouse_info (warehousing_id, drug_id, number, product_date,expiry_date,warehousing_count,price,total_price,dealer,manufacturer,remark,ctime,mtime,status,org_id,warehousing_order,type,retail_price,retail_total_price,stock_max_number,max_unit,min_unit,batch_number,stock_min_number,supply_warehouse_id,supply_warehouse_detail_info) VALUES "
 			insertParams := make([]string, 0)
 			insertData := make([]interface{}, 0)
 			for _, info := range warehousingInfo {
-				insertParams = append(insertParams, "(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)")
+				insertParams = append(insertParams, "(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)")
 				insertData = append(insertData, info.WarehousingId)
 				insertData = append(insertData, info.DrugId)
 				insertData = append(insertData, info.Number)
@@ -534,6 +534,7 @@ func CreateDrugWarehousingInfoSix(warehousingInfo []*models.DrugWarehouseInfo) (
 				insertData = append(insertData, info.BatchNumber)
 				insertData = append(insertData, info.StockMinNumber)
 				insertData = append(insertData, info.SupplyWarehouseId)
+				insertData = append(insertData, info.SupplyWarehouseDetailInfo)
 			}
 			thisSQL += strings.Join(insertParams, ", ")
 			err = utx.Exec(thisSQL, insertData...).Error

service/supply_service.go

@@ -3,7 +3,6 @@ package service
 import (
 	"XT_New/models"
 	"github.com/jinzhu/gorm"
-	"strconv"
 	"strings"
 	"time"
 )
@@ -675,7 +674,7 @@ func GetGoodReturnOrderDetail(id int64, orgid int64) (order []*models.SpSupplier
 
 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
+	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
 	return err
 }
 
@@ -786,12 +785,12 @@ func CreateDrugFlowSix(drugflow []*models.DrugFlow) (err error) {
 	if len(drugflow) > 0 {
 		utx := writeDb.Begin()
 		if len(drugflow) > 0 {
-			thisSQL := "INSERT INTO xt_drug_flow (warehousing_id, drug_id, number,batch_number,count,user_org_id,patient_id,system_time,consumable_type,is_sys,warehousing_order,warehouse_out_id,warehouse_out_order_number,is_edit,cancel_stock_id,cancel_order_number,manufacturer,dealer,creator,update_creator,status,ctime,mtime,price,warehousing_detail_id,warehouse_out_detail_id,cancel_out_detail_id,expire_date,product_date,max_unit,min_unit,supply_warehouse_id) VALUES "
+			thisSQL := "INSERT INTO xt_drug_flow (warehousing_id, drug_id, number,batch_number,count,user_org_id,patient_id,system_time,consumable_type,is_sys,warehousing_order,warehouse_out_id,warehouse_out_order_number,is_edit,cancel_stock_id,cancel_order_number,manufacturer,dealer,creator,update_creator,status,ctime,mtime,price,warehousing_detail_id,warehouse_out_detail_id,cancel_out_detail_id,expire_date,product_date,max_unit,min_unit,supply_warehouse_id,supply_warehouse_detail_info) VALUES "
 			insertParams := make([]string, 0)
 			insertData := make([]interface{}, 0)
 			for _, info := range drugflow {
 
-				insertParams = append(insertParams, "(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)")
+				insertParams = append(insertParams, "(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)")
 				insertData = append(insertData, info.WarehousingId)
 				insertData = append(insertData, info.DrugId)
 				insertData = append(insertData, info.Number)
@@ -825,6 +824,7 @@ func CreateDrugFlowSix(drugflow []*models.DrugFlow) (err error) {
 				insertData = append(insertData, info.MaxUnit)
 				insertData = append(insertData, info.MinUnit)
 				insertData = append(insertData, info.SupplyWarehouseId)
+				insertData = append(insertData, info.SupplyWarehouseDetailInfo)
 			}
 			thisSQL += strings.Join(insertParams, ", ")
 			err = utx.Exec(thisSQL, insertData...).Error
@@ -889,3 +889,34 @@ func GetLastDrugWarehouseById(orgid int64, record_date int64) (models.DrugWareho
 	err := XTReadDB().Where("org_id = ? and warehouse_out_time =? and status = 1", orgid, record_date).Find(&out).Error
 	return out, err
 }
+
+func UpdateSupplyCancelById(id int64, order models.SpSupplierWarehousingCancelOrder) error {
+
+	err := XTReadDB().Model(&order).Where("id = ? and status = 1", id).Updates(map[string]interface{}{"source_count": order.SourceCount}).Error
+	return err
+}
+
+func DeleteReturnOrder(id int64) error {
+
+	err := XTWriteDB().Model(&models.SpSupplierWarehouseCancel{}).Where("id = ? and status = 1", id).Updates(map[string]interface{}{"status": 0}).Error
+	err = XTWriteDB().Model(&models.SpSupplierWarehousingCancelOrder{}).Where("warehouse_cancel_id = ? and status = 1", id).Updates(map[string]interface{}{"status": 0}).Error
+	return err
+}
+
+func DeleteReturnOrderById(id int64) error {
+	err = XTWriteDB().Model(&models.SpSupplierWarehousingCancelOrder{}).Where("id = ? and status = 1", id).Updates(map[string]interface{}{"status": 0}).Error
+	return err
+}
+
+func ModefyReturnOrder(id int64) error {
+
+	cancel := models.SpSupplierWarehouseCancel{}
+	err := XTWriteDB().Model(&cancel).Where("id = ? and status = 1", id).Updates(map[string]interface{}{"is_check": 2, "checker": 0, "check_time": 0}).Error
+	return err
+}
+
+func UpdateWarehousingInfoById(goodid int64, supply_warehouse_id int64, info models.WarehousingInfo) error {
+
+	err := XTWriteDB().Where("good_id = ? and supply_warehouse_id = ? and status = 1", goodid, supply_warehouse_id).UpdateColumn("stock_count", gorm.Expr("stock_count - ?", info.StockCount)).Error
+	return err
+}

service/warhouse_service.go

@@ -2787,6 +2787,7 @@ func ConsumablesDeliveryNight(orgID int64, record_time int64, goods *models.Ware
 			Number:                  warehouse.Number,
 			Price:                   goods.Price,
 			LicenseNumber:           goods.LicenseNumber,
+			SupplyCancelOutId:       warehouseOut.SupplyCancelOutId,
 		}
 		warehouseOutInfo.Count = goods.Count
 		//添加出库单详情
@@ -2825,6 +2826,8 @@ func ConsumablesDeliveryNight(orgID int64, record_time int64, goods *models.Ware
 			CancelOutDetailId:       0,
 			ProductDate:             goods.ProductDate,
 			ExpireDate:              goods.ExpiryDate,
+			SupplyCancelOutId:       warehouseOut.SupplyCancelOutId,
+			SupplyWarehouseId:       warehouseOut.SupplyWarehouseId,
 		}
 
 		//创建出库流水
@@ -2869,6 +2872,7 @@ func ConsumablesDeliveryNight(orgID int64, record_time int64, goods *models.Ware
 			Number:                  warehouse.Number,
 			Price:                   warehouse.PackingPrice,
 			LicenseNumber:           goods.LicenseNumber,
+			SupplyCancelOutId:       warehouseOut.SupplyCancelOutId,
 		}
 		warehouseOutInfo.Count = stock_number
 
@@ -2916,6 +2920,8 @@ func ConsumablesDeliveryNight(orgID int64, record_time int64, goods *models.Ware
 			CancelOutDetailId:       0,
 			ProductDate:             goods.ProductDate,
 			ExpireDate:              goods.ExpiryDate,
+			SupplyCancelOutId:       warehouseOut.SupplyCancelOutId,
+			SupplyWarehouseId:       warehouseOut.SupplyWarehouseId,
 		}
 
 		//创建出库明细
@@ -2997,6 +3003,8 @@ func AutoDrugDeliverInfoNight(orgID int64, prescribingNumber int64, warehouseout
 			WarehouseInfoId:         warehouse.ID,
 			CountUnit:               drup.MinUnit,
 			AdviceId:                advice.ID,
+			SupplyCancelOutId:       warehouseout.SupplyCancelOutId,
+			SupplyWarehouseId:       warehouseout.SupplyWarehouseId,
 		}
 
 		warehouseOutInfo.Count = prescribingNumber
@@ -3030,6 +3038,8 @@ func AutoDrugDeliverInfoNight(orgID int64, prescribingNumber int64, warehouseout
 			IsSys:                   0,
 			WarehouseOutDetailId:    drugWareInfo.ID,
 			AdviceId:                advice.ID,
+			SupplyCancelOutId:       warehouseout.SupplyCancelOutId,
+			SupplyWarehouseId:       warehouseout.SupplyWarehouseId,
 		}
 
 		CreateDrugFlowOne(drugflow)
@@ -3094,6 +3104,8 @@ func AutoDrugDeliverInfoNight(orgID int64, prescribingNumber int64, warehouseout
 			WarehouseInfoId:         warehouse.ID,
 			CountUnit:               drup.MinUnit,
 			AdviceId:                advice.ID,
+			SupplyCancelOutId:       warehouseout.SupplyCancelOutId,
+			SupplyWarehouseId:       warehouseout.SupplyWarehouseId,
 		}
 		warehouseOutInfo.Count = stock_number
 
@@ -3126,6 +3138,8 @@ func AutoDrugDeliverInfoNight(orgID int64, prescribingNumber int64, warehouseout
 			IsSys:                   0,
 			WarehouseOutDetailId:    drugWareInfo.ID,
 			AdviceId:                advice.ID,
+			SupplyCancelOutId:       warehouseout.SupplyCancelOutId,
+			SupplyWarehouseId:       warehouseout.SupplyWarehouseId,
 		}
 		CreateDrugFlowOne(drugflow)
 		// 出库完成后，要将该批次库存清零
@@ -3138,7 +3152,6 @@ func AutoDrugDeliverInfoNight(orgID int64, prescribingNumber int64, warehouseout
 		}
 		// 清零完该库存后，还有剩余出库未出完，进行对应的递归操作
 		prescribingNumber_two_temp := deliver_number - stock_number
-		fmt.Println("剩余库存323323223232323232323323223", prescribingNumber_two_temp)
 		advice.CountUnit = drup.MinUnit
 
 		AutoDrugDeliverInfoNight(orgID, prescribingNumber_two_temp, warehouseout, drup, advice)