From 8b4e785de38766e5ede522039bdcffa120beb09d Mon Sep 17 00:00:00 2001 From: zhaoqing <3160641494@qq.com> Date: Tue, 11 Aug 2026 17:46:49 +0800 Subject: [PATCH] =?UTF-8?q?fix(wms):=E5=87=BA=E5=85=A5=E5=BA=93=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E5=92=8C=E5=AF=BC=E5=87=BA=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../StockInOrderApplicationService.java | 32 +++++++++++++++++++ .../StockOutOrderApplicationService.java | 24 ++++++++++++++ .../facade/IInMaterialDetailService.java | 6 ++++ .../mapper/InMaterialDetailMapper.java | 7 ++++ .../persistence/InMaterialDetailImpl.java | 10 ++++++ .../repository/po/InStockListMaterialAgg.java | 12 +++++++ .../facade/IOutMaterialDetailService.java | 5 +++ .../mapper/OutMaterialDetailMapper.java | 5 +++ .../persistence/OutMaterialDetailImpl.java | 8 +++++ .../po/OutStockListMaterialAgg.java | 2 ++ .../repository/po/StockInOrderPO.java | 3 ++ .../repository/todo/StockInOrderDO.java | 3 ++ .../repository/po/StockOutOrderPO.java | 3 ++ .../repository/todo/StockOutOrderDO.java | 3 ++ .../dto/stockInOrder/StockInOrderDTO.java | 3 ++ .../dto/stockOutOrder/StockOutOrderDTO.java | 3 ++ .../OutMaterialDetailMapper.xml | 16 ++++++++++ .../InMaterialDetailMapper.xml | 16 ++++++++++ 18 files changed, 161 insertions(+) create mode 100644 mhd_wms/src/main/java/com/mhd/wms/domain/inMaterialDetail/repository/po/InStockListMaterialAgg.java diff --git a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java index f07aca537..d7e1b1138 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java @@ -36,6 +36,7 @@ import com.mhd.wms.domain.handoverTaskOrder.repository.facade.IHandoverTaskOrder import com.mhd.wms.domain.inMaterialDetail.entity.InMaterialDetail; import com.mhd.wms.domain.inMaterialDetail.repository.facade.IInMaterialDetailService; import com.mhd.wms.domain.inMaterialDetail.repository.po.InMaterialDetailPO; +import com.mhd.wms.domain.inMaterialDetail.repository.po.InStockListMaterialAgg; import com.mhd.wms.domain.inMaterialDetail.repository.todo.InMaterialDetailDO; import com.mhd.wms.domain.materialBaseInfo.entity.MaterialBaseInfo; import com.mhd.wms.domain.materialBaseInfo.repository.facade.IMaterialBaseInfoService; @@ -242,7 +243,38 @@ public class StockInOrderApplicationService { } } List stockInOrderPOS = stockInOrderDomainService.queryList(stockInOrderDO); + if (CollectionUtils.isEmpty(stockInOrderPOS)) { + return stockInOrderPOS; + } + List inOrderNumbers = stockInOrderPOS.stream() + .map(StockInOrderPO::getInOrderNumber) + .filter(Objects::nonNull) + .collect(Collectors.toList()); + + // 列表页展示：按入库单号批量取去重后的 Invoice No + Map invoiceNoByNum = new HashMap<>(); + inMaterialDetailService.selectDistinctInvoiceNoForStockInList(inOrderNumbers) + .stream() + .filter(a -> StringUtils.isNotBlank(a.getInvoiceNo())) + .forEach(a -> invoiceNoByNum.merge(a.getInOrderNumber(), a.getInvoiceNo().trim(), (o, n) -> o + "," + n)); + + // 导出场景（needDetail=true）：批量取出完整明细树（level=1 父行 + children），按入库单号分组挂到列表 + Map> detailByNum = Collections.emptyMap(); + if (Boolean.TRUE.equals(stockInOrderDO.getNeedDetail()) && !CollectionUtils.isEmpty(inOrderNumbers)) { + InMaterialDetailDO detailQuery = new InMaterialDetailDO(); + detailQuery.setInOrderNumberList(inOrderNumbers); + List detailTreeList = inMaterialDetailService.queryListChildren(detailQuery); + detailByNum = detailTreeList.stream() + .collect(Collectors.groupingBy(InMaterialDetailPO::getInOrderNumber)); + } + for (StockInOrderPO stockInOrderPO : stockInOrderPOS) { + if (invoiceNoByNum.containsKey(stockInOrderPO.getInOrderNumber())) { + stockInOrderPO.setInvoiceNo(invoiceNoByNum.get(stockInOrderPO.getInOrderNumber())); + } + if (Boolean.TRUE.equals(stockInOrderDO.getNeedDetail())) { + stockInOrderPO.setMaterialDetailList(detailByNum.getOrDefault(stockInOrderPO.getInOrderNumber(), Collections.emptyList())); + } Long inOrderId = stockInOrderPO.getInOrderId(); List list = receiptOrderAccountService.list(new LambdaQueryWrapper().eq(ReceiptOrderAccount::getOrderId, inOrderId).eq(ReceiptOrderAccount::getInOrOut, "in")); stockInOrderPO.setReceiptOrderAccountList(list); diff --git a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java index 26de7300b..9dbe157ba 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java @@ -253,9 +253,33 @@ public class StockOutOrderApplicationService { accountByOrderId = accounts.stream().collect(Collectors.groupingBy(ReceiptOrderAccount::getOrderId)); } + // 列表页展示：按出库单号批量取去重后的 Invoice No + Map invoiceNoByNum = new HashMap<>(); + outMaterialDetailService.selectDistinctInvoiceNoForStockOutList(outOrderNumbers) + .stream() + .filter(a -> StringUtils.isNotBlank(a.getInvoiceNo())) + .forEach(a -> invoiceNoByNum.merge(a.getOutOrderNumber(), a.getInvoiceNo().trim(), (o, n) -> o + "," + n)); + + // 导出场景（needDetail=true）：批量取出完整明细树（level=1 父行 + children），按出库单号分组挂到列表 + Map> detailByNum = Collections.emptyMap(); + if (Boolean.TRUE.equals(stockOutOrderDO.getNeedDetail()) && !CollectionUtils.isEmpty(outOrderNumbers)) { + OutMaterialDetailDO detailQuery = new OutMaterialDetailDO(); + detailQuery.setOutOrderNumberList(outOrderNumbers); + List detailTreeList = outMaterialDetailService.queryListChildren(detailQuery); + detailByNum = detailTreeList.stream() + .collect(Collectors.groupingBy(OutMaterialDetailPO::getOutOrderNumber)); + } + for (StockOutOrderPO stockOutOrderPO : stockOutOrderPOS) { String outOrderNumber = stockOutOrderPO.getOutOrderNumber(); + if (invoiceNoByNum.containsKey(outOrderNumber)) { + stockOutOrderPO.setInvoiceNo(invoiceNoByNum.get(outOrderNumber)); + } + if (Boolean.TRUE.equals(stockOutOrderDO.getNeedDetail())) { + stockOutOrderPO.setMaterialDetailList(detailByNum.getOrDefault(outOrderNumber, Collections.emptyList())); + } + List list = deliveryDetailsLinkService.list(new LambdaQueryWrapper().eq(DeliveryDetailsLink::getOrderNumber, outOrderNumber)); stockOutOrderPO.setDeliveryDetailsLinkList(list); diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/inMaterialDetail/repository/facade/IInMaterialDetailService.java b/mhd_wms/src/main/java/com/mhd/wms/domain/inMaterialDetail/repository/facade/IInMaterialDetailService.java index 851a3a7f0..6e1e83472 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/inMaterialDetail/repository/facade/IInMaterialDetailService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/inMaterialDetail/repository/facade/IInMaterialDetailService.java @@ -3,6 +3,7 @@ package com.mhd.wms.domain.inMaterialDetail.repository.facade; import com.baomidou.mybatisplus.extension.service.IService; import com.mhd.wms.domain.inMaterialDetail.entity.InMaterialDetail; import com.mhd.wms.domain.inMaterialDetail.repository.po.InMaterialDetailPO; +import com.mhd.wms.domain.inMaterialDetail.repository.po.InStockListMaterialAgg; import com.mhd.wms.domain.inMaterialDetail.repository.todo.InMaterialDetailBaseDO; import com.mhd.wms.domain.inMaterialDetail.repository.todo.InMaterialDetailDO; import com.mhd.wms.domain.overStock.repository.todo.QueryOrderOverStockDO; @@ -31,6 +32,11 @@ public interface IInMaterialDetailService extends IService */ public List queryListChildren(InMaterialDetailDO inMaterialDetailDO); + /** + * 入库列表页：按入库单号批量取去重后的 Invoice No（仅 level=1） + */ + List selectDistinctInvoiceNoForStockInList(List inOrderNumbers); + /** * 新增物料明细 */ diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/inMaterialDetail/repository/mapper/InMaterialDetailMapper.java b/mhd_wms/src/main/java/com/mhd/wms/domain/inMaterialDetail/repository/mapper/InMaterialDetailMapper.java index 618bf84c9..92a00e1a1 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/inMaterialDetail/repository/mapper/InMaterialDetailMapper.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/inMaterialDetail/repository/mapper/InMaterialDetailMapper.java @@ -3,8 +3,10 @@ package com.mhd.wms.domain.inMaterialDetail.repository.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.mhd.wms.domain.inMaterialDetail.entity.InMaterialDetail; import com.mhd.wms.domain.inMaterialDetail.repository.po.InMaterialDetailPO; +import com.mhd.wms.domain.inMaterialDetail.repository.po.InStockListMaterialAgg; import com.mhd.wms.domain.inMaterialDetail.repository.todo.InMaterialDetailDO; import com.mhd.wms.domain.overStock.repository.todo.QueryOrderOverStockDO; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -26,4 +28,9 @@ public interface InMaterialDetailMapper extends BaseMapper */ public List queryInOrderList(QueryOrderOverStockDO queryOrderOverStockDO); + /** + * 入库列表页：按入库单号批量取去重后的 Invoice No（仅 level=1） + */ + List selectDistinctInvoiceNoForStockInList(@Param("inOrderNumbers") List inOrderNumbers); + } diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/inMaterialDetail/repository/persistence/InMaterialDetailImpl.java b/mhd_wms/src/main/java/com/mhd/wms/domain/inMaterialDetail/repository/persistence/InMaterialDetailImpl.java index f95edc930..761c3d6b4 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/inMaterialDetail/repository/persistence/InMaterialDetailImpl.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/inMaterialDetail/repository/persistence/InMaterialDetailImpl.java @@ -14,6 +14,7 @@ import com.mhd.wms.domain.inMaterialDetail.entity.InMaterialDetail; import com.mhd.wms.domain.inMaterialDetail.repository.facade.IInMaterialDetailService; import com.mhd.wms.domain.inMaterialDetail.repository.mapper.InMaterialDetailMapper; import com.mhd.wms.domain.inMaterialDetail.repository.po.InMaterialDetailPO; +import com.mhd.wms.domain.inMaterialDetail.repository.po.InStockListMaterialAgg; import com.mhd.wms.domain.inMaterialDetail.repository.todo.InMaterialDetailBaseDO; import com.mhd.wms.domain.inMaterialDetail.repository.todo.InMaterialDetailDO; import com.mhd.wms.domain.materialBaseInfo.repository.facade.IMaterialBaseInfoService; @@ -26,6 +27,7 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; import java.util.ArrayList; +import java.util.Collections; import java.util.Date; import java.util.List; import java.util.Map; @@ -86,6 +88,14 @@ public class InMaterialDetailImpl extends ServiceImpl selectDistinctInvoiceNoForStockInList(List inOrderNumbers) { + if (CollectionUtils.isEmpty(inOrderNumbers)) { + return Collections.emptyList(); + } + return inMaterialDetailMapper.selectDistinctInvoiceNoForStockInList(inOrderNumbers); + } + private List getChildren(Long parentUniqueId, List inMaterialDetailPOList, Integer maxLevel){ List childrenCityList = inMaterialDetailPOList.stream().filter(materialDetailPO -> parentUniqueId.equals(materialDetailPO.getParentUniqueId())).collect(Collectors.toList()); if (!CollectionUtils.isEmpty(childrenCityList)){ diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/inMaterialDetail/repository/po/InStockListMaterialAgg.java b/mhd_wms/src/main/java/com/mhd/wms/domain/inMaterialDetail/repository/po/InStockListMaterialAgg.java new file mode 100644 index 000000000..2b1ff0d01 --- /dev/null +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/inMaterialDetail/repository/po/InStockListMaterialAgg.java @@ -0,0 +1,12 @@ +package com.mhd.wms.domain.inMaterialDetail.repository.po; + +import lombok.Data; + +/** + * 入库列表页批量取去重后的 Invoice No。 + */ +@Data +public class InStockListMaterialAgg { + private String inOrderNumber; + private String invoiceNo; +} diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/facade/IOutMaterialDetailService.java b/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/facade/IOutMaterialDetailService.java index 5a2c6c4fc..d562a6faa 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/facade/IOutMaterialDetailService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/facade/IOutMaterialDetailService.java @@ -41,6 +41,11 @@ public interface IOutMaterialDetailService extends IService */ List selectAggregatesForStockOutList(List outOrderNumbers); + /** + * 出库列表页：按出库单号批量取去重后的 Invoice No（仅 level=1） + */ + List selectDistinctInvoiceNoForStockOutList(List outOrderNumbers); + /** * 新增物料明细 */ diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/mapper/OutMaterialDetailMapper.java b/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/mapper/OutMaterialDetailMapper.java index 9dc295f5a..2a854e320 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/mapper/OutMaterialDetailMapper.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/mapper/OutMaterialDetailMapper.java @@ -60,4 +60,9 @@ public interface OutMaterialDetailMapper extends BaseMapper * 出库列表页：按出库单号批量聚合（仅 level=1） */ List selectAggregatesForStockOutList(@Param("outOrderNumbers") List outOrderNumbers); + + /** + * 出库列表页：按出库单号批量取去重后的 Invoice No（仅 level=1） + */ + List selectDistinctInvoiceNoForStockOutList(@Param("outOrderNumbers") List outOrderNumbers); } diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/persistence/OutMaterialDetailImpl.java b/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/persistence/OutMaterialDetailImpl.java index 1cbe42c5e..eeb450474 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/persistence/OutMaterialDetailImpl.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/persistence/OutMaterialDetailImpl.java @@ -130,6 +130,14 @@ public class OutMaterialDetailImpl extends ServiceImpl selectDistinctInvoiceNoForStockOutList(List outOrderNumbers) { + if (CollectionUtils.isEmpty(outOrderNumbers)) { + return Collections.emptyList(); + } + return outMaterialDetailMapper.selectDistinctInvoiceNoForStockOutList(outOrderNumbers); + } + private List getChildren(Long parentUniqueId, List materialDetailPOList, Integer maxLevel){ List childrenCityList = materialDetailPOList.stream().filter(materialDetailPO -> parentUniqueId.equals(materialDetailPO.getParentUniqueId())).collect(Collectors.toList()); if (!CollectionUtils.isEmpty(childrenCityList)){ diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/po/OutStockListMaterialAgg.java b/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/po/OutStockListMaterialAgg.java index 9970582a4..6e8e71ab1 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/po/OutStockListMaterialAgg.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/po/OutStockListMaterialAgg.java @@ -13,4 +13,6 @@ public class OutStockListMaterialAgg { private BigDecimal totalOutboundQuantity; private BigDecimal checkQuantitySum; private Integer materialKindCountDistinct; + /** 列表页展示用：该出库单的 Invoice No */ + private String invoiceNo; } diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/repository/po/StockInOrderPO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/repository/po/StockInOrderPO.java index ea9facb43..20c92b22b 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/repository/po/StockInOrderPO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/repository/po/StockInOrderPO.java @@ -235,6 +235,9 @@ public class StockInOrderPO extends BaseVOEntity { @Excel(name = "备注") private String remark; + @ApiModelProperty("Invoice No（多个用逗号隔开）") + private String invoiceNo; + @ApiModelProperty("物料明细") private List materialDetailList; diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/repository/todo/StockInOrderDO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/repository/todo/StockInOrderDO.java index 24a41d5ce..c18ae7f4f 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/repository/todo/StockInOrderDO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/repository/todo/StockInOrderDO.java @@ -448,4 +448,7 @@ public class StockInOrderDO extends BaseVOEntity { @ApiModelProperty("任务移除用户ID") private String removeUserId; + + @ApiModelProperty("是否返回物料明细（导出时传 true）") + private Boolean needDetail; } \ No newline at end of file diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/po/StockOutOrderPO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/po/StockOutOrderPO.java index 73ce5b5bf..552da5d76 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/po/StockOutOrderPO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/po/StockOutOrderPO.java @@ -256,6 +256,9 @@ public class StockOutOrderPO extends BaseVOEntity { @Excel(name = "备注") private String remark; + @ApiModelProperty("Invoice No（多个用逗号隔开）") + private String invoiceNo; + @ApiModelProperty("物料明细") private List materialDetailList; diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/todo/StockOutOrderDO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/todo/StockOutOrderDO.java index 559c21fe9..b7ae141d7 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/todo/StockOutOrderDO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/todo/StockOutOrderDO.java @@ -513,4 +513,7 @@ public class StockOutOrderDO extends BaseVOEntity { @ApiModelProperty("任务移除用户ID") private String removeUserId; + + @ApiModelProperty("是否返回物料明细（导出时传 true）") + private Boolean needDetail; } \ No newline at end of file diff --git a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/stockInOrder/StockInOrderDTO.java b/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/stockInOrder/StockInOrderDTO.java index b70a0c7a7..738b81cc3 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/stockInOrder/StockInOrderDTO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/stockInOrder/StockInOrderDTO.java @@ -445,4 +445,7 @@ public class StockInOrderDTO extends StockInOrderBaseDTO { @ApiModelProperty("任务移除用户ID") private String removeUserId; + + @ApiModelProperty("是否返回物料明细（导出时传 true）") + private Boolean needDetail; } \ No newline at end of file diff --git a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/stockOutOrder/StockOutOrderDTO.java b/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/stockOutOrder/StockOutOrderDTO.java index 39e3c8793..a81b2a649 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/stockOutOrder/StockOutOrderDTO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/stockOutOrder/StockOutOrderDTO.java @@ -502,4 +502,7 @@ public class StockOutOrderDTO extends StockOutOrderBaseDTO { @ApiModelProperty("任务移除用户ID") private String removeUserId; + + @ApiModelProperty("是否返回物料明细（导出时传 true）") + private Boolean needDetail; } \ No newline at end of file diff --git a/mhd_wms/src/main/resources/mapper/OutMaterialDetail/OutMaterialDetailMapper.xml b/mhd_wms/src/main/resources/mapper/OutMaterialDetail/OutMaterialDetailMapper.xml index 02df3d80f..e50a7b25d 100644 --- a/mhd_wms/src/main/resources/mapper/OutMaterialDetail/OutMaterialDetailMapper.xml +++ b/mhd_wms/src/main/resources/mapper/OutMaterialDetail/OutMaterialDetailMapper.xml @@ -451,4 +451,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" GROUP BY a.out_order_number + + + \ No newline at end of file diff --git a/mhd_wms/src/main/resources/mapper/inMaterialDetail/InMaterialDetailMapper.xml b/mhd_wms/src/main/resources/mapper/inMaterialDetail/InMaterialDetailMapper.xml index cfee42bf1..b671a31eb 100644 --- a/mhd_wms/src/main/resources/mapper/inMaterialDetail/InMaterialDetailMapper.xml +++ b/mhd_wms/src/main/resources/mapper/inMaterialDetail/InMaterialDetailMapper.xml @@ -356,4 +356,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + \ No newline at end of file