From 0c735378c32c5b5cf3ac13981b9cc78ab5fda373 Mon Sep 17 00:00:00 2001
From: yf001217 <834502597@qq.com>
Date: Wed, 3 Jun 2026 17:18:34 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=82=E9=97=B4=E8=B0=83=E6=8B=A8=E6=97=A0?=
 =?UTF-8?q?=E7=A0=81=E5=85=A5=E5=BA=93=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/TransferCompanyController.java | 28 ++++++++++++++-----
 .../mapper/WmsTransferCompanyTicketMapper.xml |  2 +-
 2 files changed, 22 insertions(+), 8 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 6d4e2ce6..adebc90c 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
@@ -963,12 +963,8 @@ public class TransferCompanyController extends BaseController {
     @GetMapping("getListForNoScanIn")
     public ApiResult<List<NoScanItemVO>> getListForNoScanIn(@RequestParam(required = false) Long orderId
             , @RequestParam(required = false) String no) {
-        WmsTransferCompanyTicket order = transferCompanyTicketService.lambdaQuery()
-                .eq(Objects.nonNull(orderId), WmsTransferCompanyTicket::getId, orderId)
-                .eq(StrUtil.isNotBlank(no), WmsTransferCompanyTicket::getNo, no)
-                .one();
-        VUtil.trueThrowBusinessError(Objects.isNull(order)).throwMessage("订单不存在");
-        List<TransferCompanyItemVO> items = transferCompanyTicketItemService.getList(order.getId());
+        WmsTransferCompanyTicket ticket = getNoScanInTicket(orderId, no);
+        List<TransferCompanyItemVO> items = transferCompanyTicketItemService.getList(ticket.getId());
         items.removeIf(item -> item.getLeft().compareTo(BigDecimal.ZERO) <= 0
                 || noScanningBaseControllerService.existsQrCode(item.getMatnr()));
         return ApiResult.success(
@@ -992,7 +988,8 @@ public class TransferCompanyController extends BaseController {
     @Transactional
     @PostMapping("pda/submitForInNoScanning")
     public ApiResult<Void> submitForInNoScanning(@Valid @RequestBody NoScanningRequest request) {
-        TransferCompanyTicketVO ticket = transferCompanyTicketService.getInfo(request.getId(),request.getNo());
+        WmsTransferCompanyTicket ticketEntity = getNoScanInTicket(request.getId(), request.getNo());
+        TransferCompanyTicketVO ticket = transferCompanyTicketService.getInfo(ticketEntity.getId());
         VUtil.trueThrowBusinessError(Objects.isNull(ticket)).throwMessage("出库单不存在");
         VUtil.trueThrowBusinessError(!Objects.equals(ticket.getState(), 0)).throwMessage("出库单无效");
 
@@ -1116,6 +1113,23 @@ public class TransferCompanyController extends BaseController {
         return ApiResult.success();
     }
 
+    private WmsTransferCompanyTicket getNoScanInTicket(Long orderId, String no) {
+        WmsTransferCompany order = transferCompanyService.lambdaQuery()
+                .eq(Objects.nonNull(orderId), WmsTransferCompany::getId, orderId)
+                .eq(StrUtil.isNotBlank(no), WmsTransferCompany::getNo, no)
+                .one();
+        VUtil.trueThrowBusinessError(Objects.isNull(order)).throwMessage("订单不存在");
+        WmsTransferCompanyTicket ticket = transferCompanyTicketService.lambdaQuery()
+                .eq(WmsTransferCompanyTicket::getOrderId, order.getId())
+                .eq(WmsTransferCompanyTicket::getFinish, true)
+                .eq(WmsTransferCompanyTicket::getState, 0)
+                .orderByDesc(WmsTransferCompanyTicket::getId)
+                .last("LIMIT 1")
+                .one();
+        VUtil.trueThrowBusinessError(Objects.isNull(ticket)).throwMessage("出库单不存在");
+        return ticket;
+    }
+
     /**
      * 搜索转储凭证
      */
diff --git a/nflg-wms-repository/src/main/resources/mapper/WmsTransferCompanyTicketMapper.xml b/nflg-wms-repository/src/main/resources/mapper/WmsTransferCompanyTicketMapper.xml
index c89347fb..0c6ea669 100644
--- a/nflg-wms-repository/src/main/resources/mapper/WmsTransferCompanyTicketMapper.xml
+++ b/nflg-wms-repository/src/main/resources/mapper/WmsTransferCompanyTicketMapper.xml
@@ -68,6 +68,6 @@
              ,tct.doc_year,tct.state,tct.finish,tct.audit_state,tc.*
         from wms_transfer_company tc
         inner join wms_transfer_company_ticket tct on tc.id = tct.order_id
-        where tct.id=#{id} or tct.no= #{id}
+        where tct.id=#{id} or tct.no=#{no}
     </select>
 </mapper>