From 9d7bfe8cf15f1b34a87351560f39662d9e141cce Mon Sep 17 00:00:00 2001
From: L <L@132>
Date: 星期二, 20 一月 2026 11:09:37 +0800
Subject: [PATCH] *
---
src/main/webapp/views/taskWrk/taskWrk.html | 18 +++++
src/main/java/com/zy/asrs/mapper/TaskWrkMapper.java | 8 ++
src/main/java/com/zy/asrs/service/TaskWrkLogService.java | 4
src/main/java/com/zy/asrs/mapper/TaskWrkLogMapper.java | 8 ++
src/main/webapp/views/taskWrkLog/taskWrkLog.html | 16 +++++
src/main/java/com/zy/asrs/controller/TaskWrkController.java | 16 ++++
src/main/java/com/zy/asrs/service/TaskWrkService.java | 4
src/main/java/com/zy/asrs/service/impl/TaskWrkServiceImpl.java | 8 +-
src/main/resources/mapper/TaskWrkLogMapper.xml | 19 ++++++
src/main/resources/mapper/TaskWrkMapper.xml | 27 +++++++++
src/main/java/com/zy/asrs/controller/TaskWrkLogController.java | 18 +++++-
src/main/java/com/zy/asrs/service/impl/TaskWrkLogServiceImpl.java | 8 +-
12 files changed, 136 insertions(+), 18 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/TaskWrkController.java b/src/main/java/com/zy/asrs/controller/TaskWrkController.java
index 1216a4a..833b07b 100644
--- a/src/main/java/com/zy/asrs/controller/TaskWrkController.java
+++ b/src/main/java/com/zy/asrs/controller/TaskWrkController.java
@@ -70,6 +70,10 @@
Integer wrkNo = null;
String taskNo = null;
Integer status = null;
+ String barcode = null;
+ String startPoint = null;
+ String targetPoint = null;
+ String allField = null;
Date modiTimeStart = null, modiTimeEnd = null;
for (Map.Entry<String, Object> entry : param.entrySet()) {
String val = String.valueOf(entry.getValue());
@@ -86,6 +90,14 @@
taskNo = val;
} else if (entry.getKey().equals("status")) {
status = Integer.parseInt(val);
+ } else if (entry.getKey().equals("barcode")) {
+ barcode = val;
+ } else if (entry.getKey().equals("startPoint")) {
+ startPoint = val;
+ } else if (entry.getKey().equals("targetPoint")) {
+ targetPoint = val;
+ } else if (entry.getKey().equals("allField")) {
+ allField = val;
}
}
//
@@ -94,9 +106,9 @@
// convert(param, wrapper);
// if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
- List<TaskWrk> taskWrkList = taskWrkService.selectTaskWrkList(wrkNo,taskNo,status,modiTimeStart,modiTimeEnd, curr, limit);
+ List<TaskWrk> taskWrkList = taskWrkService.selectTaskWrkList(wrkNo,taskNo,status, barcode, startPoint, targetPoint, allField,modiTimeStart,modiTimeEnd, curr, limit);
Page<TaskWrk> page = new Page<TaskWrk>(curr, limit).setRecords(taskWrkList);
- page.setTotal(taskWrkService.selectTaskWrkListTotal(wrkNo,taskNo,status,modiTimeStart,modiTimeEnd));
+ page.setTotal(taskWrkService.selectTaskWrkListTotal(wrkNo,taskNo,status, barcode, startPoint, targetPoint, allField,modiTimeStart,modiTimeEnd));
return R.ok(page);
// return R.ok(taskWrkService.selectPage(new Page<>(curr, limit), wrapper));
diff --git a/src/main/java/com/zy/asrs/controller/TaskWrkLogController.java b/src/main/java/com/zy/asrs/controller/TaskWrkLogController.java
index dc1c952..9a0ff71 100644
--- a/src/main/java/com/zy/asrs/controller/TaskWrkLogController.java
+++ b/src/main/java/com/zy/asrs/controller/TaskWrkLogController.java
@@ -40,6 +40,10 @@
Integer wrkNo = null;
String taskNo = null;
Integer status = null;
+ String barcode = null;
+ String startPoint = null;
+ String targetPoint = null;
+ String allField = null;
Date modiTimeStart = null, modiTimeEnd = null;
for (Map.Entry<String, Object> entry : param.entrySet()) {
String val = String.valueOf(entry.getValue());
@@ -56,15 +60,23 @@
taskNo = val;
} else if (entry.getKey().equals("status")) {
status = Integer.parseInt(val);
+ } else if (entry.getKey().equals("barcode")) {
+ barcode = val;
+ } else if (entry.getKey().equals("startPoint")) {
+ startPoint = val;
+ } else if (entry.getKey().equals("targetPoint")) {
+ targetPoint = val;
+ } else if (entry.getKey().equals("allField")) {
+ allField = val;
}
}
- List<TaskWrkLog> taskWrkList = taskWrkLogService.selectTaskWrkLogList(wrkNo,taskNo,status,modiTimeStart,modiTimeEnd, curr, limit);
+ List<TaskWrkLog> taskWrkList = taskWrkLogService.selectTaskWrkLogList(wrkNo,taskNo,status, barcode, startPoint, targetPoint, allField,modiTimeStart,modiTimeEnd, curr, limit);
Page<TaskWrkLog> page = new Page<TaskWrkLog>(curr, limit).setRecords(taskWrkList);
if (page.getRecords().size()==0){
- taskWrkList = taskWrkLogService.selectTaskWrkLogList(wrkNo,taskNo,status,modiTimeStart,modiTimeEnd, 1, limit);
+ taskWrkList = taskWrkLogService.selectTaskWrkLogList(wrkNo,taskNo,status, barcode, startPoint, targetPoint, allField,modiTimeStart,modiTimeEnd, 1, limit);
page = new Page<TaskWrkLog>(1, limit).setRecords(taskWrkList);
}
- page.setTotal(taskWrkLogService.selectTaskWrkLogListTotal(wrkNo,taskNo,status,modiTimeStart,modiTimeEnd));
+ page.setTotal(taskWrkLogService.selectTaskWrkLogListTotal(wrkNo,taskNo,status, barcode, startPoint, targetPoint, allField,modiTimeStart,modiTimeEnd));
return R.ok(page);
} catch (Exception e) {
diff --git a/src/main/java/com/zy/asrs/mapper/TaskWrkLogMapper.java b/src/main/java/com/zy/asrs/mapper/TaskWrkLogMapper.java
index 83df432..b0676d2 100644
--- a/src/main/java/com/zy/asrs/mapper/TaskWrkLogMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/TaskWrkLogMapper.java
@@ -16,6 +16,10 @@
List<TaskWrkLog> selectTaskWrkLogList(@Param("wrkNo") Integer wrkNo,
@Param("taskNo") String taskNo,
@Param("status") Integer status,
+ @Param("barcode") String barcode,
+ @Param("startPoint") String startPoint,
+ @Param("targetPoint") String targetPoint,
+ @Param("allField") String allField,
@Param("modiTimeStart") Date modiTimeStart,
@Param("modiTimeEnd") Date modiTimeEnd,
@Param("pageNumber") Integer curr,
@@ -24,6 +28,10 @@
Long selectTaskWrkLogListTotal(@Param("wrkNo") Integer wrkNo,
@Param("taskNo") String taskNo,
@Param("status") Integer status,
+ @Param("barcode") String barcode,
+ @Param("startPoint") String startPoint,
+ @Param("targetPoint") String targetPoint,
+ @Param("allField") String allField,
@Param("modiTimeStart") Date modiTimeStart,
@Param("modiTimeEnd") Date modiTimeEnd);
}
diff --git a/src/main/java/com/zy/asrs/mapper/TaskWrkMapper.java b/src/main/java/com/zy/asrs/mapper/TaskWrkMapper.java
index 2bb743b..4668a49 100644
--- a/src/main/java/com/zy/asrs/mapper/TaskWrkMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/TaskWrkMapper.java
@@ -52,6 +52,10 @@
List<TaskWrk> selectTaskWrkList(@Param("wrkNo") Integer wrkNo,
@Param("taskNo") String taskNo,
@Param("status") Integer status,
+ @Param("barcode") String barcode,
+ @Param("startPoint") String startPoint,
+ @Param("targetPoint") String targetPoint,
+ @Param("allField") String allField,
@Param("modiTimeStart") Date modiTimeStart,
@Param("modiTimeEnd") Date modiTimeEnd,
@Param("pageNumber") Integer curr,
@@ -60,6 +64,10 @@
Long selectTaskWrkListTotal(@Param("wrkNo") Integer wrkNo,
@Param("taskNo") String taskNo,
@Param("status") Integer status,
+ @Param("barcode") String barcode,
+ @Param("startPoint") String startPoint,
+ @Param("targetPoint") String targetPoint,
+ @Param("allField") String allField,
@Param("modiTimeStart") Date modiTimeStart,
@Param("modiTimeEnd") Date modiTimeEnd);
diff --git a/src/main/java/com/zy/asrs/service/TaskWrkLogService.java b/src/main/java/com/zy/asrs/service/TaskWrkLogService.java
index 6f6dc22..7c7a37a 100644
--- a/src/main/java/com/zy/asrs/service/TaskWrkLogService.java
+++ b/src/main/java/com/zy/asrs/service/TaskWrkLogService.java
@@ -7,7 +7,7 @@
import java.util.List;
public interface TaskWrkLogService extends IService<TaskWrkLog> {
- List<TaskWrkLog> selectTaskWrkLogList(Integer wrkNo, String taskNo, Integer status, Date modiTimeStart, Date modiTimeEnd, Integer curr, Integer limit);
- Long selectTaskWrkLogListTotal(Integer wrkNo,String taskNo,Integer status,Date modiTimeStart,Date modiTimeEnd);
+ List<TaskWrkLog> selectTaskWrkLogList(Integer wrkNo, String taskNo, Integer status, String barcode,String startPoint,String targetPoint,String allField, Date modiTimeStart, Date modiTimeEnd, Integer curr, Integer limit);
+ Long selectTaskWrkLogListTotal(Integer wrkNo,String taskNo,Integer status, String barcode,String startPoint,String targetPoint,String allField,Date modiTimeStart,Date modiTimeEnd);
}
diff --git a/src/main/java/com/zy/asrs/service/TaskWrkService.java b/src/main/java/com/zy/asrs/service/TaskWrkService.java
index 708832b..e6841ac 100644
--- a/src/main/java/com/zy/asrs/service/TaskWrkService.java
+++ b/src/main/java/com/zy/asrs/service/TaskWrkService.java
@@ -32,7 +32,7 @@
int saveToHistory(String taskNo);//灏嗕换鍔¤浆鍘嗗彶鏃ュ織
int saveToHistoryD(String taskNo);//灏嗕换鍔¤浆鍘嗗彶鏃ュ織
- List<TaskWrk> selectTaskWrkList(Integer wrkNo, String taskNo, Integer status, Date modiTimeStart, Date modiTimeEnd, Integer curr, Integer limit);
- Long selectTaskWrkListTotal(Integer wrkNo,String taskNo,Integer status,Date modiTimeStart,Date modiTimeEnd);
+ List<TaskWrk> selectTaskWrkList(Integer wrkNo, String taskNo, Integer status, String barcode,String startPoint,String targetPoint,String allField, Date modiTimeStart, Date modiTimeEnd, Integer curr, Integer limit);
+ Long selectTaskWrkListTotal(Integer wrkNo,String taskNo,Integer status, String barcode,String startPoint,String targetPoint,String allField,Date modiTimeStart,Date modiTimeEnd);
}
diff --git a/src/main/java/com/zy/asrs/service/impl/TaskWrkLogServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/TaskWrkLogServiceImpl.java
index 22d7157..1f9c0a3 100644
--- a/src/main/java/com/zy/asrs/service/impl/TaskWrkLogServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/TaskWrkLogServiceImpl.java
@@ -12,12 +12,12 @@
@Service("taskWrkLogService")
public class TaskWrkLogServiceImpl extends ServiceImpl<TaskWrkLogMapper, TaskWrkLog> implements TaskWrkLogService {
@Override
- public List<TaskWrkLog> selectTaskWrkLogList(Integer wrkNo, String taskNo, Integer status, Date modiTimeStart, Date modiTimeEnd, Integer curr, Integer limit) {
- return this.baseMapper.selectTaskWrkLogList(wrkNo,taskNo, status,modiTimeStart,modiTimeEnd,curr,limit);
+ public List<TaskWrkLog> selectTaskWrkLogList(Integer wrkNo, String taskNo, Integer status, String barcode,String startPoint,String targetPoint,String allField,Date modiTimeStart, Date modiTimeEnd, Integer curr, Integer limit) {
+ return this.baseMapper.selectTaskWrkLogList(wrkNo,taskNo, status, barcode, startPoint, targetPoint, allField,modiTimeStart,modiTimeEnd,curr,limit);
}
@Override
- public Long selectTaskWrkLogListTotal(Integer wrkNo,String taskNo,Integer status,Date modiTimeStart,Date modiTimeEnd) {
- return this.baseMapper.selectTaskWrkLogListTotal(wrkNo,taskNo, status,modiTimeStart,modiTimeEnd);
+ public Long selectTaskWrkLogListTotal(Integer wrkNo,String taskNo,Integer status, String barcode,String startPoint,String targetPoint,String allField,Date modiTimeStart,Date modiTimeEnd) {
+ return this.baseMapper.selectTaskWrkLogListTotal(wrkNo,taskNo, status, barcode, startPoint, targetPoint, allField,modiTimeStart,modiTimeEnd);
}
}
diff --git a/src/main/java/com/zy/asrs/service/impl/TaskWrkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/TaskWrkServiceImpl.java
index 106bbaf..27814e8 100644
--- a/src/main/java/com/zy/asrs/service/impl/TaskWrkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/TaskWrkServiceImpl.java
@@ -257,13 +257,13 @@
@Override
- public List<TaskWrk> selectTaskWrkList(Integer wrkNo,String taskNo,Integer status,Date modiTimeStart,Date modiTimeEnd, Integer curr, Integer limit) {
- return this.baseMapper.selectTaskWrkList(wrkNo,taskNo, status,modiTimeStart,modiTimeEnd,curr,limit);
+ public List<TaskWrk> selectTaskWrkList(Integer wrkNo,String taskNo,Integer status, String barcode,String startPoint,String targetPoint,String allField,Date modiTimeStart,Date modiTimeEnd, Integer curr, Integer limit) {
+ return this.baseMapper.selectTaskWrkList(wrkNo,taskNo, status, barcode, startPoint, targetPoint, allField,modiTimeStart,modiTimeEnd,curr,limit);
}
@Override
- public Long selectTaskWrkListTotal(Integer wrkNo,String taskNo,Integer status,Date modiTimeStart,Date modiTimeEnd) {
- return this.baseMapper.selectTaskWrkListTotal(wrkNo,taskNo, status,modiTimeStart,modiTimeEnd);
+ public Long selectTaskWrkListTotal(Integer wrkNo,String taskNo,Integer status, String barcode,String startPoint,String targetPoint,String allField,Date modiTimeStart,Date modiTimeEnd) {
+ return this.baseMapper.selectTaskWrkListTotal(wrkNo,taskNo, status, barcode, startPoint, targetPoint, allField,modiTimeStart,modiTimeEnd);
}
diff --git a/src/main/resources/mapper/TaskWrkLogMapper.xml b/src/main/resources/mapper/TaskWrkLogMapper.xml
index cfe776a..b634341 100644
--- a/src/main/resources/mapper/TaskWrkLogMapper.xml
+++ b/src/main/resources/mapper/TaskWrkLogMapper.xml
@@ -36,11 +36,30 @@
<if test="status != null">
and STATUS = #{status}
</if>
+ <if test="barcode != null">
+ and BARCODE = #{barcode}
+ </if>
+ <if test="startPoint != null">
+ and START_POINT = #{startPoint}
+ </if>
+ <if test="targetPoint != null">
+ and TARGET_POINT = #{targetPoint}
+ </if>
<if test="modiTimeStart != null ">
<if test="modiTimeEnd != null ">
and MODI_TIME between #{modiTimeStart} and #{modiTimeEnd}
</if>
</if>
+ <if test="allField != null and allField != ''">
+ <bind name="searchPattern" value="'%' + allField + '%'" />
+ and (
+ WRK_NO LIKE #{searchPattern}
+ or TASK_NO LIKE #{searchPattern}
+ or BARCODE LIKE #{searchPattern}
+ or START_POINT LIKE #{searchPattern}
+ or TARGET_POINT LIKE #{searchPattern}
+ )
+ </if>
</sql>
diff --git a/src/main/resources/mapper/TaskWrkMapper.xml b/src/main/resources/mapper/TaskWrkMapper.xml
index 37eef49..7dcf83a 100644
--- a/src/main/resources/mapper/TaskWrkMapper.xml
+++ b/src/main/resources/mapper/TaskWrkMapper.xml
@@ -201,11 +201,38 @@
<if test="status != null">
and STATUS = #{status}
</if>
+ <if test="barcode != null">
+ and BARCODE = #{barcode}
+ </if>
+ <if test="startPoint != null">
+ and (
+ START_POINT = #{startPoint}
+ or ORIGIN_START_POINT = #{startPoint}
+ )
+ </if>
+ <if test="targetPoint != null">
+ and (
+ TARGET_POINT = #{targetPoint}
+ or ORIGIN_TARGET_POINT = #{targetPoint}
+ )
+ </if>
<if test="modiTimeStart != null ">
<if test="modiTimeEnd != null ">
and MODI_TIME between #{modiTimeStart} and #{modiTimeEnd}
</if>
</if>
+ <if test="allField != null and allField != ''">
+ <bind name="searchPattern" value="'%' + allField + '%'" />
+ and (
+ WRK_NO LIKE #{searchPattern}
+ or TASK_NO LIKE #{searchPattern}
+ or BARCODE LIKE #{searchPattern}
+ or START_POINT LIKE #{searchPattern}
+ or TARGET_POINT LIKE #{searchPattern}
+ or ORIGIN_START_POINT LIKE #{searchPattern}
+ or ORIGIN_TARGET_POINT LIKE #{searchPattern}
+ )
+ </if>
</sql>
diff --git a/src/main/webapp/views/taskWrk/taskWrk.html b/src/main/webapp/views/taskWrk/taskWrk.html
index ec84e8b..19d029b 100644
--- a/src/main/webapp/views/taskWrk/taskWrk.html
+++ b/src/main/webapp/views/taskWrk/taskWrk.html
@@ -21,6 +21,18 @@
<el-input v-model="tableSearchParam.task_no" placeholder="浠诲姟鍙�"></el-input>
</el-form-item>
<el-form-item label="">
+ <el-input v-model="tableSearchParam.wrk_no" placeholder="宸ヤ綔鍙�"></el-input>
+ </el-form-item>
+ <el-form-item label="">
+ <el-input v-model="tableSearchParam.barcode" placeholder="鏉＄爜"></el-input>
+ </el-form-item>
+ <el-form-item label="">
+ <el-input v-model="tableSearchParam.startPoint" placeholder="璧风偣"></el-input>
+ </el-form-item>
+ <el-form-item label="">
+ <el-input v-model="tableSearchParam.targetPoint" placeholder="缁堢偣"></el-input>
+ </el-form-item>
+ <el-form-item label="">
<el-select v-model="tableSearchParam.status" placeholder="浠诲姟鐘舵��">
<el-option label="鎺ユ敹" value="1"></el-option>
<el-option label="娲惧彂" value="2"></el-option>
@@ -29,7 +41,7 @@
</el-select>
</el-form-item>
<el-form-item label="">
- <el-input v-model="tableSearchParam.wrk_no" placeholder="宸ヤ綔鍙�"></el-input>
+ <el-input v-model="tableSearchParam.allField" placeholder="璇疯緭鍏�"></el-input>
</el-form-item>
<el-form-item label="">
<el-date-picker
@@ -163,6 +175,10 @@
task_no: null,
status: null,
wrk_no: null,
+ barcode: null,
+ startPoint: null,
+ targetPoint: null,
+ allField: null,
datetime: null,
},
taskWrkFormVisible: false,
diff --git a/src/main/webapp/views/taskWrkLog/taskWrkLog.html b/src/main/webapp/views/taskWrkLog/taskWrkLog.html
index f5d767a..c29ea58 100644
--- a/src/main/webapp/views/taskWrkLog/taskWrkLog.html
+++ b/src/main/webapp/views/taskWrkLog/taskWrkLog.html
@@ -26,6 +26,15 @@
<el-input v-model="tableSearchParam.wrk_no" placeholder="宸ヤ綔鍙�"></el-input>
</el-form-item>
<el-form-item label="">
+ <el-input v-model="tableSearchParam.barcode" placeholder="鏉＄爜"></el-input>
+ </el-form-item>
+ <el-form-item label="">
+ <el-input v-model="tableSearchParam.startPoint" placeholder="璧风偣"></el-input>
+ </el-form-item>
+ <el-form-item label="">
+ <el-input v-model="tableSearchParam.targetPoint" placeholder="缁堢偣"></el-input>
+ </el-form-item>
+ <el-form-item label="">
<el-select v-model="tableSearchParam.status" placeholder="浠诲姟鐘舵��">
<el-option label="鎺ユ敹" value="1"></el-option>
<el-option label="娲惧彂" value="2"></el-option>
@@ -34,6 +43,9 @@
<el-option label="鎵嬪姩瀹岀粨" value="7"></el-option>
<el-option label="鍑哄簱鍒拌緭閫佺嚎" value="9"></el-option>
</el-select>
+ </el-form-item>
+ <el-form-item label="">
+ <el-input v-model="tableSearchParam.allField" placeholder="璇疯緭鍏�"></el-input>
</el-form-item>
<el-form-item label="">
<el-date-picker
@@ -188,6 +200,10 @@
task_no: null,
status: null,
wrk_no: null,
+ barcode: null,
+ startPoint: null,
+ targetPoint: null,
+ allField: null,
datetime: null
},
taskWrkFormVisible: false,
--
Gitblit v1.9.1