From a96df9b8a6e5816350be4062bff9ef4023f18b23 Mon Sep 17 00:00:00 2001
From: zhouz <>
Date: Sat, 29 Jun 2024 13:19:49 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E5=A5=97=E7=AE=A1=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/BstIvtStockingivtServiceImpl.java     | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/stockingivt/service/impl/BstIvtStockingivtServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/stockingivt/service/impl/BstIvtStockingivtServiceImpl.java
index edf0ca8c2..f999c4a1d 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/stockingivt/service/impl/BstIvtStockingivtServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/stockingivt/service/impl/BstIvtStockingivtServiceImpl.java
@@ -217,20 +217,22 @@ public class BstIvtStockingivtServiceImpl extends ServiceImpl<BstIvtStockingivtM
                 PapervehicleService.save(papervehicle);
             }
 
-            //判断绑定的纸管是否在机械手范围内，如果存在的话把最新库存推送给电气
-            BstIvtStockingivt bstIvtStockingivt = bstIvtStockingivtMapper.selectOne(new LambdaQueryWrapper<BstIvtStockingivt>().eq(BstIvtStockingivt::getVehicle_code, vehicle_code));
-            if (bstIvtStockingivt != null && bstIvtStockingivt.getPoint_type().equals("1")) {
-                List<MdPbPapervehicle> list = PapervehicleService.list(new LambdaQueryWrapper<MdPbPapervehicle>().eq(MdPbPapervehicle::getVehicle_code, vehicle_code));
-                JSONObject jo = new JSONObject();
-                SlitterTaskUtil.doSavePaperInfos(list, jo);
-                wmsToAcsService.getTubeMsg(jo);
-            }
         }
 
         if (type.equals("2")) {
             PapervehicleService.remove(new LambdaQueryWrapper<MdPbPapervehicle>().eq(MdPbPapervehicle::getVehicle_code, vehicle_code)
                     .eq(MdPbPapervehicle::getRow_num, row_num));
         }
+
+        //判断绑定的纸管是否在机械手范围内，如果存在的话把最新库存推送给电气
+        BstIvtStockingivt bstIvtStockingivt = bstIvtStockingivtMapper.selectOne(new LambdaQueryWrapper<BstIvtStockingivt>().eq(BstIvtStockingivt::getVehicle_code, vehicle_code));
+        if (bstIvtStockingivt != null && bstIvtStockingivt.getPoint_type().equals("1")) {
+            List<MdPbPapervehicle> list = PapervehicleService.list(new LambdaQueryWrapper<MdPbPapervehicle>().eq(MdPbPapervehicle::getVehicle_code, vehicle_code));
+            JSONObject jo = new JSONObject();
+            SlitterTaskUtil.doSavePaperInfos(list, jo);
+            wmsToAcsService.getTubeMsg(jo);
+        }
+        
         JSONObject result = new JSONObject();
         result.put("status", HttpStatus.OK.value());
         result.put("message", "操作成功!");