From 49be63ecf30f953cd0f24d4c0deb2ea19d8fda07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B8=B8=E7=86=9F=E5=90=B4=E5=BD=A6=E7=A5=96?=
 <qi.ruan@xujiesoft.com>
Date: Mon, 9 Feb 2026 15:58:04 +0800
Subject: [PATCH] =?UTF-8?q?feat(inventory):=20=E6=B7=BB=E5=8A=A0=E7=9B=98?=
 =?UTF-8?q?=E7=82=B9=E7=BB=93=E6=9E=9C=E5=A4=84=E7=90=86=E6=A0=87=E8=AE=B0?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 新增 updateCountResultHandleFlagAndFlag 方法用于更新处理标记和处理方式
- 在 PhysicalInventoryMapper 中添加对应的数据库操作接口
- 实现盘点结果表的 handle_type 和 handle_flag 字段更新逻辑
- 修改服务层实现以使用新的更新方法
- 添加 XML 映射文件中的 SQL 更新语句
---
 .../modules/check/mapper/PhysicalInventoryMapper.java     | 5 +++++
 .../check/service/impl/PhysicalInventoryServiceImpl.java  | 2 +-
 .../resources/mapper/check/PhysicalInventoryMapper.xml    | 8 ++++++++
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/gaotao/modules/check/mapper/PhysicalInventoryMapper.java b/src/main/java/com/gaotao/modules/check/mapper/PhysicalInventoryMapper.java
index 330a299..f17a71c 100644
--- a/src/main/java/com/gaotao/modules/check/mapper/PhysicalInventoryMapper.java
+++ b/src/main/java/com/gaotao/modules/check/mapper/PhysicalInventoryMapper.java
@@ -596,6 +596,11 @@ public interface PhysicalInventoryMapper extends BaseMapper<CountHeader> {
                                     @Param("palletId") String palletId, @Param("handleFlag") String handleFlag,
                                     @Param("handleType") String handleType, @Param("username") String username);
 
+    int updateCountResultHandleFlagAndFlag(@Param("id") Long id, @Param("site") String site,
+                                    @Param("countNo") String countNo, @Param("unitId") String unitId,
+                                    @Param("palletId") String palletId, @Param("handleFlag") String handleFlag,
+                                    @Param("handleType") String handleType, @Param("username") String username);
+
     CountResultData getCountResultById(Long id);
 
     void updateCountResultHandleFlagForId(@Param("id") Long id,@Param("handleFlag") String handleFlag);
diff --git a/src/main/java/com/gaotao/modules/check/service/impl/PhysicalInventoryServiceImpl.java b/src/main/java/com/gaotao/modules/check/service/impl/PhysicalInventoryServiceImpl.java
index 97a8fbb..3e6da6c 100644
--- a/src/main/java/com/gaotao/modules/check/service/impl/PhysicalInventoryServiceImpl.java
+++ b/src/main/java/com/gaotao/modules/check/service/impl/PhysicalInventoryServiceImpl.java
@@ -2209,7 +2209,7 @@ public class PhysicalInventoryServiceImpl extends ServiceImpl<PhysicalInventoryM
             String handleType = (String) item.get("handleType");
             
             // 更新处理标记和处理方式 - rqrq
-            int updated = baseMapper.updateCountResultHandleFlag(id, site, countNo, unitId, palletId, 
+            int updated = baseMapper.updateCountResultHandleFlagAndFlag(id, site, countNo, unitId, palletId,
                     CountResult.HANDLE_FLAG_YES, handleType, username);
             updateCount += updated;
         }
diff --git a/src/main/resources/mapper/check/PhysicalInventoryMapper.xml b/src/main/resources/mapper/check/PhysicalInventoryMapper.xml
index 908cc6b..94857b5 100644
--- a/src/main/resources/mapper/check/PhysicalInventoryMapper.xml
+++ b/src/main/resources/mapper/check/PhysicalInventoryMapper.xml
@@ -1027,6 +1027,14 @@
 <!--          AND site = #{site} -->
 <!--          AND count_no = #{countNo}-->
     </update>
+    <!-- rqrq - 更新盘点结果的处理标记和处理方式 -->
+    <update id="updateCountResultHandleFlagAndFlag">
+        UPDATE count_result
+        SET  handle_type = #{handleType} ,handle_flag='Y'
+        WHERE id = #{id}
+        <!--          AND site = #{site} -->
+        <!--          AND count_no = #{countNo}-->
+    </update>
 
     <select id="getCountResultById" resultType="CountResultData">
         select