11月8日库存管理

controllers/supply_order_api_contorller.go

@@ -1982,6 +1982,7 @@ func (this *SupplyOrderApiController) UpdateGoodOrder() {
 		err = service.CreateSupplyWarehousOutOrder(item)
 	}
 	for _, item := range updateWarehout {
+		service.UpdateGoodWarehouseOutOrder(item)
 		//查询该商品是否来源于采购订单,如果存在则关联， 如果不存在则取消关联
 		_, errcode := service.GetGoodIsSource(item.WarehousingId, item.ProjectId, orgId)
 		if errcode == gorm.ErrRecordNotFound {
@@ -1989,7 +1990,7 @@ func (this *SupplyOrderApiController) UpdateGoodOrder() {
 			item.WarehouseInfoId = 0
 			item.Type = 2
 			item.OrderNumber = ""
-			service.UpdateGoodWarehouseOutOrder(item)
+
 			//更新采购单
 			service.ModfySupplyWarehouseOut(item.WarehousingId, orgId)
 		}
@@ -2456,12 +2457,12 @@ func (this *SupplyOrderApiController) SaveGoodReturnOrder() {
 				}
 				supply_count := int64(items["supply_count"].(float64))
 
-				if items["count"] == nil || reflect.TypeOf(items["count"]).String() != "float64" {
+				if items["count"] == nil || reflect.TypeOf(items["count"]).String() != "string" {
 					utils.ErrorLog("count")
 					this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 					return
 				}
-				count := int64(items["count"].(float64))
+				count := items["count"].(string)
 
 				if items["manufacturer_id"] == nil || reflect.TypeOf(items["manufacturer_id"]).String() != "float64" {
 					utils.ErrorLog("manufacturer_id")
@@ -2604,13 +2605,17 @@ func (this *SupplyOrderApiController) SaveGoodReturnOrder() {
 					return
 				}
 				id := int64(items["id"].(float64))
+
+				deposit_rate := items["deposit_rate"].(string)
+
+				deposit_rate_float, _ := strconv.ParseFloat(deposit_rate, 64)
 				cancelOrder := &models.SpSupplierWarehousingCancelOrder{
 					ManufacturerId:            manufacturer_id,
 					OrderNumber:               order_number,
 					ProjectId:                 project_id,
 					GoodNumber:                good_number,
 					IsSource:                  is_source,
-					Count:                     supply_count,
+					Count:                     count,
 					Price:                     price_float,
 					Remark:                    supply_remake,
 					RateOfConcession:          rate_of_concession_float,
@@ -2637,6 +2642,8 @@ func (this *SupplyOrderApiController) SaveGoodReturnOrder() {
 					WarehousingId:             warehousing_id,
 					SourceCount:               count,
 					SupplyWarehouseDetailInfo: id,
+					SupplyCount:               supply_count,
+					DepositRate:               deposit_rate_float,
 				}
 				warehouseCancel = append(warehouseCancel, cancelOrder)
 			}
@@ -2903,6 +2910,20 @@ func (this *SupplyOrderApiController) UpdateGoodReturn() {
 				}
 				supply_manufacturer := items["supply_manufacturer"].(string)
 
+				if items["count"] == nil || reflect.TypeOf(items["count"]).String() != "string" {
+					utils.ErrorLog("count")
+					this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+					return
+				}
+				count := items["count"].(string)
+
+				if items["deposit_rate"] == nil || reflect.TypeOf(items["deposit_rate"]).String() != "string" {
+					utils.ErrorLog("deposit_rate")
+					this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+					return
+				}
+				deposit_rate := items["deposit_rate"].(string)
+				deposit_rate_float, _ := strconv.ParseFloat(deposit_rate, 64)
 				if id > 0 {
 					cancelOrder := &models.SpSupplierWarehousingCancelOrder{
 						ID:                      id,
@@ -2911,7 +2932,7 @@ func (this *SupplyOrderApiController) UpdateGoodReturn() {
 						ProjectId:               project_id,
 						GoodNumber:              good_number,
 						IsSource:                is_source,
-						Count:                   supply_count,
+						Count:                   count,
 						Price:                   price_float,
 						Remark:                  supply_remake,
 						RateOfConcession:        rate_of_concession_float,
@@ -2931,6 +2952,8 @@ func (this *SupplyOrderApiController) UpdateGoodReturn() {
 						Name:                    name,
 						SupplyUnit:              supply_unit,
 						SupplyLicenseNumber:     supply_license_number,
+						SupplyCount:             supply_count,
+						DepositRate:             deposit_rate_float,
 					}
 					updateWarehouseCancel = append(updateWarehouseCancel, cancelOrder)
 				}
@@ -2942,7 +2965,7 @@ func (this *SupplyOrderApiController) UpdateGoodReturn() {
 						ProjectId:               project_id,
 						GoodNumber:              good_number,
 						IsSource:                is_source,
-						Count:                   supply_count,
+						Count:                   count,
 						Price:                   price_float,
 						Remark:                  supply_remake,
 						RateOfConcession:        rate_of_concession_float,
@@ -2962,6 +2985,8 @@ func (this *SupplyOrderApiController) UpdateGoodReturn() {
 						Name:                    name,
 						SupplyUnit:              supply_unit,
 						SupplyLicenseNumber:     supply_license_number,
+						SupplyCount:             supply_count,
+						DepositRate:             deposit_rate_float,
 					}
 					warehouseCancel = append(warehouseCancel, cancelOrder)
 				}
@@ -2992,12 +3017,13 @@ func (this *SupplyOrderApiController) UpdateGoodReturn() {
 func (this *SupplyOrderApiController) ModefyGoodOrder() {
 
 	id, _ := this.GetInt64("id")
+	warehousing_id, _ := this.GetInt64("warehousing_id")
 	orgId := this.GetAdminUserInfo().CurrentOrgId
 
 	//获取购货订单的数据
-	purcaseOrder, _ := service.GetAllPurcaseOrderById(id, orgId)
+	purcaseOrder, _ := service.GetAllPurcaseOrderById(warehousing_id, orgId)
 	//获取购货单的数据
-	goodOrder, _ := service.GetAllGoodOrderById(id, orgId)
+	goodOrder, _ := service.GetAllGoodOrderById(warehousing_id, orgId)
 	drugList, _ := service.GetSupplyDrugList(orgId)
 	//获取已有关联的退货单
 	cancelList, _ := service.GetSupplyCancelWarehouse(id, orgId)
@@ -3169,10 +3195,10 @@ func (this *SupplyOrderApiController) CheckReturnOrder() {
 			//判断单位是否相等
 			if medical.MaxUnit == item.SupplyUnit {
 				//转化为最小单位
-				prescribing_number_total = item.Count * medical.MinNumber
+				prescribing_number_total = item.SupplyCount * medical.MinNumber
 			}
 			if medical.MinUnit == item.SupplyUnit {
-				prescribing_number_total = item.Count
+				prescribing_number_total = item.SupplyCount
 			}
 
 			//判断单位
@@ -3247,7 +3273,7 @@ func (this *SupplyOrderApiController) CheckReturnOrder() {
 				WarehouseOutOrderNumber: lastDrug.WarehouseOutOrderNumber,
 				WarehouseOutId:          lastDrug.ID,
 				DrugId:                  item.ProjectId,
-				Count:                   item.Count,
+				Count:                   item.SupplyCount,
 				Price:                   item.Price,
 				Status:                  1,
 				Ctime:                   ctime,
@@ -3269,15 +3295,15 @@ func (this *SupplyOrderApiController) CheckReturnOrder() {
 
 			drup, _ := service.FindBaseDrugLibRecord(orgId, item.ProjectId)
 			if drup.ID > 0 {
-				prescribingNumber := item.Count
+				prescribingNumber := item.SupplyCount
 				service.AutoDrugDeliverInfoNight(orgId, prescribingNumber, &warehouseOut, &drup, warehouseOutInfo)
 			}
 
 			//修改原数据
-			orderInfo := models.SpSupplierWarehousingCancelOrder{
-				SourceCount: item.Count - item.SourceCount,
-			}
-			service.UpdateSupplyCancelById(item.ID, orderInfo)
+			/*	orderInfo := models.SpSupplierWarehousingCancelOrder{
+					SourceCount: item.SupplyCount - item.SourceCount,
+				}
+				service.UpdateSupplyCancelById(item.ID, orderInfo)*/
 		}
 
 		//耗材
@@ -3286,7 +3312,7 @@ func (this *SupplyOrderApiController) CheckReturnOrder() {
 			warehouseOne, _ := service.FindWarehousingInfoTwenTy(item.ProjectId, item.SupplyWarehouseDetailInfo)
 
 			// 如果出库数量大于该批次剩余库存数量
-			if item.Count > warehouseOne.StockCount {
+			if item.SupplyCount > warehouseOne.StockCount {
 
 				goodObj, _ := service.GetGoodInformationByGoodId(item.ProjectId)
 				this.ServeSuccessJSON(map[string]interface{}{
@@ -3340,7 +3366,7 @@ func (this *SupplyOrderApiController) CheckReturnOrder() {
 				WarehouseInfotId:        0,
 				GoodId:                  item.ProjectId,
 				GoodTypeId:              goodObj.GoodTypeId,
-				Count:                   item.Count,
+				Count:                   item.SupplyCount,
 				Price:                   item.Price,
 				TotalPrice:              0,
 				ProductDate:             item.SupplyProductDate,
@@ -3358,7 +3384,7 @@ func (this *SupplyOrderApiController) CheckReturnOrder() {
 				SupplyWarehouseId:       warehouse_out_id,
 			}
 			//出库逻辑
-			parseDateErr := service.ConsumablesDeliveryNight(orgId, record_date, info, &warehouseOut, item.Count, creater, warehouse_out_id, id)
+			parseDateErr := service.ConsumablesDeliveryNight(orgId, record_date, info, &warehouseOut, item.SupplyCount, creater, warehouse_out_id, id)
 
 			if parseDateErr != nil {
 				utils.ErrorLog(parseDateErr.Error())
@@ -3366,10 +3392,10 @@ func (this *SupplyOrderApiController) CheckReturnOrder() {
 				return
 			}
 			//更改原退库数据
-			order := models.SpSupplierWarehousingCancelOrder{
-				SourceCount: item.SourceCount - item.Count,
-			}
-			service.UpdateSupplyCancelById(item.ID, order)
+			//order := models.SpSupplierWarehousingCancelOrder{
+			//	SourceCount: item.SourceCount - item.SupplyCount,
+			//}
+			//service.UpdateSupplyCancelById(item.ID, order)
 		}
 	}
 	cancel := models.SpSupplierWarehouseCancel{
@@ -3465,13 +3491,13 @@ func (this *SupplyOrderApiController) ModefyReturnOrder() {
 				if item.SupplyUnit == base.MaxUnit {
 					//退库
 					drugInfo := models.DrugWarehouseInfo{
-						StockMaxNumber: item.Count,
+						StockMaxNumber: item.SupplyCount,
 					}
 					service.UpdateDrugWasehousring(item.ProjectId, item.SupplyWarehouseDetailInfo, drugInfo)
 				}
 				if item.SupplyType == base.MinUnit {
 					drugInfo := models.DrugWarehouseInfo{
-						StockMinNumber: item.Count,
+						StockMinNumber: item.SupplyCount,
 					}
 					service.UpdateDrugWasehousringOne(item.ProjectId, item.SupplyWarehouseDetailInfo, drugInfo)
 				}
@@ -3483,7 +3509,7 @@ func (this *SupplyOrderApiController) ModefyReturnOrder() {
 
 				//退库
 				info := models.WarehousingInfo{
-					StockCount: item.Count,
+					StockCount: item.SupplyCount,
 				}
 				//更改库存
 				err := service.UpdateWarehousingInfoById(item.ProjectId, item.SupplyWarehouseDetailInfo, info)

models/supply.models.go

@@ -343,7 +343,7 @@ type SpSupplierWarehousingCancelOrder struct {
 	ProjectId                 int64   `gorm:"column:project_id" json:"project_id" form:"project_id"`
 	GoodNumber                string  `gorm:"column:good_number" json:"good_number" form:"good_number"`
 	IsSource                  int64   `gorm:"column:is_source" json:"is_source" form:"is_source"`
-	Count                     int64   `gorm:"column:count" json:"count" form:"count"`
+	Count                     string  `gorm:"column:count" json:"count" form:"count"`
 	Price                     float64 `gorm:"column:price" json:"price" form:"price"`
 	Remark                    string  `gorm:"column:remark" json:"remark" form:"remark"`
 	RateOfConcession          float64 `gorm:"column:rate_of_concession" json:"rate_of_concession" form:"rate_of_concession"`
@@ -368,8 +368,10 @@ type SpSupplierWarehousingCancelOrder struct {
 	SupplyExpiryDate          int64   `gorm:"column:supply_expiry_date" json:"supply_expiry_date" form:"supply_expiry_date"`
 	WarehousingId             int64   `gorm:"column:warehousing_id" json:"warehousing_id" form:"warehousing_id"`
 	WarehouseInfoId           int64   `gorm:"column:warehouse_info_id" json:"warehouse_info_id" form:"warehouse_info_id"`
-	SourceCount               int64   `gorm:"column:source_count" json:"source_count" form:"source_count"`
+	SourceCount               string  `gorm:"column:source_count" json:"source_count" form:"source_count"`
 	SupplyWarehouseDetailInfo int64   `gorm:"column:supply_warehouse_detail_info" json:"supply_warehouse_detail_info" form:"supply_warehouse_detail_info"`
+	SupplyCount               int64   `gorm:"column:supply_count" json:"supply_count" form:"supply_count"`
+	DepositRate               float64 `gorm:"column:deposit_rate" json:"deposit_rate" form:"deposit_rate"`
 }
 
 func (SpSupplierWarehousingCancelOrder) TableName() string {
@@ -416,10 +418,11 @@ func (VmSpSupplierWarehousingOutOrder) TableName() string {
 }
 
 type VmSpSupplierWarehousingCancelOrder struct {
-	ProjectId  int64  `gorm:"column:project_id" json:"project_id" form:"project_id"`
-	IsSource   int64  `gorm:"column:is_source" json:"is_source" form:"is_source"`
-	Count      int64  `gorm:"column:count" json:"count" form:"count"`
-	SupplyUnit string `gorm:"column:supply_unit" json:"supply_unit" form:"supply_unit"`
+	ProjectId   int64  `gorm:"column:project_id" json:"project_id" form:"project_id"`
+	IsSource    int64  `gorm:"column:is_source" json:"is_source" form:"is_source"`
+	Count       string `gorm:"column:count" json:"count" form:"count"`
+	SupplyUnit  string `gorm:"column:supply_unit" json:"supply_unit" form:"supply_unit"`
+	SupplyCount int64  `gorm:"column:supply_count" json:"supply_count" form:"supply_count"`
 }
 
 func (VmSpSupplierWarehousingCancelOrder) TableName() string {

service/supply_service.go

@@ -655,7 +655,7 @@ func GetReturnCancelOrder(id int64, orgid int64) (models.SpSupplierWarehouseCanc
 	return cancel, err
 }
 
-func GetReturnCancelOrderList(id int64, orgid int64) (order models.SpSupplierWarehousingCancelOrder, err error) {
+func GetReturnCancelOrderList(id int64, orgid int64) (order []*models.SpSupplierWarehousingCancelOrder, err error) {
 
 	err = XTReadDB().Where("warehouse_cancel_id = ? and user_org_id =? and status = 1", id, orgid).Find(&order).Error
 	return order, err
@@ -715,7 +715,7 @@ func GetGoodReturnOrderDetail(id int64, orgid int64) (order []*models.SpSupplier
 
 func UpdateWarehouseCancelOrder(order *models.SpSupplierWarehousingCancelOrder) error {
 
-	err = XTWriteDB().Model(&order).Where("id = ? and status = 1", order.ID).Updates(map[string]interface{}{"manufacturer_id": order.ManufacturerId, "order_number": order.OrderNumber, "project_id": order.ProjectId, "is_source": order.IsSource, "count": order.Count, "price": order.Price, "remark": order.Remark, "rate_of_concession": order.RateOfConcession, "discount_amount": order.DiscountAmount, "type": order.Type, "supply_specification_name": order.SupplySpecificationName, "supply_type": order.SupplyType, "supply_total": order.SupplyTotal, "supply_manufacturer": order.SupplyManufacturer, "name": order.Name, "supply_unit": order.SupplyUnit, "supply_license_number": order.SupplyLicenseNumber}).Error
+	err = XTWriteDB().Model(&order).Where("id = ? and status = 1", order.ID).Updates(map[string]interface{}{"manufacturer_id": order.ManufacturerId, "order_number": order.OrderNumber, "project_id": order.ProjectId, "is_source": order.IsSource, "count": order.Count, "price": order.Price, "remark": order.Remark, "rate_of_concession": order.RateOfConcession, "discount_amount": order.DiscountAmount, "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, "supply_count": order.SupplyCount, "deposit_rate": order.DepositRate}).Error
 	return err
 }
 
@@ -1054,3 +1054,9 @@ func ModfySupplyCancel(id int64, orgid int64) error {
 	err = XTWriteDB().Model(models.SpSupplierWarehousingCancelOrder{}).Where("warehouse_cancel_id = ? and user_org_id = ? and status = 1", id, orgid).Updates(map[string]interface{}{"warehouse_info_id": 0, "warehouse_out_id": 0, "warehousing_id": 0, "good_number": "", "order_number": ""}).Error
 	return err
 }
+
+func UpdateSupplyWarehouseInfo(id int64) error {
+
+	err = XTWriteDB().Model(&models.SupplierWarehouseInfo{}).Where("id = ? and status= 1").Updates(map[string]interface{}{"is_warehouse": 2}).Error
+	return err
+}