From a4a70310c38602b503ade027885f91f8f5cfd0c5 Mon Sep 17 00:00:00 2001
From: liyongde <1419499670@qq.com>
Date: Tue, 11 Mar 2025 14:28:49 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E7=AE=A1=E8=8A=AF=E6=89=A3=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../slitter/service/impl/SlitterServiceImpl.java      | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

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 d965952d2..0eb36c86a 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
@@ -136,6 +136,7 @@ public class SlitterServiceImpl implements SlitterService {
         if (ObjectUtil.isEmpty(autoSendEmpty)) {
             throw new BadRequestException("未配置是否直接送气胀轴");
         }
+        log.info("获取的穿拔轴点位数据：{}", point);
         // 判断尺寸是否相同
         if (!size.equals(point.getQzz_size())) {
             log.error("设备：{}对应的气胀轴尺寸不批对，需要气胀轴尺寸：{}，实际尺寸：{}", deviceCode, point.getQzz_size(), size);
@@ -860,6 +861,9 @@ public class SlitterServiceImpl implements SlitterService {
 
     public JSONObject acsToReduceTube(JSONObject param) {
         log.info("扣除纸管数据的输入参数为：{}", param);
+        JSONObject res = new JSONObject();
+        res.put("status", HttpStatus.HTTP_OK);
+        res.put("message", "请求成功!");
         // param: device_code row_num
         if (ObjectUtil.isEmpty(param.getString("row_num"))) {
             log.error("设备：{}，排数不能为空", param.getString("device_code"));
@@ -881,6 +885,10 @@ public class SlitterServiceImpl implements SlitterService {
         MdPbPapervehicle mdPbPapervehicle = papervehicleService.getOne(new LambdaQueryWrapper<MdPbPapervehicle>()
                 .eq(MdPbPapervehicle::getVehicle_code, vehicleCode)
                 .eq(MdPbPapervehicle::getRow_num, param.getString("row_num")));
+        if (ObjectUtil.isEmpty(mdPbPapervehicle)) {
+            log.warn("托盘：" + vehicleCode + "第" + param.getString("row_num") + "行没数据！");
+            return res;
+        }
         int qty = mdPbPapervehicle.getQty().intValue();
         if (qty <= 0) {
             throw new BadRequestException("当前物料数量为0!");
@@ -897,9 +905,6 @@ public class SlitterServiceImpl implements SlitterService {
                 .eq("qty", "0");
         boolean remove = papervehicleService.remove(deleteWrapper);
         // todo: 如果等于0，则创建AGV任务，将托盘拉回去
-        JSONObject res = new JSONObject();
-        res.put("status", HttpStatus.HTTP_OK);
-        res.put("message", "请求成功!");
         return res;
     }