From aa33e56e37cd19b88ae8eea69c5ebc7c6da8b1d2 Mon Sep 17 00:00:00 2001
From: Administrator <pjb>
Date: 星期四, 05 六月 2025 17:59:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/glccwcs' into glccwcs
---
src/main/java/com/zy/asrs/controller/TaskWrkController.java | 156 +++++++++++++++++++++++++++++++++++++++------------
1 files changed, 118 insertions(+), 38 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/TaskWrkController.java b/src/main/java/com/zy/asrs/controller/TaskWrkController.java
index f82660e..b35d47a 100644
--- a/src/main/java/com/zy/asrs/controller/TaskWrkController.java
+++ b/src/main/java/com/zy/asrs/controller/TaskWrkController.java
@@ -4,25 +4,52 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
-import com.core.common.DateUtils;
-import com.zy.asrs.domain.enums.TaskStatusType;
-import com.zy.asrs.entity.TaskWrk;
-import com.zy.asrs.service.TaskWrkService;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
+import com.core.common.DateUtils;
import com.core.common.R;
+import com.zy.asrs.domain.enums.TaskStatusType;
+import com.zy.asrs.entity.LocMast;
+import com.zy.asrs.entity.TaskWrk;
+import com.zy.asrs.service.LocMastService;
+import com.zy.asrs.service.TaskWrkService;
+import com.zy.asrs.service.ToWmsService;
import com.zy.common.web.BaseController;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.*;
@RestController
+@Slf4j
public class TaskWrkController extends BaseController {
+
@Autowired
private TaskWrkService taskWrkService;
+
+
+ @Autowired
+ private LocMastService locMastService;
+
+
+ @Autowired
+ private ToWmsService toWmsService;
+
+ public static String getTaskType(Integer paramIoType) {
+ switch (paramIoType) {
+ case 1:
+ return "RK";
+ case 2:
+ return "CK";
+ case 3:
+ return "YK";
+ default:
+ return "鏈煡";
+ }
+ }
@RequestMapping(value = "/taskWrk/{wrkNo}/auth")
@ManagerAuth
@@ -32,22 +59,24 @@
@RequestMapping(value = "/taskWrk/list/auth")
@ManagerAuth
- public R list(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam Map<String, Object> param){
+ public R list(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @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));}
+ if (!Cools.isEmpty(orderByField)) {
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ }
return R.ok(taskWrkService.selectPage(new Page<>(curr, limit), wrapper));
}
- private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
- for (Map.Entry<String, Object> entry : map.entrySet()){
+ private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper) {
+ for (Map.Entry<String, Object> entry : map.entrySet()) {
String val = String.valueOf(entry.getValue());
- if (val.contains(RANGE_TIME_LINK)){
+ if (val.contains(RANGE_TIME_LINK)) {
String[] dates = val.split(RANGE_TIME_LINK);
wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
@@ -64,9 +93,9 @@
return R.ok();
}
- @RequestMapping(value = "/taskWrk/update/auth")
- @ManagerAuth
- public R update(TaskWrk taskWrk){
+ @RequestMapping(value = "/taskWrk/update/auth")
+ @ManagerAuth
+ public R update(TaskWrk taskWrk) {
if (Cools.isEmpty(taskWrk) || null == taskWrk.getTaskNo()) {
return R.error();
}
@@ -76,7 +105,7 @@
@RequestMapping(value = "/taskWrk/updatePoint/auth")
@ManagerAuth
- public R updatePoint(TaskWrk taskWrk){
+ public R updatePoint(TaskWrk taskWrk) {
if (Cools.isEmpty(taskWrk) || null == taskWrk.getTaskNo()) {
return R.error();
}
@@ -94,8 +123,8 @@
@RequestMapping(value = "/taskWrk/delete/auth")
@ManagerAuth
- public R delete(@RequestParam(value="ids[]") Long[] ids){
- for (Long id : ids){
+ public R delete(@RequestParam(value = "ids[]") Long[] ids) {
+ for (Long id : ids) {
taskWrkService.deleteById(id);
}
return R.ok();
@@ -103,7 +132,7 @@
@RequestMapping(value = "/taskWrk/export/auth")
@ManagerAuth
- public R export(@RequestBody JSONObject param){
+ public R export(@RequestBody JSONObject param) {
EntityWrapper<TaskWrk> wrapper = new EntityWrapper<>();
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
Map<String, Object> map = excludeTrash(param.getJSONObject("taskWrk"));
@@ -119,7 +148,7 @@
wrapper.like("id", condition);
Page<TaskWrk> page = taskWrkService.selectPage(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
- for (TaskWrk taskWrk : page.getRecords()){
+ for (TaskWrk taskWrk : page.getRecords()) {
Map<String, Object> map = new HashMap<>();
map.put("id", taskWrk.getTaskNo());
map.put("value", taskWrk.getTaskNo());
@@ -132,7 +161,7 @@
@ManagerAuth
public R query(@RequestBody JSONObject param) {
Wrapper<TaskWrk> wrapper = new EntityWrapper<TaskWrk>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != taskWrkService.selectOne(wrapper)){
+ if (null != taskWrkService.selectOne(wrapper)) {
return R.parse(BaseRes.REPEAT).add(getComment(TaskWrk.class, String.valueOf(param.get("key"))));
}
return R.ok();
@@ -149,23 +178,72 @@
@ManagerAuth(memo = "鎵嬪姩瀹屾垚浠诲姟")
public R complete(@RequestParam String taskNo) {
TaskWrk taskWrk = taskWrkService.selectByTaskNo(taskNo);
- if (taskWrk == null) {
- return R.error();
+ if (Cools.isEmpty(taskWrk) || taskWrk.getStatus() >= 3) {
+ return R.error("宸插畬缁撴垨宸插彇娑�");
}
- if (taskWrk.getStatus().equals(TaskStatusType.COMPLETE.id)) {
- return R.error(taskWrk.getTaskNo() + "宸插畬缁�");
+ LocMast locMast = new LocMast();
+ if (taskWrk.getIoType() == 1) {//鍏ュ簱浠诲姟瀹屾垚搴撲綅涓篎
+ locMast = locMastService.selectByLocNo(taskWrk.getTargetPoint());
+ if (Cools.isEmpty(locMast)) {
+ R.error("娌℃湁鎵惧埌璇ュ簱浣�");
+ }
+ locMast.setLocSts("F");
+ locMast.setModiTime(new Date());
+ locMast.setBarcode(taskWrk.getBarcode());
+ } else if (taskWrk.getIoType() == 2) {//鍑哄簱浠诲姟瀹屾垚搴撲綅涓篛
+ locMast = locMastService.selectByLocNo(taskWrk.getStartPoint());
+ if (Cools.isEmpty(locMast)) {
+ R.error("娌℃湁鎵惧埌璇ュ簱浣�");
+ }
+ locMast.setLocSts("O");
+ locMast.setModiTime(new Date());
+ } else if (taskWrk.getIoType() == 3) {
+ locMast = locMastService.selectByLocNo(taskWrk.getStartPoint());
+ if (Cools.isEmpty(locMast)) {
+ R.error("娌℃湁鎵惧埌璇ュ簱浣�");
+ }
+ locMast.setLocSts("O");
+ locMast.setModiTime(new Date());
+ locMastService.updateById(locMast);
+ locMast = locMastService.selectByLocNo(taskWrk.getTargetPoint());
+ if (Cools.isEmpty(locMast)) {
+ R.error("娌℃湁鎵惧埌璇ュ簱浣�");
+ }
+ locMast.setLocSts("F");
+ locMast.setModiTime(new Date());
+ locMast.setBarcode(taskWrk.getBarcode());
+
}
- Date now = new Date();
- taskWrk.setStatus(TaskStatusType.COMPLETE.id);
- taskWrk.setModiTime(now);//鎿嶄綔鏃堕棿
- try{
- taskWrk.setModiUser(getUserId());//鎿嶄綔鍛�
- }catch (Exception e){
- taskWrk.setModiUser(9999L);//鎿嶄綔鍛�
- }
- taskWrk.setCompleteTime(now);//瀹岀粨鏃堕棿
+// toWmsService.addReportLog(taskWrk);
+ locMastService.updateById(locMast);
+ taskWrk.setCompleteTime(new Date());
+ taskWrk.setStatus(7);//鎵嬪姩瀹屾垚浠诲姟
+ taskWrk.setModiTime(new Date());
taskWrkService.updateById(taskWrk);
return R.ok();
+ }
+
+ @PostMapping(value = "/taskWrk/returnWorkingCondition/auth")
+ @ManagerAuth(memo = "閲嶆柊缁欏爢鍨涙満涓嬪彂浠诲姟")
+ public R returnWorkingCondition(@RequestParam String taskNo) {
+ TaskWrk taskWrk = taskWrkService.selectByTaskNo(taskNo);
+ if (!Cools.isEmpty(taskWrk) && taskWrk.getWrkSts() == 12) {
+ taskWrk.setWrkSts(11);
+ if (!taskWrkService.updateById(taskWrk)) {
+ return R.error("鏇存柊浠诲姟鐘舵�佸け璐�");
+ }
+ return R.ok();
+ } else if (!Cools.isEmpty(taskWrk) && taskWrk.getWrkSts() == 3) {
+ taskWrk.setWrkSts(2);
+ taskWrkService.updateById(taskWrk);
+ if (!taskWrkService.updateById(taskWrk)) {
+ return R.error("鏇存柊浠诲姟鐘舵�佸け璐�");
+ }
+ return R.ok();
+ } else {
+ return R.error("浠诲姟鐘舵�佷笉瀵规棤娉曢噸鏂扮粰鍫嗗灈鏈轰笅鍙戜换鍔�");
+ }
+
}
@PostMapping(value = "/taskWrk/cancel/auth")
@@ -181,12 +259,14 @@
Date now = new Date();
taskWrk.setStatus(TaskStatusType.CANCEL.id);
taskWrk.setModiTime(now);//鎿嶄綔鏃堕棿
- try{
+ try {
taskWrk.setModiUser(getUserId());//鎿嶄綔鍛�
- }catch (Exception e){
+ } catch (Exception e) {
taskWrk.setModiUser(9999L);//鎿嶄綔鍛�
}
- taskWrk.setCompleteTime(now);//瀹岀粨鏃堕棿
+// toWmsService.addReportLog(taskWrk);
+
+ taskWrk.setCancelTime(now);//瀹岀粨鏃堕棿
taskWrkService.updateById(taskWrk);
return R.ok();
}
--
Gitblit v1.9.1