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