From ac007b6d84649854abb766b7bdacf375b8e1ebb3 Mon Sep 17 00:00:00 2001
From: "DESKTOP-5DIJMF9\\admin" <2388969634@qq.com>
Date: Thu, 1 May 2025 15:51:19 +0800
Subject: [PATCH] =?UTF-8?q?opt:=E4=BC=98=E5=8C=96=E6=89=A3=E5=87=8FFRP?=
 =?UTF-8?q?=E7=AE=A1=E5=BA=93=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/MdPbPapervehicleServiceImpl.java     |  3 ++-
 .../service/impl/SlitterServiceImpl.java      | 26 +++++++++++--------
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/papervehicle/service/impl/MdPbPapervehicleServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/papervehicle/service/impl/MdPbPapervehicleServiceImpl.java
index 61081e92b..2b699e074 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/papervehicle/service/impl/MdPbPapervehicleServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/papervehicle/service/impl/MdPbPapervehicleServiceImpl.java
@@ -68,7 +68,8 @@ public class MdPbPapervehicleServiceImpl extends ServiceImpl<MdPbPapervehicleMap
         entity.setUpdate_optname(nickName);
         entity.setUpdate_time(now);
 
-        mdPbPapervehicleMapper.updateById(entity);
+        int updateFlag = mdPbPapervehicleMapper.updateById(entity);
+        log.warn("mdPbPapervehicleMapper更新结果：" +updateFlag);
     }
 
     @Override
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/impl/SlitterServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/impl/SlitterServiceImpl.java
index 8d9cd07a0..245e80dcd 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/impl/SlitterServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/impl/SlitterServiceImpl.java
@@ -876,6 +876,8 @@ public class SlitterServiceImpl implements SlitterService {
         return null;
     }
 
+    @Override
+    @Transactional(rollbackFor = Exception.class)
     public JSONObject acsToReduceTube(JSONObject param) {
         log.info("扣除纸管数据的输入参数为：{}", param);
         JSONObject res = new JSONObject();
@@ -904,20 +906,22 @@ public class SlitterServiceImpl implements SlitterService {
                 .eq(MdPbPapervehicle::getRow_num, param.getString("row_num")));
         if (ObjectUtil.isEmpty(mdPbPapervehicle)) {
             log.warn("托盘：" + vehicleCode + "第" + param.getString("row_num") + "行没数据！");
-            return res;
+            throw new BadRequestException("托盘：" + vehicleCode + "第" + param.getString("row_num") + "行没数据！");
         }
+        log.debug("更新前：" + vehicleCode + "第" + param.getString("row_num") + mdPbPapervehicle);
         if (mdPbPapervehicle != null ||  mdPbPapervehicle.getQty().intValue() > 0) {
-            UpdateWrapper<MdPbPapervehicle> updateWrapper = new UpdateWrapper<>();
-            updateWrapper.eq("vehicle_code", vehicleCode)
-                    .eq("row_num", param.getString("row_num"))
-                    .setSql("qty=qty-1");
-            papervehicleService.update(updateWrapper);
+            //数量减一
+            mdPbPapervehicle.setQty(BigDecimal.valueOf(mdPbPapervehicle.getQty().intValue()-1));
+
+            log.debug("更新后：" + vehicleCode + "第" + param.getString("row_num") + mdPbPapervehicle);
+
             // 检查更新后的 qty 是否为 0，然后删除相应的记录
-            QueryWrapper<MdPbPapervehicle> deleteWrapper = new QueryWrapper<>();
-            deleteWrapper.eq("vehicle_code", vehicleCode)
-                    .eq("row_num", param.getString("row_num"))
-                    .eq("qty", "0");
-            boolean remove = papervehicleService.remove(deleteWrapper);
+            if(mdPbPapervehicle.getQty().intValue() <= 0){
+                boolean remove = papervehicleService.removeById(mdPbPapervehicle);
+                log.debug("删除0结果：" + vehicleCode + ":" + remove);
+            }else{
+                papervehicleService.update(mdPbPapervehicle);
+            }
             // todo: 如果qty=0，创建AGV送空任务，（新的task_type）、后期优化可以新增诺宝取货完成提前释放货位，任务状态变成071
 //            if (remove) { // hint: 错误
 //                // 证明删除成功，创建任务搬走