From 5465153a65b63199297ec72b9f677d93193e515f Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Tue, 18 Jun 2024 15:55:46 +0800
Subject: [PATCH] md

---
 .../erp/emis/domain/enumtype/OrderStatus.java | 26 +++++++++++++++++++
 .../resources/mapper/EmisWaybillMapper.xml    | 19 +++++++++++++-
 2 files changed, 44 insertions(+), 1 deletion(-)
 create mode 100644 emis-biz/src/main/java/com/xdadan/erp/emis/domain/enumtype/OrderStatus.java

diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/enumtype/OrderStatus.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/enumtype/OrderStatus.java
new file mode 100644
index 000000000..29272c2a1
--- /dev/null
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/enumtype/OrderStatus.java
@@ -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;
+    }
+}
diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
index 116bc6b20..9876bc4bb 100644
--- a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
@@ -540,7 +540,6 @@
 
             <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="createBy != null  and createBy != ''"> and a.create_by= #{createBy}</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="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 != ''">
                 and a.send_date <![CDATA[ >= ]]>  #{params.beginSendDate}