From 4702dcf5a89992503f5318ce5c2b874155097027 Mon Sep 17 00:00:00 2001
From: liyongde <1419499670@qq.com>
Date: Fri, 13 Sep 2024 17:32:38 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=B5=8B=E8=AF=95=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pda/mps/service/impl/SlitterPdaServiceImpl.java  | 12 ++++++++++--
 .../wms/pda/st/service/impl/NbjPdaServiceImpl.java   |  5 +++++
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/mps/service/impl/SlitterPdaServiceImpl.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/mps/service/impl/SlitterPdaServiceImpl.java
index b73f31651..c787616af 100644
--- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/mps/service/impl/SlitterPdaServiceImpl.java
+++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/mps/service/impl/SlitterPdaServiceImpl.java
@@ -22,6 +22,8 @@ import org.nl.wms.pdm.ivt.bcut.service.IBstIvtCutpointivtService;
 import org.nl.wms.pdm.ivt.bcut.service.dao.BstIvtCutpointivt;
 import org.nl.wms.pdm.ivt.cut.service.dao.StIvtCutpointivt;
 import org.nl.wms.pdm.ivt.cut.service.IstIvtCutpointivtService;
+import org.nl.wms.sch.point.service.ISchBasePointService;
+import org.nl.wms.sch.point.service.dao.SchBasePoint;
 import org.nl.wms.sch.task.service.ISchBaseTaskService;
 import org.nl.wms.sch.task.service.dao.SchBaseTask;
 import org.nl.wms.sch.task_manage.core.constant.GeneralDefinition;
@@ -62,6 +64,8 @@ public class SlitterPdaServiceImpl implements SlitterPdaService {
     @Autowired
     private WmsToAcsService wmsToAcsService;
     @Autowired
+    private ISchBasePointService pointService;
+    @Autowired
     private SlitterSendRollAGVTask slitterSendRollAGVTask;
     @Autowired
     private IstIvtCutpointivtService cutpointivtService;
@@ -98,7 +102,11 @@ public class SlitterPdaServiceImpl implements SlitterPdaService {
                 Stream.of(zcPoint, pointCode).collect(Collectors.toList()));
         // 判断是否呼叫过任务
         if (isTask) {
-            throw new BadRequestException("点位[" + pointCode + "]已经创建过任务！");
+            throw new BadRequestException("点位[" + pointCode + "、" + zcPoint + "]已经创建过任务！");
+        }
+        SchBasePoint zcPointObj = pointService.getById(zcPoint);
+        if (ObjectUtil.isEmpty(zcPointObj.getMaterial_code())) {
+            throw new BadRequestException("点位不存在该母卷或者该母卷已搬运");
         }
         StIvtCutpointivt cutPoint = cutpointivtService.getOneByCode(pointCode);
         param.put("config_code", "SlitterUpTrussTask");
@@ -323,7 +331,7 @@ public class SlitterPdaServiceImpl implements SlitterPdaService {
         if (StrUtil.isEmpty(device_code)) {
             throw new BadRequestException("输入的设备号不能为空！");
         }
-        StIvtCutpointivt device = cutpointivtService.getOneByCode(device_code);
+        StIvtCutpointivt device = cutpointivtService.getPintByExtCode(device_code, false);
         JSONArray jsonArray = new JSONArray();
         JSONObject p1 = new JSONObject();
         p1.put("text", device.getPoint_code() + "上轴位");
diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/st/service/impl/NbjPdaServiceImpl.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/st/service/impl/NbjPdaServiceImpl.java
index 98d038d02..049819e2d 100644
--- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/st/service/impl/NbjPdaServiceImpl.java
+++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/st/service/impl/NbjPdaServiceImpl.java
@@ -126,6 +126,11 @@ public class NbjPdaServiceImpl implements NbjPdaService {
         if (schBaseTasks.size() > 0) {
             throw new BadRequestException("该点位已经创建过任务！");
         }
+        // 判断子卷是否存在
+        PdmBiSlittingproductionplan plan = slittingproductionplanService.getByContainerName(containerName);
+        if (ObjectUtil.isEmpty(plan)) {
+            throw new BadRequestException("子卷[" + containerName + "]的分切计划不存在！");
+        }
         SchBasePoint startPoint = pointService.getById(pointCode);
         startPoint.setPoint_status("3");
         // 子卷号