From 5d2e76e56ef199debdcb38a65ae2121650c615d0 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期二, 02 九月 2025 09:00:00 +0800
Subject: [PATCH] #
---
src/main/resources/mapper/asrs/LocDetlMapper.xml | 2 +-
src/main/java/com/zy/asrs/controller/LocDetlController.java | 6 +++---
src/main/webapp/views/pakStore/locDetlCheckQuery.html | 5 +++--
3 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocDetlController.java b/src/main/java/com/zy/asrs/controller/LocDetlController.java
index bf07b1f..4ec9931 100644
--- a/src/main/java/com/zy/asrs/controller/LocDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/LocDetlController.java
@@ -152,13 +152,13 @@
public R stockOutList(@RequestParam(defaultValue = "1")Integer curr,
@RequestParam(defaultValue = "10")Integer limit,
@RequestParam Map<String, Object> param){
- if (!Cools.isEmpty(param.get("modi_time"))){
- String val = String.valueOf(param.get("modi_time"));
+ if (!Cools.isEmpty(param.get("appe_time"))){
+ String val = String.valueOf(param.get("appe_time"));
if (val.contains(RANGE_TIME_LINK)) {
String[] dates = val.split(RANGE_TIME_LINK);
param.put("startTime", DateUtils.convert(dates[0]));
param.put("endTime", DateUtils.convert(dates[1]));
- param.remove("modi_time");
+ param.remove("appe_time");
}
}
Page<LocDetl> stockOut = locDetlService.getStockOut(toPage(curr, limit, param, LocDetl.class));
diff --git a/src/main/resources/mapper/asrs/LocDetlMapper.xml b/src/main/resources/mapper/asrs/LocDetlMapper.xml
index e25f55e..b32ff7e 100644
--- a/src/main/resources/mapper/asrs/LocDetlMapper.xml
+++ b/src/main/resources/mapper/asrs/LocDetlMapper.xml
@@ -351,7 +351,7 @@
and a.anfme like '%' + #{anfme} + '%'
</if>
<if test="startTime!=null and endTime!=null">
- and a.modi_time between #{startTime} and #{endTime}
+ and a.appe_time between #{startTime} and #{endTime}
</if>
<if test="crnNo!=null and crnNo!='' ">
and b.crn_no=#{crnNo}
diff --git a/src/main/webapp/views/pakStore/locDetlCheckQuery.html b/src/main/webapp/views/pakStore/locDetlCheckQuery.html
index b04f645..e2eab23 100644
--- a/src/main/webapp/views/pakStore/locDetlCheckQuery.html
+++ b/src/main/webapp/views/pakStore/locDetlCheckQuery.html
@@ -103,7 +103,7 @@
<!-- 鏃ユ湡鑼冨洿 -->
<div class="layui-inline" style="width: 300px">
<div class="layui-input-inline">
- <input class="layui-input layui-laydate-range" name="modi_time" type="text" placeholder="璧峰鏃堕棿 - 缁堟鏃堕棿" autocomplete="off" style="width: 300px">
+ <input class="layui-input layui-laydate-range" name="appe_time" type="text" placeholder="鍏ュ簱璧峰鏃堕棿 - 缁堟鏃堕棿" autocomplete="off" style="width: 300px">
</div>
</div>
<!-- 寰呮坊鍔� -->
@@ -140,7 +140,8 @@
];
cols.push.apply(cols, detlCols);
cols.push({field: 'modiUser$', align: 'center',title: '淇敼浜哄憳', hide: true}
- ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿'})
+ ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿'}
+ ,{field: 'appeTime$', align: 'center',title: '鍏ュ簱鏃堕棿'})
return cols;
}
--
Gitblit v1.9.1