From 4f879e3d5a2e302852cd82abdaee09b2a9f7fb48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Wed, 18 Mar 2026 23:27:24 +0800 Subject: [PATCH 1/3] =?UTF-8?q?bms2=E7=9B=B8=E5=85=B3=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mhd/common/core/domain/dto/nc/SKitem.java | 5 ++++- .../repository/persistence/BillManageImpl.java | 18 ++++++++++++++++++ .../persistence/ReconciliationImpl.java | 18 ++++++++++++++++++ 3 files changed, 40 insertions(+), 1 deletion(-) diff --git a/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/dto/nc/SKitem.java b/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/dto/nc/SKitem.java index 12f66bda8..9794a8474 100644 --- a/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/dto/nc/SKitem.java +++ b/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/dto/nc/SKitem.java @@ -67,4 +67,7 @@ public class SKitem { @ApiModelProperty( "") private String def65; -} + + @ApiModelProperty( "") + private String def75; +} \ No newline at end of file diff --git a/mhd_bms/src/main/java/com/mhd/bms/domain/billManage/repository/persistence/BillManageImpl.java b/mhd_bms/src/main/java/com/mhd/bms/domain/billManage/repository/persistence/BillManageImpl.java index 7a21f6566..ba36cc5ad 100644 --- a/mhd_bms/src/main/java/com/mhd/bms/domain/billManage/repository/persistence/BillManageImpl.java +++ b/mhd_bms/src/main/java/com/mhd/bms/domain/billManage/repository/persistence/BillManageImpl.java @@ -474,6 +474,16 @@ public class BillManageImpl extends ServiceImpl im .map(BmsMakeOutInvoiceItem::getFeeType) .filter(java.util.Objects::nonNull) .collect(java.util.stream.Collectors.joining("、")); + + // 按 createTime 倒序排序并获取第一条记录 + BmsMakeOutInvoiceItem firstItem = bmsMakeOutInvoiceItems.stream() + .sorted((a, b) -> { + if (a.getCreateTime() == null) return 1; + if (b.getCreateTime() == null) return -1; + return b.getCreateTime().compareTo(a.getCreateTime()); + }) + .findFirst() + .orElse(null); String salesmanId = reconciliation.getSalesmanId(); String customerUserDept = billManageMapper.getCustomerUserDept(salesmanId); String deptValue = billManageMapper.getDeptValue(customerUserDept); @@ -517,6 +527,14 @@ public class BillManageImpl extends ServiceImpl im item.setScomment("业务部："+appointShipper+feeTypes); } } + // 费用类别 + String feeType = firstItem.getFeeType(); + String serviceItemsCodeNc = billManageMapper.getServiceItemsCodeNc(feeType); + if (serviceItemsCodeNc != null && !serviceItemsCodeNc.isEmpty()) { + item.setDef75(serviceItemsCodeNc); + } else { + item.setDef75("T10"); + } item.setPk_currtype(settlementCurrencyNcCode); item.setMoney_cr(String.valueOf(totalInvoiceValue)); item.setMoney_bal(String.valueOf(totalInvoiceValue)); diff --git a/mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/repository/persistence/ReconciliationImpl.java b/mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/repository/persistence/ReconciliationImpl.java index ee37fc9e6..a799767e5 100644 --- a/mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/repository/persistence/ReconciliationImpl.java +++ b/mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/repository/persistence/ReconciliationImpl.java @@ -1157,6 +1157,16 @@ public class ReconciliationImpl extends ServiceImpl { + if (a.getCreateTime() == null) return 1; + if (b.getCreateTime() == null) return -1; + return b.getCreateTime().compareTo(a.getCreateTime()); + }) + .findFirst() + .orElse(null); + String salesmanCodeNc=order.getSalesmanCodeNc(); String salesmanId = order.getSalesmanId(); String customerUserDept = reconciliationMapper.getCustomerUserDept(salesmanId); @@ -1200,6 +1210,14 @@ public class ReconciliationImpl extends ServiceImpl Date: Thu, 19 Mar 2026 02:14:21 +0800 Subject: [PATCH 2/3] =?UTF-8?q?PDA=E4=B8=8A=E6=9E=B6=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../stockShelfOrder/StockShelfOrderApplicationService.java | 1 + .../stockShelfOrder/repository/todo/StockShelfOrderDO.java | 3 +++ .../stockShelfOrder/service/StockShelfOrderDomainService.java | 4 +++- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockShelfOrder/StockShelfOrderApplicationService.java b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockShelfOrder/StockShelfOrderApplicationService.java index 054cbb62f..470b71f21 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockShelfOrder/StockShelfOrderApplicationService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockShelfOrder/StockShelfOrderApplicationService.java @@ -399,6 +399,7 @@ public class StockShelfOrderApplicationService { } //上架装配参数 StockShelfOrderDO assembleStockShelfOrderDO = assembleParamByShelf(stockReceiptOrderDO); + assembleStockShelfOrderDO.setFromApp(Boolean.TRUE); return stockShelfOrderDomainService.upShelf(assembleStockShelfOrderDO); } diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockShelfOrder/repository/todo/StockShelfOrderDO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockShelfOrder/repository/todo/StockShelfOrderDO.java index 26470b410..537016f38 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockShelfOrder/repository/todo/StockShelfOrderDO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockShelfOrder/repository/todo/StockShelfOrderDO.java @@ -126,6 +126,9 @@ public class StockShelfOrderDO extends StockInOrderBaseDO { @ApiModelProperty("物料明细") private List materialDetailList; + @ApiModelProperty("是否来自App（PDA）：true-累加上架数量，false-直接覆盖") + private Boolean fromApp; + @ApiModelProperty(name = "创建时间查询条件开始日期") private String createTimeStart; diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockShelfOrder/service/StockShelfOrderDomainService.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockShelfOrder/service/StockShelfOrderDomainService.java index 346167970..026122a87 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockShelfOrder/service/StockShelfOrderDomainService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockShelfOrder/service/StockShelfOrderDomainService.java @@ -544,7 +544,9 @@ public class StockShelfOrderDomainService { BigDecimal currentShelvesQuantity = stockShelfOrderPO.getShelvesQuantity() != null ? stockShelfOrderPO.getShelvesQuantity() : BigDecimal.ZERO; BigDecimal actualQuantity = stockShelfOrderDO.getActualQuantity() != null ? stockShelfOrderDO.getActualQuantity() : BigDecimal.ZERO; BigDecimal reduce = stockShelfOrderDO.getMaterialDetailList().stream().map(ShelfMaterialDetailDO::getShelvesQuantity).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add); - stockShelfOrder.setShelvesQuantity(reduce); + // PDA（fromApp=true）累加已有上架数量；PC 直接覆盖 + boolean fromApp = Boolean.TRUE.equals(stockShelfOrderDO.getFromApp()); + stockShelfOrder.setShelvesQuantity(fromApp ? currentShelvesQuantity.add(reduce) : reduce); stockShelfOrder.setShelvesMaterialQuantity(stockShelfOrderPO.getShelvesMaterialQuantity() + stockShelfOrderDO.getActualReceiptMaterialQuantity()); stockShelfOrder.setUpdateBy(loginUser.getUserid()); stockShelfOrder.setUpdateByName(loginUser.getUsername()); From be914d6c221b3f51860f17025068be7cfae1b107 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A7=A6=E9=B8=BF=E5=B1=95?= <18031053041@163.com> Date: Thu, 19 Mar 2026 04:12:40 +0800 Subject: [PATCH 3/3] =?UTF-8?q?PC=E6=8B=A3=E8=B4=A7=E9=AB=98=E7=BA=A7?= =?UTF-8?q?=E7=AD=9B=E9=80=89=E8=B4=A7=E4=B8=BB=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/mapper/pickingOrder/PickingOrderMapper.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mhd_wms/src/main/resources/mapper/pickingOrder/PickingOrderMapper.xml b/mhd_wms/src/main/resources/mapper/pickingOrder/PickingOrderMapper.xml index 4f52d88ce..152f67423 100644 --- a/mhd_wms/src/main/resources/mapper/pickingOrder/PickingOrderMapper.xml +++ b/mhd_wms/src/main/resources/mapper/pickingOrder/PickingOrderMapper.xml @@ -41,6 +41,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and a.picking_order_id = #{pickingOrderId} + + and a.shipper_id = #{shipperId} + and a.organization_id = #{organizationId}