From dc5e96e117e861d28d2322b629a988ad6fe78685 Mon Sep 17 00:00:00 2001
From: gongbaoxiong <751575283@qq.com>
Date: Wed, 3 Jul 2024 09:40:58 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E8=A3=85=E7=AE=B1?=
 =?UTF-8?q?=E4=BD=8D=E5=AD=90=E5=8D=B7=E7=8A=B6=E6=80=81=E4=B8=BA=E5=90=88?=
 =?UTF-8?q?=E6=A0=BC=E5=93=81=EF=BC=8C=E4=B8=B4=E6=97=B6=E6=8F=92=E5=85=A5?=
 =?UTF-8?q?=E5=AD=90=E5=8D=B7=E4=BF=A1=E6=81=AF=E9=87=8D=E5=A4=8D=E6=A0=A1?=
 =?UTF-8?q?=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PdmBiSubpackagerelationServiceImpl.java   | 41 +++++++++++++++++--
 .../impl/BstIvtPackageinfoivtServiceImpl.java |  2 -
 .../auto/AutoSendZxToDjw.java                 |  2 +-
 3 files changed, 39 insertions(+), 6 deletions(-)

diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/service/impl/PdmBiSubpackagerelationServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/service/impl/PdmBiSubpackagerelationServiceImpl.java
index 7f7f5def2..44fc68267 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/service/impl/PdmBiSubpackagerelationServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/service/impl/PdmBiSubpackagerelationServiceImpl.java
@@ -2,6 +2,8 @@ package org.nl.b_lms.pdm.subpackagerelation.service.impl;
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.date.StopWatch;
+import cn.hutool.core.util.IdUtil;
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -744,6 +746,39 @@ public class PdmBiSubpackagerelationServiceImpl extends ServiceImpl<PdmBiSubpack
         if (StrUtil.isEmpty(containerName)) {
             throw new BadRequestException("输入的子卷号不能为空！");
         }
+        List<PdmBiSubpackagerelation> subList = this.list(new LambdaQueryWrapper<PdmBiSubpackagerelation>().eq(PdmBiSubpackagerelation::getContainer_name, jo.getString("container_name")));
+        if (CollectionUtils.isEmpty(subList)) {
+            PdmBiSlittingproductionplan plan = iPdmBiSlittingproductionplanService.getOne(new LambdaQueryWrapper<PdmBiSlittingproductionplan>().eq(PdmBiSlittingproductionplan::getContainer_name, containerName));
+            if (ObjectUtil.isEmpty(plan)) {
+                throw new BadRequestException("未查询到可用的分切计划！");
+            }
+            PdmBiSubpackagerelation sub = new PdmBiSubpackagerelation();
+            sub.setWorkorder_id(IdUtil.getSnowflake(1, 1).nextId() + "");
+            sub.setContainer_name(plan.getContainer_name());
+            sub.setSale_order_name(plan.getSale_order_name());
+            sub.setCustomer_name("test");
+            sub.setCustomer_description("临时包装关系");
+            sub.setProduct_description(plan.getDescription());
+            sub.setWidth(String.valueOf(plan.getSplit_breadth()));
+            if (StringUtils.isBlank(plan.getWeight()) || StringUtils.isBlank(plan.getPaper_weight())) {
+                throw new BadRequestException("该子卷分切计划中的子卷重量参数为空！");
+            }
+            int net_weight = Integer.parseInt(plan.getWeight()) - Integer.parseInt(plan.getPaper_weight());
+            sub.setNet_weight(net_weight + "");
+            sub.setLength("1000");
+            sub.setIs_un_plan_production("0");
+            sub.setCreate_id(1L);
+            sub.setCreate_name("管理员");
+            sub.setCreate_time(DateUtil.now());
+            sub.setStatus("99");
+            sub.setSap_pcsn("Test");
+            sub.setExt_code("BC01");
+            sub.setBox_group(null);
+            sub.setProduct_name("测试");
+            this.saveOrUpdate(sub);
+        }
+
+
     }
 
 
@@ -770,7 +805,8 @@ public class PdmBiSubpackagerelationServiceImpl extends ServiceImpl<PdmBiSubpack
             throw new BadRequestException("标记为黄色的子卷号已分配且对应的木箱已出库，请重新选择未分配木箱规格的子卷");
         }
         //均衡获取木箱出库装箱区对接位
-        String deviceCode = getPointCode();
+        // String deviceCode = getPointCode();
+        String deviceCode = "ZXQ_1_1";
         Integer taskCount = bstIvtPackageinfoivtMapper.getZxqTaskCount(deviceCode.substring(deviceCode.lastIndexOf("_") + 1));
         if (taskCount + packagerelationList.size() > 10) {
             throw new BadRequestException("子卷搬运任务数已达上限!");
@@ -811,7 +847,6 @@ public class PdmBiSubpackagerelationServiceImpl extends ServiceImpl<PdmBiSubpack
     private void outBox(List<String> workIdList, Set<String> containerNameList, String deviceCode, Integer
             maxBoxGroup, String boxType) {
         //均衡获取装箱对接位
-        //String deviceCode = "ZXQ_1_1";
         StopWatch stopWatch = new StopWatch();
         stopWatch.start();
         JSONObject boxInfo = new JSONObject();
@@ -823,7 +858,7 @@ public class PdmBiSubpackagerelationServiceImpl extends ServiceImpl<PdmBiSubpack
         stopWatch.stop();
         System.out.println("木箱出库代码执行花费时间------------------------------------------------------------------------------------------*************************************************************************************************= totalTime = " + stopWatch.getTotalTimeMillis());
         log.info("木箱出库代码执行花费时间------------------------------------------------------------------------------------------*************************************************************************************************= totalTime = " + stopWatch.getTotalTimeMillis());
-        //String boxSn = "MX230118000013";
+        //String boxSn = "MX240702000169";
         StopWatch stopWatch1 = new StopWatch();
         stopWatch1.start();
         //更新及子卷包装状态已分配规格及木箱规格组
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/service/impl/BstIvtPackageinfoivtServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/service/impl/BstIvtPackageinfoivtServiceImpl.java
index c4155b845..5414f5254 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/service/impl/BstIvtPackageinfoivtServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/service/impl/BstIvtPackageinfoivtServiceImpl.java
@@ -548,9 +548,7 @@ public class BstIvtPackageinfoivtServiceImpl extends ServiceImpl<BstIvtPackagein
             result.put("message", "子卷号或子卷品质为空");
             return result;
         }
-
         subpackagerelationService.createSubTest(whereJson);
-
         //"有子卷","2","合格品","3","管制品","4"
         BstIvtPackageinfoivt dto = bstIvtPackageinfoivtMapper.selectOne(new LambdaQueryWrapper<BstIvtPackageinfoivt>().eq(BstIvtPackageinfoivt::getContainer_name, whereJson.getString("container_name")));
         if (dto == null) {
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendZxToDjw.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendZxToDjw.java
index a54ceae55..ffd2842fe 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendZxToDjw.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendZxToDjw.java
@@ -82,7 +82,7 @@ public class AutoSendZxToDjw {
             return;
         }
         //装箱区有子卷且没有正在进行的装箱任务
-        List<BstIvtPackageinfoivt> zxqPackageinfoivtList = packageinfoivtService.checkEndPointTask(PackageInfoIvtEnum.POINT_STATUS.code("装箱区"), PackageInfoIvtEnum.IVT_STATUS.code("有子卷"), "", "", "");
+        List<BstIvtPackageinfoivt> zxqPackageinfoivtList = packageinfoivtService.checkEndPointTask(PackageInfoIvtEnum.POINT_STATUS.code("装箱区"), PackageInfoIvtEnum.IVT_STATUS.code("合格品"), "", "", "");
         if (CollectionUtils.isEmpty(zxqPackageinfoivtList)) {
             return;
         }