From da547183e756adc4981a0152232ada2a5e637d4a Mon Sep 17 00:00:00 2001 From: linfso Date: Fri, 14 Jun 2024 16:58:03 +0800 Subject: [PATCH] md --- .../com/xdadan/erp/web/emis/EmisTmsScanRecordController.java | 2 +- .../src/main/resources/mapper/EmisTmsTransferTraceMapper.xml | 2 +- 2 files changed, 2 insertions(+), 2 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 e609d37f5..6529885e3 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 @@ -347,7 +347,7 @@ public class EmisTmsScanRecordController extends EmisBaseController */ // @PreAuthorize("@ss.hasPermi('emis:emisTmsScanRecord:remove')") @Log(title = "TMS扫描记录", businessType = BusinessType.DELETE) - @DeleteMapping("/deleteSignedAndRemark") + @DeleteMapping("/deleteSignedAndRemark/{ids}") public AjaxResult deleteSignedAndRemark(@PathVariable Long[] ids,String remark) { // 删除备注 diff --git a/emis-biz/src/main/resources/mapper/EmisTmsTransferTraceMapper.xml b/emis-biz/src/main/resources/mapper/EmisTmsTransferTraceMapper.xml index 6d806935a..fe32c71cb 100644 --- a/emis-biz/src/main/resources/mapper/EmisTmsTransferTraceMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisTmsTransferTraceMapper.xml @@ -51,7 +51,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and last_waybill_status != '50' and last_trace_date ]]> DATE_SUB(CURDATE(), INTERVAL 30 DAY) - and last_trace_date SUBDATE(now(),interval 2 hour) + and update_time SUBDATE(now(),interval 2 hour) or last_trace_date is null