mes/mes-lxsm
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix：SN码删除功能优化

Browse Source
This commit is contained in:
zhangxuanming
2024-12-24 16:59:22 +08:00
parent effd939522
commit 32b9aebafc
7 changed files with 96 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
ktg-mes/src/main/resources/mapper/wm/WmSnMapper.xml
View File

@@ -29,11 +29,37 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="updateTime" column="update_time" />
</resultMap>
<resultMap type="WmSnPageVO" id="WmSnVOResult">
<result property="ids" column="ids" />
<result property="snId" column="sn_id" />
<result property="snCode" column="sn_code" />
<result property="itemId" column="item_id" />
<result property="itemCode" column="item_code" />
<result property="itemName" column="item_name" />
<result property="specification" column="specification" />
<result property="unitOfMeasure" column="unit_of_measure" />
<result property="batchCode" column="batch_code" />
<result property="snNum" column="snNum"></result>
<result property="workorderId" column="workorder_id"></result>
<result property="workorderCode" column="workorder_code"></result>
<result property="inputTime" column="input_time"></result>
<result property="genDate" column="gen_date"></result>
<result property="remark" column="remark" />
<result property="attr1" column="attr1" />
<result property="attr2" column="attr2" />
<result property="attr3" column="attr3" />
<result property="attr4" column="attr4" />
<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="selectWmSnVo">
select sn_id, sn_code, item_id, item_code, item_name, specification, unit_of_measure, batch_code, workorder_id, gen_date, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from wm_sn
</sql>
<select id="selectWmSnList" parameterType="WmSn" resultMap="WmSnResult">
<select id="selectWmSnList" parameterType="WmSn" resultMap="WmSnVOResult">
<include refid="selectWmSnVo"/>
<where>
<if test="snCode != null and snCode != ''"> and sn_code = #{snCode}</if>
@@ -79,6 +105,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and ps.workstation_id = #{workstationId}
order by ps.input_time desc
</select>
<select id="getWmSnList" parameterType="WmSn" resultMap="WmSnVOResult">
select group_concat(sn_id) as ids, item_id, item_code, item_name, specification, unit_of_measure, batch_code,gen_date , count(*) as snNum
from wm_sn
<where>
<if test="snCode != null and snCode != ''"> and sn_code = #{snCode}</if>
<if test="itemId != null "> and item_id = #{itemId}</if>
<if test="itemCode != null and itemCode != ''"> and item_code = #{itemCode}</if>
<if test="itemName != null and itemName != ''"> and item_name like concat('%', #{itemName}, '%')</if>
<if test="specification != null and specification != ''"> and specification = #{specification}</if>
<if test="unitOfMeasure != null and unitOfMeasure != ''"> and unit_of_measure = #{unitOfMeasure}</if>
<if test="batchCode != null and batchCode != ''"> and batch_code = #{batchCode}</if>
</where>
group by item_id, item_code, item_name, specification, unit_of_measure, batch_code, gen_date
order by item_id,batch_code desc
</select>
<insert id="insertWmSn" parameterType="WmSn" useGeneratedKeys="true" keyProperty="snId">
@@ -155,8 +196,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<delete id="deleteWmSnBySnIds" parameterType="String">
delete from wm_sn where sn_id in
<foreach item="snId" collection="array" open="(" separator="," close=")">
#{snId}
<foreach item="item" collection="ids" open="(" separator="," close=")">
#{item}
</foreach>
</delete>
</mapper>