From 1bec4678da03a9d0ae616beb357af1b397283fdb Mon Sep 17 00:00:00 2001
From: zhaoqing <1670883518@qq.com>
Date: Wed, 3 Jun 2026 10:41:20 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A8=E9=80=81=E6=95=B0=E6=8D=AE=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...vationStockOutOrderApplicationService.java | 51 +++++++------------
 1 file changed, 19 insertions(+), 32 deletions(-)

diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/service/ReservationStockOutOrderApplicationService.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/service/ReservationStockOutOrderApplicationService.java
index 6e5125d98..3b0c5fb6a 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/service/ReservationStockOutOrderApplicationService.java
+++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/service/ReservationStockOutOrderApplicationService.java
@@ -1165,41 +1165,28 @@ public class ReservationStockOutOrderApplicationService {
                         String warehouse = reservationOutMaterialDetailMapper.getWarehouse(kcId);
                         String opWhLoc = reservationOutMaterialDetailMapper.getOpWhLoc(kcId);
 
-                        item.put("orderINo", inOrderNumber != null ? inOrderNumber : "");
-                        item.put("warehouse", warehouse != null ? warehouse : "");
-                        item.put("opWhLoc", opWhLoc != null ? opWhLoc : "");
-                        item.put("billI", inLotNo != null ? inLotNo : "");
-
-                        // 处理批次号中的数字
-                        if (inLotNo != null && inLotNo.contains("-")) {
-                            String numStr = inLotNo.substring(inLotNo.lastIndexOf("-") + 1);
-                            try {
-                                Integer result = Integer.valueOf(numStr);
-                                item.put("orderIRow", result);
-                                item.put("billIRow", result);
-                            } catch (NumberFormatException e) {
-                                item.put("orderIRow", null);
-                                item.put("billIRow", null);
+                        if (inOrderNumber != null) {
+                            item.put("orderINo", inOrderNumber);
+                        }
+                        if (warehouse != null) {
+                            item.put("warehouse", warehouse);
+                        }
+                        if (opWhLoc != null) {
+                            item.put("opWhLoc", opWhLoc);
+                        }
+                        if (inLotNo != null) {
+                            item.put("billI", inLotNo);
+                            if (inLotNo.contains("-")) {
+                                String numStr = inLotNo.substring(inLotNo.lastIndexOf("-") + 1);
+                                try {
+                                    Integer result = Integer.valueOf(numStr);
+                                    item.put("orderIRow", result);
+                                    item.put("billIRow", result);
+                                } catch (NumberFormatException e) {
+                                }
                             }
-                        } else {
-                            item.put("orderIRow", null);
-                            item.put("billIRow", null);
                         }
-                    } else {
-                        item.put("orderINo", "");
-                        item.put("orderIRow", null);
-                        item.put("warehouse", "");
-                        item.put("opWhLoc", "");
-                        item.put("billI", "");
-                        item.put("billIRow", null);
                     }
-                } else {
-                    item.put("orderINo", "");
-                    item.put("orderIRow", null);
-                    item.put("warehouse", "");
-                    item.put("opWhLoc", "");
-                    item.put("billI", "");
-                    item.put("billIRow", null);
                 }
 
                 orderList.add(item);