From 7b47bac4b90fe5b60a0ba1f09d32233a794c2b70 Mon Sep 17 00:00:00 2001
From: 10002617 <jianbo.lin@nflg.com>
Date: Tue, 12 May 2026 08:19:57 +0800
Subject: [PATCH] =?UTF-8?q?Revert=20"1483=20=E5=8F=91=E8=B4=A7=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86-PDA-=E8=A3=85=E7=AE=B1=E8=8F=9C=E5=8D=95=E4=B8=8B?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9=EF=BC=8C=E6=89=AB=E7=A0=81?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95=E5=8F=AF=E5=88=A0=E9=99=A4=EF=BC=8C=E6=95=B0?=
 =?UTF-8?q?=E9=87=8F=E5=8F=AF=E7=BC=96=E8=BE=91"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit f2c7ac1852d4401274c3285a61ee7619b46ce23b.
---
 .../nflg/wms/shipment/controller/PackagingCodeController.java | 2 +-
 .../src/main/java/com/nflg/wms/shipment/util/KeyUtil.java     | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/nflg-wms-shipment/src/main/java/com/nflg/wms/shipment/controller/PackagingCodeController.java b/nflg-wms-shipment/src/main/java/com/nflg/wms/shipment/controller/PackagingCodeController.java
index d3ecd797..e01d6fdb 100644
--- a/nflg-wms-shipment/src/main/java/com/nflg/wms/shipment/controller/PackagingCodeController.java
+++ b/nflg-wms-shipment/src/main/java/com/nflg/wms/shipment/controller/PackagingCodeController.java
@@ -256,7 +256,7 @@ public class PackagingCodeController extends BaseController {
 
                     materialCodeItemQrService.save(new WmsShipmentMaterialCodeItemQr()
                                     .setItemId(newMaterialCodeItem.getId())
-                                    .setNo(KeyUtil.nextFCode())
+                                    .setNo(KeyUtil.next())
                                     .setNum(newMaterialCodeItem.getNum())
                                     .setCreateBy(UserUtil.getUserName())
                                     .setCreateTime(LocalDateTime.now())
diff --git a/nflg-wms-shipment/src/main/java/com/nflg/wms/shipment/util/KeyUtil.java b/nflg-wms-shipment/src/main/java/com/nflg/wms/shipment/util/KeyUtil.java
index 965075f6..de3c6378 100644
--- a/nflg-wms-shipment/src/main/java/com/nflg/wms/shipment/util/KeyUtil.java
+++ b/nflg-wms-shipment/src/main/java/com/nflg/wms/shipment/util/KeyUtil.java
@@ -22,6 +22,10 @@ public class KeyUtil {
         return wmsShipmentMaterialCodeItemQrService;
     }
 
+    public static String next(){
+        return TSID.Factory.getTsid().toString();
+    }
+
     public static String nextBase62(){
         return TSID.Factory.getTsid().encode(62);
     }