From b26dc39100d3f532f92ea1292b70781f5bbf3b64 Mon Sep 17 00:00:00 2001 From: linfso Date: Wed, 19 Jun 2024 18:58:11 +0800 Subject: [PATCH] md --- .../impl/EmisTmsScanRecordServiceImpl.java | 23 +++++++++++++++++-- 1 file changed, 21 insertions(+), 2 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 95c08de5c..52b6db457 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 @@ -11,6 +11,7 @@ package com.xdadan.erp.emis.service.impl; import java.math.BigDecimal; +import java.text.ParseException; import java.util.*; import cn.hutool.core.collection.CollectionUtil; @@ -174,7 +175,16 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm // 开始检查数据 String[] billCodeArr = billCodeInStr.split(","); - Date scanDate = DateUtils.parseDate(scanDateStr); + 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(); + } // 合包和拆包需单独处理 @@ -283,7 +293,16 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm } String[] billCodeArr = billCodeInStr.split(","); - Date scanDate = DateUtils.parseDate(scanDateStr); + 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(ScanType.CO_PACKING.opCode.equals(scanType)){