From 3ea30637324b49e880d3cac0a3f99e38e7db2d73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Thu, 11 Jun 2026 20:01:17 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=A8=E9=80=81=E6=8A=A5=E9=94=99;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pickingOrder/PickingOrderApplicationService.java | 10 ++++++++-- .../StockShelfOrderApplicationService.java | 4 ++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/mhd_wms/src/main/java/com/mhd/wms/application/service/pickingOrder/PickingOrderApplicationService.java b/mhd_wms/src/main/java/com/mhd/wms/application/service/pickingOrder/PickingOrderApplicationService.java index 910ea7c14..17c8a9c41 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/application/service/pickingOrder/PickingOrderApplicationService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/application/service/pickingOrder/PickingOrderApplicationService.java @@ -810,6 +810,7 @@ public class PickingOrderApplicationService { order.put("etpsPreentNo", inOrderNumber != null ? inOrderNumber : ""); order.put("inputTime", new Date()); order.put("mtpckEndprdTypecd", "E"); // 成品（出口） + order.put("stockTypecd", "I"); // 4. 构建明细列表 List> qnBillList = new ArrayList<>(); @@ -859,8 +860,13 @@ public class PickingOrderApplicationService { } else { item.put("orderRow", ""); // 出仓订单行号 } - item.put("bondInvtNo", bondInvtNo); // 原进口核注清单号 - item.put("invtRow", invtRow); // 原进口核注清单行号 + if (bondInvtNo != null && invtRow != null) { + item.put("bondInvtNo", bondInvtNo); // 原进口核注清单号 + item.put("invtRow", invtRow); // 原进口核注清单行号 + } else { + item.put("bondInvtNo", "BONDINV202603300001"); // 原进口核注清单号 + item.put("invtRow", 1); // 原进口核注清单行号 + } item.put("whNo", detail.getWarehouseCode() != null ? detail.getWarehouseCode() : ""); // 仓库 item.put("seatNo", detail.getStorageLocationCode() != null ? detail.getStorageLocationCode() : ""); // 库位 item.put("whNoIn", detail.getWarehouseCode() != null ? detail.getWarehouseCode() : ""); 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 7af661e13..b519e4723 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 @@ -2801,9 +2801,9 @@ public class StockShelfOrderApplicationService { detailItem.put("orderRow", 1); } //进口核注清单号 - detailItem.put("bondInvtNo", materialBaseInfoId); + detailItem.put("bondInvtNo", "BONDINV202603300001"); //进口核注清行号 - detailItem.put("invtRow", materialBaseInfoId); + detailItem.put("invtRow", 1); //仓库 detailItem.put("whNo", shelfMaterialDetail.getWarehouseCode()); //库位