From d1496fb22f1a1093a4f106758dac56d5629381c1 Mon Sep 17 00:00:00 2001
From: "DESKTOP-5DIJMF9\\admin" <2388969634@qq.com>
Date: Sat, 22 Mar 2025 04:01:28 +0800
Subject: [PATCH] =?UTF-8?q?opt:=E6=89=98=E7=9B=98=E9=87=8D=E5=A4=8D?=
 =?UTF-8?q?=E7=BB=91=E5=AE=9A=E9=99=90=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../slitter/service/impl/SlitterServiceImpl.java  | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 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 7c32d9d8c..18520bf03 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
@@ -26,11 +26,11 @@ import org.nl.b_lms.bst.ivt.shafttubeivt.service.IBstIvtShafttubeivtService;
 import org.nl.b_lms.bst.ivt.shafttubeivt.service.dao.BstIvtShafttubeivt;
 import org.nl.b_lms.bst.ivt.stockingivt.service.IBstIvtStockingivtService;
 import org.nl.b_lms.bst.ivt.stockingivt.service.dao.BstIvtStockingivt;
+import org.nl.b_lms.bst.ivt.stockingivt.service.dao.mapper.BstIvtStockingivtMapper;
 import org.nl.b_lms.pdm.bi.slittingproductionplan.service.IPdmBiSlittingproductionplanService;
 import org.nl.b_lms.pdm.bi.slittingproductionplan.service.dao.PdmBiSlittingproductionplan;
 import org.nl.b_lms.pdm.subpackagerelation.dao.PdmBiSubpackagerelation;
 import org.nl.b_lms.pdm.subpackagerelation.service.IpdmBiSubpackagerelationService;
-import org.nl.b_lms.sch.point.dao.StIvtCoolregionio;
 import org.nl.b_lms.sch.point.dao.StIvtCutpointivt;
 import org.nl.b_lms.sch.point.service.IstIvtCutpointivtService;
 import org.nl.b_lms.sch.task.dao.SchBaseTask;
@@ -59,7 +59,6 @@ import org.springframework.transaction.annotation.Transactional;
 import java.math.BigDecimal;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
-import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -75,6 +74,8 @@ import static org.nl.b_lms.sch.tasks.slitter.util.SlitterTaskUtil.getPointLocati
 @Service
 public class SlitterServiceImpl implements SlitterService {
 
+    @Autowired
+    private BstIvtStockingivtMapper bstIvtStockingivtMapper;
     @Autowired
     private IschBaseTaskService taskService;
     @Autowired
@@ -92,8 +93,6 @@ public class SlitterServiceImpl implements SlitterService {
     @Autowired
     private SlitterDownTrussTask slitterDownTrussTask;
     @Autowired
-    private SendCopperFoilSubRollTrussTask sendCopperFoilSubRollTrussTask;
-    @Autowired
     private RedissonClient redissonClient;
     @Autowired
     private TrussCallShaftCacheTask trussCallShaftCacheTask;
@@ -1554,6 +1553,14 @@ public class SlitterServiceImpl implements SlitterService {
         if(!vehicleCode.contains("GX")){
             throw new BadRequestException("请扫描或输入正确的托盘码！");
         }
+
+        LambdaQueryWrapper<BstIvtStockingivt> lam = new LambdaQueryWrapper<>();
+        lam.eq(BstIvtStockingivt::getVehicle_code, vehicleCode)
+                .eq(BstIvtStockingivt::getIs_used, SlitterConstant.SLITTER_YES);
+        BstIvtStockingivt old = bstIvtStockingivtMapper.selectOne(lam);
+        if(ObjectUtil.isNotEmpty(old)){
+            throw new BadRequestException("当前托盘:"+vehicleCode+"已绑定在点位:"+old.getPoint_code()+"上,不允许重复绑定！");
+        }
         pointByCode.setVehicle_code(vehicleCode);
         pointByCode.setIvt_status("1");
         TaskUtils.updateOptMessageByBStockingPoint(pointByCode);