aike/emis-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

md

Browse Source
This commit is contained in:
linfso 2024-06-19 18:58:11 +08:00
parent 41c6aeb812
commit b26dc39100
1 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java
View File

@ -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)){