aike/emis-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'demand: 运单补打印报错问题定位解决' (#284) from test1 into master

Browse Source 
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/284
This commit is contained in:
heyu 2026-01-04 18:05:32 +08:00
commit e2433de6d1
1 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
View File

@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.xdadan.erp.emis.mapper.EmisWaybillMapper">
<resultMap type="EmisWaybill" id="BaseEmisWaybillResult" >
<resultMap type="EmisWaybill" id="BaseEmisWaybillResult" extends="com.xdadan.erp.emis.mapper.EmisBaseMapper.EmisBaseResult">
<result property="id" column="id" />
<result property="orderSn" column="order_sn" />
<result property="custOrderId" column="cust_order_id" />
@ -4811,6 +4811,10 @@
)
)
</if>
<!-- 客户状态 -->
<if test="params.status != null and params.status != ''">
AND cu.status = #{params.status}
</if>
</where>
GROUP BY cu.monthly_pay_code, cu.customer_name
ORDER BY totalWeight DESC, totalTickets DESC, customerName ASC
@ -4920,6 +4924,10 @@
)
)
</if>
<!-- 客户状态 -->
<if test="params.status != null and params.status != ''">
AND cu.status = #{params.status}
</if>
</where>
GROUP BY cu.monthly_pay_code
ORDER BY totalWeight desc,totalTickets desc
@ -5136,6 +5144,10 @@
)
)
</if>
<!-- 客户状态 -->
<if test="params.status != null and params.status != ''">
AND mu.status = #{params.status}
</if>
</where>
GROUP BY mu.id, mu.company
ORDER BY totalWeight DESC, totalTickets DESC, company ASC
@ -5245,6 +5257,10 @@
)
)
</if>
<!-- 客户状态 -->
<if test="params.status != null and params.status != ''">
AND mu.status = #{params.status}
</if>
</where>
GROUP BY mu.id, mu.company
ORDER BY totalWeight DESC, totalTickets DESC, company ASC