From 26cb46e44338ec9350d537e93a24b9d49a15f948 Mon Sep 17 00:00:00 2001 From: aike <17730485278@139.com> Date: Thu, 12 Jun 2025 14:19:58 +0800 Subject: [PATCH] =?UTF-8?q?demand:=20=E5=AE=9A=E6=97=B6=E6=89=AB=E6=8F=8F?= =?UTF-8?q?=E8=BF=90=E5=8D=95=E8=B4=A7=E7=89=A9=E7=BB=84=E6=89=B9=E6=AC=A1?= =?UTF-8?q?=E6=94=AF=E6=8C=81=E6=8C=89=E7=BA=BF=E8=B7=AF=E6=89=AB=E6=8F=8F?= =?UTF-8?q?=EF=BC=8C=E6=9F=A5=E8=AF=A2=E6=BC=8F=E7=BB=84=E6=89=B9=E6=AC=A1?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=94=AF=E6=8C=81=E6=8C=89=E8=BF=90=E5=8D=95?= =?UTF-8?q?=E5=AF=84=E4=BB=B6=E6=97=A5=E6=9C=9F=E6=9F=A5=20committer:=20he?= =?UTF-8?q?yu?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../erp/web/emis/EmisCommonController.java | 4 ++-- .../mapper/EmisTmsSiteBatchMissMapper.java | 2 +- .../erp/emis/mapper/EmisWaybillMapper.java | 6 ++--- .../service/IEmisTmsSiteBatchMissService.java | 2 +- .../impl/EmisTmsSiteBatchMissServiceImpl.java | 22 ++++++++++++++----- .../mapper/EmisTmsSiteBatchMissMapper.xml | 9 ++++++++ .../resources/mapper/EmisWaybillMapper.xml | 3 +++ 7 files changed, 34 insertions(+), 14 deletions(-) diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonController.java index 5e8404ecf..226e2a98d 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonController.java @@ -852,14 +852,14 @@ public class EmisCommonController extends EmisBaseController * @return */ @GetMapping("/autoScanSiteBatch") - public AjaxResult autoScanSiteBatch(){ + public AjaxResult autoScanSiteBatch(String lineCode){ String lockKey="autoScanSiteBatch"; log.info("autoScanSiteBatch start"); // 加锁查询 redissonService.lock(lockKey,300); try{ - emisTmsSiteBatchMissService.autoScanSiteBatch(); + emisTmsSiteBatchMissService.autoScanSiteBatch(lineCode); }catch(Exception ex){ ex.printStackTrace(); log.error("autoScanSiteBatch exception:"+ex.getMessage()); diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisTmsSiteBatchMissMapper.java b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisTmsSiteBatchMissMapper.java index 98ea9ba89..35572edb2 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisTmsSiteBatchMissMapper.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisTmsSiteBatchMissMapper.java @@ -65,7 +65,7 @@ public interface EmisTmsSiteBatchMissMapper { */ public int batchInsertEmisTmsSiteBatchMiss(List list); - void deleteAll(); + void deleteAll(String lineCode); /** * 根据bill_code出现次数查询TMS漏组批次信息 diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWaybillMapper.java b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWaybillMapper.java index d22f59ab1..2792a8f40 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWaybillMapper.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWaybillMapper.java @@ -10,7 +10,6 @@ */ package com.xdadan.erp.emis.mapper; -import java.util.Date; import java.util.List; import java.util.Map; @@ -18,7 +17,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; //import com.xdadan.erp.common.annotation.audit.DataAuditFilter; import com.xdadan.erp.common.annotation.audit.DataAuditLog; import com.xdadan.erp.common.annotation.audit.OperateType; -import com.xdadan.erp.emis.domain.EmisSettleSubBill; import com.xdadan.erp.emis.domain.EmisWaybill; import com.xdadan.erp.emis.service.impl.EmisWaybillServiceImpl; import org.apache.ibatis.annotations.Param; @@ -290,12 +288,12 @@ public interface EmisWaybillMapper extends BaseMapper public int setBindSalesmenDefault(@Param("customerCode") String customerCode,@Param("empCode") String empCode); /** - * * @param offset 起始位置 * @param pageSize 每页大小 + * @param lineCode * @return 运单列表 */ - List selectWaybillListBySiteBatchStatus(@Param("offset") int offset, @Param("pageSize") int pageSize); + List selectWaybillListBySiteBatchStatus(@Param("offset") int offset, @Param("pageSize") int pageSize, @Param("lineCode") String lineCode); /** * 查询客户运单信息 diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisTmsSiteBatchMissService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisTmsSiteBatchMissService.java index 8881a7235..941ea4cc8 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisTmsSiteBatchMissService.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisTmsSiteBatchMissService.java @@ -61,7 +61,7 @@ public interface IEmisTmsSiteBatchMissService { * 定时扫描运单货物组批次是否正确录入 * */ - void autoScanSiteBatch(); + void autoScanSiteBatch(String lineCode); /** * 根据bill_code出现次数查询TMS漏组批次信息 diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsSiteBatchMissServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsSiteBatchMissServiceImpl.java index b8d50c9a7..4fb126b8e 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsSiteBatchMissServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsSiteBatchMissServiceImpl.java @@ -133,9 +133,9 @@ public class EmisTmsSiteBatchMissServiceImpl extends EmisBaseService implements @Async @Override - public void autoScanSiteBatch() { + public void autoScanSiteBatch(String lineCode) { try { - emisTmsSiteBatchMissMapper.deleteAll(); + emisTmsSiteBatchMissMapper.deleteAll(lineCode); long startTime = System.currentTimeMillis(); int pageSize = 1000; int offset = 0; @@ -145,7 +145,7 @@ public class EmisTmsSiteBatchMissServiceImpl extends EmisBaseService implements List failedBillCodes = new ArrayList<>(); // 获取所有线路规划 - List treeRules = this.selectEmisTransPlanRuleTree(); + List treeRules = this.selectEmisTransPlanRuleTree(lineCode); if (treeRules.isEmpty()) { log.info("No trans plan rules found, skip auto scan"); return; @@ -162,7 +162,7 @@ public class EmisTmsSiteBatchMissServiceImpl extends EmisBaseService implements // 先查询所有数据 while (true) { - List waybills = emisWaybillMapper.selectWaybillListBySiteBatchStatus(offset, pageSize); + List waybills = emisWaybillMapper.selectWaybillListBySiteBatchStatus(offset, pageSize,lineCode); if (waybills.isEmpty()) { break; } @@ -344,6 +344,8 @@ public class EmisTmsSiteBatchMissServiceImpl extends EmisBaseService implements EmisTmsSiteBatchMiss miss = createMissRecord(waybill); miss.setMissReason("当前线路没有创建对应的线路规划"); miss.setMissType("1"); + miss.setLineCode(waybill.getTransLineType()); + miss.setProductType(waybill.getProductType()); missRecords.add(miss); successCount++; continue; @@ -359,6 +361,8 @@ public class EmisTmsSiteBatchMissServiceImpl extends EmisBaseService implements EmisTmsSiteBatchMiss miss = createMissRecord(waybill); miss.setMissReason("当前线路没有创建对应的产品类型"); miss.setMissType("1"); + miss.setLineCode(waybill.getTransLineType()); + miss.setProductType(waybill.getProductType()); missRecords.add(miss); successCount++; continue; @@ -371,6 +375,8 @@ public class EmisTmsSiteBatchMissServiceImpl extends EmisBaseService implements EmisTmsSiteBatchMiss miss = createMissRecord(waybill); miss.setMissReason("当前运单没有组批次"); miss.setMissType("2"); + miss.setLineCode(waybill.getTransLineType()); + miss.setProductType(waybill.getProductType()); missRecords.add(miss); successCount++; continue; @@ -419,9 +425,11 @@ public class EmisTmsSiteBatchMissServiceImpl extends EmisBaseService implements return new ProcessResult(successCount, failCount, failedBillCodes, batchStatusList, missRecords); } - public List selectEmisTransPlanRuleTree() { + public List selectEmisTransPlanRuleTree(String lineCode) { log.info("Start querying supplier route plan tree"); - List list = emisTransPlanRuleMapper.selectEmisTransPlanRuleList(new EmisTransPlanRule()); + EmisTransPlanRule emisTransPlanRule = new EmisTransPlanRule(); + emisTransPlanRule.setLineCode(lineCode); + List list = emisTransPlanRuleMapper.selectEmisTransPlanRuleList(emisTransPlanRule); List tree = buildTree(list); log.info("Queried supplier route plan tree, node count={}", tree != null ? tree.size() : 0); return tree; @@ -468,6 +476,8 @@ public class EmisTmsSiteBatchMissServiceImpl extends EmisBaseService implements EmisTmsSiteBatchMiss miss = createMissRecord(waybill); miss.setMissReason("该运单所有组批次信息都不匹配，请仔细核对"); miss.setMissType("3"); + miss.setLineCode(waybill.getTransLineType()); + miss.setProductType(waybill.getProductType()); missRecords.add(miss); return false; } diff --git a/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMissMapper.xml b/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMissMapper.xml index 5ebca1e38..f55b5ff7f 100644 --- a/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMissMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMissMapper.xml @@ -183,6 +183,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND w.bl_is_question = #{blIsQuestion} + + and w.send_date = ]]> #{params.beginSendDate} + + + and w.send_date #{params.endSendDate} + @@ -238,6 +244,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update emis_tms_site_batch_miss set del_flag = '1' + + where line_code = #{lineCode} + diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml index f7db99301..0767a2514 100644 --- a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml @@ -3537,6 +3537,9 @@ where a.bl_sign = '1' and a.del_flag = '0' and (b.site_batch_status is null or b.site_batch_status != '1') + + and a.trans_line_type = #{lineCode} + order by a.create_time desc limit #{offset}, #{pageSize}