From e5037fd3e8ebaecc4273d947f68ecccce4244bde Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=91=E6=97=AD=E6=98=8E=5C73939?= <739390650@QQ.COM>
Date: Sat, 4 Jul 2026 10:01:52 +0700
Subject: [PATCH] =?UTF-8?q?feat:bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../b_lms/pda/controller/VehicleTwoController.java |  7 +++++++
 .../iostorInv/IStIvtIostorinvOutService.java       |  2 +-
 .../dao/mapper/StIvtIostorinvdisMapper.xml         |  4 ++--
 .../util/impl/InBoxManageServiceImpl.java          |  8 ++++----
 .../util/impl/OutBussManageServiceImpl.java        |  1 +
 .../java/org/nl/common/utils/StringDealUtils.java  | 14 +++++++++-----
 .../service/menu/impl/SysMenuServiceImpl.java      |  2 +-
 .../src/views/wms/basedata/st/sect/index.vue       |  4 ++--
 8 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pda/controller/VehicleTwoController.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/pda/controller/VehicleTwoController.java
index 02af2bf..01e49cf 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/pda/controller/VehicleTwoController.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pda/controller/VehicleTwoController.java
@@ -51,6 +51,13 @@ public class VehicleTwoController {
         return new ResponseEntity<>(vehicleTwoService.boxIn(whereJson), HttpStatus.OK);
     }
 
+    @PostMapping("/boxUpLine")
+    @Log("木箱上线")
+    @SaIgnore
+    public ResponseEntity<Object> boxUpLine(@RequestBody JSONObject whereJson) {
+        return new ResponseEntity<>(vehicleTwoService.boxIn(whereJson), HttpStatus.OK);
+    }
+
     @PostMapping("/returnIn")
     @Log("退货入库")
     @SaIgnore
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/IStIvtIostorinvOutService.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/IStIvtIostorinvOutService.java
index 30f5b2b..c8a182c 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/IStIvtIostorinvOutService.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/IStIvtIostorinvOutService.java
@@ -125,7 +125,7 @@ public interface IStIvtIostorinvOutService extends IService<StIvtIostorinv> {
     void allSetPoint(JSONObject whereJson);
 
     /**
-     * 出库强制确认
+     * 出库强制确认,,出库确认
      * @param whereJson {
      *                  iostorinv_id： 主表标识
      * }
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/dao/mapper/StIvtIostorinvdisMapper.xml b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/dao/mapper/StIvtIostorinvdisMapper.xml
index 783b3f7..5465e7a 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/dao/mapper/StIvtIostorinvdisMapper.xml
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/dao/mapper/StIvtIostorinvdisMapper.xml
@@ -1430,10 +1430,10 @@
         WHERE
         dis.box_no = #{boxNo}
 
-        AND dis.work_status <![CDATA[ <= ]]> '99'
+        AND dis.work_status <![CDATA[ < ]]> '99'
         AND ( dis.struct_id IS NOT NULL AND dis.struct_id <![CDATA[ <> ]]> '' )
         AND mst.is_delete = '0'
-        AND mst.bill_status <![CDATA[ <= ]]> '99'
+        AND mst.bill_status <![CDATA[ < ]]> '99'
     </select>
     <select id="getOutManageExportData" resultType="org.nl.wms.st.outbill.service.vo.OutManageExportVo">
         SELECT
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBoxManageServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBoxManageServiceImpl.java
index 3bfa702..6ea2a38 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBoxManageServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBoxManageServiceImpl.java
@@ -416,20 +416,20 @@ public class InBoxManageServiceImpl implements InBoxManageService {
     @Transactional(rollbackFor = Exception.class)
     public void returnIn(JSONObject whereJson) {
         //判断是否是手工入库：如果是手工入库则判断是否是第一次入库
-        if (whereJson.getString("bill_type").equals(IOSEnum.IN_TYPE.code("生产入库")) ||
-                whereJson.getString("bill_type").equals(IOSEnum.IN_TYPE.code("手工入库"))
+        if (IOSEnum.IN_TYPE.code("生产入库").equals(whereJson.getString("bill_type")) ||
+                IOSEnum.IN_TYPE.code("手工入库").equals(whereJson.getString("bill_type"))
         ) {
             // 校验是否第一次入库
             boolean ifFirst = inBussManageService.firstInBox(whereJson.getString("box_no"));
 
             // 手工入库
-            if (whereJson.getString("bill_type").equals(IOSEnum.IN_TYPE.code("手工入库"))) {
+            if (IOSEnum.IN_TYPE.code("手工入库").equals(whereJson.getString("bill_type"))) {
                 if (!ifFirst) {
                     throw new BadRequestException("此木箱【" + whereJson.getString("box_no") + "】未入过库，请选择【生产入库】!");
                 }
             }
 
-            if (whereJson.getString("bill_type").equals(IOSEnum.IN_TYPE.code("生产入库"))) {
+            if (IOSEnum.IN_TYPE.code("生产入库").equals(whereJson.getString("bill_type"))) {
                 if (ifFirst) {
                     throw new BadRequestException("此木箱【" + whereJson.getString("box_no") + "】已入过库，请选择【手工入库】!");
                 }
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/OutBussManageServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/OutBussManageServiceImpl.java
index e499bd6..a04a083 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/OutBussManageServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/OutBussManageServiceImpl.java
@@ -159,6 +159,7 @@ public class OutBussManageServiceImpl implements OutBussManageService {
                     .set(ObjectUtil.isNotEmpty(json.getString("inv_id")), StIvtStructattr::getInv_id, json.getString("inv_id"))
                     .set(ObjectUtil.isNotEmpty(json.getString("inv_type")), StIvtStructattr::getInv_type, json.getString("inv_type"))
                     .set(ObjectUtil.isNotEmpty(json.getString("inv_code")), StIvtStructattr::getInv_code, json.getString("inv_code"))
+                    .set(ObjectUtil.isNotEmpty(json.getString("storagevehicle_code")), StIvtStructattr::getStoragevehicle_code, json.getString("storagevehicle_code"))
                     .set(ObjectUtil.isNotEmpty(json.getString("lock_type")), StIvtStructattr::getLock_type, json.getString("lock_type"));
             structattrService.update(lam);
         }
diff --git a/lms/nladmin-system/src/main/java/org/nl/common/utils/StringDealUtils.java b/lms/nladmin-system/src/main/java/org/nl/common/utils/StringDealUtils.java
index 7ac6c28..3ae99d9 100644
--- a/lms/nladmin-system/src/main/java/org/nl/common/utils/StringDealUtils.java
+++ b/lms/nladmin-system/src/main/java/org/nl/common/utils/StringDealUtils.java
@@ -2,6 +2,7 @@ package org.nl.common.utils;
 
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -12,13 +13,16 @@ import java.util.stream.Collectors;
  */
 public class StringDealUtils {
     public static List<String> splitString(String input) {
-        // 不含空格直接返回
-        if (input == null || input.trim().isEmpty() || !input.matches(".*\\s.*")) {
+        // 空值、全空白返回空集合
+        if (input == null || input.trim().isEmpty()) {
             return new ArrayList<>();
         }
-
-        return Arrays.stream(input.split("\\s+"))
-                .filter(s -> !s.isEmpty())
+        // 包含空白则分割，不包含则返回单个元素集合
+        String trimInput = input.trim();
+        if (!trimInput.matches(".*\\s.*")) {
+            return Collections.singletonList(trimInput);
+        }
+        return Arrays.stream(trimInput.split("\\s+"))
                 .collect(Collectors.toList());
     }
 }
diff --git a/lms/nladmin-system/src/main/java/org/nl/system/service/menu/impl/SysMenuServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/system/service/menu/impl/SysMenuServiceImpl.java
index 1ae5feb..9f30c2c 100644
--- a/lms/nladmin-system/src/main/java/org/nl/system/service/menu/impl/SysMenuServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/system/service/menu/impl/SysMenuServiceImpl.java
@@ -239,7 +239,7 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> impl
         updateSubCnt(oldPid);
         updateSubCnt(newPid);
         //更新SystemType
-        if (!resources.getSystem_type().equals(menu.getSystem_type())) {
+        if (StringUtils.isNotBlank(resources.getSystem_type()) && !ObjectUtil.equals(resources.getSystem_type(),menu.getSystem_type())) {
             this.update(new UpdateWrapper<SysMenu>().set(DictConstantPool.DICT_SYS_CODE, resources.getSystem_type()).in("menu_id", allChildIds));
         }
 
diff --git a/lms/nladmin-ui/src/views/wms/basedata/st/sect/index.vue b/lms/nladmin-ui/src/views/wms/basedata/st/sect/index.vue
index 0159485..1184a4d 100644
--- a/lms/nladmin-ui/src/views/wms/basedata/st/sect/index.vue
+++ b/lms/nladmin-ui/src/views/wms/basedata/st/sect/index.vue
@@ -77,12 +77,12 @@
           </el-row>
           <el-row :gutter="20">
             <el-col :span="12">
-              <el-form-item :label="$t('wms.basedata.st.sect.sectCapacity')" prop="capacity">
+              <el-form-item :label="$t('common.sectCapacity')" prop="capacity">
                 <el-input v-model="form.capacity" style="width: 200px;" />
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item :label="$t('wms.basedata.st.sect.sectType')" prop="sect_type_attr">
+              <el-form-item :label="$t('common.sectType')" prop="sect_type_attr">
                 <el-select
                   v-model="form.sect_type_attr"
                   :placeholder="$t('common.pleaseSelect')"