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-02 18:30:06 +08:00
parent 2ce65bdd3e
commit 305bca9510
1 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -121,26 +121,43 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
public List<ScanResultItem> doScanCheck(String scanType,Map<String,Object> scanDataItem){ public List<ScanResultItem> doScanCheck(String scanType,Map<String,Object> scanDataItem){
List<ScanResultItem> itemList = new ArrayList<>(); List<ScanResultItem> itemList = new ArrayList<>();
String billCode = (String)scanDataItem.get("billCode"); String billCodeInStr = (String)scanDataItem.get("billCode");
if(StringUtils.isEmpty(billCode)){ if(StringUtils.isEmpty(billCodeInStr)){
ScanResultItem scanResultItem = new ScanResultItem(); ScanResultItem scanResultItem = new ScanResultItem();
scanResultItem.setBillCode(billCode); scanResultItem.setBillCode(billCodeInStr);
scanResultItem.setResult("fail"); scanResultItem.setResult("fail");
scanResultItem.setMessage("billCode为空"); scanResultItem.setMessage("billCode为空");
itemList.add(scanResultItem); itemList.add(scanResultItem);
return itemList; return itemList;
} }
// 开始检查数据 // 开始检查数据
String[] billCodeArr = billCode.split(","); String[] billCodeArr = billCodeInStr.split(",");
for (String billCodeItem:billCodeArr) {
String scanDateStr = (String)scanDataItem.get("scanDate");
Date scanDate = DateUtils.parseDate(scanDateStr);;
if(scanDate ==null){
scanDate = new Date();
}
for (String billCode:billCodeArr) {
ScanResultItem scanResultItem = new ScanResultItem(); ScanResultItem scanResultItem = new ScanResultItem();
scanResultItem.setBillCode(billCode); scanResultItem.setBillCode(billCode);
// 检查区间
// 检查
EmisWaybill emisWaybill = getWaybillByBillCode(billCode);
if(emisWaybill==null){
scanResultItem.setResult("fail");
scanResultItem.setMessage("运单号不存在");
itemList.add(scanResultItem);
continue;
}
scanResultItem.setResult("success"); scanResultItem.setResult("success");
scanResultItem.setMessage("允许操作"); scanResultItem.setMessage("允许操作");
itemList.add(scanResultItem); itemList.add(scanResultItem);
} }