From 2a64b537e8e3bce9ce030585a3da17d48379c0ad Mon Sep 17 00:00:00 2001
From: sfd <sun.sunshine@163.com>
Date: 星期一, 26 五月 2025 15:04:45 +0800
Subject: [PATCH] 修改json类型转换错误
---
aps-modules/aps-core/src/main/resources/mapper/core/ApsMaterialStorageManagementMapper.xml | 34 +++++++++++++++++++++++++++++-----
1 files changed, 29 insertions(+), 5 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 02347ca..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" />
@@ -15,16 +15,22 @@
<result property="createTime" column="create_time" />
<result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" />
+ <result property="version" column="version" />
+ <result property="remainderStock" column="remainder_stock" />
+
</resultMap>
<sql id="selectApsMaterialStorageManagementVo">
- select id, item_number, num, applicable_factories, integration_date, refresh_date, create_by, create_time, update_by, update_time from aps_material_storage_management
+ select id, item_number, num, applicable_factories, integration_date, refresh_date, create_by,
+ 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>
+ <if test="applicableFactories != null and applicableFactories != ''"> and applicable_factories = #{applicableFactories}</if>
</where>
</select>
@@ -33,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>
@@ -61,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>
@@ -87,4 +93,22 @@
#{id}
</foreach>
</delete>
+ <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