From 2995e10bebd01ec04f50236dc31505b24c2c0fed Mon Sep 17 00:00:00 2001
From: liyongde <1419499670@qq.com>
Date: Tue, 23 Jul 2024 13:25:19 +0800
Subject: [PATCH] =?UTF-8?q?add:=20=E6=89=8B=E6=8C=81=E5=A4=87=E8=B4=A7?=
 =?UTF-8?q?=E5=8C=BA=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/nl/b_lms/sch/tasks/slitter/mapper/SlitterMapper.xml     | 2 +-
 .../sch/tasks/slitter/service/impl/SlitterServiceImpl.java      | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/mapper/SlitterMapper.xml b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/mapper/SlitterMapper.xml
index 3dc5536ba..606cf7675 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/mapper/SlitterMapper.xml
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/mapper/SlitterMapper.xml
@@ -72,7 +72,7 @@
             `bst_ivt_cutpointivt` bsp
                 LEFT JOIN pdm_bi_slittingproductionplan p ON p.is_delete = '0' AND p.`status` = '03' AND (p.qzzno = bsp.qzz_no1 OR p.qzzno = bsp.qzz_no2)
         WHERE bsp.point_type = '3' AND bsp.point_status = '2' AND p.workorder_id IS NOT NULL
-          AND p.resource_name = #{extCode} AND bsp.is_used = '1'
+          AND p.resource_name = #{extCode} AND bsp.is_used = '1' AND IFNULL(p.qzzno, '') <![CDATA[ <> ]]> ''
         ORDER BY bsp.update_time
     </select>
     <select id="getAreaFullVolumeByArea"
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 a4521b478..061bdca71 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
@@ -1466,6 +1466,7 @@ public class SlitterServiceImpl implements SlitterService {
         pointByCode.setVehicle_code(vehicleCode);
         pointByCode.setIvt_status("1");
         TaskUtils.updateOptMessageByBStockingPoint(pointByCode);
+        stockingivtService.update(pointByCode);
         JSONObject res = new JSONObject();
         res.put("status", HttpStatus.HTTP_OK);
         res.put("message", "备货区绑定成功!");
@@ -1484,6 +1485,7 @@ public class SlitterServiceImpl implements SlitterService {
         pointByCode.setVehicle_code("");
         pointByCode.setIvt_status("0");
         TaskUtils.updateOptMessageByBStockingPoint(pointByCode);
+        stockingivtService.update(pointByCode);
         JSONObject res = new JSONObject();
         res.put("status", HttpStatus.HTTP_OK);
         res.put("message", "备货区解绑成功!");