From d337c8e2e21df8ff7d2ecae493fa7a65627fedea Mon Sep 17 00:00:00 2001
From: Zhu Zhonghua <zhonghua@qq.com>
Date: 星期四, 22 五月 2025 14:52:48 +0800
Subject: [PATCH] 处理焊缝大数据插入异常问题

---
 aps-modules/aps-core/src/main/resources/mapper/core/ApsMaterialStorageManagementMapper.xml |   25 +++++++++++++++++++------
 1 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/aps-modules/aps-core/src/main/resources/mapper/core/ApsMaterialStorageManagementMapper.xml b/aps-modules/aps-core/src/main/resources/mapper/core/ApsMaterialStorageManagementMapper.xml
index 747cd2a..e16c809 100644
--- a/aps-modules/aps-core/src/main/resources/mapper/core/ApsMaterialStorageManagementMapper.xml
+++ b/aps-modules/aps-core/src/main/resources/mapper/core/ApsMaterialStorageManagementMapper.xml
@@ -4,7 +4,7 @@
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.aps.core.mapper.ApsMaterialStorageManagementMapper">
     
-    <resultMap type="ApsMaterialStorageManagement" id="ApsMaterialStorageManagementResult">
+    <resultMap type="com.aps.core.domain.ApsMaterialStorageManagement" id="ApsMaterialStorageManagementResult">
         <result property="id"    column="id"    />
         <result property="itemNumber"    column="item_number"    />
         <result property="num"    column="num"    />
@@ -22,11 +22,11 @@
 
     <sql id="selectApsMaterialStorageManagementVo">
         select id, item_number, num, applicable_factories, integration_date, refresh_date, create_by,
-               create_time, update_by, update_time ,remainderStock,version
+               create_time, update_by, update_time ,remainder_stock,version
         from aps_material_storage_management
     </sql>
 
-    <select id="selectApsMaterialStorageManagementList" parameterType="ApsMaterialStorageManagement" resultMap="ApsMaterialStorageManagementResult">
+    <select id="selectApsMaterialStorageManagementList" parameterType="com.aps.core.domain.ApsMaterialStorageManagement" resultMap="ApsMaterialStorageManagementResult">
         <include refid="selectApsMaterialStorageManagementVo"/>
         <where>  
             <if test="itemNumber != null  and itemNumber != ''"> and item_number = #{itemNumber}</if>
@@ -39,7 +39,7 @@
         where id = #{id}
     </select>
 
-    <insert id="insertApsMaterialStorageManagement" parameterType="ApsMaterialStorageManagement">
+    <insert id="insertApsMaterialStorageManagement" parameterType="com.aps.core.domain.ApsMaterialStorageManagement">
         insert into aps_material_storage_management
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="id != null">id,</if>
@@ -67,7 +67,7 @@
          </trim>
     </insert>
 
-    <update id="updateApsMaterialStorageManagement" parameterType="ApsMaterialStorageManagement">
+    <update id="updateApsMaterialStorageManagement" parameterType="com.aps.core.domain.ApsMaterialStorageManagement">
         update aps_material_storage_management
         <trim prefix="SET" suffixOverrides=",">
             <if test="itemNumber != null">item_number = #{itemNumber},</if>
@@ -93,9 +93,22 @@
             #{id}
         </foreach>
     </delete>
-    <update id="updateMaterialStorageByVersion" parameterType="ApsMaterialStorageManagement">
+    <update id="updateMaterialStorageByVersion" parameterType="com.aps.core.domain.ApsMaterialStorageManagement">
         update aps_material_storage_management
         set remainder_stock=#{remainderStock},version=version+1
         where id=#{id} and version=#{version}
     </update>
+
+    <update id="initRemainderStock">
+        update aps_material_storage_management
+        set remainder_stock=num,version=0
+        where 1=1
+    </update>
+
+    <update id="updateRemainderStock" parameterType="com.aps.core.domain.ApsMaterialStorageManagement">
+        update aps_material_storage_management
+        set remainder_stock=#{remainderStock},version=#{version}
+        where id=#{id}
+    </update>
+
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.3