From ff243b74dae132c8be730ea5ae2efa94d09d7060 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= <rakor2010@gmail.com>
Date: Mon, 15 Jun 2026 14:25:52 +0800
Subject: [PATCH] =?UTF-8?q?fix(transfer):=20=E4=BF=AE=E5=A4=8D=E8=B0=83?=
 =?UTF-8?q?=E6=8B=A8=E5=8D=95=E6=8D=AEID=E7=94=9F=E6=88=90=E5=92=8C?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=85=B3=E8=81=94=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 为WmsTransferCompanyItem和WmsTransferFactoryItem添加雪花算法ID生成
- 修复调拨公司和工厂控制器中的订单ID关联错误
- 移除多余的分号提高代码整洁性
---
 .../nflg/wms/admin/controller/TransferCompanyController.java  | 3 ++-
 .../nflg/wms/admin/controller/TransferFactoryController.java  | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferCompanyController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferCompanyController.java
index 714cf9a4..e66d8797 100644
--- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferCompanyController.java
+++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferCompanyController.java
@@ -172,6 +172,7 @@ public class TransferCompanyController extends BaseController {
                             lockVOS.addAll(itemLocks);
                         } else {
                             WmsTransferCompanyItem data = Convert.convert(WmsTransferCompanyItem.class, item);
+                            data.setId(IdUtil.getSnowflakeNextId());
                             data.setOrderId(order.getId());
                             data.setLeft(data.getNum());
                             transferCompanyItemService.save(data);
@@ -642,7 +643,7 @@ public class TransferCompanyController extends BaseController {
                 if (CollectionUtil.isNotEmpty(item.getDatas())) {
                     item.getDatas().forEach(data -> {
                         temRecords.add(new TransferCompanyNoScanRecord()
-                                .setOrderId(request.getId())
+                                .setOrderId(order.getId())
                                 .setItemId(item.getOrderItemId())
                                 .setNum(data.getNum())
                                 .setBatchNo(data.getBatchNo())
diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferFactoryController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferFactoryController.java
index edf95118..aa31d05b 100644
--- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferFactoryController.java
+++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferFactoryController.java
@@ -119,7 +119,6 @@ public class TransferFactoryController extends BaseController {
 
     @Resource
     private TransferFactoryNoScanRecordRespository transferFactoryNoScanRecordRespository;
-    ;
 
     /**
      * 查询SAP领料订单数据
@@ -171,6 +170,7 @@ public class TransferFactoryController extends BaseController {
                             lockVOS.addAll(itemLocks);
                         } else {
                             WmsTransferFactoryItem data = Convert.convert(WmsTransferFactoryItem.class, item);
+                            data.setId(IdUtil.getSnowflakeNextId());
                             data.setOrderId(order.getId());
                             data.setLeft(data.getNum());
                             transferFactoryItemService.save(data);
@@ -674,7 +674,7 @@ public class TransferFactoryController extends BaseController {
                 if (CollectionUtil.isNotEmpty(item.getDatas())) {
                     item.getDatas().forEach(data -> {
                         temRecords.add(new TransferFactoryNoScanRecord()
-                                .setOrderId(request.getId())
+                                .setOrderId(order.getId())
                                 .setItemId(item.getOrderItemId())
                                 .setNum(data.getNum())
                                 .setBatchNo(data.getBatchNo())