From a091b72e7737b203eea102224413e10f16959503 Mon Sep 17 00:00:00 2001 From: aike <17730485278@139.com> Date: Thu, 20 Nov 2025 17:29:26 +0800 Subject: [PATCH 1/6] =?UTF-8?q?demand:=20=20=20TMS=E7=B3=BB=E7=BB=9F=20-?= =?UTF-8?q?=20=E6=88=90=E6=9C=AC=E5=88=97=E8=A1=A8=20-=20=E6=8C=89?= =?UTF-8?q?=E7=85=A7=E8=BF=90=E8=BE=93=E5=8F=B7=E6=9F=A5=E8=AF=A2=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=20=E6=8F=90=E7=A4=BA=E6=97=A0=E6=95=B0=E6=8D=AE=20com?= =?UTF-8?q?mitter:=20heyu?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- emis-biz/src/main/resources/mapper/EmisTmsCostFeeMapper.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/emis-biz/src/main/resources/mapper/EmisTmsCostFeeMapper.xml b/emis-biz/src/main/resources/mapper/EmisTmsCostFeeMapper.xml index a6c57eb95..86d453ee0 100644 --- a/emis-biz/src/main/resources/mapper/EmisTmsCostFeeMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisTmsCostFeeMapper.xml @@ -205,7 +205,7 @@ and fee_type = #{feeType} and split_type = #{splitType} and trans_type=#{transType} - and FIND_IN_SET(trans_sign_no,#{transSignNo}) + and trans_sign_no like concat('%', #{transSignNo}, '%') and supplier_code=#{supplierCode} and supplier_name like concat('%', #{supplierName}, '%') and send_place=#{sendPlace} @@ -453,4 +453,4 @@ #{id} - \ No newline at end of file + From cd6699c9b192e1e9d485b87f7f86f5c28e6b6b2d Mon Sep 17 00:00:00 2001 From: aike <17730485278@139.com> Date: Tue, 25 Nov 2025 15:36:02 +0800 Subject: [PATCH 2/6] =?UTF-8?q?demand:=20=20=20=E5=AE=A2=E6=88=B7=E8=B4=A6?= =?UTF-8?q?=E5=8D=95=E6=9F=A5=E8=AF=A2-cpu=E9=A3=99=E5=8D=87=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E5=AE=9A=E4=BD=8D=E8=A7=A3=E5=86=B3=20committer:=20he?= =?UTF-8?q?yu?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../emis/EmisSettlePayRecordController.java | 67 +++++++++++++------ .../service/IEmisSettlePayRecordService.java | 21 ++++-- .../impl/EmisSettlePayRecordServiceImpl.java | 55 +++++++++------ 3 files changed, 92 insertions(+), 51 deletions(-) diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettlePayRecordController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettlePayRecordController.java index 9de42f29a..a44fc9ac3 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettlePayRecordController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettlePayRecordController.java @@ -11,37 +11,28 @@ package com.xdadan.erp.web.emis; -import java.util.Arrays; -import java.util.List; -import java.util.Map; -import javax.servlet.http.HttpServletResponse; - import cn.hutool.core.map.MapUtil; -import com.xdadan.erp.emis.domain.exception.EmisBizError; -import com.xdadan.erp.emis.domain.stat.PayBackRecordDtl; -import com.xdadan.erp.emis.utils.WaybillHelper; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.dao.DuplicateKeyException; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - import com.xdadan.erp.common.annotation.Log; import com.xdadan.erp.common.core.controller.BaseController; import com.xdadan.erp.common.core.domain.AjaxResult; import com.xdadan.erp.common.core.page.TableDataInfo; import com.xdadan.erp.common.enums.BusinessType; import com.xdadan.erp.common.utils.poi.ExcelUtil; - import com.xdadan.erp.emis.domain.EmisSettlePayRecord; +import com.xdadan.erp.emis.domain.exception.EmisBizError; +import com.xdadan.erp.emis.domain.stat.PayBackRecordDtl; import com.xdadan.erp.emis.service.IEmisSettlePayRecordService; +import com.xdadan.erp.emis.utils.WaybillHelper; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.dao.DuplicateKeyException; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.Arrays; +import java.util.List; +import java.util.Map; /** * 账单收退款记录Controller @@ -89,6 +80,38 @@ public class EmisSettlePayRecordController extends BaseController return getDataTable(list); } + /** + * 查询账单收退款记录列表 + */ + @GetMapping("/listSimple") + public TableDataInfo listSimple(EmisSettlePayRecord emisSettlePayRecord) + { + startPage(); + + setPrivParams(emisSettlePayRecord); + + String billCodeStr = MapUtil.getStr(emisSettlePayRecord.getParams(),"billCode"); + if(!StringUtils.isEmpty(billCodeStr)){ + emisSettlePayRecord.getParams().put("billCode", WaybillHelper.formatQueryValue(billCodeStr)); + String[] billCodeSortList = billCodeStr.split(","); + if(billCodeSortList.length>1){ + emisSettlePayRecord.getParams().put("billCodeSortList", Arrays.asList(billCodeSortList)); + } + } + + + if(!StringUtils.isEmpty(emisSettlePayRecord.getSettleBillNo())){ + emisSettlePayRecord.setSettleBillNo(WaybillHelper.formatQueryValue(emisSettlePayRecord.getSettleBillNo())); + String[] settleBillNoSortList = emisSettlePayRecord.getSettleBillNo().split(","); + if(settleBillNoSortList.length>1){ + emisSettlePayRecord.getParams().put("settleBillNoSortList",Arrays.asList(settleBillNoSortList)); + } + } + + List list = emisSettlePayRecordService.selectEmisSettlePayRecordListSimple(emisSettlePayRecord); + return getDataTable(list); + } + /** * 收款统计Map */ diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisSettlePayRecordService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisSettlePayRecordService.java index c20bcfb6c..4cb6c6454 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisSettlePayRecordService.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisSettlePayRecordService.java @@ -9,14 +9,13 @@ */ package com.xdadan.erp.emis.service; -import java.util.List; -import java.util.Map; + import com.xdadan.erp.emis.domain.EmisSettlePayRecord; + import com.xdadan.erp.emis.domain.exception.EmisBizError; + import com.xdadan.erp.emis.domain.stat.PayBackRecordDtl; -import javax.servlet.http.HttpServletResponse; - -import com.xdadan.erp.emis.domain.EmisSettlePayRecord; -import com.xdadan.erp.emis.domain.exception.EmisBizError; -import com.xdadan.erp.emis.domain.stat.PayBackRecordDtl; + import javax.servlet.http.HttpServletResponse; + import java.util.List; + import java.util.Map; /** * @ClassName EmisSettlePayRecordService @@ -41,6 +40,14 @@ public interface IEmisSettlePayRecordService */ public List selectEmisSettlePayRecordList(EmisSettlePayRecord emisSettlePayRecord); + /** + * 查询账单收退款记录列表 + * + * @param emisSettlePayRecord 账单收退款记录 + * @return 账单收退款记录集合 + */ + public List selectEmisSettlePayRecordListSimple(EmisSettlePayRecord emisSettlePayRecord); + public Map getSettlePayStatInfoMap(EmisSettlePayRecord emisSettlePayRecord); public List queryPayBackRecordList(EmisSettlePayRecord emisSettlePayRecord); diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettlePayRecordServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettlePayRecordServiceImpl.java index ecaf16986..dd36bf473 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettlePayRecordServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettlePayRecordServiceImpl.java @@ -10,6 +10,24 @@ package com.xdadan.erp.emis.service.impl; +import com.xdadan.erp.emis.domain.*; +import com.xdadan.erp.emis.domain.enumtype.EmisBizErrorType; +import com.xdadan.erp.emis.domain.exception.EmisBizError; +import com.xdadan.erp.emis.domain.stat.PayBackRecordDtl; +import com.xdadan.erp.emis.mapper.*; +import com.xdadan.erp.emis.service.EmisBaseService; +import com.xdadan.erp.emis.service.IEmisSettleBillService; +import com.xdadan.erp.emis.service.IEmisSettlePayRecordService; +import com.xdadan.erp.emis.service.excelCellStrategy.EmisSettlePayRecordCustomExcelUtil; +import com.xdadan.erp.emis.utils.WaybillHelper; +import jodd.util.StringUtil; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import javax.servlet.http.HttpServletResponse; import java.math.BigDecimal; import java.time.LocalDate; import java.time.ZoneId; @@ -22,25 +40,6 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.stream.Collectors; -import javax.servlet.http.HttpServletResponse; - -import com.xdadan.erp.emis.domain.*; -import com.xdadan.erp.emis.domain.enumtype.EmisBizErrorType; -import com.xdadan.erp.emis.domain.exception.EmisBizError; -import com.xdadan.erp.emis.domain.stat.PayBackRecordDtl; -import com.xdadan.erp.emis.mapper.*; -import com.xdadan.erp.emis.service.EmisBaseService; -import com.xdadan.erp.emis.service.IEmisSettleBillService; -import com.xdadan.erp.emis.service.excelCellStrategy.EmisSettlePayRecordCustomExcelUtil; -import com.xdadan.erp.emis.utils.WaybillHelper; -import jodd.util.StringUtil; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import com.xdadan.erp.emis.service.IEmisSettlePayRecordService; - /** * 账单收退款记录Service业务层处理 * @@ -92,6 +91,18 @@ public class EmisSettlePayRecordServiceImpl extends EmisBaseService implements I return emisSettlePayRecordMapper.selectEmisSettlePayRecordById(id); } + /** + * 查询账单收退款记录列表 + * + * @param emisSettlePayRecord 账单收退款记录 + * @return 账单收退款记录 + */ + @Override + public List selectEmisSettlePayRecordListSimple(EmisSettlePayRecord emisSettlePayRecord) + { + return emisSettlePayRecordMapper.selectEmisSettlePayRecordList(emisSettlePayRecord); + } + /** * 查询账单收退款记录列表（带扩展信息） * @@ -118,7 +129,7 @@ public class EmisSettlePayRecordServiceImpl extends EmisBaseService implements I .map(EmisSettlePayRecord::getPayId) .filter(StringUtils::isNotBlank) .distinct() - .collect(java.util.stream.Collectors.toList()); + .collect(Collectors.toList()); if (CollectionUtils.isEmpty(payIds)) { return baseList; @@ -365,7 +376,7 @@ public class EmisSettlePayRecordServiceImpl extends EmisBaseService implements I // 对于没有开票状态记录的payId，需要检查emis_settle_bill的open_bill_status List missingPayIds = payIds.stream() .filter(payId -> !result.containsKey(payId)) - .collect(java.util.stream.Collectors.toList()); + .collect(Collectors.toList()); if (!CollectionUtils.isEmpty(missingPayIds)) { List> billStatusList = emisSettlePayRecordMapper @@ -621,7 +632,7 @@ public class EmisSettlePayRecordServiceImpl extends EmisBaseService implements I if (StringUtils.isNotBlank(payRecordOld.getSettleBillNo())) { List settleBillNos = Arrays.stream(payRecordOld.getSettleBillNo().split(",")) .map(String::trim) - .filter(org.apache.commons.lang3.StringUtils::isNotBlank) + .filter(StringUtils::isNotBlank) .distinct() .collect(Collectors.toList()); for (String settleBillNo : settleBillNos) { From 3af3a3d37c1d1dc0e34666786c960b4a72cac889 Mon Sep 17 00:00:00 2001 From: aike <17730485278@139.com> Date: Tue, 25 Nov 2025 17:22:08 +0800 Subject: [PATCH 3/6] =?UTF-8?q?demand:=20=20=20=E5=AE=A2=E6=88=B7=E8=B4=A6?= =?UTF-8?q?=E5=8D=95=E6=9F=A5=E8=AF=A2-cpu=E9=A3=99=E5=8D=87=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E5=AE=9A=E4=BD=8D=E8=A7=A3=E5=86=B3=20committer:=20he?= =?UTF-8?q?yu?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/EmisWaybillServiceImpl.java | 52 +++++++++---------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java index 8827a3f1d..08144427c 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java @@ -157,32 +157,32 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb * @param emisWaybillSave */ private void saveOrUpdateWaybillOther(EmisWaybill emisWaybillSave) { - if (emisWaybillSave == null || emisWaybillSave.getId() == null) { - return; - } - - String salesSupport = emisWaybillSave.getSalesSupport(); - String billCode = emisWaybillSave.getBillCode(); - Long waybillId = emisWaybillSave.getId(); - - // 查询是否已存在 - EmisWaybillOther existing = emisWaybillOtherMapper.selectEmisWaybillOtherByWaybillId(waybillId); - - if (existing != null) { - // 更新 - existing.setSalesSupport(salesSupport); - existing.setBillCode(billCode); - existing.preUpdate(); - emisWaybillOtherMapper.updateEmisWaybillOther(existing); - } else { - // 新增 - EmisWaybillOther waybillOtherEntity = new EmisWaybillOther(); - waybillOtherEntity.setWaybillId(waybillId); - waybillOtherEntity.setBillCode(billCode); - waybillOtherEntity.setSalesSupport(salesSupport); - waybillOtherEntity.preInsert(); - emisWaybillOtherMapper.insertEmisWaybillOther(waybillOtherEntity); - } +// if (emisWaybillSave == null || emisWaybillSave.getId() == null) { +// return; +// } +// +// String salesSupport = emisWaybillSave.getSalesSupport(); +// String billCode = emisWaybillSave.getBillCode(); +// Long waybillId = emisWaybillSave.getId(); +// +// // 查询是否已存在 +// EmisWaybillOther existing = emisWaybillOtherMapper.selectEmisWaybillOtherByWaybillId(waybillId); +// +// if (existing != null) { +// // 更新 +// existing.setSalesSupport(salesSupport); +// existing.setBillCode(billCode); +// existing.preUpdate(); +// emisWaybillOtherMapper.updateEmisWaybillOther(existing); +// } else { +// // 新增 +// EmisWaybillOther waybillOtherEntity = new EmisWaybillOther(); +// waybillOtherEntity.setWaybillId(waybillId); +// waybillOtherEntity.setBillCode(billCode); +// waybillOtherEntity.setSalesSupport(salesSupport); +// waybillOtherEntity.preInsert(); +// emisWaybillOtherMapper.insertEmisWaybillOther(waybillOtherEntity); +// } } /** From 1caa0df5c14167a2f29d0f225bbb3f09cb312893 Mon Sep 17 00:00:00 2001 From: aike <17730485278@139.com> Date: Tue, 25 Nov 2025 18:55:48 +0800 Subject: [PATCH 4/6] =?UTF-8?q?demand:=20=20=20=E5=AE=A2=E6=88=B7=E8=B4=A6?= =?UTF-8?q?=E5=8D=95=E6=9F=A5=E8=AF=A2-cpu=E9=A3=99=E5=8D=87=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E5=AE=9A=E4=BD=8D=E8=A7=A3=E5=86=B3=20committer:=20he?= =?UTF-8?q?yu?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/EmisTmsSiteBatchMissServiceImpl.java | 2 +- .../impl/EmisTmsSiteBatchServiceImpl.java | 24 ++++----- .../service/impl/EmisWaybillServiceImpl.java | 52 +++++++++---------- 3 files changed, 39 insertions(+), 39 deletions(-) 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 ca80fd4b0..62296013b 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 @@ -248,7 +248,7 @@ public class EmisTmsSiteBatchMissServiceImpl extends EmisBaseService implements // 3) 调用scanSiteBatchByWaybills重新扫描 if (!waybills.isEmpty()) { - this.scanSiteBatchByWaybills(waybills); +// this.scanSiteBatchByWaybills(waybills); } } diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsSiteBatchServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsSiteBatchServiceImpl.java index 59f276a8b..6d7495c03 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsSiteBatchServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsSiteBatchServiceImpl.java @@ -1,10 +1,10 @@ -/** +/** * @Project: emis * @Title: EmisTmsSiteBatchServiceImpl.java * @author linfso * @date 2024-03-01 08:54:56 * @Copyright: ShangHai Duta 2022 All rights reserved. -* @version v1.0 +* @version v1.0 * @Description:

一级网点TMS组批次 实体类

*/ @@ -40,7 +40,7 @@ import org.springframework.util.CollectionUtils; /** * 一级网点TMS组批次Service业务层处理 - * + * * @author linfso * @date 2024-03-01 08:54:56 */ @@ -73,7 +73,7 @@ public class EmisTmsSiteBatchServiceImpl extends EmisBaseService implements IEmi /** * 获取稽核数据 - * + * * @param id * @return */ @@ -85,7 +85,7 @@ public class EmisTmsSiteBatchServiceImpl extends EmisBaseService implements IEmi /** * 查询一级网点TMS组批次 - * + * * @param id 一级网点TMS组批次主键 * @return 一级网点TMS组批次 */ @@ -112,7 +112,7 @@ public class EmisTmsSiteBatchServiceImpl extends EmisBaseService implements IEmi /** * 查询一级网点TMS组批次列表 - * + * * @param emisTmsSiteBatch 一级网点TMS组批次 * @return 一级网点TMS组批次 */ @@ -123,7 +123,7 @@ public class EmisTmsSiteBatchServiceImpl extends EmisBaseService implements IEmi /** * 批次明细 - * + * * @param emisTmsSiteBatch * @return */ @@ -134,7 +134,7 @@ public class EmisTmsSiteBatchServiceImpl extends EmisBaseService implements IEmi /** * 新增一级网点TMS组批次 - * + * * @param emisTmsSiteBatch 一级网点TMS组批次 * @return 结果 */ @@ -452,7 +452,7 @@ public class EmisTmsSiteBatchServiceImpl extends EmisBaseService implements IEmi /** * 修改一级网点TMS组批次 - * + * * @param emisTmsSiteBatch 一级网点TMS组批次 * @return 结果 */ @@ -468,7 +468,7 @@ public class EmisTmsSiteBatchServiceImpl extends EmisBaseService implements IEmi /** * 批量删除一级网点TMS组批次 - * + * * @param ids 需要删除的一级网点TMS组批次主键 * @return 结果 */ @@ -489,7 +489,7 @@ public class EmisTmsSiteBatchServiceImpl extends EmisBaseService implements IEmi /** * 删除一级网点TMS组批次信息 - * + * * @param id 一级网点TMS组批次主键 * @return 结果 */ @@ -509,7 +509,7 @@ public class EmisTmsSiteBatchServiceImpl extends EmisBaseService implements IEmi if (CollectionUtil.isEmpty(waybills)) { return; } - scanSiteBatchByWaybills(waybills); +// scanSiteBatchByWaybills(waybills); } @Override diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java index 08144427c..8827a3f1d 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java @@ -157,32 +157,32 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb * @param emisWaybillSave */ private void saveOrUpdateWaybillOther(EmisWaybill emisWaybillSave) { -// if (emisWaybillSave == null || emisWaybillSave.getId() == null) { -// return; -// } -// -// String salesSupport = emisWaybillSave.getSalesSupport(); -// String billCode = emisWaybillSave.getBillCode(); -// Long waybillId = emisWaybillSave.getId(); -// -// // 查询是否已存在 -// EmisWaybillOther existing = emisWaybillOtherMapper.selectEmisWaybillOtherByWaybillId(waybillId); -// -// if (existing != null) { -// // 更新 -// existing.setSalesSupport(salesSupport); -// existing.setBillCode(billCode); -// existing.preUpdate(); -// emisWaybillOtherMapper.updateEmisWaybillOther(existing); -// } else { -// // 新增 -// EmisWaybillOther waybillOtherEntity = new EmisWaybillOther(); -// waybillOtherEntity.setWaybillId(waybillId); -// waybillOtherEntity.setBillCode(billCode); -// waybillOtherEntity.setSalesSupport(salesSupport); -// waybillOtherEntity.preInsert(); -// emisWaybillOtherMapper.insertEmisWaybillOther(waybillOtherEntity); -// } + if (emisWaybillSave == null || emisWaybillSave.getId() == null) { + return; + } + + String salesSupport = emisWaybillSave.getSalesSupport(); + String billCode = emisWaybillSave.getBillCode(); + Long waybillId = emisWaybillSave.getId(); + + // 查询是否已存在 + EmisWaybillOther existing = emisWaybillOtherMapper.selectEmisWaybillOtherByWaybillId(waybillId); + + if (existing != null) { + // 更新 + existing.setSalesSupport(salesSupport); + existing.setBillCode(billCode); + existing.preUpdate(); + emisWaybillOtherMapper.updateEmisWaybillOther(existing); + } else { + // 新增 + EmisWaybillOther waybillOtherEntity = new EmisWaybillOther(); + waybillOtherEntity.setWaybillId(waybillId); + waybillOtherEntity.setBillCode(billCode); + waybillOtherEntity.setSalesSupport(salesSupport); + waybillOtherEntity.preInsert(); + emisWaybillOtherMapper.insertEmisWaybillOther(waybillOtherEntity); + } } /** From 8d9b0aef0b891f4225c1ab4724ed65440f696159 Mon Sep 17 00:00:00 2001 From: aike <17730485278@139.com> Date: Tue, 25 Nov 2025 18:56:55 +0800 Subject: [PATCH 5/6] =?UTF-8?q?demand:=20=20=20=E5=AE=A2=E6=88=B7=E8=B4=A6?= =?UTF-8?q?=E5=8D=95=E6=9F=A5=E8=AF=A2-cpu=E9=A3=99=E5=8D=87=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E5=AE=9A=E4=BD=8D=E8=A7=A3=E5=86=B3=20committer:=20he?= =?UTF-8?q?yu?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/xdadan/erp/web/emis/EmisCommonController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 114df9f00..074810d81 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 @@ -924,7 +924,7 @@ public class EmisCommonController extends EmisBaseController redissonService.setStr(statusKey, "RUNNING", 1800); // 异步执行任务 - emisTmsSiteBatchMissService.autoScanSiteBatch(lineCode); +// emisTmsSiteBatchMissService.autoScanSiteBatch(lineCode); log.info("autoScanSiteBatch async task started"); return AjaxResult.success("异步任务已启动，请稍后查看执行结果"); From b9ab49daf6716e477da2de70e39a176317a4e6b5 Mon Sep 17 00:00:00 2001 From: aike <17730485278@139.com> Date: Tue, 25 Nov 2025 19:34:28 +0800 Subject: [PATCH 6/6] =?UTF-8?q?demand:=20=20=20=E5=AE=A2=E6=88=B7=E8=B4=A6?= =?UTF-8?q?=E5=8D=95=E6=9F=A5=E8=AF=A2-cpu=E9=A3=99=E5=8D=87=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E5=AE=9A=E4=BD=8D=E8=A7=A3=E5=86=B3=20committer:=20he?= =?UTF-8?q?yu?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xdadan/erp/web/emis/EmisCommonController.java | 2 +- .../xdadan/erp/emis/service/EmisBaseService.java | 14 ++++++++++---- .../impl/EmisTmsSiteBatchMissServiceImpl.java | 2 +- .../service/impl/EmisTmsSiteBatchServiceImpl.java | 2 +- 4 files changed, 13 insertions(+), 7 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 074810d81..114df9f00 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 @@ -924,7 +924,7 @@ public class EmisCommonController extends EmisBaseController redissonService.setStr(statusKey, "RUNNING", 1800); // 异步执行任务 -// emisTmsSiteBatchMissService.autoScanSiteBatch(lineCode); + emisTmsSiteBatchMissService.autoScanSiteBatch(lineCode); log.info("autoScanSiteBatch async task started"); return AjaxResult.success("异步任务已启动，请稍后查看执行结果"); diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java index 3cbb4ea92..f53c39360 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java @@ -16,7 +16,10 @@ package com.xdadan.erp.emis.service; import com.beust.jcommander.internal.Lists; import com.xdadan.erp.common.core.domain.entity.SysUser; import com.xdadan.erp.common.core.redis.RedissonService; - import com.xdadan.erp.common.utils.*; + import com.xdadan.erp.common.utils.DateUtils; + import com.xdadan.erp.common.utils.DictUtils; + import com.xdadan.erp.common.utils.NoticeUtils; + import com.xdadan.erp.common.utils.SecurityUtils; import com.xdadan.erp.emis.domain.*; import com.xdadan.erp.emis.domain.enumtype.*; import com.xdadan.erp.emis.domain.exception.EmisBizError; @@ -41,6 +44,7 @@ package com.xdadan.erp.emis.service; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; + import org.springframework.cglib.beans.BeanCopier; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; @@ -54,7 +58,6 @@ package com.xdadan.erp.emis.service; import java.time.format.DateTimeParseException; import java.time.temporal.ChronoUnit; import java.util.*; -import java.util.Set; import java.util.stream.Collectors; /** @@ -197,6 +200,9 @@ public class EmisBaseService { @Autowired private EmisTmsSiteBatchDtlMapper emisTmsSiteBatchDtlMapper; + private static final BeanCopier TRANS_PLAN_RULE_COPIER = + BeanCopier.create(EmisTransPlanRule.class, EmisTransPlanRule.class, false); + private static SysUser emptySysUser = new SysUser(); static { @@ -4512,8 +4518,8 @@ public class EmisBaseService { visitedIds.add(source.getId()); visitPath.add(source.getId()); - EmisTransPlanRule copy = new EmisTransPlanRule(); - BeanUtils.copyProperties(source, copy); + EmisTransPlanRule copy = new EmisTransPlanRule(); + TRANS_PLAN_RULE_COPIER.copy(source, copy, null); // 为每个新节点生成唯一treeId copy.setTreeId(com.xdadan.erp.common.utils.idgen.UUID.fastUUID().toString()); 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 62296013b..ca80fd4b0 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 @@ -248,7 +248,7 @@ public class EmisTmsSiteBatchMissServiceImpl extends EmisBaseService implements // 3) 调用scanSiteBatchByWaybills重新扫描 if (!waybills.isEmpty()) { -// this.scanSiteBatchByWaybills(waybills); + this.scanSiteBatchByWaybills(waybills); } } diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsSiteBatchServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsSiteBatchServiceImpl.java index 6d7495c03..f5d2480fe 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsSiteBatchServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsSiteBatchServiceImpl.java @@ -509,7 +509,7 @@ public class EmisTmsSiteBatchServiceImpl extends EmisBaseService implements IEmi if (CollectionUtil.isEmpty(waybills)) { return; } -// scanSiteBatchByWaybills(waybills); + scanSiteBatchByWaybills(waybills); } @Override