From fd45df13c68cf6bd9acde8a5d2762c04af8d4d35 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: Fri, 17 Oct 2025 09:38:05 +0800
Subject: [PATCH] =?UTF-8?q?opt:=E8=B6=8A=E5=8D=97=E5=AF=8C=E4=BD=B3?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/AcsToWmsController.java        |  1 +
 .../service/impl/PdaIosInServiceImpl.java     |  4 +-
 .../service/impl/StIvtMoveinvServiceImpl.java | 15 +++-
 .../service/util/UpdateIvtUtils.java          | 76 ++++++++++++++++---
 4 files changed, 83 insertions(+), 13 deletions(-)

diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/controller/AcsToWmsController.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/controller/AcsToWmsController.java
index d686676..c0fa19d 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/controller/AcsToWmsController.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/controller/AcsToWmsController.java
@@ -24,6 +24,7 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 @RequestMapping("/api/wms")
 @Slf4j
+@SaIgnore
 public class AcsToWmsController {
     @Autowired
     private AcsToWmsService acsToWmsService;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/impl/PdaIosInServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/impl/PdaIosInServiceImpl.java
index 358ea1b..acc28a0 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/impl/PdaIosInServiceImpl.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/impl/PdaIosInServiceImpl.java
@@ -277,7 +277,9 @@ public class PdaIosInServiceImpl implements PdaIosInService {
     @Override
     public List<SelectItemVo> getSect(JSONObject whereJson) {
         LambdaQueryWrapper<Sectattr> queryWrapper = new LambdaQueryWrapper<>(Sectattr.class)
-                .ne(Sectattr::getSect_type_attr,"09");
+                .ne(Sectattr::getSect_type_attr,"09")
+                .eq(Sectattr::getIs_delete,"0")
+                .eq(Sectattr::getIs_used,"1");
        List<Sectattr> sectList = iSectattrService.list(queryWrapper);
         List<SelectItemVo> selectList = new ArrayList<>();
         sectList.forEach(r ->
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/impl/StIvtMoveinvServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/impl/StIvtMoveinvServiceImpl.java
index 5621668..1f1be56 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/impl/StIvtMoveinvServiceImpl.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/impl/StIvtMoveinvServiceImpl.java
@@ -301,8 +301,19 @@ public class StIvtMoveinvServiceImpl extends ServiceImpl<StIvtMoveinvMapper, StI
         } else if (executing_flag) {
             mstDao.setBill_status(IOSEnum.MOVE_MST_STATUS.code("执行中"));
         }
-        mstDao.setUpdate_optid(SecurityUtils.getCurrentUserId());
-        mstDao.setUpdate_optname(SecurityUtils.getCurrentNickName());
+        String currentUserId = "";
+        String nickName  = "";
+        try {
+            currentUserId = SecurityUtils.getCurrentUserId();
+            nickName = SecurityUtils.getCurrentNickName();
+        }
+        catch (Exception e){
+            currentUserId = "OtherSys";
+            nickName= "OtherSys";
+        }
+
+        mstDao.setUpdate_optid(currentUserId);
+        mstDao.setUpdate_optname(nickName);
         mstDao.setUpdate_time(DateUtil.now());
         this.updateById(mstDao);
     }
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/util/UpdateIvtUtils.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/util/UpdateIvtUtils.java
index 57d9cec..445adae 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/util/UpdateIvtUtils.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/util/UpdateIvtUtils.java
@@ -162,8 +162,20 @@ public class UpdateIvtUtils {
         // 加冻结数
         BigDecimal frozen_qty = extDao.getFrozen_qty().add(where.getBigDecimal("change_qty"));
         extDao.setFrozen_qty(frozen_qty);
-        extDao.setUpdate_id(SecurityUtils.getCurrentUserId());
-        extDao.setUpdate_name(SecurityUtils.getCurrentNickName());
+
+        String currentUserId = "";
+        String nickName  = "";
+        try {
+            currentUserId = SecurityUtils.getCurrentUserId();
+            nickName = SecurityUtils.getCurrentNickName();
+        }
+        catch (Exception e){
+            currentUserId = "OtherSys";
+            nickName= "OtherSys";
+        }
+        extDao.setUpdate_id(currentUserId);
+        extDao.setUpdate_name(nickName);
+
         extDao.setUpdate_time(DateUtil.now());
         extDao.setRemark(where.getString("remark"));
         iMdPbGroupPlateService.updateById(extDao);
@@ -195,8 +207,19 @@ public class UpdateIvtUtils {
             iMdPbStoragevehicleextService.removeById(extDao);
         } else {
             extDao.setFrozen_qty(frozen_qty);
-            extDao.setUpdate_id(SecurityUtils.getCurrentUserId());
-            extDao.setUpdate_name(SecurityUtils.getCurrentNickName());
+            String currentUserId = "";
+            String nickName  = "";
+            try {
+                currentUserId = SecurityUtils.getCurrentUserId();
+                nickName = SecurityUtils.getCurrentNickName();
+            }
+            catch (Exception e){
+                currentUserId = "OtherSys";
+                nickName= "OtherSys";
+            }
+
+            extDao.setUpdate_id(currentUserId);
+            extDao.setUpdate_name(nickName);
             extDao.setUpdate_time(DateUtil.now());
             extDao.setRemark(where.getString("remark"));
             iMdPbGroupPlateService.updateById(extDao);
@@ -225,9 +248,21 @@ public class UpdateIvtUtils {
             throw new BadRequestException(LangBehavior.language("warehouse_manage.frozen_quantity_cannot_be_negative", String.valueOf(extDao.getFrozen_qty()), String.valueOf(where.getDoubleValue("change_qty"))));
         }
         // 加可用
+
+        String currentUserId = "";
+        String nickName  = "";
+        try {
+            currentUserId = SecurityUtils.getCurrentUserId();
+            nickName = SecurityUtils.getCurrentNickName();
+        }
+        catch (Exception e){
+            currentUserId = "OtherSys";
+            nickName= "OtherSys";
+        }
+
         extDao.setFrozen_qty(BigDecimal.ZERO);
-        extDao.setUpdate_id(SecurityUtils.getCurrentUserId());
-        extDao.setUpdate_name(SecurityUtils.getCurrentNickName());
+        extDao.setUpdate_id(currentUserId);
+        extDao.setUpdate_name(nickName);
         extDao.setUpdate_time(DateUtil.now());
         extDao.setRemark(where.getString("remark"));
         iMdPbGroupPlateService.updateById(extDao);
@@ -248,8 +283,19 @@ public class UpdateIvtUtils {
         }
         BigDecimal canuse_qty = extDao.getQty().add(where.getBigDecimal("change_qty"));
         extDao.setQty(canuse_qty);
-        extDao.setUpdate_id(SecurityUtils.getCurrentUserId());
-        extDao.setUpdate_name(SecurityUtils.getCurrentNickName());
+
+        String currentUserId = "";
+        String nickName  = "";
+        try {
+            currentUserId = SecurityUtils.getCurrentUserId();
+            nickName = SecurityUtils.getCurrentNickName();
+        }
+        catch (Exception e){
+            currentUserId = "OtherSys";
+            nickName= "OtherSys";
+        }
+        extDao.setUpdate_id(currentUserId);
+        extDao.setUpdate_name(nickName);
         extDao.setUpdate_time(DateUtil.now());
         extDao.setRemark(where.getString("remark"));
         iMdPbGroupPlateService.updateById(extDao);
@@ -278,8 +324,18 @@ public class UpdateIvtUtils {
             iMdPbStoragevehicleextService.removeById(extDao);
         }else {
             extDao.setQty(canuse_qty);
-            extDao.setUpdate_id(SecurityUtils.getCurrentUserId());
-            extDao.setUpdate_name(SecurityUtils.getCurrentNickName());
+            String currentUserId = "";
+            String nickName  = "";
+            try {
+                currentUserId = SecurityUtils.getCurrentUserId();
+                nickName = SecurityUtils.getCurrentNickName();
+            }
+            catch (Exception e){
+                currentUserId = "OtherSys";
+                nickName= "OtherSys";
+            }
+            extDao.setUpdate_id(currentUserId);
+            extDao.setUpdate_name(nickName);
             extDao.setUpdate_time(DateUtil.now());
             extDao.setRemark(where.getString("remark"));
             iMdPbGroupPlateService.updateById(extDao);