From c8f29bfad4e87788400e9309c3233d20d2653559 Mon Sep 17 00:00:00 2001 From: linfso Date: Sun, 5 Jan 2025 13:00:25 +0800 Subject: [PATCH] md --- .../web/emis/EmisTmsScanRecordController.java | 21 ++----------------- .../erp/emis/service/EmisBaseService.java | 2 +- 2 files changed, 3 insertions(+), 20 deletions(-) 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 da0c7b227..6db62bd2d 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 @@ -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 list = emisTmsScanRecordService.selectMonitorScanRecordList(emisTmsScanRecord); return getDataTable(list); 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 36eb33a55..4a9c7107f 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 @@ -3102,7 +3102,7 @@ public class EmisBaseService { } if (isOutTimeLock(emisWaybill)) { - throw new EmisBizError(EmisBizErrorType.BILL_LOCK, "已超时，不允许修改"); + throw new EmisBizError(EmisBizErrorType.BILL_LOCK, "已开单且超过当日0点，不允许修改"); } }