root/XuGongHanYunWMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rev：平板作业管理测试修改

Browse Source
This commit is contained in:
liuxy
2025-09-19 17:36:38 +08:00
parent d94ad5ad6a
commit 2047b6b167
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/dao/mapper/SchBaseTaskMapper.java
View File

@@ -42,7 +42,7 @@ public interface SchBaseTaskMapper extends BaseMapper<SchBaseTask> {
* end_time: 结束时间 * end_time: 结束时间
* } * }
*/ */
List<JSONObject> queryPdaHistoryTask(JSONObject whereJson); List<JSONObject> queryPdaHistoryTask(@Param("param") JSONObject whereJson);
/** /**
* 获取载具任务 * 获取载具任务

7
wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/dao/mapper/SchBaseTaskMapper.xml
View File

@@ -99,7 +99,8 @@
<select id="queryPdaHistoryTask" resultType="com.alibaba.fastjson.JSONObject"> <select id="queryPdaHistoryTask" resultType="com.alibaba.fastjson.JSONObject">
SELECT SELECT
task.*, task.*,
config.config_name config.config_name,
SUBSTR(task.create_time,1,10) AS task_time
FROM FROM
sch_base_task task sch_base_task task
INNER JOIN sch_base_taskconfig config ON task.config_code = config.config_code INNER JOIN sch_base_taskconfig config ON task.config_code = config.config_code
@@ -116,12 +117,12 @@
<if test="param.start_time != null and param.start_time != ''"> <if test="param.start_time != null and param.start_time != ''">
AND AND
task.create_time > #{param.start_time} SUBSTR(task.create_time,1,10) >= #{param.start_time}
</if> </if>
<if test="param.end_time != null and param.end_time != ''"> <if test="param.end_time != null and param.end_time != ''">
AND AND
#{param.end_time} > task.create_time #{param.end_time} >= SUBSTR(task.create_time,1,10)
</if> </if>
</where> </where>
</select> </select>