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-06-18 15:55:46 +08:00
parent d8fb3bbefe
commit 5465153a65
2 changed files with 44 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
emis-biz/src/main/java/com/xdadan/erp/emis/domain/enumtype/OrderStatus.java Normal file
View File

@ -0,0 +1,26 @@
package com.xdadan.erp.emis.domain.enumtype;
/**
* waybill order status
*/
public enum OrderStatus {
INIT("0","创建成功"),
CONFIRM("1","已接单"),
CANCEL("-1","已取消"),
OTHER("999","其他"),
;
public String statusCode;
public String statusName;
OrderStatus(String statusCode, String statusName) {
this.statusCode = statusCode;
this.statusName = statusName;
}
}

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

@ -540,7 +540,6 @@
<if test="sendSiteCode != null and sendSiteCode != ''"> and a.send_site_code= #{sendSiteCode}</if> <if test="sendSiteCode != null and sendSiteCode != ''"> and a.send_site_code= #{sendSiteCode}</if>
<if test="remark != null and remark != ''"> and a.remark like concat('%', #{remark}, '%')</if> <if test="remark != null and remark != ''"> and a.remark like concat('%', #{remark}, '%')</if>
<if test="createBy != null and createBy != ''"> and a.create_by= #{createBy}</if> <if test="createBy != null and createBy != ''"> and a.create_by= #{createBy}</if>
<if test="updateBy != null and updateBy != ''"> and a.update_by=#{updateBy}</if> <if test="updateBy != null and updateBy != ''"> and a.update_by=#{updateBy}</if>
@ -548,6 +547,24 @@
<if test="updateSite != null and updateSite != ''"> and a.update_site=#{updateSite}</if> <if test="updateSite != null and updateSite != ''"> and a.update_site=#{updateSite}</if>
<if test="params.waybillStatType != null and params.waybillStatType == '1'">
and a.waybill_status='0' and a.order_status='0'
</if>
<if test="params.waybillStatType != null and params.waybillStatType == '2'">
and a.waybill_status!='0' and a.order_status='1'
</if>
<if test="params.waybillStatType != null and params.waybillStatType == '3'">
and a.waybill_status!='0'
</if>
<if test="params.waybillStatType != null and params.waybillStatType == '4'">
</if>
<if test="params.beginSendDate != null and params.beginSendDate != ''"> <if test="params.beginSendDate != null and params.beginSendDate != ''">
and a.send_date <![CDATA[ >= ]]> #{params.beginSendDate} and a.send_date <![CDATA[ >= ]]> #{params.beginSendDate}