From d91fae31f20fa81081fe1b0769437be66470175d Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期二, 03 三月 2026 14:38:25 +0800
Subject: [PATCH] lsh#

---
 rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaCheckOrderServiceImpl.java |   13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaCheckOrderServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaCheckOrderServiceImpl.java
index 8c13859..26b5778 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaCheckOrderServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaCheckOrderServiceImpl.java
@@ -5,7 +5,7 @@
 import com.vincent.rsf.framework.common.Cools;
 import com.vincent.rsf.framework.common.R;
 import com.vincent.rsf.framework.exception.CoolException;
-import com.vincent.rsf.server.api.controller.params.SaveCheckDiffParams;
+import com.vincent.rsf.server.api.controller.erp.params.SaveCheckDiffParams;
 import com.vincent.rsf.server.api.service.PdaCheckOrderService;
 import com.vincent.rsf.server.manager.entity.*;
 import com.vincent.rsf.server.manager.enums.CheckDiffExceStatus;
@@ -99,7 +99,7 @@
         if (checkDiff.getExceStatus().equals(CheckDiffExceStatus.CHECK_DIFF_EXCE_STATUS_END.val)) {
             return R.error("璇ョ洏鐐瑰崟宸插畬鎴�");
         }
-        Task task = taskService.getOne(new LambdaQueryWrapper<Task>().eq(Task::getBarcode, params.getContainer()));
+        Task task = taskService.getOne(new LambdaQueryWrapper<Task>().eq(Task::getBarcode, params.getContainer()).last("limit 1"));
         if (null == task) {
             throw new CoolException("鏁版嵁閿欒锛屾湭鎵惧埌瀹瑰櫒鐮佸搴旂洏鐐逛换鍔�");
         }
@@ -113,7 +113,7 @@
                         .setBarcode(task.getBarcode())
                         .setAnfme(ckDiffItem.getCheckQty());
 
-                Matnr matnr = matnrService.getOne(new LambdaQueryWrapper<Matnr>().eq(Matnr::getCode, diffItem.getMatnrCode()));
+                Matnr matnr = matnrService.getOne(new LambdaQueryWrapper<Matnr>().eq(Matnr::getCode, diffItem.getMatnrCode()).last("limit 1"));
                 if (Objects.isNull(matnr)) {
                     throw new CoolException("鍗曟嵁鐗╂枡鍚嶇О涓嶅瓨鍦紒锛�");
                 }
@@ -145,6 +145,7 @@
                         .setMemo("涓嶅湪搴撴槑缁嗭紝鐩樻紡鏂板")
                         .setUpdateTime(new Date())
                         .setId(null)
+                        .setSplrBatch(ckDiffItem.getBatch())
                         //鐩樼偣鍗旾D
                         .setOrderId(checkDiff.getOrderId());
                 if (!taskItemService.save(taskItem)) {
@@ -202,7 +203,7 @@
         if (Cools.isEmpty(matnrCode)){
             return R.error("鐗╂枡鐮佷负绌�");
         }
-        Matnr matnr = matnrService.getOne(new LambdaQueryWrapper<Matnr>().eq(Matnr::getCode, matnrCode));
+        Matnr matnr = matnrService.getOne(new LambdaQueryWrapper<Matnr>().eq(Matnr::getCode, matnrCode).last("limit 1"));
         if (null == matnr){
             return R.error("鏈壘鍒扮紪鐮佸搴旂殑鏄庣粏");
         }
@@ -219,7 +220,7 @@
     public R getCheckTaskItemList2(String barcode) {
         LambdaQueryWrapper<Task> lambdaQueryWrapper = new LambdaQueryWrapper<>();
         lambdaQueryWrapper.eq(Task::getBarcode, barcode);
-        Task task = taskService.getOne(lambdaQueryWrapper);
+        Task task = taskService.getOne(lambdaQueryWrapper.last("limit 1"));
         if (null == task) {
             throw new CoolException("鏈壘鍒板鍣ㄥ彿瀵瑰簲浠诲姟");
         }
@@ -231,7 +232,7 @@
             throw new CoolException("鏈壘鍒拌瀹瑰櫒鐮佸搴旂殑浠诲姟鏄庣粏");
         }
         String sourceCode = taskItems.stream().findFirst().map(TaskItem::getSourceCode).orElse(null);
-        CheckDiff checkDiff = checkDiffService.getOne(new LambdaQueryWrapper<CheckDiff>().eq(CheckDiff::getOrderCode,sourceCode));
+        CheckDiff checkDiff = checkDiffService.getOne(new LambdaQueryWrapper<CheckDiff>().eq(CheckDiff::getOrderCode,sourceCode).last("limit 1"));
         if (null == checkDiff) {
             return R.error("鏈壘鍒扮洏鐐瑰樊寮傚崟");
         }

--
Gitblit v1.9.1