diff --git a/blade-ops/blade-job/src/main/java/org/springblade/job/processor/erp/SynPurchaseLOTTJProcessor.java b/blade-ops/blade-job/src/main/java/org/springblade/job/processor/erp/SynPurchaseLOTTJProcessor.java new file mode 100644 index 00000000..0a30c4bc --- /dev/null +++ b/blade-ops/blade-job/src/main/java/org/springblade/job/processor/erp/SynPurchaseLOTTJProcessor.java @@ -0,0 +1,27 @@ +package org.springblade.job.processor.erp; + +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springblade.erpdata.feign.IErpMesRbWoClient; +import tech.powerjob.worker.core.processor.ProcessResult; +import tech.powerjob.worker.core.processor.TaskContext; +import tech.powerjob.worker.core.processor.sdk.BasicProcessor; + +import java.util.concurrent.CompletableFuture; + +@RequiredArgsConstructor +@Slf4j +public class SynPurchaseLOTTJProcessor implements BasicProcessor { + + private final IErpMesRbWoClient mesRbWoClient; + + + + @Override + public ProcessResult process(TaskContext taskContext) throws Exception { + log.info("同步采购LOTTJ订单定时任务开始"); + CompletableFuture runFuture = CompletableFuture.runAsync(()-> mesRbWoClient.synPurchaseLOTTJ()); + log.info("同步采购LOTTJ订单定时任务结束"); + return new ProcessResult(true); + } +} diff --git a/blade-ops/blade-job/src/main/java/org/springblade/job/processor/erp/SynSinterProcessor.java b/blade-ops/blade-job/src/main/java/org/springblade/job/processor/erp/SynSinterProcessor.java new file mode 100644 index 00000000..453a08b3 --- /dev/null +++ b/blade-ops/blade-job/src/main/java/org/springblade/job/processor/erp/SynSinterProcessor.java @@ -0,0 +1,27 @@ +package org.springblade.job.processor.erp; + +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springblade.erpdata.feign.IErpMesRbWoClient; +import tech.powerjob.worker.core.processor.ProcessResult; +import tech.powerjob.worker.core.processor.TaskContext; +import tech.powerjob.worker.core.processor.sdk.BasicProcessor; + +import java.util.concurrent.CompletableFuture; + +@RequiredArgsConstructor +@Slf4j +public class SynSinterProcessor implements BasicProcessor { + + private final IErpMesRbWoClient mesRbWoClient; + + + + @Override + public ProcessResult process(TaskContext taskContext) throws Exception { + log.info("同步烧结订单定时任务开始"); + CompletableFuture runFuture = CompletableFuture.runAsync(()-> mesRbWoClient.synSinter()); + log.info("同步烧结订单定时任务结束"); + return new ProcessResult(true); + } +} diff --git a/blade-ops/blade-job/src/main/java/org/springblade/job/processor/erp/SynTemporaryProcessor.java b/blade-ops/blade-job/src/main/java/org/springblade/job/processor/erp/SynTemporaryProcessor.java new file mode 100644 index 00000000..8be3f8b1 --- /dev/null +++ b/blade-ops/blade-job/src/main/java/org/springblade/job/processor/erp/SynTemporaryProcessor.java @@ -0,0 +1,27 @@ +package org.springblade.job.processor.erp; + +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springblade.erpdata.feign.IErpMesRbWoClient; +import tech.powerjob.worker.core.processor.ProcessResult; +import tech.powerjob.worker.core.processor.TaskContext; +import tech.powerjob.worker.core.processor.sdk.BasicProcessor; + +import java.util.concurrent.CompletableFuture; + +@RequiredArgsConstructor +@Slf4j +public class SynTemporaryProcessor implements BasicProcessor { + + private final IErpMesRbWoClient mesRbWoClient; + + + + @Override + public ProcessResult process(TaskContext taskContext) throws Exception { + log.info("同步临时订单定时任务开始"); + CompletableFuture runFuture = CompletableFuture.runAsync(()-> mesRbWoClient.synTemporary()); + log.info("同步临时订单定时任务结束"); + return new ProcessResult(true); + } +} diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/feign/IApsOrderClient.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/feign/IApsOrderClient.java index 9395e3f0..c92b8b04 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/feign/IApsOrderClient.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/feign/IApsOrderClient.java @@ -3,10 +3,12 @@ package org.springblade.desk.order.feign; import org.springblade.core.launch.constant.AppConstant; import org.springblade.desk.dashboard.pojo.entity.DsCraftEntity; import org.springblade.desk.dashboard.pojo.entity.DsPartEntity; +import org.springblade.desk.order.pojo.entity.YieldOrder; import org.springblade.desk.order.pojo.entity.YieldPlan; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestParam; import java.util.List; @@ -32,6 +34,10 @@ public interface IApsOrderClient { String MAX_CARD_NO = API_PREFIX + "/getMaxCardNo"; String SYN_GLASS_CAKE = API_PREFIX + "/synGlassCake"; String CLOSE_PROD_PLAN = API_PREFIX + "/synCloseProdPlan"; + String GET_SELECT_TIME = API_PREFIX + "/getSelectTime"; + String GET_CRAFT_CODE = API_PREFIX + "/getDsCraftListByCode"; + String SAVE_ORDER_LIST = API_PREFIX + "/saveOrderList"; + String UP_DATE_MAX = API_PREFIX + "/upByDateMax"; @PostMapping(SYNC_PLAN_FROM_SAVE) void saveList(List yieldOrderList); @@ -51,4 +57,12 @@ public interface IApsOrderClient { void synGlassCake(); @GetMapping(CLOSE_PROD_PLAN) void synCloseProdPlan(); + @GetMapping(GET_SELECT_TIME) + String getSelectTime(String sycnTime); + @GetMapping(GET_CRAFT_CODE) + List getDsCraftListByCode(String prtno); + @PostMapping(SAVE_ORDER_LIST) + void saveOrderList(List yieldOrderList); + @GetMapping (UP_DATE_MAX) + void upByDateMax(@RequestParam("max") String max,@RequestParam("code") String code); } diff --git a/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpMesRbWoClient.java b/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpMesRbWoClient.java index 3b62e80d..fb4f8c16 100644 --- a/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpMesRbWoClient.java +++ b/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpMesRbWoClient.java @@ -25,6 +25,13 @@ public interface IErpMesRbWoClient { String API_PREFIX = "/feign/erpdata/mesrbwo"; String GET_LIST = API_PREFIX + "/getList"; String GET_WO = API_PREFIX + "/getWoOne"; + String SYN_MES_WO = API_PREFIX + "/synMesRbWo"; + String SYN_CLOSE_PLAN = API_PREFIX + "/synCloseProdPlan"; + String SYN_PURCHASE = API_PREFIX + "/synPurchase"; + String SYN_TEMPORARY = API_PREFIX + "/synTemporary"; + String SYN_SINTER = API_PREFIX + "/synSinter"; + String SYN_PURCHASELOTTJ = API_PREFIX + "/synPurchaseLOTTJ"; + String SYN_GLASSCAKE = API_PREFIX + "/synGlassCake"; /** * 查询烧结配套信息 @@ -38,15 +45,23 @@ public interface IErpMesRbWoClient { /** * 同步生产计划数据 */ + @GetMapping(SYN_MES_WO) R synMesRbWo(); /** * 同步玻璃饼订单 */ + @GetMapping(SYN_GLASSCAKE) R synGlassCake(); - + @GetMapping(SYN_CLOSE_PLAN) RsynCloseProdPlan(); @GetMapping(GET_WO) R getWoOne(String ypCode); - + @GetMapping(SYN_PURCHASE) R synPurchase(); + @GetMapping(SYN_TEMPORARY) + R synTemporary(); + @GetMapping(SYN_SINTER) + R synSinter(); + @GetMapping(SYN_PURCHASELOTTJ) + R synPurchaseLOTTJ(); } diff --git a/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpMesRbWoClientFallback.java b/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpMesRbWoClientFallback.java index fafe2f6a..93d31281 100644 --- a/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpMesRbWoClientFallback.java +++ b/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpMesRbWoClientFallback.java @@ -45,4 +45,19 @@ public class IErpMesRbWoClientFallback implements IErpMesRbWoClient { public R synPurchase() { return R.fail("获取数据失败"); } + + @Override + public R synTemporary() { + return R.fail("获取数据失败"); + } + + @Override + public R synSinter() { + return R.fail("获取数据失败"); + } + + @Override + public R synPurchaseLOTTJ() { + return R.fail("获取数据失败"); + } } diff --git a/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/view/MesRbPacturnrecord.java b/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/view/MesRbPacturnrecord.java index f35be009..00584f87 100644 --- a/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/view/MesRbPacturnrecord.java +++ b/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/view/MesRbPacturnrecord.java @@ -43,4 +43,5 @@ public class MesRbPacturnrecord { private String ouclp; //路线卡号 private String processlinedesc; //一级路线 private String wono; //工作订单号 + private String firseq; } diff --git a/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/view/MesRbPurtoso.java b/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/view/MesRbPurtoso.java index 7526f30d..6cd4be1b 100644 --- a/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/view/MesRbPurtoso.java +++ b/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/view/MesRbPurtoso.java @@ -28,4 +28,5 @@ public class MesRbPurtoso { private String kdofplat; //镀种 private String prtmeterial; //材料 private String rigidity; //硬度 + private String firseq; } diff --git a/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/view/MesRbSjso.java b/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/view/MesRbSjso.java index a907b246..395a4dd2 100644 --- a/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/view/MesRbSjso.java +++ b/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/view/MesRbSjso.java @@ -33,4 +33,5 @@ public class MesRbSjso { private String warctlr; private String planner; private String username; + private String firseq; } diff --git a/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/view/MesRbWxpromotion.java b/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/view/MesRbWxpromotion.java index 5c26239b..2636bd62 100644 --- a/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/view/MesRbWxpromotion.java +++ b/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/view/MesRbWxpromotion.java @@ -39,4 +39,5 @@ public class MesRbWxpromotion { private String kdofplat; //镀种 private String prtmeterial; //材料 private String rigidity; //硬度 + private String firseq; } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/feign/ApsOrderClient.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/feign/ApsOrderClient.java index fe5b7260..a9e2c632 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/feign/ApsOrderClient.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/feign/ApsOrderClient.java @@ -8,6 +8,7 @@ import org.springblade.desk.dashboard.pojo.entity.DsCraftEntity; import org.springblade.desk.dashboard.pojo.entity.DsPartEntity; import org.springblade.desk.dashboard.service.IDsCraftService; import org.springblade.desk.dashboard.service.IDsPartService; +import org.springblade.desk.order.pojo.entity.YieldOrder; import org.springblade.desk.order.pojo.entity.YieldPlan; import org.springblade.desk.order.service.IYieldOrderService; import org.springblade.desk.order.service.IYieldPlanService; @@ -36,6 +37,7 @@ public class ApsOrderClient implements IApsOrderClient { private final IDsPartService dsPartService; //private final IErpMesRbWoClient mesRbWoClient; + @Override @PostMapping(SYNC_PLAN_FROM_SAVE) public void saveList(List yieldPlanList) { @@ -102,4 +104,24 @@ public class ApsOrderClient implements IApsOrderClient { // } // }); } + + @Override + public String getSelectTime(String sycnTime) { + return yieldPlanService.getSelectTime(sycnTime); + } + @Override + public List getDsCraftListByCode(String prtno) { + return dsPartService.list(new QueryWrapper().lambda() + .eq(DsPartEntity::getPartCode, prtno)); + } + + @Override + public void saveOrderList(List yieldOrderList) { + yieldOrderService.saveOrUpdateBatch(yieldOrderList); + } + + @Override + public void upByDateMax(String max, String code) { + yieldPlanService.updateByNewlevdateMax(max,code); + } } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/YieldPlanMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/YieldPlanMapper.java index 602b1534..2d5270c2 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/YieldPlanMapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/YieldPlanMapper.java @@ -51,4 +51,14 @@ public interface YieldPlanMapper extends BaseMapper { * @return */ LineMemoVo getLineMemo(String ypCode); + /** + * 获取计划开始时间 + * @return + */ + String getSelectTime(String sycnTime); + /** + * 更新计划开始时间 + * @return + */ + void updateByNewlevdateMax(String newlevdateMax, String code); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/YieldPlanMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/YieldPlanMapper.xml index fd351f5e..5cd0878c 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/YieldPlanMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/YieldPlanMapper.xml @@ -73,4 +73,25 @@ + + + UPDATE BLADE_DICT + SET DICT_VALUE = to_char(#{newlevdateMax}, 'yyyy-mm-dd hh24:mi:ss') + + + and code = #{code} + + and DICT_KEY = 1 + + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IYieldPlanService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IYieldPlanService.java index d32cd305..f35808bc 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IYieldPlanService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IYieldPlanService.java @@ -68,4 +68,14 @@ public interface IYieldPlanService extends BaseService { * 同步玻璃饼订单 */ void synGlassCake(); + /** + * 获取同步时间 + * @return + */ + String getSelectTime(String sycnTime); + /** + * 更新同步时间 + * + */ + void updateByNewlevdateMax(String newlevdateMax, String code); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldPlanServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldPlanServiceImpl.java index 891e3427..c119a4f8 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldPlanServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldPlanServiceImpl.java @@ -227,4 +227,14 @@ public class YieldPlanServiceImpl extends BaseServiceImpl synTemporary() { + erpMesRbWoService.synTemporary(); + return R.success(); + } + + @Override + public R synSinter() { + log.info("同步烧结订单定时任务开始"); + erpMesRbWoService.synSinter(); + log.info("同步烧结订单定时任务结束"); + return R.success(); + } + + @Override + public R synPurchaseLOTTJ() { + log.info("同步采购LOTTJ订单定时任务开始"); + erpMesRbWoService.synPurchaseLOTTJ(); + log.info("同步采购LOTTJ订单定时任务结束"); + return R.success(); + } } diff --git a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbPacturnrecordMapper.java b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbPacturnrecordMapper.java index b7543b08..74493aa1 100644 --- a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbPacturnrecordMapper.java +++ b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbPacturnrecordMapper.java @@ -18,4 +18,10 @@ public interface ErpMesRbPacturnrecordMapper extends Mapper { * @return */ List getMesRbPacturnrecordErpList(); + /** + * 获取要同步的推进计划转工单 + * + * @return + */ + List getMesRbPacturnrecordList(String newlevdateMax); } diff --git a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbPacturnrecordMapper.xml b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbPacturnrecordMapper.xml index ff896a38..94da969d 100644 --- a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbPacturnrecordMapper.xml +++ b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbPacturnrecordMapper.xml @@ -6,4 +6,37 @@ SELECT * FROM v_mes_rb_pacturnrecord WHERE is_deleted = 0 + + diff --git a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbPartoplinkMapper.java b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbPartoplinkMapper.java index d84c4335..878d4174 100644 --- a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbPartoplinkMapper.java +++ b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbPartoplinkMapper.java @@ -18,4 +18,25 @@ public interface ErpMesRbPartoplinkMapper extends Mapper { * @return */ List getMesRbPartoplinkErpList(); + /** + * 获取ERP推进计划转工单 + * + * @param + * @return + */ + Long getVcount(String prtno, String firseq); + /** + * 获取ERP推进计划转工单 + * + * @param + * @return + */ + String getRoamNo(String prtno, String firseq); + /** + * 获取ERP推进计划转工单 + * + * @param + * @return + */ + String getRoamNoNext(String prtno, String firseq); } diff --git a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbPartoplinkMapper.xml b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbPartoplinkMapper.xml index c195a0d8..2d6df1da 100644 --- a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbPartoplinkMapper.xml +++ b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbPartoplinkMapper.xml @@ -5,5 +5,75 @@ + + + diff --git a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbPurtosoMapper.java b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbPurtosoMapper.java index 4fa0252f..89f3e970 100644 --- a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbPurtosoMapper.java +++ b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbPurtosoMapper.java @@ -18,4 +18,26 @@ public interface ErpMesRbPurtosoMapper extends Mapper { * @return */ List getMesRbPurtosoErpList(); + /** + * 获取ERP最新等级时间 + * + * @param selectTime + * @return + */ + String getNewlevdateMax(String selectTime); + /** + * 获取ERP推进计划转工单 + * + * @param newlevdateMax + * @return + */ + List getMesRbPurtosoList(String newlevdateMax); + /** + * 获取ERP推进计划转工单的vcount + * + * @param prtno + * @param firseq + * @return + */ + Long getVcount(String prtno, String firseq); } diff --git a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbPurtosoMapper.xml b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbPurtosoMapper.xml index 2e8d6beb..51bc2f55 100644 --- a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbPurtosoMapper.xml +++ b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbPurtosoMapper.xml @@ -6,4 +6,28 @@ SELECT * FROM V_MES_RB_PURTOSO WHERE is_deleted = 0 + + + + diff --git a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbSjsoMapper.java b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbSjsoMapper.java index 26055cf9..98d2d2e3 100644 --- a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbSjsoMapper.java +++ b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbSjsoMapper.java @@ -18,4 +18,10 @@ public interface ErpMesRbSjsoMapper extends Mapper { * @return */ List getMesRbSjsoErpList(); + /** + * 获取要同步的推进计划转工单 + * + * @return + */ + List getMesRbSjsoList(String newlevdateMax); } diff --git a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbSjsoMapper.xml b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbSjsoMapper.xml index de1cee7b..59d40134 100644 --- a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbSjsoMapper.xml +++ b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbSjsoMapper.xml @@ -6,4 +6,36 @@ SELECT * FROM v_mes_rb_sjso WHERE is_deleted = 0 + + diff --git a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbWxpromotionMapper.java b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbWxpromotionMapper.java index d24fd4a9..c5ee6c8f 100644 --- a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbWxpromotionMapper.java +++ b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbWxpromotionMapper.java @@ -19,4 +19,10 @@ public interface ErpMesRbWxpromotionMapper extends Mapper { * @return */ List getMesRbWxpromotionErpList(); + /** + * 获取要同步的推进计划转工单 + * + * @return + */ + List getMesRbWxpromotionList(String newlevdateMax); } diff --git a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbWxpromotionMapper.xml b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbWxpromotionMapper.xml index 40451998..ba726877 100644 --- a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbWxpromotionMapper.xml +++ b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbWxpromotionMapper.xml @@ -6,4 +6,35 @@ SELECT * FROM v_mes_rb_wxpromotion WHERE is_deleted = 0 + + diff --git a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/IErpMesRbPacturnrecordService.java b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/IErpMesRbPacturnrecordService.java index 0be0c542..2a20ff85 100644 --- a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/IErpMesRbPacturnrecordService.java +++ b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/IErpMesRbPacturnrecordService.java @@ -1,5 +1,9 @@ package org.springblade.erpdata.service; +import org.springblade.erpdata.pojo.dto.view.MesRbPacturnrecord; + +import java.util.List; + /** * ERP数据查询service * @@ -11,4 +15,11 @@ public interface IErpMesRbPacturnrecordService { * 同步推进计划转工单 */ void synMesRbPacturnrecord(); + /** + * 从ERP视图中获取要同步的推进计划转工单 + * + * @return + */ + + List getMesRbPacturnrecordList(String newlevdateMax); } diff --git a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/IErpMesRbPartoplinkService.java b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/IErpMesRbPartoplinkService.java index 71969bc8..419770e4 100644 --- a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/IErpMesRbPartoplinkService.java +++ b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/IErpMesRbPartoplinkService.java @@ -11,4 +11,25 @@ public interface IErpMesRbPartoplinkService { * 同步推进计划转工单 */ void synMesRbPartoplink(); + /** + * 获取ERP推进计划转工单 + * + * @param + * @return + */ + Long getVcount(String prtno, String firseq); + /** + * 获取ERP推进计划转工单 + * + * @param + * @return + */ + String getRoamNo(String prtno, String firseq); + /** + * 获取ERP推进计划转工单 + * + * @param + * @return + */ + String getRoamNoNext(String prtno, String firseq); } diff --git a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/IErpMesRbPurtosoService.java b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/IErpMesRbPurtosoService.java index 31309b34..642ee48e 100644 --- a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/IErpMesRbPurtosoService.java +++ b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/IErpMesRbPurtosoService.java @@ -1,6 +1,6 @@ package org.springblade.erpdata.service; -import org.springblade.erpdata.pojo.dto.view.MesRbWo; +import org.springblade.erpdata.pojo.dto.view.MesRbPurtoso; import java.util.List; @@ -15,4 +15,23 @@ public interface IErpMesRbPurtosoService { * 同步推进计划转工单 */ void synPurtoso(); + /** + * 获取最新等级时间 + * @param selectTime + * @return + */ + String getNewlevdateMax(String selectTime); + /** + * 获取推进计划转工单 + * @param newlevdateMax + * @return + */ + List getMesRbPurtosoList(String newlevdateMax); + /** + * 获取vcount + * @param prtno + * @param firseq + * @return + */ + Long getVcount(String prtno, String firseq); } diff --git a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/IErpMesRbSjsoService.java b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/IErpMesRbSjsoService.java index 6d8b5797..935fb995 100644 --- a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/IErpMesRbSjsoService.java +++ b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/IErpMesRbSjsoService.java @@ -1,5 +1,9 @@ package org.springblade.erpdata.service; +import org.springblade.erpdata.pojo.dto.view.MesRbSjso; + +import java.util.List; + /** * ERP数据查询service * @@ -11,4 +15,11 @@ public interface IErpMesRbSjsoService { * 同步推进计划转工单 */ void synMesRbSjso(); + /** + * 获取推送的推送计划 + * + * @param newlevdateMax + * @return + */ + List getMesRbSjsoList(String newlevdateMax); } diff --git a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/IErpMesRbWoService.java b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/IErpMesRbWoService.java index 97ea5e46..a81bf78e 100644 --- a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/IErpMesRbWoService.java +++ b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/IErpMesRbWoService.java @@ -32,4 +32,16 @@ public interface IErpMesRbWoService { R getWoOne(String ypCode); void synPurchase(); + /** + * 同步临时数据 + */ + void synTemporary(); + /** + * 同步烧结数据 + */ + void synSinter(); + /** + * 同步采购订单LOTTJ数据 + */ + void synPurchaseLOTTJ(); } diff --git a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/IErpMesRbWxpromotionService.java b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/IErpMesRbWxpromotionService.java index 3bbda291..a958ae3a 100644 --- a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/IErpMesRbWxpromotionService.java +++ b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/IErpMesRbWxpromotionService.java @@ -1,5 +1,9 @@ package org.springblade.erpdata.service; +import org.springblade.erpdata.pojo.dto.view.MesRbWxpromotion; + +import java.util.List; + /** * ERP数据查询service * @@ -11,4 +15,11 @@ public interface IErpMesRbWxpromotionService { * 同步数据 */ void synMesRbWxpromotion(); + /** + * 获取数据 + * + * @param newlevdateMax + * @return + */ + List getMesRbWxpromotionList(String newlevdateMax); } diff --git a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/impl/ErpMesRbPacturnrecordServiceImpl.java b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/impl/ErpMesRbPacturnrecordServiceImpl.java index 5134d815..a5c67e5b 100644 --- a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/impl/ErpMesRbPacturnrecordServiceImpl.java +++ b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/impl/ErpMesRbPacturnrecordServiceImpl.java @@ -5,10 +5,13 @@ import lombok.extern.slf4j.Slf4j; import org.springblade.desk.order.feign.IApsClient; import org.springblade.erpdata.mapper.ErpMesRbPacturnrecordMapper; import org.springblade.erpdata.mapper.ErpMesRbPartoplinkMapper; +import org.springblade.erpdata.pojo.dto.view.MesRbPacturnrecord; import org.springblade.erpdata.service.IErpMesRbPacturnrecordService; import org.springblade.erpdata.service.IErpMesRbPartoplinkService; import org.springframework.stereotype.Service; +import java.util.List; + /** * @author lqk * @date 2025-11-26 9:39 @@ -26,4 +29,15 @@ public class ErpMesRbPacturnrecordServiceImpl implements IErpMesRbPacturnrecordS public void synMesRbPacturnrecord() { } + /** + * 从ERP视图中获取要同步的推进计划转工单 + * + * @return + */ + @Override + public List getMesRbPacturnrecordList(String newlevdateMax) { + return mesRbPacturnrecordMapper.getMesRbPacturnrecordList(newlevdateMax); + } + + } diff --git a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/impl/ErpMesRbPartoplinkServiceImpl.java b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/impl/ErpMesRbPartoplinkServiceImpl.java index 1fceb510..1609285d 100644 --- a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/impl/ErpMesRbPartoplinkServiceImpl.java +++ b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/impl/ErpMesRbPartoplinkServiceImpl.java @@ -27,4 +27,19 @@ public class ErpMesRbPartoplinkServiceImpl implements IErpMesRbPartoplinkService public void synMesRbPartoplink() { } + + @Override + public Long getVcount(String prtno, String firseq) { + return mesRbPartoplinkMapper.getVcount(prtno,firseq); + } + + @Override + public String getRoamNo(String prtno, String firseq) { + return mesRbPartoplinkMapper.getRoamNo(prtno,firseq); + } + + @Override + public String getRoamNoNext(String prtno, String firseq) { + return mesRbPartoplinkMapper.getRoamNoNext(prtno,firseq); + } } diff --git a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/impl/ErpMesRbPurtosoServiceImpl.java b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/impl/ErpMesRbPurtosoServiceImpl.java index 09c51f9c..22e6d9d3 100644 --- a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/impl/ErpMesRbPurtosoServiceImpl.java +++ b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/impl/ErpMesRbPurtosoServiceImpl.java @@ -4,9 +4,12 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springblade.desk.order.feign.IApsClient; import org.springblade.erpdata.mapper.ErpMesRbPurtosoMapper; +import org.springblade.erpdata.pojo.dto.view.MesRbPurtoso; import org.springblade.erpdata.service.IErpMesRbPurtosoService; import org.springframework.stereotype.Service; +import java.util.List; + /** * @author lqk * @date 2025-11-26 9:39 @@ -25,4 +28,19 @@ public class ErpMesRbPurtosoServiceImpl implements IErpMesRbPurtosoService { public void synPurtoso() { } + + @Override + public String getNewlevdateMax(String selectTime) { + return mesRbPurtosoMapper.getNewlevdateMax(selectTime); + } + + @Override + public List getMesRbPurtosoList(String newlevdateMax) { + return mesRbPurtosoMapper.getMesRbPurtosoList(newlevdateMax); + } + + @Override + public Long getVcount(String prtno, String firseq) { + return mesRbPurtosoMapper.getVcount(prtno, firseq); + } } diff --git a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/impl/ErpMesRbSjsoServiceImpl.java b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/impl/ErpMesRbSjsoServiceImpl.java index f745a897..954a61b6 100644 --- a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/impl/ErpMesRbSjsoServiceImpl.java +++ b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/impl/ErpMesRbSjsoServiceImpl.java @@ -4,9 +4,12 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springblade.desk.order.feign.IApsClient; import org.springblade.erpdata.mapper.ErpMesRbSjsoMapper; +import org.springblade.erpdata.pojo.dto.view.MesRbSjso; import org.springblade.erpdata.service.IErpMesRbSjsoService; import org.springframework.stereotype.Service; +import java.util.List; + /** * @author lqk * @date 2025-11-26 9:39 @@ -25,4 +28,14 @@ public class ErpMesRbSjsoServiceImpl implements IErpMesRbSjsoService { public void synMesRbSjso() { } + /** + * 获取推送的推送计划 + * + * @param newlevdateMax + * @return + */ + @Override + public List getMesRbSjsoList(String newlevdateMax) { + return mesRbSjsoMapper.getMesRbSjsoList(newlevdateMax); + } } diff --git a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/impl/ErpMesRbWoServiceImpl.java b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/impl/ErpMesRbWoServiceImpl.java index 79227e92..e2d9664a 100644 --- a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/impl/ErpMesRbWoServiceImpl.java +++ b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/impl/ErpMesRbWoServiceImpl.java @@ -3,19 +3,19 @@ package org.springblade.erpdata.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; import org.springblade.core.tool.api.R; import org.springblade.desk.dashboard.pojo.entity.DsCraftEntity; import org.springblade.desk.dashboard.pojo.entity.DsPartEntity; import org.springblade.desk.order.feign.IApsOrderClient; +import org.springblade.desk.order.pojo.entity.YieldOrder; import org.springblade.desk.order.pojo.entity.YieldPlan; import org.springblade.desk.order.pojo.enums.YieldPlanEnum; import org.springblade.erpdata.mapper.ErpMesRbWoMapper; import org.springblade.erpdata.pojo.dto.table.Rrbwoerptomes; import org.springblade.erpdata.pojo.dto.table.Wo; -import org.springblade.erpdata.pojo.dto.view.MesRbWo; -import org.springblade.erpdata.service.IErpMesRbWoService; -import org.springblade.erpdata.service.IErpRrbwoerptomesService; -import org.springblade.erpdata.service.IErpWoService; +import org.springblade.erpdata.pojo.dto.view.*; +import org.springblade.erpdata.service.*; import org.springframework.stereotype.Service; import java.util.ArrayList; @@ -39,6 +39,16 @@ public class ErpMesRbWoServiceImpl implements IErpMesRbWoService { private final IErpWoService woService; + private final IErpMesRbPurtosoService mesRbPurtosoService; + + private final IErpMesRbPartoplinkService mesRbPartoplinkService; + + private final IErpMesRbPacturnrecordService mesRbPacturnrecordService; + + private final IErpMesRbSjsoService mesRbSjsoService; + + private final IErpMesRbWxpromotionService mesRbWxpromotionService; + @Override public List getList(MesRbWo entity) { @@ -171,9 +181,112 @@ public class ErpMesRbWoServiceImpl implements IErpMesRbWoService { .eq("WONO",ypCode)); return R.data(wo); } - + /** + * 同步采购工单 + */ @Override public void synPurchase() { - + String selectTime=apsOrderClient.getSelectTime("SYCN_BUYTRANSFER_TIME"); + String newlevdateMax=mesRbPurtosoService.getNewlevdateMax(selectTime); + //apsOrderClient.updateByNewlevdateMax(newlevdateMax, "SYCN_BUYTRANSFER_TIME"); + List purtosoList=mesRbPurtosoService.getMesRbPurtosoList(newlevdateMax); + List yieldOrderList=new ArrayList<>(); + purtosoList.forEach(mesRbPurtoso -> { + YieldOrder yieldOrder=new YieldOrder(); + List dsPartList=apsOrderClient.getDsCraftListByCode(mesRbPurtoso.getPrtno()); + yieldOrder.setYieldType(12001); + if(dsPartList!=null&&dsPartList.get(0).getCraftWay().contains("封接")){ + yieldOrder.setYieldType(12002); + } + yieldOrder.setRoamNo("");//当前b号 + yieldOrder.setRoamNoNext("");//下级b号 + Long vCount=mesRbPartoplinkService.getVcount(mesRbPurtoso.getPrtno(),mesRbPurtoso.getFirseq()); + if(vCount>0){ + String roamNo=mesRbPartoplinkService.getRoamNo(mesRbPurtoso.getPrtno(),mesRbPurtoso.getFirseq()); + yieldOrder.setRoamNo(roamNo);//当前b号 + String roamNoNext=mesRbPartoplinkService.getRoamNoNext(mesRbPurtoso.getPrtno(),mesRbPurtoso.getFirseq()); + yieldOrder.setRoamNoNext(roamNoNext);//下级b号 + } + yieldOrderList.add(yieldOrder); + }); + apsOrderClient.saveOrderList(yieldOrderList); + } + /** + * 同步临时工单 + */ + @Override + public void synTemporary() { + String selectTime=apsOrderClient.getSelectTime("SYCN_BUYTRANSFER_TIME"); + String newlevdateMax=mesRbPurtosoService.getNewlevdateMax(selectTime); + //apsOrderClient.updateByNewlevdateMax(newlevdateMax, "SYCN_BUYTRANSFER_TIME"); + List pacturnrecordList=mesRbPacturnrecordService.getMesRbPacturnrecordList(newlevdateMax); + List yieldOrderList=new ArrayList<>(); + pacturnrecordList.forEach(mesRbPacturnrecord -> { + YieldOrder yieldOrder=new YieldOrder(); + List dsPartList=apsOrderClient.getDsCraftListByCode(mesRbPacturnrecord.getPrtno()); + yieldOrder.setYieldType(12001); + if(dsPartList!=null&&dsPartList.get(0).getCraftWay().contains("封接")){ + yieldOrder.setYieldType(12002); + } + yieldOrder.setRoamNoNext("");//下级b号 + if(StringUtils.isNotEmpty(mesRbPacturnrecord.getFirseq())){ + String roamNoNext=mesRbPartoplinkService.getRoamNoNext(mesRbPacturnrecord.getPrtno(),mesRbPacturnrecord.getFirseq()); + yieldOrder.setRoamNoNext(roamNoNext);//下级b号 + } + yieldOrderList.add(yieldOrder); + }); + apsOrderClient.saveOrderList(yieldOrderList); + } + /** + * 同步烧结数据 + */ + @Override + public void synSinter() { + String selectTime=apsOrderClient.getSelectTime("SYCN_BUYTRANSFER_TIME"); + String newlevdateMax=mesRbPurtosoService.getNewlevdateMax(selectTime); + //apsOrderClient.updateByNewlevdateMax(newlevdateMax, "SYCN_BUYTRANSFER_TIME"); + List rbtosoList=mesRbSjsoService.getMesRbSjsoList(newlevdateMax); + List yieldOrderList=new ArrayList<>(); + rbtosoList.forEach(mesRbtoso -> { + YieldOrder yieldOrder=new YieldOrder(); + yieldOrder.setYieldType(12002); + yieldOrder.setRoamNoNext( ""); + if(StringUtils.isNotEmpty(mesRbtoso.getFirseq())){ + String roamNoNext=mesRbPartoplinkService.getRoamNoNext(mesRbtoso.getPrtno(),mesRbtoso.getFirseq()); + yieldOrder.setRoamNoNext(roamNoNext);//下级b号 + } + yieldOrderList.add(yieldOrder); + }); + apsOrderClient.saveOrderList(yieldOrderList); + } + /** + * 同步采购LOTTJ + */ + @Override + public void synPurchaseLOTTJ() { + String selectTime=apsOrderClient.getSelectTime("SYCN_BUYTRANSFER_TIME"); + String dateMax=mesRbPurtosoService.getNewlevdateMax(selectTime); + apsOrderClient.upByDateMax(dateMax,"SYCN_BUYTRANSFER_TIME"); + List wxpromotionList=mesRbWxpromotionService.getMesRbWxpromotionList(dateMax); + List yieldOrderList=new ArrayList<>(); + wxpromotionList.forEach(mesRbWxpromotion -> { + YieldOrder yieldOrder=new YieldOrder(); + List dsPartList=apsOrderClient.getDsCraftListByCode(mesRbWxpromotion.getPrtno()); + yieldOrder.setYieldType(12001); + if(dsPartList!=null&&dsPartList.get(0).getCraftWay().contains("封接")){ + yieldOrder.setYieldType(12002); + } + yieldOrder.setRoamNo("");//当前b号 + yieldOrder.setRoamNoNext("");//下级b号 + Long vCount=mesRbPartoplinkService.getVcount(mesRbWxpromotion.getPrtno(),mesRbWxpromotion.getFirseq()); + if(vCount>0){ + String roamNo=mesRbPartoplinkService.getRoamNo(mesRbWxpromotion.getPrtno(),mesRbWxpromotion.getFirseq()); + yieldOrder.setRoamNo(roamNo);//当前b号 + String roamNoNext=mesRbPartoplinkService.getRoamNoNext(mesRbWxpromotion.getPrtno(),mesRbWxpromotion.getFirseq()); + yieldOrder.setRoamNoNext(roamNoNext);//下级b号 + } + yieldOrderList.add(yieldOrder); + }); + apsOrderClient.saveOrderList(yieldOrderList); } } diff --git a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/impl/ErpMesRbWxpromotionServiceImpl.java b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/impl/ErpMesRbWxpromotionServiceImpl.java index 1481ade5..b19f007e 100644 --- a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/impl/ErpMesRbWxpromotionServiceImpl.java +++ b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/impl/ErpMesRbWxpromotionServiceImpl.java @@ -4,9 +4,12 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springblade.desk.order.feign.IApsClient; import org.springblade.erpdata.mapper.ErpMesRbWxpromotionMapper; +import org.springblade.erpdata.pojo.dto.view.MesRbWxpromotion; import org.springblade.erpdata.service.IErpMesRbWxpromotionService; import org.springframework.stereotype.Service; +import java.util.List; + /** * @author lqk * @date 2025-11-26 9:39 @@ -25,4 +28,14 @@ public class ErpMesRbWxpromotionServiceImpl implements IErpMesRbWxpromotionServi public void synMesRbWxpromotion() { } + /** + * 获取ERP数据 + * + * @param newlevdateMax + * @return + */ + @Override + public List getMesRbWxpromotionList(String newlevdateMax) { + return mesRbWxpromotionMapper.getMesRbWxpromotionList(newlevdateMax); + } }