diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java index 5daa4f3ff..c77140db5 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java @@ -99,7 +99,7 @@ public class EmisBaseService { public EmisWaybill getWaybillByBillCode(String billCode){ - if(!StringUtils.isEmpty(billCode)){ + if(StringUtils.isEmpty(billCode)){ return null; } @@ -123,21 +123,6 @@ public class EmisBaseService { } - private void checkWabillCanScan(String scanType,EmisWaybill waybill) throws EmisBizError{ - - if(waybill == null){ - throw new EmisBizError(EmisBizErrorType.NOT_EXISTS,"运单不存在"); - } - -// if(waybill.getWaybillStatus()){ -// -// } - - } - - - - /** * 产生客户编码 规则: siteCode+ 000000 * @param siteCode 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 25f5ffd58..7a5845708 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 @@ -131,16 +131,8 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm return itemList; } - // 开始检查数据 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);