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 2025-05-08 15:25:07 +08:00
parent 897b265198
commit 49f353a500
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsScanRecordController.java
View File

@ -136,18 +136,18 @@ public class EmisTmsScanRecordController extends EmisBaseController
try {
// 检查数据
for (Map<String,Object> 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<String,Object> 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);