From b1cbb59d39cea44d35110d95e54fbd86d4a12e13 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期五, 01 八月 2025 12:55:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ghjtasrs' into ghjtasrs

---
 src/main/java/com/zy/asrs/importexcle/LocMatListener.java |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/zy/asrs/importexcle/LocMatListener.java b/src/main/java/com/zy/asrs/importexcle/LocMatListener.java
index c4775e8..37d4079 100644
--- a/src/main/java/com/zy/asrs/importexcle/LocMatListener.java
+++ b/src/main/java/com/zy/asrs/importexcle/LocMatListener.java
@@ -26,7 +26,7 @@
     /**
      * 姣忛殧1000鏉″瓨鍌ㄦ暟鎹簱锛屽疄闄呬娇鐢ㄤ腑鍙互3000鏉★紝鐒跺悗娓呯悊list 锛屾柟渚垮唴瀛樺洖鏀�
      */
-    private static final int BATCH_COUNT = 400;
+    private static final int BATCH_COUNT = 50;
 
     private static int num = 1;
 
@@ -94,18 +94,19 @@
                     throw new CoolException(locMat.getA() + ":搴撲綅涓嶄负绌猴紒");
                 }
                 Date now = new Date();
+                String flag = "A" + num;
                 if ("F".equals(locMat.getB())) {
                     LocDetl locDetl = new LocDetl();
                     locDetl.setLocNo(locMat.getA());
                     locDetl.setMatnr("3渭m脳10mm");
                     locDetl.setMaktx("3渭m脳10mm");
-                    String flag = "A" + num;
+                    locDetl.setBatch("");
                     locDetl.setUnit(flag);
                     locDetl.setModel(flag);
                     locDetl.setBrand(flag);
                     locDetl.setOrigin("涓�");
                     locDetl.setColor(locMat.getC());
-                    locDetl.setManu("A");
+                    locDetl.setManu(flag);
                     locDetl.setSku("10");
                     locDetl.setItemNum("10");
                     locDetl.setManuDate("2024-02-01 23:12:21");
@@ -123,11 +124,14 @@
 
                     // 娣诲姞杩涘簱瀛樻槑缁嗗垪琛�
                     locDetls.add(locDetl);
+                    locMast.setBarcode(flag);
                     num ++;
                 }
 
                 // 鏇存柊搴撲綅鐘舵��
                 locMast.setLocSts(locMat.getB());
+                locMast.setBarcode(flag);
+
                 locMastService.updateById(locMast);
             });
             // 鎵归噺鎻掑叆搴撳瓨鏄庣粏

--
Gitblit v1.9.1