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-01-05 13:00:25 +08:00
parent fad50486d4
commit c8f29bfad4
2 changed files with 3 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -329,31 +329,14 @@ public class EmisTmsScanRecordController extends EmisBaseController
/**
* 扫描对比列表
*/
@GetMapping("/scanMonitorCompareList")
public TableDataInfo scanMonitorCompareList(EmisTmsScanRecord emisTmsScanRecord)
@GetMapping("/scanMonitorList")
public TableDataInfo scanMonitorList(EmisTmsScanRecord emisTmsScanRecord)
{
startPage();
// 设置通用权限查询参数
setPrivParams(emisTmsScanRecord);
if(!StringUtils.isEmpty(emisTmsScanRecord.getBillCode())){
emisTmsScanRecord.setBillCode(WaybillHelper.formatQueryValue(emisTmsScanRecord.getBillCode()));
String[] billCodeSortList = emisTmsScanRecord.getBillCode().split(",");
if(billCodeSortList.length>1){
emisTmsScanRecord.getParams().put("billCodeSortList",Arrays.asList(billCodeSortList));
}
}
if(!StringUtils.isEmpty(emisTmsScanRecord.getOrderSn())){
emisTmsScanRecord.setOrderSn(WaybillHelper.formatQueryValue(emisTmsScanRecord.getOrderSn()));
String[] orderSnSortList = emisTmsScanRecord.getOrderSn().split(",");
if(orderSnSortList.length>1){
emisTmsScanRecord.getParams().put("orderSnSortList",Arrays.asList(orderSnSortList));
}
}
List<EmisTmsScanRecord> list = emisTmsScanRecordService.selectMonitorScanRecordList(emisTmsScanRecord);
return getDataTable(list);

2
emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
View File

@ -3102,7 +3102,7 @@ public class EmisBaseService {
}
if (isOutTimeLock(emisWaybill)) {
throw new EmisBizError(EmisBizErrorType.BILL_LOCK, "已超时，不允许修改");
throw new EmisBizError(EmisBizErrorType.BILL_LOCK, "已开单且超过当日0点，不允许修改");
}
}