diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java index b3e78ff49..ef06a3b80 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java @@ -400,23 +400,21 @@ public class EmisBaseService { public List cvtTransferTraceToScanRecord(String billCode) { List 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); } } }