From c556787ee869d343e8430a2c1d3dfd3879e49b44 Mon Sep 17 00:00:00 2001
From: ls <1793460677@qq.com>
Date: Fri, 5 Sep 2025 09:30:03 +0800
Subject: [PATCH] =?UTF-8?q?add:=20=E7=8E=B0=E5=9C=BA=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nl/wms/pda/mps/service/impl/SlitterPdaServiceImpl.java  | 2 +-
 .../org/nl/wms/pda/st/service/impl/NbjPdaServiceImpl.java   | 2 +-
 .../wms/pdm/ivt/hot/service/IstIvtHotpointivtService.java   | 5 ++++-
 .../ivt/hot/service/dao/mapper/StIvtHotpointivtMapper.java  | 3 +--
 .../ivt/hot/service/dao/mapper/StIvtHotpointivtMapper.xml   | 2 +-
 .../ivt/hot/service/impl/StIvtHotpointivtServiceImpl.java   | 6 ++++--
 .../wms/sch/task_manage/tasks/hot/AutoInHotTrussTask.java   | 2 +-
 .../nl/wms/sch/task_manage/tasks/hot/InHotTrussTask.java    | 6 +++---
 .../nl/wms/sch/task_manage/tasks/hot/OutHotTrussTask.java   | 2 +-
 .../src/main/java/org/nl/wms/util/TaskUtils.java            | 2 +-
 10 files changed, 18 insertions(+), 14 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 47b3cfb02..19bb8d03a 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
@@ -487,7 +487,7 @@ public class SlitterPdaServiceImpl implements SlitterPdaService {
             plan.setSplit_group(virtualContainer);
             plan.setDescription("-");
             plan.setWare_house("-");
-            plan.setResource_name(cutDevice.getExt_code());
+            plan.setResource_name(cutDevice.getPoint_code());
             plan.setManufacture_sort("1");
             plan.setMfg_order_name("-");
             plan.setManufacture_date(DateUtil.format(new Date(), "yyyy-MM-dd"));
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 9a2e0ba47..9e6a0d482 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
@@ -384,7 +384,7 @@ public class NbjPdaServiceImpl implements NbjPdaService {
                 .map(item -> {
                     JSONObject jsonObject = new JSONObject();
                     jsonObject.put("text", item.getPoint_code());
-                    jsonObject.put("value", item.getExt_code());
+                    jsonObject.put("value", item.getPoint_code());
                     return jsonObject;
                 })
                 .collect(Collectors.toCollection(JSONArray::new));
diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/hot/service/IstIvtHotpointivtService.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/hot/service/IstIvtHotpointivtService.java
index 22a0e03d0..fcd1cf73b 100644
--- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/hot/service/IstIvtHotpointivtService.java
+++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/hot/service/IstIvtHotpointivtService.java
@@ -68,7 +68,10 @@ public interface IstIvtHotpointivtService extends IService<StIvtHotpointivt> {
      * @param used 是否使用
      * @return /
      */
-    List<StIvtHotpointivt> getNotTaskHotOven(String rollType, String used);
+    List<StIvtHotpointivt> getNotTaskHotOven(String rollType, String used, String status);
+
+
+
 
     /**
      * 查找设备号给ACS
diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/hot/service/dao/mapper/StIvtHotpointivtMapper.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/hot/service/dao/mapper/StIvtHotpointivtMapper.java
index 609bd6fd4..4f0821c90 100644
--- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/hot/service/dao/mapper/StIvtHotpointivtMapper.java
+++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/hot/service/dao/mapper/StIvtHotpointivtMapper.java
@@ -1,6 +1,5 @@
 package org.nl.wms.pdm.ivt.hot.service.dao.mapper;
 
-import com.alibaba.fastjson.JSONArray;
 import org.nl.wms.pdm.ivt.hot.service.dao.StIvtHotpointivt;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.nl.wms.quartz.dto.HotDeviceAndEreaDto;
@@ -16,7 +15,7 @@ import java.util.List;
 public interface StIvtHotpointivtMapper extends BaseMapper<StIvtHotpointivt> {
 
 
-    List<StIvtHotpointivt> getNotTaskHotOven(String rollType, String used);
+    List<StIvtHotpointivt> getNotTaskHotOven(String rollType, String used, String status);
 
     List<HotDeviceAndEreaDto> getHotDeviceInfoForAcs(String productArea);
 
diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/hot/service/dao/mapper/StIvtHotpointivtMapper.xml b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/hot/service/dao/mapper/StIvtHotpointivtMapper.xml
index 18c479982..98ee5cea0 100644
--- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/hot/service/dao/mapper/StIvtHotpointivtMapper.xml
+++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/hot/service/dao/mapper/StIvtHotpointivtMapper.xml
@@ -6,7 +6,7 @@
     <select id="getNotTaskHotOven" resultType="org.nl.wms.pdm.ivt.hot.service.dao.StIvtHotpointivt">
         SELECT ht.*
         FROM `st_ivt_hotpointivt` ht
-        WHERE ht.point_status = '01'
+        WHERE ht.point_status = #{status}
           AND ht.plan = #{rollType}
           AND ht.is_used = #{used}
           AND 0 = (SELECT COUNT(*)
diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/hot/service/impl/StIvtHotpointivtServiceImpl.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/hot/service/impl/StIvtHotpointivtServiceImpl.java
index 4c6855fcf..bad629fc8 100644
--- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/hot/service/impl/StIvtHotpointivtServiceImpl.java
+++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/ivt/hot/service/impl/StIvtHotpointivtServiceImpl.java
@@ -129,10 +129,12 @@ public class StIvtHotpointivtServiceImpl extends ServiceImpl<StIvtHotpointivtMap
     }
 
     @Override
-    public List<StIvtHotpointivt> getNotTaskHotOven(String rollType, String used) {
-        return stIvtHotpointivtMapper.getNotTaskHotOven(rollType, used);
+    public List<StIvtHotpointivt> getNotTaskHotOven(String rollType, String used,String status) {
+        return stIvtHotpointivtMapper.getNotTaskHotOven(rollType, used,status);
     }
 
+
+
     @Override
     public List<HotDeviceAndEreaDto> getHotDeviceInfoForAcs(String productArea) {
         return stIvtHotpointivtMapper.getHotDeviceInfoForAcs(productArea);
diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/tasks/hot/AutoInHotTrussTask.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/tasks/hot/AutoInHotTrussTask.java
index 2c3e97bf5..8cfacb3a7 100644
--- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/tasks/hot/AutoInHotTrussTask.java
+++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/tasks/hot/AutoInHotTrussTask.java
@@ -80,7 +80,7 @@ public class AutoInHotTrussTask extends AbstractTask {
                 }
                 String bakingTemperature = order.getBaking_temperature();
                 // 如果需要烘烤, 先找对应点
-                List<StIvtHotpointivt> hotList = hotpointivtService.getNotTaskHotOven(order.getRoll_type(), "1");
+                List<StIvtHotpointivt> hotList = hotpointivtService.getNotTaskHotOven(order.getRoll_type(), "1","01");
                 if (hotList.size() == 0) {
                     log.error("找不到温度为：{} 的可用烘箱位置", bakingTemperature);
                     break;
diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/tasks/hot/InHotTrussTask.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/tasks/hot/InHotTrussTask.java
index 73d80b62c..c6f425b24 100644
--- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/tasks/hot/InHotTrussTask.java
+++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/tasks/hot/InHotTrussTask.java
@@ -93,7 +93,7 @@ public class InHotTrussTask extends AbstractTask {
             requestObj.put("baking_temperature", bakingTemperature);
             requestObj.put("baking_time", order.getBaking_time());
             // 如果需要烘烤, 先找对应点
-            List<StIvtHotpointivt> hotList = hotpointivtService.getNotTaskHotOven(order.getRoll_type(), "1");
+            List<StIvtHotpointivt> hotList = hotpointivtService.getNotTaskHotOven(order.getRoll_type(), "1","01");
             if (hotList.size() > 0) {
                 List<StIvtHotpointivt> hotListFilter = multiFilter(hotList);
                 // 查找合适温度的点位
@@ -125,9 +125,9 @@ public class InHotTrussTask extends AbstractTask {
             }
             // todo: 需要烘烤，且是小卷，但是没有位置，需要将最快结束的烘箱组锁住
         } else {
-            // 如果是去烘箱暂存的，找禁用的烘箱
+            // 如果是去烘箱暂存的，找暂存的烘箱
             if (GeneralDefinition.YES.equals(isStorage)) {
-                List<StIvtHotpointivt> hotList = hotpointivtService.getNotTaskHotOven(plan, "0");
+                List<StIvtHotpointivt> hotList = hotpointivtService.getNotTaskHotOven(plan, "1","03");
                 for (StIvtHotpointivt hotPoint : hotList) {
                     String pointCode = hotPoint.getPoint_code();
                     String pointTemperature = (String) redisUtils.hget(pointCode, "temperature");
diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/tasks/hot/OutHotTrussTask.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/tasks/hot/OutHotTrussTask.java
index 1e5aff8d1..869ceaceb 100644
--- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/tasks/hot/OutHotTrussTask.java
+++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/tasks/hot/OutHotTrussTask.java
@@ -79,7 +79,7 @@ public class OutHotTrussTask extends AbstractTask {
                 // 找一个没开启的烘箱？？？
                 PdmBiRawfoilworkorder order = rawfoilworkorderService.getById(hotPoint.getWorkorder_id());
                 List<StIvtHotpointivt> notTaskHotOven = hotpointivtService.getNotTaskHotOven(order.getRoll_type(),
-                        "0");
+                        "0","01");
                 // 没有位置，自然需要报错
                 if (notTaskHotOven.size() == 0) {
                     throw new BadRequestException("烘箱烘烤完毕的暂存位不够!");
diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/util/TaskUtils.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/util/TaskUtils.java
index da2677ce5..ebb02163b 100644
--- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/util/TaskUtils.java
+++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/util/TaskUtils.java
@@ -428,6 +428,6 @@ public class TaskUtils {
      * @return
      */
     public static String createVirtualSubContainer(String format, String pointCode, int count) {
-        return "S-" + pointCode + "-" + TaskUtils.getDateTime(format) + "-" + count;
+        return TaskUtils.getDateTime(format) + "-" + count;
     }
 }