From 81595307332a33a39202b7b13381ea10c20b4ddf Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Wed, 19 Jun 2024 19:13:22 +0800
Subject: [PATCH] md

---
 .../impl/EmisTmsScanRecordServiceImpl.java    | 48 ++++++++++++-------
 1 file changed, 31 insertions(+), 17 deletions(-)

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 52b6db457..d003c61fc 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
@@ -176,16 +176,11 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
         // 开始检查数据
         String[] billCodeArr = billCodeInStr.split(",");
         Date scanDate = null;
-        try {
-            String[] possibleDateFormats = {
-                    DateUtils.YYYY_MM_DD_HH_MM_SS,
-                    "yyyy-MM-dd'T'HH:mm:ss.SSSZ"
-            };
-            scanDate = DateUtils.parseDate(scanDateStr,possibleDateFormats);
-        } catch (ParseException e) {
-            e.printStackTrace();
+        if(scanDateStr.contains("Z")){
+            scanDateStr=scanDateStr.replace("T"," ");
+            scanDateStr=scanDateStr.substring(0,scanDateStr.lastIndexOf("."));
         }
-
+        scanDate = DateUtils.parseDate(scanDateStr);
 
         // 合包和拆包需单独处理
         if(ScanType.CO_PACKING.opCode.equals(scanType)){
@@ -294,15 +289,11 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
 
         String[] billCodeArr = billCodeInStr.split(",");
         Date scanDate = null;
-        try {
-            String[] possibleDateFormats = {
-                    DateUtils.YYYY_MM_DD_HH_MM_SS,
-                    "yyyy-MM-dd'T'HH:mm:ss.SSSZ"
-            };
-            scanDate = DateUtils.parseDate(scanDateStr,possibleDateFormats);
-        } catch (ParseException e) {
-            e.printStackTrace();
+        if(scanDateStr.contains("Z")){
+            scanDateStr=scanDateStr.replace("T"," ");
+            scanDateStr=scanDateStr.substring(0,scanDateStr.lastIndexOf("."));
         }
+        scanDate = DateUtils.parseDate(scanDateStr);
 
         // 合包和拆包需单独处理
         if(ScanType.CO_PACKING.opCode.equals(scanType)){
@@ -1259,6 +1250,29 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
     }
 
 
+    public static void main(String[] args) {
+        String dateStr="2024-06-19T11:02:00.231Z";
+        if(dateStr.contains("Z")){
+            dateStr=dateStr.replace("T"," ");
+            dateStr=dateStr.substring(0,dateStr.lastIndexOf("."));
+        }
+        System.out.println(dateStr);
+        Date scanDate = null;
+        try {
+            String[] possibleDateFormats = {
+                    DateUtils.YYYY_MM_DD_HH_MM_SS,
+                    "yyyy-MM-dd'T'HH:mm:ss.SSS Z"
+            };
+            scanDate = DateUtils.parseDate(dateStr,possibleDateFormats);
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
+
+        System.out.println(scanDate);
+
+    }
+
+