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