11月8日库存管理

controllers/supply_order_api_contorller.go

@@ -3261,22 +3261,49 @@ func (this *SupplyOrderApiController) ModefyReturnOrder() {
 		for _, item := range list {
 
 			//药品
-			if item.IsSource == 2 {
-
+			if item.IsSource == 1 {
+				base, _ := service.GetDrugDetailByDrugId(item.ProjectId)
+				//更改库存
+				if item.SupplyUnit == base.MaxUnit {
+					//退库
+					drugInfo := models.DrugWarehouseInfo{
+						StockMaxNumber: item.Count,
+					}
+					service.UpdateDrugWasehousring(item.ProjectId, item.SupplyWarehouseDetailInfo, drugInfo)
+				}
+				if item.SupplyType == base.MinUnit {
+					drugInfo := models.DrugWarehouseInfo{
+						StockMinNumber: item.Count,
+					}
+					service.UpdateDrugWasehousringOne(item.ProjectId, item.SupplyWarehouseDetailInfo, drugInfo)
+				}
+				//删除流水
+				service.DeleteDrugWarehouseOutNight(item.ProjectId, item.WarehouseCancelId)
 			}
 			//耗材
-			if item.IsSource == 1 {
+			if item.IsSource == 2 {
 
 				//退库
 				info := models.WarehousingInfo{
 					StockCount: item.Count,
 				}
 				//更改库存
-				err := service.UpdateWarehousingInfoById(item.ProjectId, item.WarehouseInfoId, info)
+				err := service.UpdateWarehousingInfoById(item.ProjectId, item.SupplyWarehouseDetailInfo, info)
+				//删除出库记录
+				service.DeleteGoodWarehouseOut(item.ProjectId, item.WarehouseCancelId)
 				fmt.Println(err)
 			}
 		}
 	} else {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 	}
+
+	if err == nil {
+		returnData := make(map[string]interface{}, 0)
+		returnData["msg"] = "ok"
+		this.ServeSuccessJSON(returnData)
+		return
+	} else {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+	}
 }

service/supply_service.go

@@ -928,6 +928,35 @@ func ModefyReturnOrder(id int64) error {
 
 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
+	err := XTWriteDB().Model(&info).Where("good_id = ? and supply_warehouse_detail_info = ? and status = 1", goodid, supply_warehouse_id).UpdateColumn("stock_count", gorm.Expr("stock_count - ?", info.StockCount)).Error
+	return err
+}
+
+func DeleteGoodWarehouseOut(goodid int64, supply_warehouse_id int64) error {
+
+	err := XTWriteDB().Model(&models.WarehouseOutInfo{}).Where("good_id = ? and supply_cancel_out_id = ? and status = 1", goodid, supply_warehouse_id).Updates(map[string]interface{}{"status": 0}).Error
+
+	err = XTWriteDB().Model(&models.VmStockFlow{}).Where("good_id = ? and supply_cancel_out_id = ? and status = 1", goodid, supply_warehouse_id).Updates(map[string]interface{}{"status": 0}).Error
+
+	return err
+}
+func UpdateDrugWasehousring(goodid int64, supply_warehouse_id int64, info models.DrugWarehouseInfo) error {
+
+	err := XTWriteDB().Model(&info).Where("good_id = ? and supply_cancel_out_id = ? and status = 1", goodid, supply_warehouse_id).UpdateColumn("stock_max_number", gorm.Expr("stock_max_number - ?", info.StockMaxNumber)).Error
+	return err
+}
+
+func UpdateDrugWasehousringOne(goodid int64, supply_warehouse_id int64, info models.DrugWarehouseInfo) error {
+
+	err := XTWriteDB().Model(&info).Where("good_id = ? and supply_cancel_out_id = ? and status = 1", goodid, supply_warehouse_id).UpdateColumn("stock_min_number", gorm.Expr("stock_min_number - ?", info.StockMinNumber)).Error
+	return err
+}
+
+func DeleteDrugWarehouseOutNight(goodid int64, supply_warehouse_id int64) error {
+
+	err := XTWriteDB().Model(&models.DrugWarehouseOutInfo{}).Where("good_id = ? and supply_cancel_out_id = ? and status = 1", goodid, supply_warehouse_id).Updates(map[string]interface{}{"status": 0}).Error
+
+	err = XTWriteDB().Model(&models.DrugFlow{}).Where("good_id = ? and supply_cancel_out_id = ? and status = 1", goodid, supply_warehouse_id).Updates(map[string]interface{}{"status": 0}).Error
+
 	return err
 }