diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/utils/Kd100Helper.java b/emis-biz/src/main/java/com/xdadan/erp/emis/utils/Kd100Helper.java
index db2d90c23..190d3c6eb 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/utils/Kd100Helper.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/utils/Kd100Helper.java
@@ -169,11 +169,6 @@ public class Kd100Helper {
}
-
-
-
-
-
/**
* 业务数据加密 --> param + key + customer 的顺序进行MD5加密(注意加密后字符串一定要转大写)
* @param timestamp
diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
index 27def10fb..6704e9eee 100644
--- a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
@@ -470,22 +470,22 @@
where FIND_IN_SET(`bill_code`,#{billCode})
- ORDER BY
+
- FIELD
+ ORDER BY FIELD
#{item}
- ,
- FIELD
+ ORDER BY FIELD
#{item}
- ,
- a.create_time desc
+
+ ORDER BY a.send_date desc
+
@@ -1619,22 +1624,24 @@
- ORDER BY
- FIELD
+ ORDER BY FIELD
#{item}
- ,
- FIELD
+ ORDER BY FIELD
#{item}
- ,
- a.create_time desc
+
+
+ ORDER BY a.send_date desc
+
+
+