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-05-09 22:20:22 +08:00
parent 01f4319092
commit 290bfb9a3a
2 changed files with 23 additions and 4 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/domain/vo/scan/ScanResultItem.java
View File

@ -1,8 +1,10 @@
package com.xdadan.erp.emis.domain.vo.scan; package com.xdadan.erp.emis.domain.vo.scan;
import com.alibaba.fastjson.JSONObject;
import lombok.Data; import lombok.Data;
import java.io.Serializable; import java.io.Serializable;
import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -30,8 +32,23 @@ import java.util.Map;
public class ScanResultItem implements Serializable { public class ScanResultItem implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
String billCode; private String billCode;
String result; private String result;
String message; private String message;
private Map<String,Object> data;
public Map<String, Object> getData() {
if (this.data == null) {
this.data = new HashMap();
}
return this.data;
}
public void setData(Map<String, Object> data) {
this.data = data;
}
} }

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

@ -202,7 +202,8 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
continue; continue;
} }
scanResultItem.getData().put("billWeight",emisWaybill.getBillWeight());
scanResultItem.getData().put("parcelQty",emisWaybill.getParcelQty());
EmisTmsScanRecord emisTmsScanRecord=new EmisTmsScanRecord(); EmisTmsScanRecord emisTmsScanRecord=new EmisTmsScanRecord();
@ -223,6 +224,7 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
if(ScanType.GOT.opCode.equals(scanType)){ if(ScanType.GOT.opCode.equals(scanType)){
setScanGot(emisTmsScanRecord,scanDataItem); setScanGot(emisTmsScanRecord,scanDataItem);
scanResultItem.getData().putAll(scanDataItem);
} }