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

流转单接口修改

Browse Source
This commit is contained in:
yinjinlu-pc\尹金路
2024-11-24 18:39:18 +08:00
parent 9d1089843a
commit 92e300607d
9 changed files with 74 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ktg-mes/src/main/resources/mapper/pro/ProCardMapper.xml
View File

@@ -69,8 +69,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
from pro_card pc
left join pro_card_process pcp
on pc.card_id = pcp.card_id
where pc.workorder_id = #{workOrderId}
and pc.workstation_id = #{workStationId}
where pc.workorder_id = #{workorderId}
and pcp.workstation_id = #{workstationId}
order by pcp.input_time desc
</select>

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

@@ -14,7 +14,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="unitOfMeasure" column="unit_of_measure" />
<result property="batchCode" column="batch_code" />
<result property="snNum" column="snNum"></result>
<result property="workOrderId" column="work_order_id"></result>
<result property="workorderId" column="workorder_id"></result>
<result property="inputTime" column="input_time"></result>
<result property="genDate" column="gen_date"></result>
<result property="remark" column="remark" />
@@ -29,7 +29,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectWmSnVo">
select sn_id, sn_code, item_id, item_code, item_name, specification, unit_of_measure, batch_code, work_order_id, gen_date, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from wm_sn
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">
@@ -42,7 +42,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<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>
<if test="workOderId != null and workOrderId != ''"> and work_order_id = #{workOrderId}</if>
<if test="workoderId != null and workorderId != ''"> and workorder_id = #{workorderId}</if>
</where>
</select>
@@ -72,8 +72,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
from wm_sn sn
left join pro_sn_process ps
on sn.sn_id = ps.sn_id
where sn.work_order_id =#{workOrderId}
and ps.workstation_id = #{workStationId}
where sn.workorder_id =#{workorderId}
and ps.workstation_id = #{workstationId}
order by ps.input_time desc
</select>
@@ -88,7 +88,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="specification != null">specification,</if>
<if test="unitOfMeasure != null">unit_of_measure,</if>
<if test="batchCode != null">batch_code,</if>
<if test="workOderId != null">work_order_id,</if>
<if test="workoderId != null">workorder_id,</if>
<if test="genDate !=null">gen_date,</if>
<if test="remark != null">remark,</if>
<if test="attr1 != null">attr1,</if>
@@ -108,7 +108,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="specification != null">#{specification},</if>
<if test="unitOfMeasure != null">#{unitOfMeasure},</if>
<if test="batchCode != null">#{batchCode},</if>
<if test="workOderId != null">#{workOrderId},</if>
<if test="workoderId != null">#{workorderId},</if>
<if test="genDate !=null">#{genDate},</if>
<if test="remark != null">#{remark},</if>
<if test="attr1 != null">#{attr1},</if>
@@ -132,7 +132,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="specification != null">specification = #{specification},</if>
<if test="unitOfMeasure != null">unit_of_measure = #{unitOfMeasure},</if>
<if test="batchCode != null">batch_code = #{batchCode},</if>
<if test="workOderId != null">work_order_id = #{workOrderId},</if>
<if test="workoderId != null">workorder_id = #{workorderId},</if>
<if test="remark != null">remark = #{remark},</if>
<if test="attr1 != null">attr1 = #{attr1},</if>
<if test="attr2 != null">attr2 = #{attr2},</if>