From 830f42ba062e9ba730a96dff56366c32ace03666 Mon Sep 17 00:00:00 2001 From: aike <17730485278@139.com> Date: Tue, 9 Sep 2025 14:44:09 +0800 Subject: [PATCH 1/4] =?UTF-8?q?demand:=20TMS=E7=B3=BB=E7=BB=9F=20-=20?= =?UTF-8?q?=E5=AE=A2=E6=88=B7=E8=B4=A6=E5=8D=95=E7=AE=A1=E7=90=86=20-=20?= =?UTF-8?q?=E6=94=B6=E6=AC=BE=E6=98=8E=E7=BB=86=E6=9F=A5=E8=AF=A2=20-=20?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2/=E5=AF=BC=E5=87=BA=E7=BB=86=E8=8A=82?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit committer: heyu --- .../mapper/EmisSettlePayRecordMapper.java | 20 +- .../EmisSettlePayRecordCustomExcelUtil.java | 85 ++++--- .../impl/EmisSettlePayRecordServiceImpl.java | 213 +++++++++++++----- .../mapper/EmisSettlePayRecordMapper.xml | 17 +- 4 files changed, 235 insertions(+), 100 deletions(-) diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisSettlePayRecordMapper.java b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisSettlePayRecordMapper.java index 27231f9f6..63a0b1e79 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisSettlePayRecordMapper.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisSettlePayRecordMapper.java @@ -20,15 +20,18 @@ import org.apache.ibatis.annotations.Param; /** * @ClassName EmisSettlePayRecordMapper - * @Description

账单收退款记录 Mapper 接口

+ * @Description + *

+ * 账单收退款记录 Mapper 接口 + *

* @author linfso * @date 2024-07-21 13:31:24 */ -public interface EmisSettlePayRecordMapper extends BaseMapper -{ +public interface EmisSettlePayRecordMapper extends BaseMapper { /** * 主键查询 - * @param id + * + * @param id * @return */ public EmisSettlePayRecord selectEmisSettlePayRecordById(Long id); @@ -57,7 +60,6 @@ public interface EmisSettlePayRecordMapper extends BaseMapper> getInvoiceRemarksByPayIds(@Param("list") List payIds); + + /** + * 根据支付ID列表获取账单开票状态 + * + * @param payIds 支付ID列表 + * @return 账单开票状态映射 + */ + List> getBillOpenStatusByPayIds(@Param("list") List payIds); } diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/excelCellStrategy/EmisSettlePayRecordCustomExcelUtil.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/excelCellStrategy/EmisSettlePayRecordCustomExcelUtil.java index 340b03870..d5620284e 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/excelCellStrategy/EmisSettlePayRecordCustomExcelUtil.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/excelCellStrategy/EmisSettlePayRecordCustomExcelUtil.java @@ -21,9 +21,9 @@ import java.util.List; public class EmisSettlePayRecordCustomExcelUtil { private static final String[] HEADERS = { - "交易时间", "收款来源", "收款账户", "支付类型", "缴款客户", "微信昵称", "运单号", "开票状态", + "交易时间", "收款来源", "收款账户", "支付类型", "缴款客户", "微信昵称", "运单号", "账单金额", "开票金额", "支付金额", "理赔金额", "折让金额", "抵扣金额", "其他收费", - "理赔原因", "折让原因", "抵扣原因", "其他原因", "备注" + "理赔原因", "折让原因", "抵扣原因", "其他原因", "开票状态", "备注" }; private static final int[] COLUMN_WIDTHS = { @@ -94,58 +94,57 @@ public class EmisSettlePayRecordCustomExcelUtil { // 运单号 createCell(row, 6, data.getBillCodes() != null ? data.getBillCodes() : "", dataStyle); - // 开票状态 -// String invoiceStatusDesc = getInvoiceStatusDesc(data.getInvoiceStatus()); - createCell(row, 7, data.getInvoiceStatus(), dataStyle); - // 账单金额 BigDecimal billAmount = data.getBillAmount() != null ? data.getBillAmount() : BigDecimal.ZERO; - createCell(row, 8, billAmount, numberStyle); + createCell(row, 7, billAmount, numberStyle); totalBillAmount = totalBillAmount.add(billAmount); // 开票金额 BigDecimal invoiceAmount = data.getInvoiceAmount() != null ? data.getInvoiceAmount() : BigDecimal.ZERO; - createCell(row, 9, invoiceAmount, numberStyle); + createCell(row, 8, invoiceAmount, numberStyle); totalInvoiceAmount = totalInvoiceAmount.add(invoiceAmount); // 支付金额 BigDecimal payMoney = data.getPayMoney() != null ? data.getPayMoney() : BigDecimal.ZERO; - createCell(row, 10, payMoney, numberStyle); + createCell(row, 9, payMoney, numberStyle); totalPayMoney = totalPayMoney.add(payMoney); // 理赔金额 BigDecimal satisfyMoney = data.getSatisfyMoney() != null ? data.getSatisfyMoney() : BigDecimal.ZERO; - createCell(row, 11, satisfyMoney, numberStyle); + createCell(row, 10, satisfyMoney, numberStyle); totalSatisfyMoney = totalSatisfyMoney.add(satisfyMoney); // 折让金额 BigDecimal allowanceMoney = data.getAllowanceMoney() != null ? data.getAllowanceMoney() : BigDecimal.ZERO; - createCell(row, 12, allowanceMoney, numberStyle); + createCell(row, 11, allowanceMoney, numberStyle); totalAllowanceMoney = totalAllowanceMoney.add(allowanceMoney); // 抵扣金额 BigDecimal deductionMoney = data.getDeductionMoney() != null ? data.getDeductionMoney() : BigDecimal.ZERO; - createCell(row, 13, deductionMoney, numberStyle); + createCell(row, 12, deductionMoney, numberStyle); totalDeductionMoney = totalDeductionMoney.add(deductionMoney); // 其他收费 BigDecimal otherMoney = data.getOtherMoney() != null ? data.getOtherMoney() : BigDecimal.ZERO; - createCell(row, 14, otherMoney, numberStyle); + createCell(row, 13, otherMoney, numberStyle); totalOtherMoney = totalOtherMoney.add(otherMoney); // 理赔原因 - createCell(row, 15, data.getSatisfyReason() != null ? data.getSatisfyReason() : "", dataStyle); + createCell(row, 14, data.getSatisfyReason() != null ? data.getSatisfyReason() : "", dataStyle); // 折让原因 - createCell(row, 16, data.getAllowanceReason() != null ? data.getAllowanceReason() : "", dataStyle); + createCell(row, 15, data.getAllowanceReason() != null ? data.getAllowanceReason() : "", dataStyle); // 抵扣原因 - createCell(row, 17, data.getDeductionReason() != null ? data.getDeductionReason() : "", dataStyle); + createCell(row, 16, data.getDeductionReason() != null ? data.getDeductionReason() : "", dataStyle); // 其他原因 - createCell(row, 18, data.getOtherReason() != null ? data.getOtherReason() : "", dataStyle); + createCell(row, 17, data.getOtherReason() != null ? data.getOtherReason() : "", dataStyle); + + // 开票状态 + createCell(row, 18, data.getInvoiceStatus() != null ? data.getInvoiceStatus() : "", dataStyle); // 备注 createCell(row, 19, data.getRemark() != null ? data.getRemark() : "", dataStyle); @@ -208,24 +207,6 @@ public class EmisSettlePayRecordCustomExcelUtil { } } - /** - * 获取开票状态描述 - */ - private static String getInvoiceStatusDesc(String invoiceStatus) { - if (invoiceStatus == null) - return "未开票"; - switch (invoiceStatus) { - case "0": - return "待开票"; - case "1": - return "已开票"; - case "2": - return "已开票"; - default: - return "未开票"; - } - } - /** * 创建表头样式 */ @@ -365,12 +346,30 @@ public class EmisSettlePayRecordCustomExcelUtil { cell.setCellStyle(style); } + /** + * 格式化BigDecimal，去除尾部多余的0，避免科学计数法 + */ + private static BigDecimal formatBigDecimal(BigDecimal value) { + if (value == null) { + return BigDecimal.ZERO; + } + // 使用stripTrailingZeros()去除尾部0，然后使用toPlainString()避免科学计数法 + BigDecimal stripped = value.stripTrailingZeros(); + // 如果scale为负数，说明有尾随0被移除，需要重新构造 + if (stripped.scale() < 0) { + stripped = stripped.setScale(0); + } + return stripped; + } + /** * 创建数字单元格 */ private static void createCell(Row row, int columnIndex, BigDecimal value, CellStyle style) { Cell cell = row.createCell(columnIndex); - cell.setCellValue(value != null ? value.doubleValue() : 0.0); + BigDecimal formattedValue = formatBigDecimal(value); + // 使用toPlainString()避免科学计数法，然后转换为double + cell.setCellValue(formattedValue.toPlainString()); cell.setCellStyle(style); } @@ -404,13 +403,13 @@ public class EmisSettlePayRecordCustomExcelUtil { sumLabelCell.setCellStyle(labelStyle); // 合计金额 - createCell(sumRow, 8, totalBillAmount, sumStyle); - createCell(sumRow, 9, totalInvoiceAmount, sumStyle); - createCell(sumRow, 10, totalPayMoney, sumStyle); - createCell(sumRow, 11, totalSatisfyMoney, sumStyle); - createCell(sumRow, 12, totalAllowanceMoney, sumStyle); - createCell(sumRow, 13, totalDeductionMoney, sumStyle); - createCell(sumRow, 14, totalOtherMoney, sumStyle); + createCell(sumRow, 7, formatBigDecimal(totalBillAmount), sumStyle); + createCell(sumRow, 8, formatBigDecimal(totalInvoiceAmount), sumStyle); + createCell(sumRow, 9, formatBigDecimal(totalPayMoney), sumStyle); + createCell(sumRow, 10, formatBigDecimal(totalSatisfyMoney), sumStyle); + createCell(sumRow, 11, formatBigDecimal(totalAllowanceMoney), sumStyle); + createCell(sumRow, 12, formatBigDecimal(totalDeductionMoney), sumStyle); + createCell(sumRow, 13, formatBigDecimal(totalOtherMoney), sumStyle); } /** 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 51ba1cbc4..99d271619 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 @@ -101,6 +101,11 @@ public class EmisSettlePayRecordServiceImpl extends EmisBaseService implements I return baseList; } + // 格式化基础数据中的所有BigDecimal字段 + for (EmisSettlePayRecord record : baseList) { + formatAllBigDecimalFields(record); + } + // 提取支付ID列表 List payIds = baseList.stream() .map(EmisSettlePayRecord::getPayId) @@ -143,12 +148,21 @@ public class EmisSettlePayRecordServiceImpl extends EmisBaseService implements I // 设置账单金额 if (billAmountsMap.containsKey(payId)) { - record.setBillAmount((BigDecimal) billAmountsMap.get(payId)); + BigDecimal billAmount = (BigDecimal) billAmountsMap.get(payId); + if (billAmount != null) { + record.setBillAmount(formatBigDecimal(billAmount)); + } } // 设置开票金额 if (invoiceAmountsMap.containsKey(payId)) { - record.setInvoiceAmount((BigDecimal) invoiceAmountsMap.get(payId)); + BigDecimal invoiceAmount = (BigDecimal) invoiceAmountsMap.get(payId); + if (invoiceAmount != null) { + record.setInvoiceAmount(formatBigDecimal(invoiceAmount)); + } + } else { + // 如果开票金额为空，设置为0 + record.setInvoiceAmount(BigDecimal.ZERO); } // 设置开票状态 @@ -160,6 +174,14 @@ public class EmisSettlePayRecordServiceImpl extends EmisBaseService implements I if (invoiceRemarksMap.containsKey(payId)) { record.setRemark((String) invoiceRemarksMap.get(payId)); } + + // 设置createSite，如果为空则设置为88888 + if (StringUtils.isBlank(record.getCreateSite())) { + record.setCreateSite("88888"); + } + + // 格式化所有BigDecimal字段，去除多余的0 + formatAllBigDecimalFields(record); } } catch (Exception e) { log.error("并行查询扩展信息时发生异常", e); @@ -181,12 +203,21 @@ public class EmisSettlePayRecordServiceImpl extends EmisBaseService implements I // 设置账单金额 if (billAmountsMap.containsKey(payId)) { - record.setBillAmount((BigDecimal) billAmountsMap.get(payId)); + BigDecimal billAmount = (BigDecimal) billAmountsMap.get(payId); + if (billAmount != null) { + record.setBillAmount(formatBigDecimal(billAmount)); + } } // 设置开票金额 if (invoiceAmountsMap.containsKey(payId)) { - record.setInvoiceAmount((BigDecimal) invoiceAmountsMap.get(payId)); + BigDecimal invoiceAmount = (BigDecimal) invoiceAmountsMap.get(payId); + if (invoiceAmount != null) { + record.setInvoiceAmount(formatBigDecimal(invoiceAmount)); + } + } else { + // 如果开票金额为空，设置为0 + record.setInvoiceAmount(BigDecimal.ZERO); } // 设置开票状态 @@ -198,12 +229,71 @@ public class EmisSettlePayRecordServiceImpl extends EmisBaseService implements I if (invoiceRemarksMap.containsKey(payId)) { record.setRemark((String) invoiceRemarksMap.get(payId)); } + + // 设置createSite，如果为空则设置为88888 + if (StringUtils.isBlank(record.getCreateSite())) { + record.setCreateSite("88888"); + } + + // 格式化所有BigDecimal字段，去除多余的0 + formatAllBigDecimalFields(record); } } return baseList; } + /** + * 格式化BigDecimal，去除尾部多余的0，避免科学计数法 + */ + private BigDecimal formatBigDecimal(BigDecimal value) { + if (value == null) { + return BigDecimal.ZERO; + } + // 使用stripTrailingZeros()去除尾部0，然后使用toPlainString()避免科学计数法 + BigDecimal stripped = value.stripTrailingZeros(); + // 如果scale为负数，说明有尾随0被移除，需要重新构造 + if (stripped.scale() < 0) { + stripped = stripped.setScale(0); + } + return stripped; + } + + /** + * 格式化EmisSettlePayRecord中所有BigDecimal字段，去除多余的0 + */ + private void formatAllBigDecimalFields(EmisSettlePayRecord record) { + if (record == null) { + return; + } + + // 格式化所有BigDecimal字段 + if (record.getPayMoney() != null) { + record.setPayMoney(formatBigDecimal(record.getPayMoney())); + } + if (record.getRefundMoney() != null) { + record.setRefundMoney(formatBigDecimal(record.getRefundMoney())); + } + if (record.getSatisfyMoney() != null) { + record.setSatisfyMoney(formatBigDecimal(record.getSatisfyMoney())); + } + if (record.getAllowanceMoney() != null) { + record.setAllowanceMoney(formatBigDecimal(record.getAllowanceMoney())); + } + if (record.getDeductionMoney() != null) { + record.setDeductionMoney(formatBigDecimal(record.getDeductionMoney())); + } + if (record.getOtherMoney() != null) { + record.setOtherMoney(formatBigDecimal(record.getOtherMoney())); + } + if (record.getBillAmount() != null) { + record.setBillAmount(formatBigDecimal(record.getBillAmount())); + } + if (record.getInvoiceAmount() != null) { + record.setInvoiceAmount(formatBigDecimal(record.getInvoiceAmount())); + } + } + /** * 获取运单号映射 */ @@ -255,12 +345,43 @@ public class EmisSettlePayRecordServiceImpl extends EmisBaseService implements I private Map getInvoiceStatusMap(List payIds) { List> invoiceStatusList = emisSettlePayRecordMapper.getInvoiceStatusByPayIds(payIds); Map result = new java.util.HashMap<>(); + + // 先处理查询到的开票状态 for (Map map : invoiceStatusList) { String payId = (String) map.get("pay_id"); if (payId != null) { result.put(payId, map.get("status")); } } + + // 对于没有开票状态记录的payId，需要检查emis_settle_bill的open_bill_status + List missingPayIds = payIds.stream() + .filter(payId -> !result.containsKey(payId)) + .collect(java.util.stream.Collectors.toList()); + + if (!CollectionUtils.isEmpty(missingPayIds)) { + List> billStatusList = emisSettlePayRecordMapper + .getBillOpenStatusByPayIds(missingPayIds); + for (Map map : billStatusList) { + String payId = (String) map.get("pay_id"); + String openBillStatus = (String) map.get("open_bill_status"); + if (payId != null) { + if ("3".equals(openBillStatus)) { + result.put(payId, "不开票"); + } else { + result.put(payId, "未开票"); + } + } + } + + // 对于仍然没有状态的payId，设置为"未开票" + for (String payId : missingPayIds) { + if (!result.containsKey(payId)) { + result.put(payId, "未开票"); + } + } + } + return result; } @@ -285,18 +406,15 @@ public class EmisSettlePayRecordServiceImpl extends EmisBaseService implements I } @Override - public List queryPayBackRecordList(EmisSettlePayRecord emisSettlePayRecord) - { + public List queryPayBackRecordList(EmisSettlePayRecord emisSettlePayRecord) { return emisSettlePayRecordMapper.queryPayBackRecordList(emisSettlePayRecord); } @Override - public List queryNoPayBackRecordList(EmisSettlePayRecord emisSettlePayRecord) - { + public List queryNoPayBackRecordList(EmisSettlePayRecord emisSettlePayRecord) { return emisSettlePayRecordMapper.queryNoPayBackRecordList(emisSettlePayRecord); } - /** * 检查是否重复 * @@ -304,9 +422,8 @@ public class EmisSettlePayRecordServiceImpl extends EmisBaseService implements I * @return 数量 */ @Override - public int checkUnique(EmisSettlePayRecord emisSettlePayRecord) - { - return emisSettlePayRecordMapper.checkUnique(emisSettlePayRecord); + public int checkUnique(EmisSettlePayRecord emisSettlePayRecord) { + return emisSettlePayRecordMapper.checkUnique(emisSettlePayRecord); } /** @@ -316,7 +433,7 @@ public class EmisSettlePayRecordServiceImpl extends EmisBaseService implements I * @return 结果 */ @Override - public int insertEmisSettlePayRecord(EmisSettlePayRecord emisSettlePayRecord,String payId) throws EmisBizError { + public int insertEmisSettlePayRecord(EmisSettlePayRecord emisSettlePayRecord, String payId) throws EmisBizError { // 非空校验 checkParam(emisSettlePayRecord); @@ -326,40 +443,38 @@ public class EmisSettlePayRecordServiceImpl extends EmisBaseService implements I emisSettlePayRecord.setSettleBillNo(WaybillHelper.formatQueryValue(emisSettlePayRecord.getSettleBillNo())); // 多账单合并收款 - String [] settleBillNoArr = emisSettlePayRecord.getSettleBillNo().split(","); + String[] settleBillNoArr = emisSettlePayRecord.getSettleBillNo().split(","); - for(int i=0;i listRel=emisSettlePayRecord.getPayRelList(); - if(!CollectionUtils.isEmpty(listRel)){ - for (EmisSettlePayRel payRel:listRel - ) { + List listRel = emisSettlePayRecord.getPayRelList(); + if (!CollectionUtils.isEmpty(listRel)) { + for (EmisSettlePayRel payRel : listRel) { payRel.setId(null); payRel.setPayId(payId); - if("2".equals(emisSettlePayRecord.getRecType())){ + if ("2".equals(emisSettlePayRecord.getRecType())) { payRel.setPayMoney(BigDecimal.ZERO.subtract(payRel.getPayMoney())); } emisSettlePayRelMapper.insertEmisSettlePayRel(payRel); @@ -399,9 +512,9 @@ public class EmisSettlePayRecordServiceImpl extends EmisBaseService implements I emisSettlePayRecordMapper.insertEmisSettlePayRecord(emisSettlePayRecord); // 重新计算账单收款信息 - for(int i=0;i exportList = selectEmisSettlePayRecordList(emisSettlePayRecord); // 使用定制Excel工具类导出 - EmisSettlePayRecordCustomExcelUtil.exportCustomExcel(response, exportList, "收款明细定制导出_" + System.currentTimeMillis()); + EmisSettlePayRecordCustomExcelUtil.exportCustomExcel(response, exportList, + "收款明细定制导出_" + System.currentTimeMillis()); } catch (Exception e) { log.error("定制导出收款明细失败", e); diff --git a/emis-biz/src/main/resources/mapper/EmisSettlePayRecordMapper.xml b/emis-biz/src/main/resources/mapper/EmisSettlePayRecordMapper.xml index 3510cecc0..3645a4bb1 100644 --- a/emis-biz/src/main/resources/mapper/EmisSettlePayRecordMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisSettlePayRecordMapper.xml @@ -684,7 +684,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" WHEN invoice_amount = FLOOR(invoice_amount) THEN CAST(FLOOR(invoice_amount) AS CHAR) ELSE TRIM(TRAILING '0' FROM TRIM(TRAILING '.' FROM CAST(invoice_amount AS CHAR))) END, - ' ', + '元 ', company_name ) END @@ -770,4 +770,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" group by espr.pay_id + + + From 76c8a183d3b4072763d8c8afbfa2ae2caf128434 Mon Sep 17 00:00:00 2001 From: aike <17730485278@139.com> Date: Tue, 9 Sep 2025 14:51:01 +0800 Subject: [PATCH 2/4] =?UTF-8?q?demand:=20TMS=E7=B3=BB=E7=BB=9F=20-=20?= =?UTF-8?q?=E5=AE=A2=E6=88=B7=E8=B4=A6=E5=8D=95=E7=AE=A1=E7=90=86=20-=20?= =?UTF-8?q?=E6=94=B6=E6=AC=BE=E6=98=8E=E7=BB=86=E6=9F=A5=E8=AF=A2=20-=20?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2/=E5=AF=BC=E5=87=BA=E7=BB=86=E8=8A=82?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit committer: heyu --- .../erp/emis/service/impl/EmisSettlePayRecordServiceImpl.java | 1 + 1 file changed, 1 insertion(+) 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 99d271619..9375ea3f5 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 @@ -178,6 +178,7 @@ public class EmisSettlePayRecordServiceImpl extends EmisBaseService implements I // 设置createSite，如果为空则设置为88888 if (StringUtils.isBlank(record.getCreateSite())) { record.setCreateSite("88888"); + record.setCreateSiteName("总部"); } // 格式化所有BigDecimal字段，去除多余的0 From 6826a0679790b64c8f5a92b66eb08c234a273b6a Mon Sep 17 00:00:00 2001 From: aike <17730485278@139.com> Date: Tue, 9 Sep 2025 17:48:42 +0800 Subject: [PATCH 3/4] =?UTF-8?q?demand:=20TMS=E7=B3=BB=E7=BB=9F=20-=20?= =?UTF-8?q?=E8=BF=90=E8=BE=93=E7=AE=A1=E7=90=86=20-=20=E6=BC=8F=E7=BB=84?= =?UTF-8?q?=E6=89=B9=E6=AC=A1=E8=AE=A2=E5=8D=95=E7=95=8C=E9=9D=A2=20-=20?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=A2=9E=E5=8A=A0=E6=A0=B9=E6=8D=AE=E9=94=80?= =?UTF-8?q?=E5=94=AE=E8=81=94=E7=B3=BB=E4=BA=BA=E3=80=81=E5=9B=9E=E6=AC=BE?= =?UTF-8?q?=E8=81=94=E7=B3=BB=E4=BA=BA=E3=80=81=E5=BD=95=E5=85=A5=E4=BA=BA?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit committer: heyu --- .../erp/emis/domain/EmisTmsSiteBatchMiss.java | 14 ++++++++++- .../mapper/EmisTmsSiteBatchMissMapper.xml | 25 +++++++++++++++++++ 2 files changed, 38 insertions(+), 1 deletion(-) diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsSiteBatchMiss.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsSiteBatchMiss.java index 947fc6b9e..f3154f785 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsSiteBatchMiss.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsSiteBatchMiss.java @@ -138,6 +138,18 @@ public class EmisTmsSiteBatchMiss extends BaseEntity { /** 人工审核备注 */ private String manualRemark; - /* 完成状态 1：系统审核完成，2：人工审核完成，3：无需组批次 默认为1*/ + /* 完成状态 1：系统审核完成，2：人工审核完成，3：无需组批次 默认为1 */ private String blManual; + + /* 收款人 */ + @TableField(exist = false) + private String payee; + + /* 销售员 */ + @TableField(exist = false) + private String salesmen; + + /* 录单人姓名 */ + @TableField(exist = false) + private String registerManName; } diff --git a/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMissMapper.xml b/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMissMapper.xml index 4a64094cc..485ba5f0f 100644 --- a/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMissMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMissMapper.xml @@ -50,6 +50,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + @@ -62,6 +65,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" w.product_type,w.problem_type,w.virtual_remark,w.dispatch_underling_site_code, w.payment_type, w.parcel_qty, w.bill_weight, w.total_volume, w.volume_weight, w.settlement_weight, w.freight, w.remark as waybill_remark, w.fee_remark, m.manager, k.trans_manager, + w.payee, w.salesmen, u.emp_name as registerManName, (SELECT GROUP_CONCAT(s.name) FROM emis_supplier s WHERE FIND_IN_SET(s.code, m.supplier_code) @@ -81,6 +85,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" left join emis_trans_line k on w.trans_line_type=k.line_code and k.del_flag='0' left join emis_trans_plan_rule r on m.trans_plan_rule_id=r.id and r.del_flag='0' left join emis_trans_line l on m.line_code=l.line_code and l.del_flag='0' + left join sys_user u on w.register_man_code=u.emp_code and u.del_flag='0' @@ -149,6 +154,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" w.payment_type, w.parcel_qty, w.bill_weight, w.total_volume, w.volume_weight, w.settlement_weight, w.freight, w.remark as waybill_remark, w.fee_remark, null as manager, null as trans_manager, + w.payee, w.salesmen, u.emp_name as registerManName, (SELECT GROUP_CONCAT(s.site_name ORDER BY FIND_IN_SET(s.site_code, w.start_site_code)) FROM emis_site s WHERE FIND_IN_SET(s.site_code, w.start_site_code) AND s.del_flag = 0) as start_site_name, @@ -168,6 +174,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" left join emis_site s2 on w.dispatch_underling_site_code=s2.site_code and s2.del_flag=0 left join emis_trans_line l on w.trans_line_type=l.line_code and l.del_flag=0 left join emis_country c2 on w.receive_country=c2.code and c2.del_flag=0 + left join sys_user u on w.register_man_code=u.emp_code and u.del_flag='0' b.site_batch_status = '1' @@ -213,6 +220,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and (w.start_site_code=#{params.privSiteCode} or w.send_site_code=#{params.privSiteCode}) + + AND w.payee like concat('%', #{payee}, '%') + + + AND w.salesmen like concat('%', #{salesmen}, '%') + + + AND u.emp_name like concat('%', #{registerManName}, '%') + @@ -314,6 +330,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and w.send_date #{params.endSendDate} + + AND w.payee like concat('%', #{payee}, '%') + + + AND w.salesmen like concat('%', #{salesmen}, '%') + + + AND u.emp_name like concat('%', #{registerManName}, '%') + order by m.bill_code desc From 11dc5915f83121a2cbee12eeaecbba8e883cb5fb Mon Sep 17 00:00:00 2001 From: aike <17730485278@139.com> Date: Tue, 9 Sep 2025 17:50:13 +0800 Subject: [PATCH 4/4] =?UTF-8?q?demand:=20TMS=E7=B3=BB=E7=BB=9F=20-=20?= =?UTF-8?q?=E8=BF=90=E8=BE=93=E7=AE=A1=E7=90=86=20-=20=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E6=BC=8F=E7=BB=84=E6=89=B9=E6=AC=A1=E8=AE=A2=E5=8D=95=E5=AE=9A?= =?UTF-8?q?=E6=97=B6/=E5=AE=9E=E6=97=B6=E6=89=AB=E6=8F=8F=E7=AD=96?= =?UTF-8?q?=E7=95=A5=EF=BC=8C=E7=B2=BE=E7=A1=AE=E6=BC=8F=E7=BB=84=E6=89=B9?= =?UTF-8?q?=E6=AC=A1=E8=AE=A2=E5=8D=95=E6=8E=A8=E8=8D=90=E8=8C=83=E5=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit committer: heyu --- .../erp/emis/service/EmisBaseService.java | 49 +++++++++++++------ 1 file changed, 35 insertions(+), 14 deletions(-) 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 d133b38be..2ca357da4 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 @@ -5134,7 +5134,7 @@ public class EmisBaseService { // 检查第一级是否至少有一个节点匹配 boolean hasFirstLevelMatch = false; - // 收集所有第一级节点的子节点（第二级） + // 收集第一级节点的子节点（第二级） Set secondLevelRules = new HashSet<>(); for (EmisTransPlanRule firstLevelRule : firstLevelRules) { @@ -5148,18 +5148,26 @@ public class EmisBaseService { && !batch.getEtd().before(firstLevelRule.getStartDate())) { firstLevelMatch = true; list.add(firstLevelRule); - // 收集当前第一级节点的所有子节点到第二级集合中 - if (!CollectionUtil.isEmpty(firstLevelRule.getChildren())) { - secondLevelRules.addAll(firstLevelRule.getChildren()); - } break; } } if (firstLevelMatch) { hasFirstLevelMatch = true; + // 如果当前节点匹配，则只收集该节点的子节点 + if (!CollectionUtil.isEmpty(firstLevelRule.getChildren())) { + secondLevelRules.addAll(firstLevelRule.getChildren()); + } } + } + // 如果第一级都不满足，则收集所有第一级节点的子节点 + if (!hasFirstLevelMatch) { + for (EmisTransPlanRule firstLevelRule : firstLevelRules) { + if (!CollectionUtil.isEmpty(firstLevelRule.getChildren())) { + secondLevelRules.addAll(firstLevelRule.getChildren()); + } + } } // 如果第二级为空，说明已经到底了，返回当前节点匹配且第一级至少有一个匹配的结果 @@ -5183,18 +5191,26 @@ public class EmisBaseService { && !batch.getEtd().before(secondLevelRule.getStartDate())) { secondLevelMatch = true; list.add(secondLevelRule); - // 收集当前第二级节点的所有子节点到第三级集合中 - if (!CollectionUtil.isEmpty(secondLevelRule.getChildren())) { - thirdLevelRules.addAll(secondLevelRule.getChildren()); - } break; } } if (secondLevelMatch) { hasSecondLevelMatch = true; + // 如果当前节点匹配，则只收集该节点的子节点 + if (!CollectionUtil.isEmpty(secondLevelRule.getChildren())) { + thirdLevelRules.addAll(secondLevelRule.getChildren()); + } } + } + // 如果第二级都不满足，则收集所有第二级节点的子节点 + if (!hasSecondLevelMatch) { + for (EmisTransPlanRule secondLevelRule : secondLevelRules) { + if (!CollectionUtil.isEmpty(secondLevelRule.getChildren())) { + thirdLevelRules.addAll(secondLevelRule.getChildren()); + } + } } // 递归处理下一级，并收集结果 @@ -5236,14 +5252,19 @@ public class EmisBaseService { if (currentLevelMatch) { hasCurrentLevelMatch = true; - if (CollectionUtil.isEmpty(currentLevelRule.getChildren())) { - return true; + // 如果当前节点匹配，则只收集该节点的子节点 + if (!CollectionUtil.isEmpty(currentLevelRule.getChildren())) { + nextLevelRules.addAll(currentLevelRule.getChildren()); } } + } - // 收集当前级节点的所有子节点到下一级集合中 - if (!CollectionUtil.isEmpty(currentLevelRule.getChildren())) { - nextLevelRules.addAll(currentLevelRule.getChildren()); + // 如果当前级都不满足，则收集所有当前级节点的子节点 + if (!hasCurrentLevelMatch) { + for (EmisTransPlanRule currentLevelRule : currentLevelRules) { + if (!CollectionUtil.isEmpty(currentLevelRule.getChildren())) { + nextLevelRules.addAll(currentLevelRule.getChildren()); + } } }