From 7215f3607ef81440be5f38cfeda4f11682ab1fe2 Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期一, 12 一月 2026 12:45:34 +0800
Subject: [PATCH] 出入库流程功能优化

---
 src/main/java/com/zy/asrs/utils/OrderExcelListener.java |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zy/asrs/utils/OrderExcelListener.java b/src/main/java/com/zy/asrs/utils/OrderExcelListener.java
index 59e6c5e..4a05dd6 100644
--- a/src/main/java/com/zy/asrs/utils/OrderExcelListener.java
+++ b/src/main/java/com/zy/asrs/utils/OrderExcelListener.java
@@ -78,6 +78,7 @@
         Order order = new Order();
         order.setOrderNo(data.getOrderNo());
         order.setDocType(docType.getDocId());
+        order.setUuid(UUID.randomUUID().toString());
         order.setCreateTime(now);
         order.setUpdateTime(now);
         order.setSettle(1L);
@@ -101,9 +102,10 @@
         detl.setMatnr(data.getMatnr());
         detl.setMaktx(mat.getMaktx());
         detl.setQty(data.getQty());
-        detl.setBatch(data.getBatch());
+        detl.setSpecs(data.getSpecs());
+        detl.setBatch(Objects.isNull(data.getBatch()) ? "1" : data.getBatch());
         detl.setVolume(data.getVolume());
-        detl.setSafeQty(mat.getSafeQty());
+        detl.setSafeQty(data.getSafeQty());
         detl.setAnfme(data.getAnfme());
         detl.setBarcode(data.getBarcode());
         detl.setUpdateTime(now);
@@ -113,6 +115,7 @@
         if (!detlService.insert(detl)) {
             throw new CoolException("璁㈠崟璇︽儏鍒涘缓澶辫触锛侊紒");
         }
+        total ++ ;
     }
 
     @Override

--
Gitblit v1.9.1