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-13 19:53:57 +08:00
parent 2be6cc183d
commit 8b58b9cbf1
1 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
View File

@ -400,23 +400,21 @@ public class EmisBaseService {
public List<EmisTmsScanRecord> cvtTransferTraceToScanRecord(String billCode) {
List<EmisTmsScanRecord> recordList= null;
try {
EmisWaybill waybill=getWaybillByBillCode(billCode);
if("1".equals(waybill.getBlDispFd())){
EmisTmsTransferTrace emisTmsTransferTrace = getEmisTmsTransferTraceByBillCode(billCode);
if(emisTmsTransferTrace!=null){
if(!StringUtils.isEmpty(emisTmsTransferTrace.getTraceInfo())){
JSONObject jsonObject = JSONObject.parseObject(emisTmsTransferTrace.getTraceInfo());
JSONArray steps=jsonObject.getJSONArray("data");
if(steps!=null && steps.size()>0){
recordList = new ArrayList<>();
for (Object obj:steps) {
JSONObject stepItem = (JSONObject)obj;
EmisTmsScanRecord recordItem = new EmisTmsScanRecord();
recordItem.setBillCode(billCode);
recordItem.setScanDate(stepItem.getDate("time"));
recordItem.setRemark(stepItem.getString("context"));
recordItem.setScanType("81");
}
EmisTmsTransferTrace emisTmsTransferTrace = getEmisTmsTransferTraceByBillCode(billCode);
if(emisTmsTransferTrace!=null){
if(!StringUtils.isEmpty(emisTmsTransferTrace.getTraceInfo())){
JSONObject jsonObject = JSONObject.parseObject(emisTmsTransferTrace.getTraceInfo());
JSONArray steps=jsonObject.getJSONArray("data");
if(steps!=null && steps.size()>0){
recordList = new ArrayList<>();
for (Object obj:steps) {
JSONObject stepItem = (JSONObject)obj;
EmisTmsScanRecord recordItem = new EmisTmsScanRecord();
recordItem.setBillCode(billCode);
recordItem.setScanDate(stepItem.getDate("time"));
recordItem.setRemark(stepItem.getString("context"));
recordItem.setScanType("81");
recordList.add(recordItem);
}
}
}