From 0cf26d5f8c8c2c15645443e84566ffec72abfdf1 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期一, 28 四月 2025 14:35:41 +0800
Subject: [PATCH] *
---
src/main/webapp/views/taskWrk/taskWrk.html | 35 ++++++++
src/main/java/com/zy/asrs/mapper/TaskWrkMapper.java | 18 ++++
src/main/java/com/zy/asrs/controller/TaskWrkController.java | 77 +++++++++++++++---
src/main/java/com/zy/asrs/service/TaskWrkService.java | 5 +
src/main/java/com/zy/asrs/service/impl/TaskWrkServiceImpl.java | 19 ++++
src/main/resources/mapper/TaskWrkMapper.xml | 36 +++++++++
6 files changed, 175 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/TaskWrkController.java b/src/main/java/com/zy/asrs/controller/TaskWrkController.java
index 3136a88..b145e8b 100644
--- a/src/main/java/com/zy/asrs/controller/TaskWrkController.java
+++ b/src/main/java/com/zy/asrs/controller/TaskWrkController.java
@@ -6,14 +6,10 @@
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.core.common.DateUtils;
-import com.core.exception.CoolException;
import com.zy.asrs.domain.enums.TaskStatusType;
-import com.zy.asrs.entity.CommandInfo;
import com.zy.asrs.entity.LocMast;
import com.zy.asrs.entity.TaskWrk;
-import com.zy.asrs.entity.param.TaskOverToWms;
import com.zy.asrs.service.ApiLogService;
-import com.zy.asrs.service.CommandInfoService;
import com.zy.asrs.service.LocMastService;
import com.zy.asrs.service.TaskWrkService;
import com.core.annotations.ManagerAuth;
@@ -40,9 +36,6 @@
private TaskWrkService taskWrkService;
@Autowired
- private CommandInfoService commandInfoService;
-
- @Autowired
private LocMastService locMastService;
@Value("${wms.taskStatusFeedbackPath}")
@@ -64,11 +57,45 @@
@RequestParam(required = false)String orderByField,
@RequestParam(required = false)String orderByType,
@RequestParam Map<String, Object> param){
- EntityWrapper<TaskWrk> wrapper = new EntityWrapper<>();
- excludeTrash(param);
- convert(param, wrapper);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
- return R.ok(taskWrkService.selectPage(new Page<>(curr, limit), wrapper));
+
+ try{
+ Integer wrkNo = null;
+ Integer taskNo = null;
+ Integer status = null;
+ Date modiTimeStart = null, modiTimeEnd = null;
+ for (Map.Entry<String, Object> entry : param.entrySet()) {
+ String val = String.valueOf(entry.getValue());
+ if (Cools.isEmpty(val)) {
+ continue;
+ }
+ if (val.contains(RANGE_TIME_LINK)) {
+ String[] dates = val.split(RANGE_TIME_LINK);
+ modiTimeStart = DateUtils.convert(dates[0]);
+ modiTimeEnd = DateUtils.convert(dates[1]);
+ } else if (entry.getKey().equals("wrk_no")) {
+ wrkNo = Integer.parseInt(val);
+ } else if (entry.getKey().equals("task_no")) {
+ taskNo = Integer.parseInt(val);
+ } else if (entry.getKey().equals("status")) {
+ status = Integer.parseInt(val);
+ }
+ }
+
+ EntityWrapper<TaskWrk> wrapper = new EntityWrapper<>();
+ excludeTrash(param);
+ 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);
+ Page<TaskWrk> page1 = new Page<TaskWrk>(curr, limit).setRecords(taskWrkList);
+ page1.setTotal(taskWrkService.selectTaskWrkListTotal(wrkNo,taskNo,status,modiTimeStart,modiTimeEnd));
+ return R.ok(page1);
+// return R.ok(taskWrkService.selectPage(new Page<>(curr, limit), wrapper));
+
+ } catch (Exception e) {
+ return R.error("鏌ヨ澶辫触,璇锋鏌ュ弬鏁�:"+e.getMessage());
+ }
+
}
private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
@@ -121,10 +148,30 @@
@RequestMapping(value = "/taskWrk/delete/auth")
@ManagerAuth
- public R delete(@RequestParam(value="ids[]") Long[] ids){
- for (Long id : ids){
- taskWrkService.deleteById(id);
+ public R delete(@RequestParam String taskNo){
+// for (Long id : ids){
+// taskWrkService.deleteById(id);
+// }
+ TaskWrk taskWrk = taskWrkService.selectByTaskNo(taskNo);
+ if (taskWrk == null) {
+ return R.error();
}
+ Date now = new Date();
+ taskWrk.setMemo("鎵嬪姩寮哄埗鍒犻櫎锛侊紒锛�");
+ taskWrk.setModiTime(now);
+ taskWrk.setModiUser(getUserId());
+ if (!taskWrkService.updateById(taskWrk)){
+ log.error("鍒犻櫎澶辫触" + taskWrk);
+ return R.error("鍒犻櫎澶辫触" + taskWrk);
+
+ }
+ if (taskWrkService.saveToHistoryD(taskWrk.getTaskNo()) == 0) {
+ log.error("浠诲姟妗ｈ浆浠诲姟鍘嗗彶妗ｅけ璐�" + taskWrk);
+ return R.error("浠诲姟妗ｈ浆浠诲姟鍘嗗彶妗ｅけ璐�" + taskWrk);
+
+ }
+ //鍒犻櫎浠诲姟
+ taskWrkService.delete(new EntityWrapper<TaskWrk>().eq("task_no", taskWrk.getTaskNo()));
return R.ok();
}
diff --git a/src/main/java/com/zy/asrs/mapper/TaskWrkMapper.java b/src/main/java/com/zy/asrs/mapper/TaskWrkMapper.java
index 92b8d62..448da66 100644
--- a/src/main/java/com/zy/asrs/mapper/TaskWrkMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/TaskWrkMapper.java
@@ -7,6 +7,7 @@
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
+import java.util.Date;
import java.util.List;
@Mapper
@@ -42,4 +43,21 @@
List<TaskWrk> selectWorkingTask();//鑾峰彇宸ヤ綔涓殑浠诲姟
+ List<TaskWrk> selectTaskWrkList(@Param("wrkNo") Integer wrkNo,
+ @Param("taskNo") Integer taskNo,
+ @Param("status") Integer status,
+ @Param("modiTimeStart") Date modiTimeStart,
+ @Param("modiTimeEnd") Date modiTimeEnd,
+ @Param("pageNumber") Integer curr,
+ @Param("pageSize") Integer limit);
+
+ Long selectTaskWrkListTotal(@Param("wrkNo") Integer wrkNo,
+ @Param("taskNo") Integer taskNo,
+ @Param("status") Integer status,
+ @Param("modiTimeStart") Date modiTimeStart,
+ @Param("modiTimeEnd") Date modiTimeEnd);
+
+ int saveToHistoryD(String taskNo);//灏嗕换鍔¤浆鍘嗗彶鏃ュ織
+
+
}
diff --git a/src/main/java/com/zy/asrs/service/TaskWrkService.java b/src/main/java/com/zy/asrs/service/TaskWrkService.java
index e62ee0b..5b19516 100644
--- a/src/main/java/com/zy/asrs/service/TaskWrkService.java
+++ b/src/main/java/com/zy/asrs/service/TaskWrkService.java
@@ -3,6 +3,7 @@
import com.zy.asrs.entity.TaskWrk;
import com.baomidou.mybatisplus.service.IService;
+import java.util.Date;
import java.util.List;
public interface TaskWrkService extends IService<TaskWrk> {
@@ -29,5 +30,9 @@
List<TaskWrk> selectToBeHistoryData();
int saveToHistory(String taskNo);//灏嗕换鍔¤浆鍘嗗彶鏃ュ織
+ int saveToHistoryD(String taskNo);//灏嗕换鍔¤浆鍘嗗彶鏃ュ織
+
+ List<TaskWrk> selectTaskWrkList(Integer wrkNo, Integer taskNo, Integer status, Date modiTimeStart, Date modiTimeEnd, Integer curr, Integer limit);
+ Long selectTaskWrkListTotal(Integer wrkNo,Integer taskNo,Integer status,Date modiTimeStart,Date 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 e1ee44a..65408e9 100644
--- a/src/main/java/com/zy/asrs/service/impl/TaskWrkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/TaskWrkServiceImpl.java
@@ -6,6 +6,7 @@
import com.core.exception.CoolException;
import com.zy.asrs.domain.enums.TaskStatusType;
import com.zy.asrs.domain.enums.WorkNoType;
+import com.zy.asrs.entity.DeviceError;
import com.zy.asrs.entity.StaDesc;
import com.zy.asrs.mapper.TaskWrkMapper;
import com.zy.asrs.entity.TaskWrk;
@@ -247,4 +248,22 @@
public int saveToHistory(String taskNo) {
return this.baseMapper.saveToHistory(taskNo);
}
+
+
+
+ @Override
+ public List<TaskWrk> selectTaskWrkList(Integer wrkNo,Integer taskNo,Integer status,Date modiTimeStart,Date modiTimeEnd, Integer curr, Integer limit) {
+ return this.baseMapper.selectTaskWrkList(wrkNo,taskNo, status,modiTimeStart,modiTimeEnd,curr,limit);
+ }
+
+ @Override
+ public Long selectTaskWrkListTotal(Integer wrkNo,Integer taskNo,Integer status,Date modiTimeStart,Date modiTimeEnd) {
+ return this.baseMapper.selectTaskWrkListTotal(wrkNo,taskNo, status,modiTimeStart,modiTimeEnd);
+ }
+
+
+ @Override
+ public int saveToHistoryD(String taskNo) {
+ return this.baseMapper.saveToHistoryD(taskNo);
+ }
}
diff --git a/src/main/resources/mapper/TaskWrkMapper.xml b/src/main/resources/mapper/TaskWrkMapper.xml
index c11c07d..5773347 100644
--- a/src/main/resources/mapper/TaskWrkMapper.xml
+++ b/src/main/resources/mapper/TaskWrkMapper.xml
@@ -133,6 +133,10 @@
and ("STATUS"=5 or "STATUS"=4 or "STATUS"=6)
</insert>
+ <insert id="saveToHistoryD">
+ insert into "SOURCE"."wcs_task_wrk_log" select * from "SOURCE"."wcs_task_wrk" where TASK_NO = #{taskNo}
+ </insert>
+
<select id="selectWorkingTask" resultMap="BaseResultMap">
select * from "SOURCE"."wcs_task_wrk"
where ("WRK_STS"=3 and "IO_TYPE" = 1)
@@ -140,4 +144,36 @@
order by "IO_PRI" desc,"CREATE_TIME","WRK_NO" ASC
</select>
+ <sql id="batchSeq">
+ <if test="wrkNo != null">
+ and WRK_NO = #{wrkNo}
+ </if>
+ <if test="taskNo != null">
+ and TASK_NO = #{taskNo}
+ </if>
+ <if test="status != null">
+ and STATUS = #{status}
+ </if>
+ <if test="modiTimeStart != null ">
+ <if test="modiTimeEnd != null ">
+ and MODI_TIME between #{modiTimeStart} and #{modiTimeEnd}
+ </if>
+ </if>
+ </sql>
+
+
+ <select id="selectTaskWrkList" resultMap="BaseResultMap">
+ SELECT * FROM "SOURCE"."wcs_task_wrk"
+ WHERE 1=1
+ <include refid="batchSeq"></include>
+ ORDER BY CREATE_TIME DESC
+ LIMIT #{pageSize} OFFSET ((#{pageNumber} - 1) * #{pageSize});
+ </select>
+
+ <select id="selectTaskWrkListTotal" resultType="Long">
+ SELECT count(1) FROM "SOURCE"."wcs_task_wrk"
+ WHERE 1=1
+ <include refid="batchSeq"></include>
+ </select>
+
</mapper>
diff --git a/src/main/webapp/views/taskWrk/taskWrk.html b/src/main/webapp/views/taskWrk/taskWrk.html
index a0887f2..d867a23 100644
--- a/src/main/webapp/views/taskWrk/taskWrk.html
+++ b/src/main/webapp/views/taskWrk/taskWrk.html
@@ -58,6 +58,7 @@
<el-dropdown-item command="assign">娲惧彂</el-dropdown-item>
<el-dropdown-item command="complete">瀹岀粨</el-dropdown-item>
<el-dropdown-item command="cancel">鍙栨秷</el-dropdown-item>
+ <el-dropdown-item command="delete">鍒犻櫎鏃犻渶涓婃姤</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
</template>
@@ -231,6 +232,10 @@
//鍙栨秷浠诲姟
this.cancelWrk(row)
break;
+ case "delete":
+ //鍙栨秷浠诲姟
+ this.deleteWrk(row)
+ break;
}
},
showCommand(row) {
@@ -343,6 +348,36 @@
}
});
},
+ deleteWrk(row) {
+ //鍙栨秷浠诲姟
+ let that = this
+ $.ajax({
+ url: baseUrl + "/taskWrk/delete/auth",
+ headers: {
+ 'token': localStorage.getItem('token')
+ },
+ data: {
+ taskNo: row.taskNo
+ },
+ method: 'POST',
+ success: function (res) {
+ if (res.code == 200) {
+ that.$message({
+ message: "鍒犻櫎鎴愬姛",
+ type: 'success'
+ });
+ that.getTableData()
+ } else if (res.code === 403) {
+ top.location.href = baseUrl + "/";
+ } else {
+ that.$message({
+ message: res.msg,
+ type: 'error'
+ });
+ }
+ }
+ });
+ },
cancelWrk(row) {
//鍙栨秷浠诲姟
let that = this
--
Gitblit v1.9.1