From 184980deb3f854a98eb112e7998875113ebbba9a Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期一, 28 四月 2025 17:10:39 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/controller/TaskWrkController.java | 77 +++++++++++++++++++++++++++++++-------
1 files changed, 62 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();
}
--
Gitblit v1.9.1