From f2668259a3b4e473b31c9eca01b0930c32a45d8e Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Mon, 30 Sep 2024 15:34:44 +0800
Subject: [PATCH] md

---
 .../erp/web/emis/EmisCommonController.java    |  3 ++
 .../erp/emis/service/EmisBaseService.java     | 32 +++++++++----------
 .../resources/mapper/EmisWaybillMapper.xml    |  2 +-
 3 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonController.java
index 33235a26d..30c78cdd3 100644
--- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonController.java
+++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonController.java
@@ -529,6 +529,9 @@ public class EmisCommonController extends EmisBaseController
         rstMap.put("sendCountry",sendCountry);
         rstMap.put("receiveCountry",receiveCountry);
 
+        // sendCountry -- 发件国二字码
+        // receiveCountry -- 收件国二字码
+
         rstMap.put("billCode",mainNo);
         List<Map> stepList=emisTmsScanRecordService.queryWaybillTraceInfo(mainNo,lang);
         rstMap.put("steps",stepList);
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
index 9782b8264..c5df6fd89 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
@@ -339,22 +339,22 @@ public class EmisBaseService {
          int statType_3_num=0;
          int statType_4_num=0;
 
-         List<Map> dbStatMapList = emisWaybillMapper.getWaybillStatMap(emisWaybill);
-         if(!CollectionUtils.isEmpty(dbStatMapList)){
-             for (Map objMap:dbStatMapList) {
-                 String waybillStatus= MapUtils.getString(objMap,"waybillStatus",null);
-                 int cnt= MapUtils.getIntValue(objMap,"cnt",0);
-                 if(WaybillStatus.INIT.statusCode.equals(waybillStatus)){
-
-                     waitDoNum=waitDoNum+cnt;
-                     statType_1_num=statType_1_num+cnt;
-                 }else{
-                     statType_2_num=statType_1_num+cnt;
-                     hasDoNum=hasDoNum+cnt;
-                 }
-
-             }
-         }
+//         List<Map> dbStatMapList = emisWaybillMapper.getWaybillStatMap(emisWaybill);
+//         if(!CollectionUtils.isEmpty(dbStatMapList)){
+//             for (Map objMap:dbStatMapList) {
+//                 String waybillStatus= MapUtils.getString(objMap,"waybillStatus",null);
+//                 int cnt= MapUtils.getIntValue(objMap,"cnt",0);
+//                 if(WaybillStatus.INIT.statusCode.equals(waybillStatus)){
+//
+//                     waitDoNum=waitDoNum+cnt;
+//                     statType_1_num=statType_1_num+cnt;
+//                 }else{
+//                     statType_2_num=statType_1_num+cnt;
+//                     hasDoNum=hasDoNum+cnt;
+//                 }
+//
+//             }
+//         }
 
          List<Map> statNumList = new ArrayList<>();
          // statType 1
diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
index 5f273a70f..b1cd37b3b 100644
--- a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
@@ -494,7 +494,7 @@
     <select id="selectWaitGotOrderList" parameterType="EmisWaybill" resultMap="EmisWaybillResult">
         <include refid="selectEmisWaybillVo"/>
         <where>
-            a.del_flag='0' and a.order_type='0' and a.waybill_status='0' and a.order_status='0'
+            a.del_flag='0' and a.order_type='0' and a.waybill_status='0' and a.order_status in('0','2')
 
             <if test="id != null "> and a.id = #{id}</if>
             <if test="orderSn != null  and orderSn != ''"> and ( FIND_IN_SET(`order_sn`,#{orderSn}) or order_sn like concat('%', #{orderSn}, '%') ) </if>