From 116ab17ceb0c77aef99fa10b8a88fc055bb839f0 Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期一, 23 六月 2025 19:35:53 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/TaskWrkController.java | 118 ++++++++++++++++++++---------------------------------------
1 files changed, 40 insertions(+), 78 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/TaskWrkController.java b/src/main/java/com/zy/asrs/controller/TaskWrkController.java
index 69497df..7a21695 100644
--- a/src/main/java/com/zy/asrs/controller/TaskWrkController.java
+++ b/src/main/java/com/zy/asrs/controller/TaskWrkController.java
@@ -6,12 +6,11 @@
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.dto.NotifyCustomDataDto;
+import com.zy.asrs.domain.enums.NotifyMsgType;
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;
@@ -20,6 +19,7 @@
import com.core.common.BaseRes;
import com.core.common.Cools;
import com.core.common.R;
+import com.zy.asrs.utils.NotifyUtils;
import com.zy.common.utils.HttpHandler;
import com.zy.common.web.BaseController;
import lombok.extern.slf4j.Slf4j;
@@ -35,21 +35,18 @@
@Value("${wms.url}")
private String wmsUrl;
-
@Autowired
private TaskWrkService taskWrkService;
-
@Autowired
private CommandInfoService commandInfoService;
-
@Autowired
private LocMastService locMastService;
-
- @Value("${wms.taskStatusFeedbackPath}")
- private String taskStatusFeedbackPath;
-
+ @Value("${wms.TaskExecCallback}")
+ private String TaskExecCallback;
@Autowired
private ApiLogService apiLogService;
+ @Autowired
+ private NotifyUtils notifyUtils;
@RequestMapping(value = "/taskWrk/{wrkNo}/auth")
@ManagerAuth
@@ -165,12 +162,12 @@
return R.ok();
}
- @PostMapping(value = "/taskWrk/distribute/auth")
- @ManagerAuth(memo = "鎵嬪姩娲惧彂浠诲姟")
- public R distribute(@RequestParam String taskNo) {
- taskWrkService.distribute(taskNo, getUserId());
- return R.ok();
- }
+// @PostMapping(value = "/taskWrk/distribute/auth")
+// @ManagerAuth(memo = "鎵嬪姩娲惧彂浠诲姟")
+// public R distribute(@RequestParam String taskNo) {
+// taskWrkService.distribute(taskNo, getUserId());
+// return R.ok();
+// }
@PostMapping(value = "/taskWrk/complete/auth")
@ManagerAuth(memo = "鎵嬪姩瀹屾垚浠诲姟")
@@ -179,9 +176,9 @@
if (Cools.isEmpty(taskWrk) || taskWrk.getStatus()>=3){
return R.error("宸插畬缁撴垨宸插彇娑�") ;
}
- LocMast locMast=new LocMast();
+ LocMast locMast = new LocMast();
if(taskWrk.getIoType()==1){//鍏ュ簱浠诲姟瀹屾垚搴撲綅涓篎
- locMast=locMastService.selectByLocNo(taskWrk.getTargetPoint());
+ locMast = locMastService.selectByLocNo(taskWrk.getTargetPoint());
if(Cools.isEmpty(locMast)){
R.error("娌℃湁鎵惧埌璇ュ簱浣�") ;
}
@@ -189,14 +186,14 @@
locMast.setModiTime(new Date());
locMast.setBarcode(taskWrk.getBarcode());
}else if(taskWrk.getIoType()==2){//鍑哄簱浠诲姟瀹屾垚搴撲綅涓篛
- locMast=locMastService.selectByLocNo(taskWrk.getStartPoint());
+ 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());
+ locMast = locMastService.selectByLocNo(taskWrk.getStartPoint());
if(Cools.isEmpty(locMast)){
R.error("娌℃湁鎵惧埌璇ュ簱浣�") ;
}
@@ -212,41 +209,35 @@
locMast.setBarcode(taskWrk.getBarcode());
}
- String response="";
- try{
- HashMap<String, Object> headParam = new HashMap<>();
- headParam.put("taskNo",taskWrk.getTaskNo());
- headParam.put("status",taskWrk.getStatus());
- headParam.put("ioType",taskWrk.getIoType());
- headParam.put("barcode",taskWrk.getBarcode());
-// headParam.put("reportTime",new Date());
- log.info("wcs鎵嬪姩瀹屾垚浠诲姟涓婃姤wms={}", taskWrk);
- response = new HttpHandler.Builder()
- // .setHeaders(headParam)
- .setUri(wmsUrl)
- .setPath(taskStatusFeedbackPath)
- .setJson(JSON.toJSONString(headParam))
- .build()
- .doPost();
- JSONObject jsonObject = JSON.parseObject(response);
- apiLogService.save("wcs鎵嬪姩瀹屾垚浠诲姟涓婃姤wms"
- ,wmsUrl+taskStatusFeedbackPath
- ,null
- ,"127.0.0.1"
- ,JSON.toJSONString(headParam)
- ,response
- ,true
- );
- }catch (Exception e){
- log.error("wcs鎵嬪姩瀹屾垚浠诲姟涓婃姤wms澶眥},杩斿洖鍊�={}", taskWrk,response);
- throw new CoolException(e);
- }
locMastService.updateById(locMast);
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")
@@ -267,36 +258,7 @@
}catch (Exception e){
taskWrk.setModiUser(9999L);//鎿嶄綔鍛�
}
- String response="";
- try{
- HashMap<String, Object> headParam = new HashMap<>();
- headParam.put("taskNo",taskWrk.getTaskNo());
- headParam.put("status",taskWrk.getStatus());
- headParam.put("ioType",taskWrk.getIoType());
- headParam.put("barcode",taskWrk.getBarcode());
-// headParam.put("reportTime",new Date());
- log.info("wcs鎵嬪姩鍙栨秷浠诲姟涓婃姤wm={}", taskWrk);
- response = new HttpHandler.Builder()
- // .setHeaders(headParam)
- .setUri(wmsUrl)
- .setPath(taskStatusFeedbackPath)
- .setJson(JSON.toJSONString(headParam))
- .build()
- .doPost();
- JSONObject jsonObject = JSON.parseObject(response);
- apiLogService.save("wcs鎵嬪姩鍙栨秷浠诲姟涓婃姤wms"
- ,wmsUrl+taskStatusFeedbackPath
- ,null
- ,"127.0.0.1"
- ,JSON.toJSONString(headParam)
- ,response
- ,true
- );
- }catch (Exception e){
- log.error("wcs鎵嬪姩鍙栨秷浠诲姟涓婃姤wms澶辫触={},杩斿洖鍊�={}", taskWrk,response);
- throw new CoolException(e);
- }
taskWrk.setCompleteTime(now);//瀹岀粨鏃堕棿
taskWrkService.updateById(taskWrk);
return R.ok();
--
Gitblit v1.9.1