From 07a05debcbbdbaa39e63e9db1ebe67d001cd0731 Mon Sep 17 00:00:00 2001
From: liyongde <1419499670@qq.com>
Date: Tue, 24 Jun 2025 11:30:25 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=87=BA=E5=BA=93=E5=8D=95=E7=A1=AE?=
 =?UTF-8?q?=E8=AE=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../iostorInv/impl/StIvtIostorinvOutServiceImpl.java      | 8 ++++----
 .../nl/wms/st/outbill/rest/CheckOutBillController.java    | 6 ++++++
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvOutServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvOutServiceImpl.java
index b249c8e..26a3d44 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvOutServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvOutServiceImpl.java
@@ -756,7 +756,7 @@ public class StIvtIostorinvOutServiceImpl extends ServiceImpl<StIvtIostorinvOutM
         // 查询所有明细
         List<StIvtIostorinvdtl> dtlDaoList = iStIvtIostorinvdtlService.list(
                 new QueryWrapper<StIvtIostorinvdtl>().lambda()
-                        .eq(StIvtIostorinvdtl::getIostorinv_id, mstDao.getIostorinv_id().toString())
+                        .eq(StIvtIostorinvdtl::getIostorinv_id, mstDao.getIostorinv_id())
         );
 
         // 判断是否有生成状态的
@@ -780,7 +780,7 @@ public class StIvtIostorinvOutServiceImpl extends ServiceImpl<StIvtIostorinvOutM
         // 查询此单据下所有分配明细
         List<StIvtIostorinvdis> disDaoList = iStIvtIostorinvdisService.list(
                 new QueryWrapper<StIvtIostorinvdis>().lambda()
-                        .eq(StIvtIostorinvdis::getIostorinv_id, mstDao.getIostorinv_id().toString())
+                        .eq(StIvtIostorinvdis::getIostorinv_id, mstDao.getIostorinv_id())
         );
 
         //判断分配明细中是否有未生成状态的分配明细
@@ -824,13 +824,13 @@ public class StIvtIostorinvOutServiceImpl extends ServiceImpl<StIvtIostorinvOutM
             jsonIvt.put("quality_scode", disDao.getQuality_scode());
 
             // 判断木箱是否是主存区的，如果是主存区的则不更新库存
-            if (disDao.getSect_id().toString().equals(RegionTypeEnum.TWO_BZC01.getId())) {
+            if (disDao.getSect_id().equals(RegionTypeEnum.TWO_BZC01.getId())) {
                 continue;
             }
             needUpdateIvtList.add(jsonIvt);
 
             if (disDao.getTask_id() != null) {
-                needUpdateTaskList.add(disDao.getTask_id().toString());
+                needUpdateTaskList.add(disDao.getTask_id());
             }
         }
 
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/rest/CheckOutBillController.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/rest/CheckOutBillController.java
index 36f9736..8341fab 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/rest/CheckOutBillController.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/rest/CheckOutBillController.java
@@ -114,4 +114,10 @@ public class CheckOutBillController {
         iStIvtIostorinvOutService.allSetPoint(whereJson);
         return new ResponseEntity<>(HttpStatus.NO_CONTENT);
     }
+    @PostMapping("/confirm")
+    @Log("出库单强制确认")
+    public ResponseEntity<Object> confirm(@RequestBody JSONObject whereJson) {
+        iStIvtIostorinvOutService.confirm(whereJson);
+        return new ResponseEntity<>(HttpStatus.NO_CONTENT);
+    }
 }