From 4d66d7a9b8bb5d0ecf52a2c24c34c2c1742e37a9 Mon Sep 17 00:00:00 2001 From: aike <17730485278@139.com> Date: Tue, 11 Nov 2025 11:38:25 +0800 Subject: [PATCH 1/4] demand: committer: heyu --- .../src/main/resources/mapper/EmisWaybillMapper.xml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml index 56abbbb81..789df80da 100644 --- a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml @@ -3999,7 +3999,7 @@ a.cust_no AS custNo, COUNT(DISTINCT a.bill_code) AS totalTickets, IFNULL(SUM(a.bill_weight), 0) AS totalWeight, - GROUP_CONCAT(DISTINCT a.salesmen ORDER BY a.order_date SEPARATOR '/') AS salesmen, + GROUP_CONCAT(DISTINCT cu.salesmen ORDER BY a.order_date SEPARATOR '/') AS salesmen, SUM(CASE WHEN a.send_country = '0086' AND tl.trans_type = '1' THEN 1 ELSE 0 END) AS expressTickets, IFNULL(SUM(CASE WHEN a.send_country = '0086' AND tl.trans_type = '1' THEN a.bill_weight ELSE 0 END), 0) AS expressWeight, SUM(CASE WHEN a.send_country = '0086' AND tl.trans_type = '2' THEN 1 ELSE 0 END) AS airTickets, @@ -4116,6 +4116,14 @@ AND a.cust_no = #{custNo} + + + AND a.send_country = #{sendCountry} + + + + AND a.receive_country = #{receiveCountry} + AND EXISTS ( From 588b3d3a78789c2960bf20ba347bee82868308c5 Mon Sep 17 00:00:00 2001 From: aike <17730485278@139.com> Date: Tue, 11 Nov 2025 13:12:58 +0800 Subject: [PATCH 2/4] =?UTF-8?q?demand:=20=20=20=20tms-=E6=8A=A5=E4=BB=B7?= =?UTF-8?q?=E7=AE=A1=E7=90=86-=E5=B9=B2=E7=BA=BF=E8=BF=90=E8=BE=93?= =?UTF-8?q?=E8=B4=B9-=E5=AF=84=E4=BB=B6=E5=8C=BA=E5=9F=9F/=E6=B4=BE?= =?UTF-8?q?=E4=BB=B6=E5=8C=BA=E5=9F=9F-=E6=96=B0=E5=A2=9E/=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E6=A0=B9=E6=8D=AE=E5=90=8D=E7=A7=B0=E9=AA=8C=E9=87=8D?= =?UTF-8?q?=EF=BC=8C=E5=90=8D=E7=A7=B0=E5=85=A8=E5=8C=B9=E9=85=8D=E6=89=8D?= =?UTF-8?q?=E7=AE=97=E9=87=8D=E5=A4=8D=20committer:=20heyu?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../erp/emis/service/impl/EmisQuoteDispAreaServiceImpl.java | 2 +- .../erp/emis/service/impl/EmisQuoteSendAreaServiceImpl.java | 2 +- .../src/main/resources/mapper/EmisQuoteDispAreaMapper.xml | 3 ++- .../src/main/resources/mapper/EmisQuoteSendAreaMapper.xml | 5 ++++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisQuoteDispAreaServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisQuoteDispAreaServiceImpl.java index d7e3c4178..bd32d320d 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisQuoteDispAreaServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisQuoteDispAreaServiceImpl.java @@ -123,7 +123,7 @@ public class EmisQuoteDispAreaServiceImpl extends EmisBaseService implements IEm public void validateEmisQuoteDispArea(EmisQuoteDispArea emisQuoteDispArea, boolean isUpdate) throws EmisBizError { // 1. 校验区域名称和删除标志的唯一性 EmisQuoteDispArea queryParam = new EmisQuoteDispArea(); - queryParam.setAreaName(emisQuoteDispArea.getAreaName()); + queryParam.getParams().put("areaName",emisQuoteDispArea.getAreaName()); queryParam.setDelFlag("0"); // 只查询未删除的记录 List existingList = emisQuoteDispAreaMapper.selectEmisQuoteDispAreaList(queryParam); diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisQuoteSendAreaServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisQuoteSendAreaServiceImpl.java index 59ab5f237..ec44c4476 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisQuoteSendAreaServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisQuoteSendAreaServiceImpl.java @@ -122,7 +122,7 @@ public class EmisQuoteSendAreaServiceImpl extends EmisBaseService implements IEm public void validateEmisQuoteSendArea(EmisQuoteSendArea emisQuoteSendArea, boolean isUpdate) throws EmisBizError { // 1. 校验区域名称和删除标志的唯一性 EmisQuoteSendArea queryParam = new EmisQuoteSendArea(); - queryParam.setAreaName(emisQuoteSendArea.getAreaName()); + queryParam.getParams().put("areaName",emisQuoteSendArea.getAreaName()); queryParam.setDelFlag("0"); // 只查询未删除的记录 List existingList = emisQuoteSendAreaMapper.selectEmisQuoteSendAreaList(queryParam); diff --git a/emis-biz/src/main/resources/mapper/EmisQuoteDispAreaMapper.xml b/emis-biz/src/main/resources/mapper/EmisQuoteDispAreaMapper.xml index 0b6aac141..6566ab8b5 100644 --- a/emis-biz/src/main/resources/mapper/EmisQuoteDispAreaMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisQuoteDispAreaMapper.xml @@ -64,6 +64,7 @@ SELECT #{createSite} FROM dual ) + and area_name =#{params.areaName} order by create_time desc @@ -159,4 +160,4 @@ #{areaId} - \ No newline at end of file + diff --git a/emis-biz/src/main/resources/mapper/EmisQuoteSendAreaMapper.xml b/emis-biz/src/main/resources/mapper/EmisQuoteSendAreaMapper.xml index 74e03fe8a..7322f3364 100644 --- a/emis-biz/src/main/resources/mapper/EmisQuoteSendAreaMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisQuoteSendAreaMapper.xml @@ -66,6 +66,9 @@ ) + and area_name =#{params.areaName} + + order by create_time desc @@ -161,4 +164,4 @@ #{areaId} - \ No newline at end of file + From 84a9a6a490ff3a3fcc1d70eeeb4c5e1d42822a02 Mon Sep 17 00:00:00 2001 From: aike <17730485278@139.com> Date: Tue, 11 Nov 2025 14:15:40 +0800 Subject: [PATCH 3/4] =?UTF-8?q?demand:=20=20=20=20tms-=E6=89=AB=E6=8F=8F?= =?UTF-8?q?=E7=AE=A1=E7=90=86-=E5=8F=91=E4=BB=B6=E6=89=AB=E6=8F=8F?= =?UTF-8?q?=E3=80=81=E5=88=B0=E4=BB=B6=E6=89=AB=E6=8F=8F=E7=AD=89=E6=89=AB?= =?UTF-8?q?=E6=8F=8F-=E6=89=AB=E6=8F=8F=E6=97=A5=E5=BF=97=E4=BF=9D?= =?UTF-8?q?=E5=AD=98=E5=AD=90=E5=8D=95=E5=8F=B7=EF=BC=8C=E5=8C=BA=E5=88=86?= =?UTF-8?q?=E5=AD=90=E5=8D=95-=E4=B8=BB=E5=8D=95=20=20tms-=E5=AE=A2?= =?UTF-8?q?=E6=88=B7=E7=AE=A1=E7=90=86-=E5=BF=AB=E4=BB=B6=E8=B7=9F?= =?UTF-8?q?=E8=B8=AA-=E6=97=A5=E5=BF=97=E8=AE=B0=E5=BD=95-=E5=AD=90?= =?UTF-8?q?=E5=8D=95=E6=89=AB=E6=8F=8F=E6=8B=BC=E6=8E=A5=E5=AD=90=E5=8D=95?= =?UTF-8?q?=E5=8F=B7=E5=81=9A=E5=8C=BA=E5=88=86=20committer:=20heyu?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/EmisTmsScanRecordServiceImpl.java | 20 ++++----- .../impl/EmisWaybillOperLogServiceImpl.java | 44 ++++++++++++------- 2 files changed, 39 insertions(+), 25 deletions(-) diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java index f4b8633c5..acb38e0b4 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java @@ -1,10 +1,10 @@ - /** + /** * @Project: emis * @Title: EmisTmsScanRecordServiceImpl.java * @author linfso * @date 2024-03-01 08:54:59 * @Copyright: ShangHai Duta 2022 All rights reserved. - * @version v1.0 + * @version v1.0 * @Description:

TMS扫描记录 实体类

*/ @@ -43,7 +43,7 @@ import org.springframework.transaction.annotation.Transactional; /** * TMS扫描记录Service业务层处理 - * + * * @author linfso * @date 2024-03-01 08:54:59 */ @@ -88,7 +88,7 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm /** * 查询TMS扫描记录 - * + * * @param id TMS扫描记录主键 * @return TMS扫描记录 */ @@ -124,7 +124,7 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm /** * 查询TMS扫描记录列表 - * + * * @param emisTmsScanRecord TMS扫描记录 * @return TMS扫描记录 */ @@ -171,7 +171,7 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm /** * 新增TMS扫描记录 - * + * * @param emisTmsScanRecord TMS扫描记录 * @return 结果 */ @@ -183,7 +183,7 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm /** * 修改TMS扫描记录 - * + * * @param emisTmsScanRecord TMS扫描记录 * @return 结果 */ @@ -195,7 +195,7 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm /** * 批量删除TMS扫描记录 - * + * * @param ids 需要删除的TMS扫描记录主键 * @return 结果 */ @@ -207,7 +207,7 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm /** * 删除TMS扫描记录信息 - * + * * @param id TMS扫描记录主键 * @return 结果 */ @@ -1841,7 +1841,7 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm String scanTypeLabel = DictUtils.getDictLabel("emis_scan_type", emisTmsScanRecord.getScanType()); // 记录扫描操作日志 recordWaybillOperLog( - mainBillCode, + scanBillCode, WaybillOperLogType.SITE_DO_SCAN, getCurrentUser().getEmpName(), getCurrentUser().getOwnerSiteName(), diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillOperLogServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillOperLogServiceImpl.java index 1d130f381..dbfeb340b 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillOperLogServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillOperLogServiceImpl.java @@ -1,10 +1,10 @@ - /** + /** * @Project: emis * @Title: EmisWaybillOperLogServiceImpl.java * @author linfso * @date 2025-01-20 15:55:57 * @Copyright: ShangHai Duta 2022 All rights reserved. - * @version v1.0 + * @version v1.0 * @Description:

运单操作日志 实体类

*/ @@ -19,19 +19,19 @@ import com.xdadan.erp.emis.service.IEmisWaybillOperLogService; /** * 运单操作日志Service业务层处理 - * + * * @author linfso * @date 2025-01-20 15:55:57 */ @Service -public class EmisWaybillOperLogServiceImpl implements IEmisWaybillOperLogService +public class EmisWaybillOperLogServiceImpl implements IEmisWaybillOperLogService { @Autowired private EmisWaybillOperLogMapper emisWaybillOperLogMapper; /** * 查询运单操作日志 - * + * * @param id 运单操作日志主键 * @return 运单操作日志 */ @@ -44,7 +44,7 @@ public class EmisWaybillOperLogServiceImpl implements IEmisWaybillOperLogService /** * 查询运单操作日志列表 - * + * * @param emisWaybillOperLog 运单操作日志 * @return 运单操作日志 */ @@ -55,15 +55,29 @@ public class EmisWaybillOperLogServiceImpl implements IEmisWaybillOperLogService } @Override - public List selectListByMainBillCode(String mainBillCode) - { - return emisWaybillOperLogMapper.selectListByMainBillCode(mainBillCode); + public List selectListByMainBillCode(String mainBillCode) { + List list = emisWaybillOperLogMapper.selectListByMainBillCode(mainBillCode); + if (list != null && mainBillCode != null) { + for (EmisWaybillOperLog log : list) { + if (log != null && log.getBillCode() != null + && log.getBillCode().length() > mainBillCode.length()) { + String opDesc = log.getOpDesc(); + if (opDesc == null) { + opDesc = "子单" + log.getBillCode(); + } else { + opDesc = opDesc + "-子单-" + log.getBillCode(); + } + log.setOpDesc(opDesc); + } + } + } + return list; } /** * 检查是否重复 - * - * @param emisWaybillOperLog + * + * @param emisWaybillOperLog * @return 数量 */ @Override @@ -74,7 +88,7 @@ public class EmisWaybillOperLogServiceImpl implements IEmisWaybillOperLogService /** * 新增运单操作日志 - * + * * @param emisWaybillOperLog 运单操作日志 * @return 结果 */ @@ -86,7 +100,7 @@ public class EmisWaybillOperLogServiceImpl implements IEmisWaybillOperLogService /** * 修改运单操作日志 - * + * * @param emisWaybillOperLog 运单操作日志 * @return 结果 */ @@ -98,7 +112,7 @@ public class EmisWaybillOperLogServiceImpl implements IEmisWaybillOperLogService /** * 批量删除运单操作日志 - * + * * @param ids 需要删除的运单操作日志主键 * @return 结果 */ @@ -110,7 +124,7 @@ public class EmisWaybillOperLogServiceImpl implements IEmisWaybillOperLogService /** * 删除运单操作日志信息 - * + * * @param id 运单操作日志主键 * @return 结果 */ From 253c8c69b795ed42f41909e2f284fbb9354f8f7a Mon Sep 17 00:00:00 2001 From: aike <17730485278@139.com> Date: Tue, 11 Nov 2025 17:22:25 +0800 Subject: [PATCH 4/4] =?UTF-8?q?demand:=20=20=20=20tms-=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?=E6=8A=A5=E8=A1=A8-=E6=9C=88=E7=BB=93=E5=AE=A2=E6=88=B7?= =?UTF-8?q?=E5=87=BA=E8=B4=A7=E7=BB=9F=E8=AE=A1-=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=80=A7=E8=83=BD=E4=BC=98=E5=8C=96=20committer:=20heyu?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../erp/emis/mapper/EmisWaybillMapper.java | 3 +- .../impl/EmisCustomerUserServiceImpl.java | 33 +------------------ .../resources/mapper/EmisWaybillMapper.xml | 6 ++-- 3 files changed, 6 insertions(+), 36 deletions(-) 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 659a5d797..cc6242801 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 @@ -18,6 +18,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.xdadan.erp.common.annotation.audit.DataAuditLog; import com.xdadan.erp.common.annotation.audit.OperateType; import com.xdadan.erp.emis.domain.EmisWaybill; +import com.xdadan.erp.emis.domain.vo.MonthlyCustomerShipmentStatVO; import com.xdadan.erp.emis.service.impl.EmisWaybillServiceImpl; import org.apache.ibatis.annotations.Param; @@ -370,7 +371,7 @@ public interface EmisWaybillMapper extends BaseMapper * @param emisWaybill 查询条件 * @return 统计结果列表 */ - List selectMonthlyCustomerShipmentStat(EmisWaybill emisWaybill); + List selectMonthlyCustomerShipmentStat(EmisWaybill emisWaybill); /** * 查询月结客户出货明细 diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisCustomerUserServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisCustomerUserServiceImpl.java index eb0bacc2d..f53a9d9aa 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisCustomerUserServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisCustomerUserServiceImpl.java @@ -162,38 +162,7 @@ public class EmisCustomerUserServiceImpl extends EmisBaseService implements IEmi */ @Override public List selectMonthlyCustomerShipmentStat(EmisWaybill emisWaybill) { - List mapList = emisWaybillMapper.selectMonthlyCustomerShipmentStat(emisWaybill); - return mapList.stream().map(map -> { - MonthlyCustomerShipmentStatVO vo = new MonthlyCustomerShipmentStatVO(); - vo.setCustomerName((String) map.get("customerName")); - vo.setCustNo((String) map.get("custNo")); - vo.setCustomerCode((String) map.get("customerCode")); - Object totalTicketsObj = map.get("totalTickets"); - if (totalTicketsObj != null) { - vo.setTotalTickets(((Number) totalTicketsObj).intValue()); - } else { - vo.setTotalTickets(0); - } - vo.setTotalWeight((java.math.BigDecimal) map.get("totalWeight")); - vo.setSalesmen((String) map.get("salesmen")); - - Object expressTicketsObj = map.get("expressTickets"); - vo.setExpressTickets(expressTicketsObj != null ? ((Number) expressTicketsObj).intValue() : 0); - vo.setExpressWeight((java.math.BigDecimal) map.getOrDefault("expressWeight", java.math.BigDecimal.ZERO)); - - Object airTicketsObj = map.get("airTickets"); - vo.setAirTickets(airTicketsObj != null ? ((Number) airTicketsObj).intValue() : 0); - vo.setAirWeight((java.math.BigDecimal) map.getOrDefault("airWeight", java.math.BigDecimal.ZERO)); - - Object landTicketsObj = map.get("landTickets"); - vo.setLandTickets(landTicketsObj != null ? ((Number) landTicketsObj).intValue() : 0); - vo.setLandWeight((java.math.BigDecimal) map.getOrDefault("landWeight", java.math.BigDecimal.ZERO)); - - Object importTicketsObj = map.get("importTickets"); - vo.setImportTickets(importTicketsObj != null ? ((Number) importTicketsObj).intValue() : 0); - vo.setImportWeight((java.math.BigDecimal) map.getOrDefault("importWeight", java.math.BigDecimal.ZERO)); - return vo; - }).collect(Collectors.toList()); + return emisWaybillMapper.selectMonthlyCustomerShipmentStat(emisWaybill); } /** diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml index 789df80da..c3f219522 100644 --- a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml @@ -4010,7 +4010,7 @@ IFNULL(SUM(CASE WHEN a.receive_country = '0086' AND tl.trans_type IN ('1', '2', '3') THEN a.bill_weight ELSE 0 END), 0) AS importWeight FROM emis_waybill a LEFT JOIN emis_trans_line tl ON a.trans_line_type = tl.line_code AND tl.del_flag = '0' - LEFT JOIN emis_customer_user cu ON a.cust_no = cu.monthly_pay_code AND cu.del_flag = '0' + LEFT JOIN emis_customer_user cu ON a.customer_code = cu.customer_code AND cu.del_flag = '0' a.del_flag = '0' AND a.order_status !='0' @@ -4062,7 +4062,7 @@ AND cu.salesmen LIKE CONCAT('%', #{salesmen}, '%') - + AND ( cu.sales_executive = #{params.privEmpName} @@ -4150,7 +4150,7 @@ AND EXISTS ( SELECT 1 FROM emis_customer_user cu - WHERE a.cust_no = cu.monthly_pay_code + WHERE a.customer_code = cu.customer_code AND cu.del_flag = '0' AND ( cu.sales_executive = #{params.privEmpName}