From 9b3ea6b552da1e2564b816ab0eb938d9c29594ce Mon Sep 17 00:00:00 2001 From: liuchen864 <23082234@qq.com> Date: Wed, 27 Dec 2023 18:05:30 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BE=9B=E5=BA=94=E5=95=86?= =?UTF-8?q?=E7=AD=96=E7=95=A5=E6=8E=A5=E5=8F=A3=E5=90=8D=E7=A7=B0=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/service/purchase/PurchaseMainServiceImpl.java | 2 +- .../service/purchasePlan/PurchasePlanMainServiceImpl.java | 3 +-- .../PurchasereceiptRequestMainServiceImpl.java | 6 +++--- .../java/com/win/module/wms/service/rule/RuleService.java | 6 +++--- .../com/win/module/wms/service/rule/RuleServiceImpl.java | 4 ++-- .../SupplierdeliverRequestMainServiceImpl.java | 2 +- 6 files changed, 11 insertions(+), 12 deletions(-) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchase/PurchaseMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchase/PurchaseMainServiceImpl.java index 2de7d586..20090e80 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchase/PurchaseMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchase/PurchaseMainServiceImpl.java @@ -540,7 +540,7 @@ public class PurchaseMainServiceImpl implements PurchaseMainService { purchasePlanMainDO.setAvailable("TRUE"); //供应商代码 purchasePlanMainDO.setSupplierCode(mainDO.getSupplierCode()); - RuleRespVO ruleRespVO = ruleService.deliverGoods(mainDO.getSupplierCode(), null); + RuleRespVO ruleRespVO = ruleService.purchasePlan(mainDO.getSupplierCode(), null); if (ruleRespVO == null) { throw new ServiceException(STDCOSTPRICE_SUPPLIER_CODE_NOT_EXISTS); } else { diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasePlan/PurchasePlanMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasePlan/PurchasePlanMainServiceImpl.java index 94ad9093..009e6449 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasePlan/PurchasePlanMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasePlan/PurchasePlanMainServiceImpl.java @@ -34,7 +34,6 @@ import com.win.module.wms.dal.mysql.purchasePlan.PurchasePlanDetailMapper; import com.win.module.wms.dal.mysql.purchasePlan.PurchasePlanMainMapper; import com.win.module.wms.enums.DictTypeConstants; import com.win.module.wms.enums.order.OrderStatusEnum; -import com.win.module.wms.enums.plan.PlanStatusEnum; import com.win.module.wms.enums.plan.PurchasePlanStatusEnum; import com.win.module.wms.enums.request.RequestStatusEnum; import com.win.module.wms.service.itembasic.ItembasicService; @@ -205,7 +204,7 @@ public class PurchasePlanMainServiceImpl implements PurchasePlanMainService { //主表校验 校验供应商送货策略 private RuleRespVO validatorDeliverGoods(String supplierCode) { - return ruleService.deliverGoods(supplierCode, null); + return ruleService.purchasePlan(supplierCode, null); } //子表校验 校验供应商基础信息 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRequest/PurchasereceiptRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRequest/PurchasereceiptRequestMainServiceImpl.java index ca447ae0..ccdbcea4 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRequest/PurchasereceiptRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRequest/PurchasereceiptRequestMainServiceImpl.java @@ -403,7 +403,7 @@ public class PurchasereceiptRequestMainServiceImpl implements PurchasereceiptReq */ private void validatePurchasereceiptRequestMainCreate(PurchasereceiptRequestMainDO mainDo) { supplierService.selectSupplier(mainDo.getSupplierCode()); - RuleRespVO ruleRespVO = ruleService.deliverGoods(mainDo.getSupplierCode(), null); + RuleRespVO ruleRespVO = ruleService.purchasePlan(mainDo.getSupplierCode(), null); if(ruleRespVO == null) { throw new ServiceException(STDCOSTPRICE_SUPPLIER_CODE_NOT_EXISTS); } else { @@ -435,7 +435,7 @@ public class PurchasereceiptRequestMainServiceImpl implements PurchasereceiptReq // purchasereceiptRecordMainService.createPurchasereceiptRecordMain(purchasereceiptRecordMainCreateReqVO); // return; // } - RuleRespVO ruleRespVO = ruleService.deliveryGoods(mainDO.getSupplierCode()); + RuleRespVO ruleRespVO = ruleService.purchaseJobSplit(mainDO.getSupplierCode()); JSONObject jsonObject = JSONUtil.parseObj(ruleRespVO.getConfiguration()); Map> listMap = new HashMap<>(); List purchasereceiptJobMainCreateReqVOList = new ArrayList<>(); @@ -625,7 +625,7 @@ public class PurchasereceiptRequestMainServiceImpl implements PurchasereceiptReq */ private void validateSupplier(PurchasereceiptRequestMainDO mainDo) { supplierService.selectSupplier(mainDo.getSupplierCode()); - RuleRespVO ruleRespVO = ruleService.deliverGoods(mainDo.getSupplierCode(), null); + RuleRespVO ruleRespVO = ruleService.purchasePlan(mainDo.getSupplierCode(), null); JSONArray conditionArray = JSONUtil.parseArray(ruleRespVO.getCondition()); for (int i = 0; i < conditionArray.size(); i++) { JSONObject conditionObject = conditionArray.getJSONObject(i); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/rule/RuleService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/rule/RuleService.java index 2c036b57..bf723eb7 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/rule/RuleService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/rule/RuleService.java @@ -81,13 +81,13 @@ public interface RuleService { /**************** 规则接口 ****************/ /** - * 采购默认策略 + * 采购计划策略 * * @param supplierCode 供应商代码 * @param weekday 星期几 * @return */ - RuleRespVO deliverGoods(String supplierCode, String weekday); + RuleRespVO purchasePlan(String supplierCode, String weekday); /** * 获取采购收货任务拆分策略 @@ -95,7 +95,7 @@ public interface RuleService { * @param supplierCode 供应商代码 * @return */ - RuleRespVO deliveryGoods(String supplierCode); + RuleRespVO purchaseJobSplit(String supplierCode); /** * 获取检验策略 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/rule/RuleServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/rule/RuleServiceImpl.java index a722b355..39ab1008 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/rule/RuleServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/rule/RuleServiceImpl.java @@ -150,7 +150,7 @@ public class RuleServiceImpl implements RuleService { } @Override - public RuleRespVO deliverGoods(String supplierCode, String weekday) { + public RuleRespVO purchasePlan(String supplierCode, String weekday) { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("strategy_code", "S001"); queryWrapper.orderByDesc("priority"); @@ -177,7 +177,7 @@ public class RuleServiceImpl implements RuleService { } @Override - public RuleRespVO deliveryGoods(String supplierCode) { + public RuleRespVO purchaseJobSplit(String supplierCode) { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("strategy_code", "S002"); queryWrapper.orderByDesc("priority"); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRequest/SupplierdeliverRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRequest/SupplierdeliverRequestMainServiceImpl.java index b594aaae..8f435ff4 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRequest/SupplierdeliverRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRequest/SupplierdeliverRequestMainServiceImpl.java @@ -274,7 +274,7 @@ public class SupplierdeliverRequestMainServiceImpl implements SupplierdeliverReq //主表校验 校验供应商基础信息 private RuleRespVO validatordeliverGoods(String supplierCode) { - return ruleService.deliverGoods(supplierCode, null); + return ruleService.purchasePlan(supplierCode, null); } //子表校验 校验供应商基础信息