diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/scan/ScanResultItem.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/scan/ScanResultItem.java index deb48c150..987ad522f 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/scan/ScanResultItem.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/scan/ScanResultItem.java @@ -1,8 +1,10 @@ package com.xdadan.erp.emis.domain.vo.scan; +import com.alibaba.fastjson.JSONObject; import lombok.Data; import java.io.Serializable; +import java.util.HashMap; import java.util.List; import java.util.Map; @@ -30,8 +32,23 @@ import java.util.Map; public class ScanResultItem implements Serializable { private static final long serialVersionUID = 1L; - String billCode; - String result; - String message; + private String billCode; + private String result; + private String message; + + private Map data; + + public Map getData() { + if (this.data == null) { + this.data = new HashMap(); + } + + return this.data; + } + + public void setData(Map data) { + this.data = data; + } + } 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 882cba933..ef69d9375 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 @@ -202,7 +202,8 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm continue; } - + scanResultItem.getData().put("billWeight",emisWaybill.getBillWeight()); + scanResultItem.getData().put("parcelQty",emisWaybill.getParcelQty()); EmisTmsScanRecord emisTmsScanRecord=new EmisTmsScanRecord(); @@ -223,6 +224,7 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm if(ScanType.GOT.opCode.equals(scanType)){ setScanGot(emisTmsScanRecord,scanDataItem); + scanResultItem.getData().putAll(scanDataItem); }