purovps/jshERP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化序列号和批号选择列表的接口

Browse Source
This commit is contained in:
季圣华
2022-09-09 00:25:03 +08:00
parent 9795d32bee
commit aa72b0bce2
9 changed files with 77 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
jshERP-boot/src/main/resources/mapper_xml/SerialNumberMapperEx.xml
View File

@@ -158,9 +158,9 @@
)
</update>
<select id="getEnableSerialNumberList" resultMap="com.jsh.erp.datasource.mappers.SerialNumberMapper.BaseResultMap">
<select id="getEnableSerialNumberList" resultType="com.jsh.erp.datasource.entities.SerialNumberEx">
select
ser.id, ser.serial_number
ser.id, ser.serial_number, ser.in_bill_no, ser.create_time, ser.update_time
FROM jsh_serial_number ser
left join jsh_material m on m.id=ser.material_id and ifnull(m.delete_flag, '0') != '1'
left join jsh_material_extend me on me.material_id=m.id and ifnull(me.delete_flag,'0') !='1'
@@ -175,7 +175,11 @@
<if test="barCode != null">
and me.bar_code= #{barCode}
</if>
and ser.is_sell = '0'
and (ser.is_sell = '0'
<if test="number != null">
or ser.out_bill_no = #{number}
</if>
)
and ifnull(ser.delete_flag,'0') !='1'
order by ser.id desc
<if test="offset != null and rows != null">
@@ -199,7 +203,11 @@
<if test="barCode != null">
and me.bar_code= #{barCode}
</if>
and ser.is_sell = '0'
and (ser.is_sell = '0'
<if test="number != null">
or ser.out_bill_no = #{number}
</if>
)
and ifnull(ser.delete_flag,'0') !='1'
</select>
</mapper>