From 2727e5424fb918b14c156f69d4ac449d307a7f24 Mon Sep 17 00:00:00 2001
From: zhangzq <zhangzhiqiang@yoycol.com>
Date: Tue, 9 Sep 2025 16:12:55 +0800
Subject: [PATCH] =?UTF-8?q?add:=E6=89=8B=E6=8C=81=E7=9B=98=E7=82=B9?=
 =?UTF-8?q?=E7=A1=AE=E8=AE=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/PadLargeMaterialBoxServiceImpl.java  | 21 ++++++++++++++++++-
 .../dao/mapper/StIvtCheckdtlMapper.xml        |  4 ++--
 .../impl/StIvtCheckmstServiceImpl.java        |  4 ++++
 3 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/large_material_box/service/impl/PadLargeMaterialBoxServiceImpl.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/large_material_box/service/impl/PadLargeMaterialBoxServiceImpl.java
index 34349d8..c61ce2b 100644
--- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/large_material_box/service/impl/PadLargeMaterialBoxServiceImpl.java
+++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/large_material_box/service/impl/PadLargeMaterialBoxServiceImpl.java
@@ -86,6 +86,8 @@ public class PadLargeMaterialBoxServiceImpl implements PdaLargeMaterialBoxServic
     private IStIvtMoveinvService iStIvtMoveinvService;
     @Autowired
     private IMdPbMeasureunitService iMdPbMeasureunitService;
+    @Autowired
+    private IStIvtCheckmstService iStIvtCheckmstService;
 
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -574,6 +576,23 @@ public class PadLargeMaterialBoxServiceImpl implements PdaLargeMaterialBoxServic
 
     @Override
     public PdaResponse materialBoxInventoryConfirm(JSONObject reqParam) {
+        /**
+         * {
+         * 		"check_id": "CHK202312150001", --盘点单id
+         * 		"check_code": "CHECK-20231215-001", --盘点单据号
+         * 		"checkdtl_id": "CHKDTL202312150001", --盘点单明细ID
+         *      "check_result": "1", --状态
+         * 		"material_id": "M1001", --物料id
+         * 		"material_code": "MAT-001", --物料编码
+         * 		"material_name": "304不锈钢板材",  --物料名称
+         * 		"struct_code": "WH-A-01-001", --点位
+         * 		"storagevehicle_code": "PALLET-001", --载具
+         * 		"pcsn": "SN202312150001", --批号
+         * 		"base_qty": 50, --库存数量
+         * 		"fac_qty": 48 -- 盘点数量
+         *        }
+         */
+        iStIvtCheckmstService.dtlCheckConfirm(JSONObject.toJavaObject(reqParam,StIvtCheckdtl.class));
         return PdaResponse.requestOk();
     }
 
@@ -799,4 +818,4 @@ public class PadLargeMaterialBoxServiceImpl implements PdaLargeMaterialBoxServic
         data.put("ivt_qty", storagevehicleext == null ? 0 : storagevehicleext.getCanuse_qty());
         return PdaResponse.requestParamOk(data);
     }
-}
\ No newline at end of file
+}
diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/mapper/StIvtCheckdtlMapper.xml b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/mapper/StIvtCheckdtlMapper.xml
index 69886d6..7ac3e1b 100644
--- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/mapper/StIvtCheckdtlMapper.xml
+++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/mapper/StIvtCheckdtlMapper.xml
@@ -86,9 +86,9 @@
         LEFT JOIN md_cs_supplierbase sb ON sb.supp_code = gp.supp_code
         <where>
             mst.is_delete = '0'AND mst.status != '99'
-            <if test="reqParam.bill_code != null and reqParam.bill_code != ''">
+            <if test="bill_code != null and bill_code != ''">
                 AND
-                mst.check_code = #{reqParam.bill_code}
+                mst.check_code = #{bill_code}
             </if>
         </where>
         ORDER BY mst.input_time,dtl.seq_no ASC
diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/impl/StIvtCheckmstServiceImpl.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/impl/StIvtCheckmstServiceImpl.java
index 300afb2..158f82b 100644
--- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/impl/StIvtCheckmstServiceImpl.java
+++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/impl/StIvtCheckmstServiceImpl.java
@@ -155,6 +155,10 @@ public class StIvtCheckmstServiceImpl extends ServiceImpl<StIvtCheckmstMapper, S
     @Transactional
     public void dtlCheckConfirm(StIvtCheckdtl dao) {
         StIvtCheckdtl dtlDao = iStIvtCheckdtlService.getById(dao.getCheckdtl_id());
+        String dtlVehicle = dtlDao.getStoragevehicle_code();
+        if (!dtlVehicle.equals(dao.getStoragevehicle_code())){
+            throw new BadRequestException("扫码托盘不属于当前盘点当");
+        }
         dtlDao.setFac_qty(dao.getFac_qty());
         // 是否异常 1-正常 2-异常
         dtlDao.setCheck_result(