修改供应商策略接口名称。

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