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 2024-06-14 16:58:03 +08:00
parent 7b1a9ec3b9
commit da547183e7
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -347,7 +347,7 @@ public class EmisTmsScanRecordController extends EmisBaseController
*/ */
// @PreAuthorize("@ss.hasPermi('emis:emisTmsScanRecord:remove')") // @PreAuthorize("@ss.hasPermi('emis:emisTmsScanRecord:remove')")
@Log(title = "TMS扫描记录", businessType = BusinessType.DELETE) @Log(title = "TMS扫描记录", businessType = BusinessType.DELETE)
@DeleteMapping("/deleteSignedAndRemark") @DeleteMapping("/deleteSignedAndRemark/{ids}")
public AjaxResult deleteSignedAndRemark(@PathVariable Long[] ids,String remark) public AjaxResult deleteSignedAndRemark(@PathVariable Long[] ids,String remark)
{ {
// 删除备注 // 删除备注

2
emis-biz/src/main/resources/mapper/EmisTmsTransferTraceMapper.xml
View File

@ -51,7 +51,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="params.needTrace != null and params.needTrace != '1'"> <if test="params.needTrace != null and params.needTrace != '1'">
and last_waybill_status != '50' and last_waybill_status != '50'
and last_trace_date <![CDATA[ > ]]> DATE_SUB(CURDATE(), INTERVAL 30 DAY) and last_trace_date <![CDATA[ > ]]> DATE_SUB(CURDATE(), INTERVAL 30 DAY)
and last_trace_date <![CDATA[ < ]]> SUBDATE(now(),interval 2 hour) and update_time <![CDATA[ < ]]> SUBDATE(now(),interval 2 hour)
or last_trace_date is null or last_trace_date is null
</if> </if>