Merge remote-tracking branch 'origin/master'

pom.xml

@@ -21,8 +21,6 @@
         <module>win-module-wms</module>
         <!-- mes -->
         <module>win-module-mes</module>
-        <!-- scp -->
-        <module>win-module-scp</module>
     </modules>
 
     <name>${project.artifactId}</name>

win-module-scp/pom.xml

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <groupId>com.win</groupId>
-        <artifactId>win</artifactId>
-        <version>${revision}</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-    <modules>
-        <module>win-module-scp-api</module>
-        <module>win-module-scp-biz</module>
-    </modules>
-    <artifactId>win-module-scp</artifactId>
-    <packaging>pom</packaging>
-
-    <name>${project.artifactId}</name>
-    <description>
-        scp 模块下，我们放通用业务，支撑上层的核心业务。
-    </description>
-
-</project>

win-module-scp/win-module-scp-api/pom.xml

@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <groupId>com.win</groupId>
-        <artifactId>win-module-scp</artifactId>
-        <version>${revision}</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>win-module-scp-api</artifactId>
-    <packaging>jar</packaging>
-
-    <name>${project.artifactId}</name>
-    <description>
-        scp 模块 API，暴露给其它模块调用
-    </description>
-
-    <dependencies>
-        <dependency>
-            <groupId>com.win</groupId>
-            <artifactId>win-common</artifactId>
-        </dependency>
-
-        <!-- 参数校验 -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-validation</artifactId>
-            <optional>true</optional>
-        </dependency>
-
-    </dependencies>
-
-</project>

win-module-scp/win-module-scp-api/src/main/java/com/win/module/scp/api/package-info.java

@@ -1,4 +0,0 @@
-/**
- * System API 包，定义暴露给其它模块的 API
- */
-package com.win.module.scp.api;

win-module-scp/win-module-scp-biz/pom.xml

@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <groupId>com.win</groupId>
-        <artifactId>win-module-scp</artifactId>
-        <version>${revision}</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>win-module-scp-biz</artifactId>
-    <packaging>jar</packaging>
-
-    <name>${project.artifactId}</name>
-    <description>
-        scp 模块下，我们放通用业务，支撑上层的核心业务。
-    </description>
-
-    <dependencies>
-        <dependency>
-            <groupId>com.win</groupId>
-            <artifactId>win-module-system-api</artifactId>
-            <version>${revision}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.win</groupId>
-            <artifactId>win-module-infra-api</artifactId>
-            <version>${revision}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.win</groupId>
-            <artifactId>win-module-scp-api</artifactId>
-            <version>${revision}</version>
-        </dependency>
-
-        <!-- 业务组件 -->
-        <dependency>
-            <groupId>com.win</groupId>
-            <artifactId>win-spring-boot-starter-biz-operatelog</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.win</groupId>
-            <artifactId>win-spring-boot-starter-biz-sms</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.win</groupId>
-            <artifactId>win-spring-boot-starter-biz-dict</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.win</groupId>
-            <artifactId>win-spring-boot-starter-biz-data-permission</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.win</groupId>
-            <artifactId>win-spring-boot-starter-biz-tenant</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.win</groupId>
-            <artifactId>win-spring-boot-starter-biz-ip</artifactId>
-        </dependency>
-
-        <!-- Web 相关 -->
-        <dependency>
-            <groupId>com.win</groupId>
-            <artifactId>win-spring-boot-starter-security</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-validation</artifactId>
-        </dependency>
-
-        <!-- DB 相关 -->
-        <dependency>
-            <groupId>com.win</groupId>
-            <artifactId>win-spring-boot-starter-mybatis</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.win</groupId>
-            <artifactId>win-spring-boot-starter-redis</artifactId>
-        </dependency>
-
-        <!-- Job 定时任务相关 -->
-        <dependency>
-            <groupId>com.win</groupId>
-            <artifactId>win-spring-boot-starter-job</artifactId>
-        </dependency>
-
-        <!-- 消息队列相关 -->
-        <dependency>
-            <groupId>com.win</groupId>
-            <artifactId>win-spring-boot-starter-mq</artifactId>
-        </dependency>
-
-        <!-- Test 测试相关 -->
-        <dependency>
-            <groupId>com.win</groupId>
-            <artifactId>win-spring-boot-starter-test</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-        <!-- 工具类相关 -->
-        <dependency>
-            <groupId>com.win</groupId>
-            <artifactId>win-spring-boot-starter-excel</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.win</groupId>
-            <artifactId>win-spring-boot-starter-captcha</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-mail</artifactId>
-        </dependency>
-    </dependencies>
-
-</project>

win-module-scp/win-module-scp-biz/src/main/java/com/win/module/scp/api/package-info.java

@@ -1,4 +0,0 @@
-/**
- * System API 包，定义暴露给其它模块的 API
- */
-package com.win.module.scp.api;

win-module-scp/win-module-scp-biz/src/main/java/com/win/module/scp/controller/package-info.java

@@ -1,4 +0,0 @@
-/**
- * System API 包，定义暴露给其它模块的 API
- */
-package com.win.module.scp.controller;

win-module-scp/win-module-scp-biz/src/main/resources/i18n/scp.properties

@@ -1 +0,0 @@
-#\u6B64\u6587\u4EF6\u4E0D\u9700\u8981\u586B\u5199

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 {

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);
     }
 
     //子表校验 校验供应商基础信息

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<String, List<PurchasereceiptRequestDetailDO>> listMap = new HashMap<>();
         List<PurchasereceiptJobMainCreateReqVO> 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);

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);
 
     /**
      * 获取检验策略

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<RuleDO> 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<RuleDO> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("strategy_code", "S002");
         queryWrapper.orderByDesc("priority");

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);
     }
 
     //子表校验 校验供应商基础信息

win-server/pom.xml

@@ -8,10 +8,8 @@
         <version>${revision}</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-
     <artifactId>win-server</artifactId>
     <packaging>jar</packaging>
-
     <name>${project.artifactId}</name>
     <description>
         后端 Server 的主项目，通过引入需要 win-module-xxx 的依赖，
@@ -19,7 +17,6 @@
         本质上来说，它就是个空壳（容器）！
     </description>
     <url>https://github.com/YunaiV/ruoyi-vue-pro</url>
-
     <dependencies>
 
         <dependency>
@@ -27,6 +24,12 @@
             <artifactId>magic-api-spring-boot-starter</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>com.win</groupId>
+            <artifactId>win-module-mes-biz</artifactId>
+            <version>${revision}</version>
+        </dependency>
+
         <dependency>
             <groupId>com.win</groupId>
             <artifactId>win-module-wms-biz</artifactId>