From 85024f269d854a3599892330c86c1acb749df325 Mon Sep 17 00:00:00 2001
From: zhouz <>
Date: Fri, 10 Oct 2025 09:45:21 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E7=A9=BA=E6=8C=87=E9=92=88=E5=8D=A1?=
 =?UTF-8?q?=E6=8E=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java  | 4 +++-
 .../org/nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java  | 2 +-
 .../org/nl/wms/pda/st/service/impl/VirtualOutServiceImpl.java | 2 +-
 .../src/main/java/org/nl/wms/st/outbill/wql/ST_OUTIVT04.wql   | 1 -
 4 files changed, 5 insertions(+), 4 deletions(-)

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 c6457b60e..b8b471913 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
@@ -87,6 +87,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import javax.swing.*;
 import java.lang.reflect.Method;
 import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
@@ -960,7 +961,8 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
                         JSONObject bake_jo = new JSONObject();
                         bake_jo.put("point_code", device_code);
                         bake_jo.put("option", "2");
-                        new BakingServiceImpl().ovenInAndOut(bake_jo);
+                        BakingServiceImpl bakingService = SpringContextHolder.getBean(BakingServiceImpl.class);
+                        bakingService.ovenInAndOut(bake_jo);
                     }
                 } else {
                     throw new BadRequestException("请输入正确的任务类型!");
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java
index 0b4dbc3c2..4f6e9a4e7 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java
@@ -2096,7 +2096,7 @@ public class MesToLmsServiceImpl implements MesToLmsService {
     public JSONObject getRollInfo(JSONObject param) {
         JSONObject result = new JSONObject();
         String ContainerName = param.getString("ContainerName");
-        PdmBiSlittingproductionplan one = slittingproductionplanService.getOne(new LambdaQueryWrapper<PdmBiSlittingproductionplan>().eq(PdmBiSlittingproductionplan::getContainer_name, ContainerName));
+        PdmBiSlittingproductionplan one = slittingproductionplanService.getOne(new LambdaQueryWrapper<PdmBiSlittingproductionplan>().eq(PdmBiSlittingproductionplan::getContainer_name, ContainerName).eq(PdmBiSlittingproductionplan::getIs_delete,"0"));
         if (ObjectUtil.isEmpty(one)) {
             throw new BadRequestException("未查询到子卷号为[" + ContainerName + "]的分切计划！");
         }
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/VirtualOutServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/VirtualOutServiceImpl.java
index 7c4858fd5..97ed85053 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/VirtualOutServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/VirtualOutServiceImpl.java
@@ -97,7 +97,7 @@ public class VirtualOutServiceImpl implements VirtualOutService {
 
         if (ObjectUtil.isNotEmpty(whereJson.getString("box_no"))) {
             JSONObject jsonSub = WQL.getWO("PDA_VIRTUALOUT").addParam("flag", "4").addParam("box_no", whereJson.getString("box_no")).process().uniqueResult(0);
-            if (ObjectUtil.isEmpty(jsonSub)){
+            if (ObjectUtil.isEmpty(jsonSub) || ObjectUtil.isEmpty(jsonSub.getString("net_weight_num"))){
                 throw new BadRequestException("未查询到设木箱号为["+whereJson.getString("box_no")+"]的子卷包装关系信息！");
             }
 
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/ST_OUTIVT04.wql b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/ST_OUTIVT04.wql
index e2d04fc7e..ac8ad2d4c 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/ST_OUTIVT04.wql
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/ST_OUTIVT04.wql
@@ -304,7 +304,6 @@
                WHERE
                     attr.block_num = 输入.block_num
                     AND attr.row_num = 输入.row_num
-                    AND attr.sect_id = 输入.sect_id
                     AND IFNULL( attr.storagevehicle_code, '' ) <> ''
                 ENDSELECT
             ENDQUERY