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

优化入库明细和出库明细的接口

Browse Source
This commit is contained in:
季圣华
2022-10-13 23:08:00 +08:00
parent 97e89cb035
commit 0a9cb85654
4 changed files with 93 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
jshERP-boot/src/main/resources/mapper_xml/DepotHeadMapperEx.xml
View File

@@ -239,7 +239,7 @@
and ifnull(jsh_depot_item.delete_flag,'0') !='1'
</select>
<select id="findInDetail" parameterType="com.jsh.erp.datasource.entities.DepotItemExample" resultMap="ResultWithInfoExMap">
<select id="findInOutDetail" parameterType="com.jsh.erp.datasource.entities.DepotItemExample" resultMap="ResultWithInfoExMap">
select dh.number,me.bar_code, m.`name` MName,m.model,m.standard,di.unit_price,di.material_unit as mUnit,
di.oper_number,di.all_price, ifnull(di.tax_rate,0) tax_rate, ifnull(di.tax_money,0) tax_money, ifnull(di.tax_last_money,0) tax_last_money,
s.supplier SName,d.dName DName, date_format(dh.oper_time, '%Y-%m-%d') OperTime, concat(dh.sub_type,dh.type) as NewType,
@@ -271,11 +271,11 @@
)
</if>
<if test="organArray != null and organArray !=''">
and dh.organ_id in (
and (dh.organ_id in (
<foreach collection="organArray" item="organId" separator=",">
#{organId}
</foreach>
)
) or dh.sub_type='采购退货' or dh.sub_type='零售')
</if>
<if test="number != null and number !=''">
<bind name="bindNumber" value="'%'+number+'%'"/>
@@ -297,7 +297,7 @@
</if>
</select>
<select id="findInDetailCount" resultType="java.lang.Integer">
<select id="findInOutDetailCount" resultType="java.lang.Integer">
select count(1)
from jsh_depot_head dh
left join jsh_depot_item di on di.header_id=dh.id and ifnull(di.delete_flag,'0') !='1'
@@ -326,11 +326,11 @@
)
</if>
<if test="organArray != null and organArray !=''">
and dh.organ_id in (
and (dh.organ_id in (
<foreach collection="organArray" item="organId" separator=",">
#{organId}
</foreach>
)
) or dh.sub_type='采购退货' or dh.sub_type='零售')
</if>
<if test="number != null and number !=''">
<bind name="bindNumber" value="'%'+number+'%'"/>
@@ -372,11 +372,11 @@
)
</if>
<if test="organArray != null and organArray !=''">
and dh.organ_id in (
and (dh.organ_id in (
<foreach collection="organArray" item="organId" separator=",">
#{organId}
</foreach>
)
) or dh.sub_type='采购退货' or dh.sub_type='零售')
</if>
<if test="depotList.size()>0">
<if test="type == '入库'">
@@ -429,11 +429,11 @@
)
</if>
<if test="organArray != null and organArray !=''">
and dh.organ_id in (
and (dh.organ_id in (
<foreach collection="organArray" item="organId" separator=",">
#{organId}
</foreach>
)
) or dh.sub_type='采购退货' or dh.sub_type='零售')
</if>
<if test="depotList.size()>0">
<if test="type == '入库'">