From a076f17e79985b5c8fdc5d97d71be73d2524a3ac Mon Sep 17 00:00:00 2001 From: liuchen864 <23082234@qq.com> Date: Wed, 27 Dec 2023 17:43:37 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=88=A0=E9=99=A4scp=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 - win-module-scp/pom.xml | 23 ---- win-module-scp/win-module-scp-api/pom.xml | 34 ----- .../com/win/module/scp/api/package-info.java | 4 - win-module-scp/win-module-scp-biz/pom.xml | 120 ------------------ .../com/win/module/scp/api/package-info.java | 4 - .../module/scp/controller/package-info.java | 4 - .../src/main/resources/i18n/scp.properties | 1 - .../main/resources/i18n/scp_en_US.properties | 0 .../main/resources/i18n/scp_zh_CN.properties | 0 win-server/pom.xml | 9 +- 11 files changed, 6 insertions(+), 195 deletions(-) delete mode 100644 win-module-scp/pom.xml delete mode 100644 win-module-scp/win-module-scp-api/pom.xml delete mode 100644 win-module-scp/win-module-scp-api/src/main/java/com/win/module/scp/api/package-info.java delete mode 100644 win-module-scp/win-module-scp-biz/pom.xml delete mode 100644 win-module-scp/win-module-scp-biz/src/main/java/com/win/module/scp/api/package-info.java delete mode 100644 win-module-scp/win-module-scp-biz/src/main/java/com/win/module/scp/controller/package-info.java delete mode 100644 win-module-scp/win-module-scp-biz/src/main/resources/i18n/scp.properties delete mode 100644 win-module-scp/win-module-scp-biz/src/main/resources/i18n/scp_en_US.properties delete mode 100644 win-module-scp/win-module-scp-biz/src/main/resources/i18n/scp_zh_CN.properties diff --git a/pom.xml b/pom.xml index e691dc1d..cb0fc352 100644 --- a/pom.xml +++ b/pom.xml @@ -21,8 +21,6 @@ win-module-wms win-module-mes - - win-module-scp ${project.artifactId} diff --git a/win-module-scp/pom.xml b/win-module-scp/pom.xml deleted file mode 100644 index ed8142e5..00000000 --- a/win-module-scp/pom.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - com.win - win - ${revision} - - 4.0.0 - - win-module-scp-api - win-module-scp-biz - - win-module-scp - pom - - ${project.artifactId} - - scp 模块下，我们放通用业务，支撑上层的核心业务。 - - - diff --git a/win-module-scp/win-module-scp-api/pom.xml b/win-module-scp/win-module-scp-api/pom.xml deleted file mode 100644 index a456bd9e..00000000 --- a/win-module-scp/win-module-scp-api/pom.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - com.win - win-module-scp - ${revision} - - 4.0.0 - win-module-scp-api - jar - - ${project.artifactId} - - scp 模块 API，暴露给其它模块调用 - - - - - com.win - win-common - - - - - org.springframework.boot - spring-boot-starter-validation - true - - - - - diff --git a/win-module-scp/win-module-scp-api/src/main/java/com/win/module/scp/api/package-info.java b/win-module-scp/win-module-scp-api/src/main/java/com/win/module/scp/api/package-info.java deleted file mode 100644 index a21bbbea..00000000 --- a/win-module-scp/win-module-scp-api/src/main/java/com/win/module/scp/api/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * System API 包，定义暴露给其它模块的 API - */ -package com.win.module.scp.api; diff --git a/win-module-scp/win-module-scp-biz/pom.xml b/win-module-scp/win-module-scp-biz/pom.xml deleted file mode 100644 index c9f681de..00000000 --- a/win-module-scp/win-module-scp-biz/pom.xml +++ /dev/null @@ -1,120 +0,0 @@ - - - - com.win - win-module-scp - ${revision} - - 4.0.0 - win-module-scp-biz - jar - - ${project.artifactId} - - scp 模块下，我们放通用业务，支撑上层的核心业务。 - - - - - com.win - win-module-system-api - ${revision} - - - com.win - win-module-infra-api - ${revision} - - - com.win - win-module-scp-api - ${revision} - - - - - com.win - win-spring-boot-starter-biz-operatelog - - - com.win - win-spring-boot-starter-biz-sms - - - com.win - win-spring-boot-starter-biz-dict - - - com.win - win-spring-boot-starter-biz-data-permission - - - com.win - win-spring-boot-starter-biz-tenant - - - com.win - win-spring-boot-starter-biz-ip - - - - - com.win - win-spring-boot-starter-security - - - - org.springframework.boot - spring-boot-starter-validation - - - - - com.win - win-spring-boot-starter-mybatis - - - - com.win - win-spring-boot-starter-redis - - - - - com.win - win-spring-boot-starter-job - - - - - com.win - win-spring-boot-starter-mq - - - - - com.win - win-spring-boot-starter-test - test - - - - - com.win - win-spring-boot-starter-excel - - - - com.win - win-spring-boot-starter-captcha - - - - org.springframework.boot - spring-boot-starter-mail - - - - diff --git a/win-module-scp/win-module-scp-biz/src/main/java/com/win/module/scp/api/package-info.java b/win-module-scp/win-module-scp-biz/src/main/java/com/win/module/scp/api/package-info.java deleted file mode 100644 index a21bbbea..00000000 --- a/win-module-scp/win-module-scp-biz/src/main/java/com/win/module/scp/api/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * System API 包，定义暴露给其它模块的 API - */ -package com.win.module.scp.api; diff --git a/win-module-scp/win-module-scp-biz/src/main/java/com/win/module/scp/controller/package-info.java b/win-module-scp/win-module-scp-biz/src/main/java/com/win/module/scp/controller/package-info.java deleted file mode 100644 index 11212f58..00000000 --- a/win-module-scp/win-module-scp-biz/src/main/java/com/win/module/scp/controller/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * System API 包，定义暴露给其它模块的 API - */ -package com.win.module.scp.controller; diff --git a/win-module-scp/win-module-scp-biz/src/main/resources/i18n/scp.properties b/win-module-scp/win-module-scp-biz/src/main/resources/i18n/scp.properties deleted file mode 100644 index 6882c293..00000000 --- a/win-module-scp/win-module-scp-biz/src/main/resources/i18n/scp.properties +++ /dev/null @@ -1 +0,0 @@ -#\u6B64\u6587\u4EF6\u4E0D\u9700\u8981\u586B\u5199 \ No newline at end of file diff --git a/win-module-scp/win-module-scp-biz/src/main/resources/i18n/scp_en_US.properties b/win-module-scp/win-module-scp-biz/src/main/resources/i18n/scp_en_US.properties deleted file mode 100644 index e69de29b..00000000 diff --git a/win-module-scp/win-module-scp-biz/src/main/resources/i18n/scp_zh_CN.properties b/win-module-scp/win-module-scp-biz/src/main/resources/i18n/scp_zh_CN.properties deleted file mode 100644 index e69de29b..00000000 diff --git a/win-server/pom.xml b/win-server/pom.xml index 8883d200..ad9245ee 100644 --- a/win-server/pom.xml +++ b/win-server/pom.xml @@ -8,10 +8,8 @@ ${revision} 4.0.0 - win-server jar - ${project.artifactId} 后端 Server 的主项目，通过引入需要 win-module-xxx 的依赖， @@ -19,7 +17,6 @@ 本质上来说，它就是个空壳（容器）！ https://github.com/YunaiV/ruoyi-vue-pro - @@ -27,6 +24,12 @@ magic-api-spring-boot-starter + + com.win + win-module-mes-biz + ${revision} + + com.win win-module-wms-biz 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 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BE=9B=E5=BA=94?= =?UTF-8?q?=E5=95=86=E7=AD=96=E7=95=A5=E6=8E=A5=E5=8F=A3=E5=90=8D=E7=A7=B0?= =?UTF-8?q?=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); } //子表校验 校验供应商基础信息