diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsScanRecordController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsScanRecordController.java index 1f7408e5c..18fe82ef4 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsScanRecordController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsScanRecordController.java @@ -136,18 +136,18 @@ public class EmisTmsScanRecordController extends EmisBaseController try { // 检查数据 - for (Map scanDataItem: scanInfo.getScanData()) { - String billCodeInStr = MapUtils.getString(scanDataItem,"billCode",null); - billCodeInStr=WaybillHelper.formatQueryValue(billCodeInStr); - String[] billCodeArr = billCodeInStr.split(","); - // 未揽收不允许做扫描操作 - for(int i = 0 ; i < billCodeArr.length ; i++){ - String checkBillCode=billCodeArr[i]; - if(!emisBaseService.checkCanScan(checkBillCode)){ - return AjaxResult.error("运单["+checkBillCode+"]未揽收,不允许扫描"); - } - } - } +// for (Map scanDataItem: scanInfo.getScanData()) { +// String billCodeInStr = MapUtils.getString(scanDataItem,"billCode",null); +// billCodeInStr=WaybillHelper.formatQueryValue(billCodeInStr); +// String[] billCodeArr = billCodeInStr.split(","); +// // 未揽收不允许做扫描操作 +// for(int i = 0 ; i < billCodeArr.length ; i++){ +// String checkBillCode=billCodeArr[i]; +// if(!emisBaseService.checkCanScan(checkBillCode)){ +// return AjaxResult.error("运单["+checkBillCode+"]未揽收,不允许扫描"); +// } +// } +// } ScanResult scanResult=emisTmsScanRecordService.scan(scanInfo,getLoginUser().getUser().getEmpCode(),getLoginUser().getUser().getOwnerSiteCode()); return AjaxResult.success("扫描成功",scanResult);