weiaisuosi/nanguangszwlback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(wms):修改导出

Browse Source
This commit is contained in:
zhaoqing
2026-08-14 11:36:08 +08:00
parent 6a87c5a75a
commit e5fea50466
2 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java
+6 -4
View File
@@ -259,8 +259,10 @@ public class StockInOrderApplicationService {
.forEach(a -> invoiceNoByNum.merge(a.getInOrderNumber(), a.getInvoiceNo().trim(), (o, n) -> o + "," + n)); .forEach(a -> invoiceNoByNum.merge(a.getInOrderNumber(), a.getInvoiceNo().trim(), (o, n) -> o + "," + n));
// 导出场景（needDetail=true）：批量取出完整明细树（level=1 父行 + children），按入库单号分组挂到列表 // 导出场景（needDetail=true）：批量取出完整明细树（level=1 父行 + children），按入库单号分组挂到列表
// 注释掉 needDetail 判断：列表/导出统一返回明细
Map<String, List<InMaterialDetailPO>> detailByNum = Collections.emptyMap(); Map<String, List<InMaterialDetailPO>> detailByNum = Collections.emptyMap();
if (Boolean.TRUE.equals(stockInOrderDO.getNeedDetail()) && !CollectionUtils.isEmpty(inOrderNumbers)) { // if (Boolean.TRUE.equals(stockInOrderDO.getNeedDetail()) && !CollectionUtils.isEmpty(inOrderNumbers)) {
if (!CollectionUtils.isEmpty(inOrderNumbers)) {
InMaterialDetailDO detailQuery = new InMaterialDetailDO(); InMaterialDetailDO detailQuery = new InMaterialDetailDO();
detailQuery.setInOrderNumberList(inOrderNumbers); detailQuery.setInOrderNumberList(inOrderNumbers);
List<InMaterialDetailPO> detailTreeList = inMaterialDetailService.queryListChildren(detailQuery); List<InMaterialDetailPO> detailTreeList = inMaterialDetailService.queryListChildren(detailQuery);
@@ -272,9 +274,9 @@ public class StockInOrderApplicationService {
if (invoiceNoByNum.containsKey(stockInOrderPO.getInOrderNumber())) { if (invoiceNoByNum.containsKey(stockInOrderPO.getInOrderNumber())) {
stockInOrderPO.setInvoiceNo(invoiceNoByNum.get(stockInOrderPO.getInOrderNumber())); stockInOrderPO.setInvoiceNo(invoiceNoByNum.get(stockInOrderPO.getInOrderNumber()));
} }
if (Boolean.TRUE.equals(stockInOrderDO.getNeedDetail())) { // if (Boolean.TRUE.equals(stockInOrderDO.getNeedDetail())) {
stockInOrderPO.setMaterialDetailList(detailByNum.getOrDefault(stockInOrderPO.getInOrderNumber(), Collections.emptyList())); stockInOrderPO.setMaterialDetailList(detailByNum.getOrDefault(stockInOrderPO.getInOrderNumber(), Collections.emptyList()));
} // }
Long inOrderId = stockInOrderPO.getInOrderId(); Long inOrderId = stockInOrderPO.getInOrderId();
List<ReceiptOrderAccount> list = receiptOrderAccountService.list(new LambdaQueryWrapper<ReceiptOrderAccount>().eq(ReceiptOrderAccount::getOrderId, inOrderId).eq(ReceiptOrderAccount::getInOrOut, "in")); List<ReceiptOrderAccount> list = receiptOrderAccountService.list(new LambdaQueryWrapper<ReceiptOrderAccount>().eq(ReceiptOrderAccount::getOrderId, inOrderId).eq(ReceiptOrderAccount::getInOrOut, "in"));
stockInOrderPO.setReceiptOrderAccountList(list); stockInOrderPO.setReceiptOrderAccountList(list);
mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java
+6 -4
View File
@@ -261,8 +261,10 @@ public class StockOutOrderApplicationService {
.forEach(a -> invoiceNoByNum.merge(a.getOutOrderNumber(), a.getInvoiceNo().trim(), (o, n) -> o + "," + n)); .forEach(a -> invoiceNoByNum.merge(a.getOutOrderNumber(), a.getInvoiceNo().trim(), (o, n) -> o + "," + n));
// 导出场景（needDetail=true）：批量取出完整明细树（level=1 父行 + children），按出库单号分组挂到列表 // 导出场景（needDetail=true）：批量取出完整明细树（level=1 父行 + children），按出库单号分组挂到列表
// 注释掉 needDetail 判断：列表/导出统一返回明细
Map<String, List<OutMaterialDetailPO>> detailByNum = Collections.emptyMap(); Map<String, List<OutMaterialDetailPO>> detailByNum = Collections.emptyMap();
if (Boolean.TRUE.equals(stockOutOrderDO.getNeedDetail()) && !CollectionUtils.isEmpty(outOrderNumbers)) { // if (Boolean.TRUE.equals(stockOutOrderDO.getNeedDetail()) && !CollectionUtils.isEmpty(outOrderNumbers)) {
if (!CollectionUtils.isEmpty(outOrderNumbers)) {
OutMaterialDetailDO detailQuery = new OutMaterialDetailDO(); OutMaterialDetailDO detailQuery = new OutMaterialDetailDO();
detailQuery.setOutOrderNumberList(outOrderNumbers); detailQuery.setOutOrderNumberList(outOrderNumbers);
List<OutMaterialDetailPO> detailTreeList = outMaterialDetailService.queryListChildren(detailQuery); List<OutMaterialDetailPO> detailTreeList = outMaterialDetailService.queryListChildren(detailQuery);
@@ -276,9 +278,9 @@ public class StockOutOrderApplicationService {
if (invoiceNoByNum.containsKey(outOrderNumber)) { if (invoiceNoByNum.containsKey(outOrderNumber)) {
stockOutOrderPO.setInvoiceNo(invoiceNoByNum.get(outOrderNumber)); stockOutOrderPO.setInvoiceNo(invoiceNoByNum.get(outOrderNumber));
} }
if (Boolean.TRUE.equals(stockOutOrderDO.getNeedDetail())) { // if (Boolean.TRUE.equals(stockOutOrderDO.getNeedDetail())) {
stockOutOrderPO.setMaterialDetailList(detailByNum.getOrDefault(outOrderNumber, Collections.emptyList())); stockOutOrderPO.setMaterialDetailList(detailByNum.getOrDefault(outOrderNumber, Collections.emptyList()));
} // }
List<DeliveryDetailsLink> list = deliveryDetailsLinkService.list(new LambdaQueryWrapper<DeliveryDetailsLink>().eq(DeliveryDetailsLink::getOrderNumber, outOrderNumber)); List<DeliveryDetailsLink> list = deliveryDetailsLinkService.list(new LambdaQueryWrapper<DeliveryDetailsLink>().eq(DeliveryDetailsLink::getOrderNumber, outOrderNumber));
stockOutOrderPO.setDeliveryDetailsLinkList(list); stockOutOrderPO.setDeliveryDetailsLinkList(list);