diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/ComponentOutboundController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/ComponentOutboundController.java
index 30fc6949..2ca8e39b 100644
--- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/ComponentOutboundController.java
+++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/ComponentOutboundController.java
@@ -418,7 +418,7 @@ public class ComponentOutboundController extends BaseController {
                 .one();
         VUtil.trueThrowBusinessError(Objects.isNull(order)).throwMessage("订单不存在");
         List<WmsComponentPackingItem> items = wmsComponentPackingItemService.lambdaQuery()
-                .eq(WmsComponentPackingItem::getPackingId, orderId)
+                .eq(WmsComponentPackingItem::getPackingId, order.getId())
                 .list();
         items.removeIf(item -> item.getOutQty().compareTo(BigDecimal.ZERO) <= 0
                 || noScanningBaseControllerService.existsQrCode(item.getIdnrk()));
diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InCostCenterBackController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InCostCenterBackController.java
index f1b9faca..8704ebb7 100644
--- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InCostCenterBackController.java
+++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InCostCenterBackController.java
@@ -217,7 +217,7 @@ public class InCostCenterBackController extends BaseController {
                 .one();
         VUtil.trueThrowBusinessError(Objects.isNull(order)).throwMessage("订单不存在");
         List<WmsInCostcenterBackItem> items = inCostcenterBackItemService.lambdaQuery()
-                .eq(WmsInCostcenterBackItem::getOrderId, orderId)
+                .eq(WmsInCostcenterBackItem::getOrderId, order.getId())
                 .list();
         items.removeIf(item -> item.getLeft().compareTo(BigDecimal.ZERO) <= 0
                 || noScanningBaseControllerService.existsQrCode(item.getMatnr()));
diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceBackController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceBackController.java
index 4353c8bf..e9302ab4 100644
--- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceBackController.java
+++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceBackController.java
@@ -226,7 +226,7 @@ public class InProduceBackController extends BaseController {
                 .one();
         VUtil.trueThrowBusinessError(Objects.isNull(order)).throwMessage("订单不存在");
         List<WmsInProduceBackItem> items = inProduceBackItemService.lambdaQuery()
-                .eq(WmsInProduceBackItem::getOrderId, orderId)
+                .eq(WmsInProduceBackItem::getOrderId, order.getId())
                 .list();
         items.removeIf(item -> item.getSqsl().subtract(item.getNum()).compareTo(BigDecimal.ZERO) <= 0
                 || noScanningBaseControllerService.existsQrCode(item.getMatnr()));
diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceOrderController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceOrderController.java
index 9c4f7c75..87981e74 100644
--- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceOrderController.java
+++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceOrderController.java
@@ -432,7 +432,7 @@ public class InProduceOrderController extends BaseController {
                 .one();
         VUtil.trueThrowBusinessError(Objects.isNull(order)).throwMessage("订单不存在");
         List<WmsInProduceOrderItem> items = produceOrderItemService.lambdaQuery()
-                .eq(WmsInProduceOrderItem::getOrderId, orderId)
+                .eq(WmsInProduceOrderItem::getOrderId, order.getId())
                 .list();
         items.removeIf(item -> item.getNum().compareTo(BigDecimal.ZERO) <= 0
                 || noScanningBaseControllerService.existsQrCode(item.getMaterialNo()));
diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceOrderSurplusController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceOrderSurplusController.java
index 46ee4c55..7ca24c73 100644
--- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceOrderSurplusController.java
+++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceOrderSurplusController.java
@@ -403,11 +403,15 @@ public class InProduceOrderSurplusController extends BaseController {
      * @param orderId 订单ID
      */
     @GetMapping("getListForNoScan")
-    public ApiResult<List<NoScanItemVO>> getListForNoScan(@RequestParam Long orderId) {
-        WmsInProduceOrderSurplus order = inProduceOrderSurplusService.getById(orderId);
+    public ApiResult<List<NoScanItemVO>> getListForNoScan(@RequestParam(required = false) Long orderId
+            , @RequestParam(required = false) String no) {
+        WmsInProduceOrderSurplus order = inProduceOrderSurplusService.lambdaQuery()
+                .eq(Objects.nonNull(orderId), WmsInProduceOrderSurplus::getId, orderId)
+                .eq(StrUtil.isNotBlank(no), WmsInProduceOrderSurplus::getNo, no)
+                .one();
         VUtil.trueThrowBusinessError(Objects.isNull(order)).throwMessage("订单不存在");
         List<WmsInProduceOrderSurplusItem> items = inProduceOrderSurplusItemService.lambdaQuery()
-                .eq(WmsInProduceOrderSurplusItem::getOrderId, orderId)
+                .eq(WmsInProduceOrderSurplusItem::getOrderId, order.getId())
                 .list();
         items.removeIf(item -> item.getLeftNum().compareTo(BigDecimal.ZERO) <= 0
                 || noScanningBaseControllerService.existsQrCode(item.getMatnr()));
@@ -444,7 +448,10 @@ public class InProduceOrderSurplusController extends BaseController {
         WmsInProduceOrderSurplus order = null;
 
         for (NoScanningRequest request : requests) {
-            order = inProduceOrderSurplusService.getById(request.getId());
+            order = inProduceOrderSurplusService.lambdaQuery()
+                    .eq(Objects.nonNull(request.getId()), WmsInProduceOrderSurplus::getId, request.getId())
+                    .eq(StrUtil.isNotBlank(request.getNo()), WmsInProduceOrderSurplus::getNo, request.getNo())
+                    .one();
             VUtil.trueThrowBusinessError(Objects.isNull(order)).throwMessage("订单不存在");
             WmsInProduceOrderSurplus currentOrder = order;
             List<WmsInProduceOrderSurplusItem> orderItems = inProduceOrderSurplusItemService.lambdaQuery()
diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalPGIController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalPGIController.java
index e3b8eb5d..55fdaeb8 100644
--- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalPGIController.java
+++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalPGIController.java
@@ -201,7 +201,7 @@ public class NormalPGIController extends BaseController {
                 .one();
         VUtil.trueThrowBusinessError(Objects.isNull(order)).throwMessage("收货单不存在");
         List<WmsSrmOrderItem> items = wmsSrmOrderItemService.lambdaQuery()
-                .eq(WmsSrmOrderItem::getOrderId, orderId)
+                .eq(WmsSrmOrderItem::getOrderId, order.getId())
                 .list();
         items.removeIf(item -> item.getDeliveryQty().compareTo(item.getReceiptQty()) <= 0
                 || noScanningBaseControllerService.existsQrCode(item.getItemCode()));
@@ -268,7 +268,7 @@ public class NormalPGIController extends BaseController {
 
         // 查询当前订单的所有明细项，建立索引
         Map<Long, WmsSrmOrderItem> orderItemMap = wmsSrmOrderItemService.lambdaQuery()
-                .eq(WmsSrmOrderItem::getOrderId, request.getId())
+                .eq(WmsSrmOrderItem::getOrderId, order.getId())
                 .list()
                 .stream()
                 .collect(Collectors.toMap(WmsSrmOrderItem::getId, i -> i));
diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutAssistanceController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutAssistanceController.java
index 4f3cc717..53ac268d 100644
--- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutAssistanceController.java
+++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutAssistanceController.java
@@ -295,7 +295,7 @@ public class OutAssistanceController extends BaseController {
                 .one();
         VUtil.trueThrowBusinessError(Objects.isNull(order)).throwMessage("订单不存在");
         List<WmsOutAssistanceItem> items = outAssistanceItemService.lambdaQuery()
-                .eq(WmsOutAssistanceItem::getOrderId, orderId)
+                .eq(WmsOutAssistanceItem::getOrderId, order.getId())
                 .list();
         items.removeIf(item -> item.getLeft().compareTo(BigDecimal.ZERO) <= 0
                 || noScanningBaseControllerService.existsQrCode(item.getMatnr1()));
diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutCostCenterController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutCostCenterController.java
index f94f6c85..109ef558 100644
--- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutCostCenterController.java
+++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutCostCenterController.java
@@ -296,7 +296,7 @@ public class OutCostCenterController extends BaseController {
                 .one();
         VUtil.trueThrowBusinessError(Objects.isNull(order)).throwMessage("订单不存在");
         List<WmsOutCostcenterItem> items = outCostcenterItemService.lambdaQuery()
-                .eq(WmsOutCostcenterItem::getOrderId, orderId)
+                .eq(WmsOutCostcenterItem::getOrderId, order.getId())
                 .list();
         items.removeIf(item -> item.getLeft().compareTo(BigDecimal.ZERO) <= 0
                 || noScanningBaseControllerService.existsQrCode(item.getMatnr()));
diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutProduceController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutProduceController.java
index 68d11067..161fdbe7 100644
--- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutProduceController.java
+++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutProduceController.java
@@ -423,7 +423,7 @@ public class OutProduceController extends BaseController {
                 .one();
         VUtil.trueThrowBusinessError(Objects.isNull(order)).throwMessage("订单不存在");
         List<WmsOutProduceItem> items = outProduceItemService.lambdaQuery()
-                .eq(WmsOutProduceItem::getOrderId, orderId)
+                .eq(WmsOutProduceItem::getOrderId, order.getId())
                 .list();
         items.removeIf(item -> item.getSqsl().subtract(item.getNum()).compareTo(BigDecimal.ZERO) <= 0
                 || noScanningBaseControllerService.existsQrCode(item.getMatnr()));
diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutPurchaseController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutPurchaseController.java
index 93b025c7..0733bb0c 100644
--- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutPurchaseController.java
+++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutPurchaseController.java
@@ -154,7 +154,7 @@ public class OutPurchaseController extends BaseController {
                 .one();
         VUtil.trueThrowBusinessError(Objects.isNull(order)).throwMessage("订单不存在");
         List<WmsReturnRequestItem> items = returnRequestItemService.lambdaQuery()
-                .eq(WmsReturnRequestItem::getApplicationId, orderId)
+                .eq(WmsReturnRequestItem::getApplicationId, order.getId())
                 .list();
         items.removeIf(item -> item.getLeft().compareTo(BigDecimal.ZERO) <= 0
                 || noScanningBaseControllerService.existsQrCode(item.getMaterialCode()));
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 3116d8e1..6d4e2ce6 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
@@ -504,7 +504,7 @@ public class TransferCompanyController extends BaseController {
                 .one();
         VUtil.trueThrowBusinessError(Objects.isNull(order)).throwMessage("订单不存在");
         List<WmsTransferCompanyItem> items = transferCompanyItemService.lambdaQuery()
-                .eq(WmsTransferCompanyItem::getOrderId, orderId)
+                .eq(WmsTransferCompanyItem::getOrderId, order.getId())
                 .list();
         items.removeIf(item -> item.getLeft().compareTo(BigDecimal.ZERO) <= 0
                 || noScanningBaseControllerService.existsQrCode(item.getMatnr()));
@@ -968,7 +968,7 @@ public class TransferCompanyController extends BaseController {
                 .eq(StrUtil.isNotBlank(no), WmsTransferCompanyTicket::getNo, no)
                 .one();
         VUtil.trueThrowBusinessError(Objects.isNull(order)).throwMessage("订单不存在");
-        List<TransferCompanyItemVO> items = transferCompanyTicketItemService.getList(orderId);
+        List<TransferCompanyItemVO> items = transferCompanyTicketItemService.getList(order.getId());
         items.removeIf(item -> item.getLeft().compareTo(BigDecimal.ZERO) <= 0
                 || noScanningBaseControllerService.existsQrCode(item.getMatnr()));
         return ApiResult.success(
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 ff591acd..e2ef0525 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
@@ -938,7 +938,7 @@ public class TransferFactoryController extends BaseController {
             , @RequestParam(required = false) String no) {
         TransferFactoryTicketInfoVO order = transferFactoryTicketService.getInfo(orderId, no);
         VUtil.trueThrowBusinessError(Objects.isNull(order)).throwMessage("订单不存在");
-        List<TransferFactoryItemVO> items = transferFactoryTicketItemService.getList(orderId);
+        List<TransferFactoryItemVO> items = transferFactoryTicketItemService.getList(order.getId());
         items.removeIf(item -> item.getLeft().compareTo(BigDecimal.ZERO) <= 0
                 || noScanningBaseControllerService.existsQrCode(item.getMatnr()));
         return ApiResult.success(