From c77a5f03e55ec4eaa6c2bf6e1ec4fb1259857623 Mon Sep 17 00:00:00 2001
From: gongbaoxiong <751575283@qq.com>
Date: Wed, 3 Jul 2024 17:32:25 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E5=A2=9E=E5=8A=A0=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/PdmBiSubpackagerelationServiceImpl.java    | 6 +++---
 .../sch/tasks/first_floor_area/auto/AutoSendZxToDjw.java    | 5 +++--
 .../nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java    | 3 ++-
 3 files changed, 8 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 11ff3673e..c00444781 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
@@ -854,11 +854,11 @@ public class PdmBiSubpackagerelationServiceImpl extends ServiceImpl<PdmBiSubpack
         boxInfo.put("device_code", deviceCode);
         boxInfo.put("material_code", boxType);
         boxInfo.put("num", workIdList.size());
-        String boxSn = outBoxManageService.outBox(boxInfo);
+        //String boxSn = outBoxManageService.outBox(boxInfo);
         stopWatch.stop();
         System.out.println("木箱出库代码执行花费时间------------------------------------------------------------------------------------------*************************************************************************************************= totalTime = " + stopWatch.getTotalTimeMillis());
         log.info("木箱出库代码执行花费时间------------------------------------------------------------------------------------------*************************************************************************************************= totalTime = " + stopWatch.getTotalTimeMillis());
-        //String boxSn = "MX240702000169";
+        String boxSn = "MX240703000118";
         StopWatch stopWatch1 = new StopWatch();
         stopWatch1.start();
         //更新及子卷包装状态已分配规格及木箱规格组
@@ -902,7 +902,7 @@ public class PdmBiSubpackagerelationServiceImpl extends ServiceImpl<PdmBiSubpack
         djqPoints.forEach(r -> {
             //校验重复任务
             List<SchBaseTask> taskList = taskService.list(new LambdaQueryWrapper<SchBaseTask>().eq(SchBaseTask::getVehicle_code, r.getContainer_name()).eq(SchBaseTask::getTask_type, PackageInfoIvtEnum.TASK_TYPE.code("待检区->装箱区"))
-                    .eq(SchBaseTask::getIs_delete, IOSEnum.IS_NOTANDYES.code("否")));
+                    .eq(SchBaseTask::getIs_delete, IOSEnum.IS_NOTANDYES.code("否")).lt(SchBaseTask::getTask_status, TaskStatusEnum.FINISHED));
             if (CollectionUtils.isEmpty(taskList)) {
                 JSONObject jo = new JSONObject();
                 jo.put("task_type", PackageInfoIvtEnum.TASK_TYPE.code("待检区->装箱区"));
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 0997184ab..48a88ea9d 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
@@ -27,6 +27,7 @@ import org.nl.common.enums.PackageInfoIvtEnum;
 import org.nl.modules.common.exception.BadRequestException;
 import org.nl.system.service.param.ISysParamService;
 import org.nl.wms.ext.mes.service.impl.LmsToMesServiceImpl;
+import org.nl.wms.sch.manage.TaskStatusEnum;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
@@ -114,7 +115,7 @@ public class AutoSendZxToDjw {
                 throw new BadRequestException("装箱区的子卷号为" + containerName + "无对应的分切计划信息，请检查!");
             }
             //校验是否存在相同子卷号任务
-            List<SchBaseTask> taskList = taskService.list(new LambdaQueryWrapper<SchBaseTask>().eq(SchBaseTask::getVehicle_code, containerName).eq(SchBaseTask::getTask_type, PackageInfoIvtEnum.TASK_TYPE.code("装箱区->装箱对接位")).eq(SchBaseTask::getIs_delete, IOSEnum.IS_NOTANDYES.code("否")));
+            List<SchBaseTask> taskList = taskService.list(new LambdaQueryWrapper<SchBaseTask>().eq(SchBaseTask::getVehicle_code, containerName).eq(SchBaseTask::getTask_type, PackageInfoIvtEnum.TASK_TYPE.code("装箱区->装箱对接位")).eq(SchBaseTask::getIs_delete, IOSEnum.IS_NOTANDYES.code("否")).lt(SchBaseTask::getTask_status, TaskStatusEnum.FINISHED.getCode()));
             if (CollectionUtils.isEmpty(taskList)) {
                 //创建搬运任务到装箱位
                 JSONObject jo = new JSONObject();
@@ -159,7 +160,7 @@ public class AutoSendZxToDjw {
      * 传输子卷包装关系至MES
      */
     public void transferBoxPackageToMes(List<PdmBiSubpackagerelation> packagerelationList, BstIvtBoxinfo bstIvtBoxinfo) {
-        if (StringUtils.isBlank(packagerelationList.get(0).getPackage_box_sn()) || packagerelationList.get(0).getBox_weight() == null) {
+        if (StringUtils.isBlank(packagerelationList.get(0).getPackage_box_sn())) {
             log.info("transferBoxPackageToMes接口的子卷号：" + packagerelationList.get(0).getContainer_name() + ",子卷未确定木箱规格信息");
             throw new BadRequestException("子卷未确定木箱规格信息!");
         }
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
index 2f3ce485d..6f4a0c42f 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
@@ -1939,7 +1939,8 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
         return taskService.list(new LambdaQueryWrapper<SchBaseTask>()
                 .eq(SchBaseTask::getTask_type, taskType)
                 .eq(SchBaseTask::getVehicle_code, containerName)
-                .gt(SchBaseTask::getCreate_time, startTime)
+                //.gt(SchBaseTask::getCreate_time, startTime)
+                .lt(SchBaseTask::getTask_status, TaskStatusEnum.FINISHED.getCode())
                 .eq(SchBaseTask::getIs_delete, IOSEnum.IS_NOTANDYES.code("否"))
 
         );