From 383a135d0ecc29b5381941dbd16b14a2e2e7d82a Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Fri, 9 Aug 2024 21:12:49 +0800
Subject: [PATCH] md

---
 .../xdadan/erp/web/emis/EmisTmsScanRecordController.java  | 1 +
 .../com/xdadan/erp/emis/domain/stat/ScanStatInfoDtl.java  | 2 ++
 .../java/com/xdadan/erp/emis/domain/vo/WaybillOrder.java  | 4 ++++
 .../emis/service/impl/EmisTmsScanRecordServiceImpl.java   | 1 +
 .../java/com/xdadan/erp/emis/utils/WaybillHelper.java     | 3 +++
 .../src/main/resources/mapper/EmisTmsScanRecordMapper.xml | 8 +++++---
 6 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsScanRecordController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsScanRecordController.java
index bb179690a..c7bc6c8d4 100644
--- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsScanRecordController.java
+++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsScanRecordController.java
@@ -131,6 +131,7 @@ public class EmisTmsScanRecordController extends EmisBaseController
         }
 
         try {
+
             ScanResult scanResult=emisTmsScanRecordService.scan(scanInfo);
             return AjaxResult.success("扫描成功",scanResult);
         }catch (Exception ex){
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/stat/ScanStatInfoDtl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/stat/ScanStatInfoDtl.java
index 9f734b8ce..0a91aca11 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/stat/ScanStatInfoDtl.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/stat/ScanStatInfoDtl.java
@@ -30,6 +30,8 @@ public class ScanStatInfoDtl implements Serializable {
     // 留仓次数
     private Integer holdCount;
 
+    private Integer transferCount;
+
     // 运单详情
     private EmisWaybill waybillDetail;
 
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/WaybillOrder.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/WaybillOrder.java
index 6db94d2cd..5c0822f8e 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/WaybillOrder.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/WaybillOrder.java
@@ -67,6 +67,8 @@ public class WaybillOrder  implements Serializable {
     /* 支付方式 : 现金或月结 */
     private String paymentType;
 
+    private String paymentStatus;
+
     /* 计费方式 01-按重量 02-按体积 03-一口价 */
     private String calcFeeType;
 
@@ -482,6 +484,8 @@ public class WaybillOrder  implements Serializable {
 
         voItem.setEstimateDate(dbWaybill.getEstimateDate());
 
+        voItem.setPaymentStatus(dbWaybill.getPaymentStatus());
+
         voItem.setPackType(dbWaybill.getPackType());
         voItem.setDispatchMethod(dbWaybill.getDispatchMethod());
         voItem.setPickupMethod(dbWaybill.getPickupMethod());
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java
index 56001625f..e748882a8 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java
@@ -427,6 +427,7 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
             return itemList;
         }
 
+
         billCodeInStr=WaybillHelper.formatQueryValue(billCodeInStr);
         String[] billCodeArr = billCodeInStr.split(",");
 
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/utils/WaybillHelper.java b/emis-biz/src/main/java/com/xdadan/erp/emis/utils/WaybillHelper.java
index a24bba239..f9a164c48 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/utils/WaybillHelper.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/utils/WaybillHelper.java
@@ -272,6 +272,9 @@ public class WaybillHelper {
             } catch (UnsupportedEncodingException e) {
                 e.printStackTrace();
             }
+
+            str=removeUnSeeChar(str);
+
             str=str.replaceAll("\\n", ",");
             str=str.replaceAll("\\r", ",");
             str=str.replaceAll("\\t", ",");
diff --git a/emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml b/emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml
index 5cf9f74f5..0b5fdb9dd 100644
--- a/emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml
@@ -85,7 +85,8 @@
 
         <result property="gotCount"   column="gotCount"    />
         <result property="sendCount"    column="sendCount"    />
-        <result property="arrivalCount"    column="arrivalCount"    />
+        <result property="arrivalCount"    column="arrivalCount" />
+        <result property="transferCount"    column="transferCount" />
         <result property="sentCount"    column="sentCount"    />
         <result property="issueCount"    column="issueCount"    />
         <result property="holdCount"    column="holdCount"    />
@@ -106,7 +107,8 @@
             sum(IF(scan_type='40',1,0)) as sentCount,
             sum(IF(scan_type='50',1,0)) as signCount,
             sum(IF(scan_type='-1',1,0)) as issueCount,
-            sum(IF(scan_type='70',1,0)) as holdCount
+            sum(IF(scan_type='70',1,0)) as holdCount,
+            sum(IF(scan_type='80',1,0)) as transferCount
             from emis_tms_scan_record  a
             where EXISTS(
                     select 1 from emis_waybill  b
@@ -162,7 +164,7 @@
                         )
                     </if>
             )
-            and a.scan_type in('10','20','30','40','50','-1')
+            and a.scan_type in('10','20','30','40','50','-1','80')
             group by a.main_bill_code
     </select>