BruceSun
/
RuoYi-Vue
mirror of https://gitee.com/y_project/RuoYi-Vue.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

master：生产需求管理列表BUG修复；

pull/1121/head
liujiang 2025-09-20 15:06:56 +08:00
parent 4a7992b38d
commit b7c5ca8a7c
2 changed files with 2 additions and 171 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
xkt/src/main/resources/mapper/StoreProductDemandDetailMapper.xml
View File

@ -9,7 +9,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
SELECT spdd.store_id, spdd.id AS storeProdDemandDetailId, spdd.store_prod_demand_id AS storeProdDemandId, sf.fac_name AS storeFactoryName, spdd.create_time, spd.`code`,
spdd.prod_art_num, spdd.color_name, spdd.quantity, spd.remark, spdd.detail_status, spdd.emergency, spdd.store_prod_id AS storeProdId,
spdd.store_prod_color_id AS storeProdColorId, spdd.store_color_id AS storeColorId,
spdd.size_30 AS size30, spdd.size_31 AS size33, spdd.size_32 AS size32, spdd.size_33 AS size33, spdd.size_34 AS size34, spdd.size_35 AS size35, spdd.size_36 AS size36,
spdd.size_30 AS size30, spdd.size_31 AS size31, spdd.size_32 AS size32, spdd.size_33 AS size33, spdd.size_34 AS size34, spdd.size_35 AS size35, spdd.size_36 AS size36,
spdd.size_37 AS size37, spdd.size_38 AS size38, spdd.size_39 AS size39, spdd.size_40 AS size40, spdd.size_41 AS size41, spdd.size_42 AS size42, spdd.size_43 AS size43
FROM
store_product_demand_detail spdd
@ -17,7 +17,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
LEFT JOIN store_factory sf ON spd.store_factory_id = sf.id
WHERE
spdd.del_flag = 0 AND spdd.store_id = #{storeId}
<if test="prodArtNum != null and prodArtNum != ''"> and spdd.prod_art_num = #{prodArtNum}</if>
<if test="prodArtNum != null and prodArtNum != ''"> and spdd.prod_art_num like concat('%', #{remark}, '%')</if>
<if test="storeFactoryId != null "> and sf.id = #{storeFactoryId}</if>
<if test="remark != null and remark != ''"> and sf.remark like concat('%', #{remark}, '%')</if>
<if test="emergency != null "> and spdd.emergency = #{emergency}</if>

169
xkt/src/main/resources/mapper/StoreProductStorageDemandDeducteMapper.xml
View File

@ -3,174 +3,5 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.xkt.mapper.StoreProductStorageDemandDeductMapper">
<resultMap type="StoreProductStorageDemandDeduct" id="StoreProductStorageDemandDeductResult">
<result property="id" column="id" />
<result property="storeProdStorDetailId" column="store_prod_stor_detail_id" />
<result property="storeProdDemandId" column="store_prod_demand_id" />
<result property="storeProdColorId" column="store_prod_color_id" />
<result property="storeProdId" column="store_prod_id" />
<result property="storageCode" column="storage_code" />
<result property="demandCode" column="demand_code" />
<result property="size30" column="size_30" />
<result property="size31" column="size_31" />
<result property="size32" column="size_32" />
<result property="size33" column="size_33" />
<result property="size34" column="size_34" />
<result property="size35" column="size_35" />
<result property="size36" column="size_36" />
<result property="size37" column="size_37" />
<result property="size38" column="size_38" />
<result property="size39" column="size_39" />
<result property="size40" column="size_40" />
<result property="size41" column="size_41" />
<result property="size42" column="size_42" />
<result property="size43" column="size_43" />
<result property="version" column="version" />
<result property="delFlag" column="del_flag" />
<result property="createBy" column="create_by" />
<result property="createTime" column="create_time" />
<result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" />
</resultMap>
<sql id="selectStoreProductStorageDemandDeductVo">
select id, store_prod_stor_detail_id, store_prod_demand_id, store_prod_color_id, store_prod_id, storage_code, demand_code, size_30, size_31, size_32, size_33, size_34, size_35, size_36, size_37, size_38, size_39, size_40, size_41, size_42, size_43, version, del_flag, create_by, create_time, update_by, update_time from store_product_storage_demand_Deduct
</sql>
<select id="selectStoreProductStorageDemandDeductList" parameterType="StoreProductStorageDemandDeduct" resultMap="StoreProductStorageDemandDeductResult">
<include refid="selectStoreProductStorageDemandDeductVo"/>
<where>
<if test="storeProdStorDetailId != null "> and store_prod_stor_detail_id = #{storeProdStorDetailId}</if>
<if test="storeProdDemandId != null "> and store_prod_demand_id = #{storeProdDemandId}</if>
<if test="storeProdColorId != null "> and store_prod_color_id = #{storeProdColorId}</if>
<if test="storeProdId != null "> and store_prod_id = #{storeProdId}</if>
<if test="storageCode != null and storageCode != ''"> and storage_code = #{storageCode}</if>
<if test="demandCode != null and demandCode != ''"> and demand_code = #{demandCode}</if>
<if test="size30 != null "> and size_30 = #{size30}</if>
<if test="size31 != null "> and size_31 = #{size31}</if>
<if test="size32 != null "> and size_32 = #{size32}</if>
<if test="size33 != null "> and size_33 = #{size33}</if>
<if test="size34 != null "> and size_34 = #{size34}</if>
<if test="size35 != null "> and size_35 = #{size35}</if>
<if test="size36 != null "> and size_36 = #{size36}</if>
<if test="size37 != null "> and size_37 = #{size37}</if>
<if test="size38 != null "> and size_38 = #{size38}</if>
<if test="size39 != null "> and size_39 = #{size39}</if>
<if test="size40 != null "> and size_40 = #{size40}</if>
<if test="size41 != null "> and size_41 = #{size41}</if>
<if test="size42 != null "> and size_42 = #{size42}</if>
<if test="size43 != null "> and size_43 = #{size43}</if>
<if test="version != null "> and version = #{version}</if>
</where>
</select>
<select id="selectStoreProductStorageDemandDeductByStoreProdStorDemaDeductId" parameterType="Long" resultMap="StoreProductStorageDemandDeductResult">
<include refid="selectStoreProductStorageDemandDeductVo"/>
where id = #{id}
</select>
<insert id="insertStoreProductStorageDemandDeduct" parameterType="StoreProductStorageDemandDeduct" useGeneratedKeys="true" keyProperty="storeProdStorDemaDeductId">
insert into store_product_storage_demand_Deduct
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="storeProdStorDetailId != null">store_prod_stor_detail_id,</if>
<if test="storeProdDemandId != null">store_prod_demand_id,</if>
<if test="storeProdColorId != null">store_prod_color_id,</if>
<if test="storeProdId != null">store_prod_id,</if>
<if test="storageCode != null">storage_code,</if>
<if test="demandCode != null">demand_code,</if>
<if test="size30 != null">size_30,</if>
<if test="size31 != null">size_31,</if>
<if test="size32 != null">size_32,</if>
<if test="size33 != null">size_33,</if>
<if test="size34 != null">size_34,</if>
<if test="size35 != null">size_35,</if>
<if test="size36 != null">size_36,</if>
<if test="size37 != null">size_37,</if>
<if test="size38 != null">size_38,</if>
<if test="size39 != null">size_39,</if>
<if test="size40 != null">size_40,</if>
<if test="size41 != null">size_41,</if>
<if test="size42 != null">size_42,</if>
<if test="size43 != null">size_43,</if>
<if test="version != null">version,</if>
<if test="delFlag != null">del_flag,</if>
<if test="createBy != null">create_by,</if>
<if test="createTime != null">create_time,</if>
<if test="updateBy != null">update_by,</if>
<if test="updateTime != null">update_time,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="storeProdStorDetailId != null">#{storeProdStorDetailId},</if>
<if test="storeProdDemandId != null">#{storeProdDemandId},</if>
<if test="storeProdColorId != null">#{storeProdColorId},</if>
<if test="storeProdId != null">#{storeProdId},</if>
<if test="storageCode != null">#{storageCode},</if>
<if test="demandCode != null">#{demandCode},</if>
<if test="size30 != null">#{size30},</if>
<if test="size31 != null">#{size31},</if>
<if test="size32 != null">#{size32},</if>
<if test="size33 != null">#{size33},</if>
<if test="size34 != null">#{size34},</if>
<if test="size35 != null">#{size35},</if>
<if test="size36 != null">#{size36},</if>
<if test="size37 != null">#{size37},</if>
<if test="size38 != null">#{size38},</if>
<if test="size39 != null">#{size39},</if>
<if test="size40 != null">#{size40},</if>
<if test="size41 != null">#{size41},</if>
<if test="size42 != null">#{size42},</if>
<if test="size43 != null">#{size43},</if>
<if test="version != null">#{version},</if>
<if test="delFlag != null">#{delFlag},</if>
<if test="createBy != null">#{createBy},</if>
<if test="createTime != null">#{createTime},</if>
<if test="updateBy != null">#{updateBy},</if>
<if test="updateTime != null">#{updateTime},</if>
</trim>
</insert>
<update id="updateStoreProductStorageDemandDeduct" parameterType="StoreProductStorageDemandDeduct">
update store_product_storage_demand_Deduct
<trim prefix="SET" suffixOverrides=",">
<if test="storeProdStorDetailId != null">store_prod_stor_detail_id = #{storeProdStorDetailId},</if>
<if test="storeProdDemandId != null">store_prod_demand_id = #{storeProdDemandId},</if>
<if test="storeProdColorId != null">store_prod_color_id = #{storeProdColorId},</if>
<if test="storeProdId != null">store_prod_id = #{storeProdId},</if>
<if test="storageCode != null">storage_code = #{storageCode},</if>
<if test="demandCode != null">demand_code = #{demandCode},</if>
<if test="size30 != null">size_30 = #{size30},</if>
<if test="size31 != null">size_31 = #{size31},</if>
<if test="size32 != null">size_32 = #{size32},</if>
<if test="size33 != null">size_33 = #{size33},</if>
<if test="size34 != null">size_34 = #{size34},</if>
<if test="size35 != null">size_35 = #{size35},</if>
<if test="size36 != null">size_36 = #{size36},</if>
<if test="size37 != null">size_37 = #{size37},</if>
<if test="size38 != null">size_38 = #{size38},</if>
<if test="size39 != null">size_39 = #{size39},</if>
<if test="size40 != null">size_40 = #{size40},</if>
<if test="size41 != null">size_41 = #{size41},</if>
<if test="size42 != null">size_42 = #{size42},</if>
<if test="size43 != null">size_43 = #{size43},</if>
<if test="version != null">version = #{version},</if>
<if test="delFlag != null">del_flag = #{delFlag},</if>
<if test="createBy != null">create_by = #{createBy},</if>
<if test="createTime != null">create_time = #{createTime},</if>
<if test="updateBy != null">update_by = #{updateBy},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
</trim>
where id = #{id}
</update>
<delete id="deleteStoreProductStorageDemandDeductByStoreProdStorDemaDeductId" parameterType="Long">
delete from store_product_storage_demand_Deduct where id = #{id}
</delete>
<delete id="deleteStoreProductStorageDemandDeductByStoreProdStorDemaDeductIds" parameterType="String">
delete from store_product_storage_demand_Deduct where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</delete>
</mapper>