From 1cf2e6305dd64275041f21087dcf4022bf6f657c Mon Sep 17 00:00:00 2001
From: liyongde <1419499670@qq.com>
Date: Mon, 1 Jul 2024 22:00:58 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=88=A0=E9=99=A4=E5=AD=90=E5=8D=B7?=
 =?UTF-8?q?=E5=8C=85=E8=A3=85=E5=85=B3=E7=B3=BB=EF=BC=8C=E5=BC=82=E5=B8=B8?=
 =?UTF-8?q?=E5=8C=85=E8=A3=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../slitter/service/impl/SlitterServiceImpl.java    | 13 ++++++++++++-
 .../src/main/resources/config/application-dev.yml   |  6 +++---
 lms/nladmin-ui/.env.development                     |  4 ++--
 3 files changed, 17 insertions(+), 6 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 983070e1d..9f1f907bd 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,6 +26,8 @@ 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.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.StIvtCutpointivt;
 import org.nl.b_lms.sch.point.service.IstIvtCutpointivtService;
 import org.nl.b_lms.sch.task.dao.SchBaseTask;
@@ -111,6 +113,8 @@ public class SlitterServiceImpl implements SlitterService {
     private ISysParamService paramService;
     @Autowired
     private SendNBJExceptionPointTask sendNBJExceptionPointTask;
+    @Autowired
+    private IpdmBiSubpackagerelationService subpackagerelationService;
 
     @Override
 
@@ -1036,12 +1040,19 @@ public class SlitterServiceImpl implements SlitterService {
         TaskUtils.updateOptMessageBySlitterPlan(outPlan);
         List<PdmBiSlittingproductionplan> collect = Stream.of(outPlan, inPlan).collect(Collectors.toList());
         slittingproductionplanService.updateBatchById(collect);
+        // 删除子卷包装关系
+        subpackagerelationService.remove(new LambdaQueryWrapper<PdmBiSubpackagerelation>()
+                .eq(PdmBiSubpackagerelation::getContainer_name, insideContainerName));
         if (SlitterConstant.SLITTER_YES.equals(carrierStatus)) {
             List<String> cons = Stream.of(outPlan.getQzzno()).collect(Collectors.toList());
             // 调接口创建任务
             JSONObject taskParam = new JSONObject();
             taskParam.put("container", cons);
-            mesSlittingMachineSendMaterial(taskParam);
+            try {
+                mesSlittingMachineSendMaterial(taskParam);
+            } catch (Exception e) {
+                log.error(e.getMessage(), e);
+            }
         }
         return null;
     }
diff --git a/lms/nladmin-system/src/main/resources/config/application-dev.yml b/lms/nladmin-system/src/main/resources/config/application-dev.yml
index e06af5d9b..bec993619 100644
--- a/lms/nladmin-system/src/main/resources/config/application-dev.yml
+++ b/lms/nladmin-system/src/main/resources/config/application-dev.yml
@@ -1,5 +1,5 @@
 server:
-  port: 8010
+  port: 9999
 #配置数据源
 spring:
   datasource:
@@ -7,10 +7,10 @@ spring:
       db-type: com.alibaba.druid.pool.DruidDataSource
       driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
 #      url: jdbc:log4jdbc:mysql://${DB_HOST:10.1.3.91}:${DB_PORT:3306}/${DB_NAME:lzhl_lms}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
-      url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:lms_xc}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
+      url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:lzhl_two_test}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
       username: ${DB_USER:root}
 #      password: ${DB_PWD:NLABC&hl123}
-      password: ${DB_PWD:root}
+      password: ${DB_PWD:12356}
       # 初始连接数
       initial-size: 5
       # 最小连接数
diff --git a/lms/nladmin-ui/.env.development b/lms/nladmin-ui/.env.development
index e37a9a4f0..3e1472584 100644
--- a/lms/nladmin-ui/.env.development
+++ b/lms/nladmin-ui/.env.development
@@ -1,8 +1,8 @@
 ENV = 'development'
 
 # 接口地址
-VUE_APP_BASE_API  = 'http://localhost:8011'
-VUE_APP_WS_API = 'ws://localhost:8011'
+VUE_APP_BASE_API  = 'http://localhost:9999'
+VUE_APP_WS_API = 'ws://localhost:9999'
 
 # 是否启用 babel-plugin-dynamic-import-node插件
 VUE_CLI_BABEL_TRANSPILE_MODULES = true