From 533bccb991763a5c2db8a958fa5003b90b196cfc Mon Sep 17 00:00:00 2001 From: hongjli <3117313295@qq.com> Date: 星期三, 14 五月 2025 18:05:11 +0800 Subject: [PATCH] Merge branch 'dev' of http://192.168.50.149:8085/r/aps-backend into dev_lhj --- aps-modules/aps-core/src/main/resources/mapper/core/ApsMaterialStorageManagementMapper.xml | 12 ++++++------ 1 files changed, 6 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 fe547a9..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" /> @@ -26,7 +26,7 @@ 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,7 +93,7 @@ #{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} @@ -105,7 +105,7 @@ where 1=1 </update> - <update id="updateRemainderStock" parameterType="ApsMaterialStorageManagement"> + <update id="updateRemainderStock" parameterType="com.aps.core.domain.ApsMaterialStorageManagement"> update aps_material_storage_management set remainder_stock=#{remainderStock},version=#{version} where id=#{id} -- Gitblit v1.9.3