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

md

Browse Source
This commit is contained in:
linfso 2024-07-28 22:55:47 +08:00
parent f3dd65a002
commit b9235445ac
2 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java
View File

@ -638,9 +638,8 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
// 运单修改
else{
// 判断是否是接单
boolean isConfirmOrder=false;
if("1".equals(emisWaybillOld.getOrderStatus())){
// 判断是否是接单,如果订单状态为0，则需要做接单操作
if("0".equals(emisWaybillOld.getOrderStatus())){
emisWaybillSave.setId(emisWaybillOld.getId());
emisWaybillSave.setOrderSn(emisWaybillOld.getOrderSn());

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

@ -663,6 +663,14 @@
</if>
<if test="params.beginOrderDate != null and params.beginOrderDate != ''">
and a.order_date <![CDATA[ >= ]]> #{params.beginOrderDate}
</if>
<if test="params.endOrderDate != null and params.endOrderDate != ''">
and a.order_date <![CDATA[ <= ]]> #{params.endOrderDate}
</if>
<if test="payee != null and payee != ''">
or a.payee=#{payee}
</if>
@ -970,6 +978,22 @@
</if>
<if test="params.beginOrderDate != null and params.beginOrderDate != ''">
and a.order_date <![CDATA[ >= ]]> #{params.beginOrderDate}
</if>
<if test="params.endOrderDate != null and params.endOrderDate != ''">
and a.order_date <![CDATA[ <= ]]> #{params.endOrderDate}
</if>
<if test="payee != null and payee != ''">
or a.payee=#{payee}
</if>
<if test="salesmen != null and salesmen != '' " >
or a.salesmen=#{salesmen}
</if>
<if test="blSign != null and blSign == 1">
and a.bl_sign='1'
</if>