From 7d626989e20297c0f52cd80a44c3763e2c2d9865 Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期日, 27 四月 2025 22:53:52 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/OpenController.java | 271 ++++++++++++++++++++++++++----------------------------
1 files changed, 130 insertions(+), 141 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 205df92..a1f22f7 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -25,10 +25,12 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
+import org.springframework.data.redis.core.ReactiveRedisTemplate;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
+import java.text.SimpleDateFormat;
import java.util.*;
@@ -41,8 +43,8 @@
private String wmsUrl;
@Value("${wms.inboundTaskApplyPath}")
private String inboundTaskApplyPath;
- @Value("${wms.taskStatusFeedbackPath}")
- private String taskStatusFeedbackPath;
+ @Value("${wms.TaskExecCallback}")
+ private String TaskExecCallback;
@Autowired
private OpenService openService;
@@ -72,6 +74,8 @@
public static final ArrayList<String> APP_KEY_LIST = new ArrayList<String>() {{
add("ea1f0459efc02a79f046f982767939ae");
}};
+ @Autowired
+ private ReactiveRedisTemplate reactiveRedisTemplate;
private void auth(String appkey, Object obj, HttpServletRequest request) {
log.info("{}鎺ュ彛琚闂紱appkey:{}锛涜姹傛暟鎹細{}", request.getServletPath(), appkey, JSON.toJSONString(obj));
@@ -169,8 +173,7 @@
return R.error("鏉＄爜[barcode]涓嶈兘涓虹┖");
}
- HashMap<String, Object> result = openService.taskCreateIn(param);
- return R.ok().add(result);
+ return openService.taskCreateIn(param);
}catch (Exception e){
log.error("浠诲姟涓嬪彂寮傚父"+e);
}
@@ -208,114 +211,95 @@
//浠诲姟涓嬪彂鎺ュ彛
@PostMapping("/outboundTaskSend")
@Transactional
- public HashMap<String, Object> outboundTaskSend(@RequestBody HashMap<String,Object> hashMap) {
- String jsonString = JSON.toJSONString(hashMap.get("TaskList"));
- List<CarryParam> params= JSONObject.parseArray(jsonString,CarryParam.class);
- HashMap<String, Object> map = new HashMap<>();
- List<WMSAndAGVInterfaceParam> params1 =new ArrayList<>();
- for (CarryParam param:params){
- if (Cools.isEmpty(param)){
- map.put("Code","0");
- map.put("Msg","鍙傛暟涓虹┖锛�");
- return map;
- } else if (Cools.isEmpty(param.getTaskNo())){
- map.put("Code","0");
- map.put("Msg","浠诲姟鍙蜂负绌猴紒");
- return map;
- } else if (Cools.isEmpty(param.getStereoscopicTaskType())){
- map.put("Code","0");
- map.put("Msg","浠诲姟绫诲瀷涓虹┖锛�");
- return map;
- }
- String fusion = Utils.getLocNo(param.getOriginalRowNo(), param.getOriginalFloorNo(), param.getOriginalColumnNo());
- param.setStartPoint(fusion);
- LocMast locMast = locMastService.selectByLocNo(param.getStartPoint());
- if(Cools.isEmpty(locMast)){
- map.put("Code","0");
- map.put("Msg","鍒濆搴撲綅鏃犳硶鎵惧埌锛�");
- return map;
- }
-
- HashMap<String,Object> r = new HashMap<>();
-
- if(param.getStereoscopicTaskType() == 2){
- //鍑哄簱浠诲姟鍒涘缓
- StaDesc staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>()
- .eq("type_no",2)
- .eq("crn_no",locMast.getCrnNo())
- .eq("stn_no",param.getTerminalNo()));
- if(Cools.isEmpty(staDesc)){
- map.put("Code","0");
- map.put("Msg","鍑哄簱璺姴涓嶅瓨鍦紒");
- return map;
- }
- r = openService.taskCreate(new TaskCreateParam(param,staDesc.getCrnNo()));
- if(r.get("Code").equals("0")){
- return r;
- }
- }else if (param.getStereoscopicTaskType() == 3){
- String fusion1 = Utils.getLocNo(param.getGoalRowNo(), param.getGoalFloorNo(), param.getGoalColumnNo());
- param.setTerminalNo(fusion1);
- //绉诲簱浠诲姟鍒涘缓
- r = openService.taskCreate(new TaskCreateParam(param,locMast.getCrnNo()));
- if(r.get("Code").equals("0")){
- return r;
- }
- }
- apiLogService.save("Wms浠诲姟涓嬪彂鎺ュ彛"
- ,request.getRemoteAddr()+request.getRequestURI()
- ,""
- ,request.getRemoteAddr()
- ,JSON.toJSONString(param)
- ,r.toString()
- ,true
- );
+ public HashMap<String, Object> outboundTaskSend(@RequestBody TaskCreateParam param) {
+ if (Cools.isEmpty(param)){
+ return R.error("鍙傛暟涓虹┖");
}
- map.put("Code","1");
- map.put("Msg","ok");
- return map;
+
+ if (param.getTaskNo() == null){
+ return R.error("浠诲姟鍙蜂负绌�");
+ }
+
+ if (param.getIoType() == null){
+ return R.error("浠诲姟绫诲瀷涓虹┖");
+ }
+
+ LocMast locMast = locMastService.selectByLocNo(param.getStartPoint());
+ if(locMast == null){
+ return R.error("鍒濆搴撲綅鏃犳硶鎵惧埌");
+ }
+
+ if (!locMast.getLocSts().equals("F")) {
+ return R.error("搴撲綅涓嶅浜庡湪搴撶姸鎬�");
+ }
+
+ R result = null;
+ if(param.getIoType() == 1){
+ //鍑哄簱浠诲姟鍒涘缓
+ StaDesc staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>()
+ .eq("type_no", 2)
+ .eq("crn_no", locMast.getCrnNo())
+ .eq("stn_no", param.getTargetPoint()));
+ if(Cools.isEmpty(staDesc)){
+ return R.error("鍑哄簱璺緞涓嶅瓨鍦�");
+ }
+
+ param.setIoType(2);
+ result = openService.taskCreate(param);
+ }
+
+ apiLogService.save("wms浠诲姟涓嬪彂鎺ュ彛"
+ ,request.getRemoteAddr()+request.getRequestURI()
+ ,""
+ ,request.getRemoteAddr()
+ ,JSON.toJSONString(param)
+ ,JSON.toJSONString(result)
+ ,true
+ );
+
+ return result;
}
//浠诲姟鍙栨秷鎺ュ彛
@PostMapping("/taskCancel")
public R taskCancel(@RequestHeader String appkey,
- @RequestBody WMSAndAGVInterfaceParam param,
+ @RequestBody TaskCancelParam param,
HttpServletRequest request) {
auth(appkey, param, request);
- if (Cools.isEmpty(param)){
+ if (Cools.isEmpty(param)) {
return R.error("鍙傛暟涓虹┖锛�");
- } else if (Cools.isEmpty(param.getTaskNo())){
+ } else if (Cools.isEmpty(param.getTaskNo())) {
return R.error("宸ヤ綔鍙蜂负绌猴紒");
- } else if (Cools.isEmpty(param.getIoType())){
+ } else if (Cools.isEmpty(param.getIoType())) {
return R.error("鎿嶄綔绫诲瀷涓虹┖锛�");
- } else if (Cools.isEmpty(param.getBarcode())){
+ } else if (Cools.isEmpty(param.getBarcode())) {
return R.error("鎵樼洏鐮佷笉鑳戒负绌猴紒");
}
TaskWrk taskWrk = taskWrkService.selectOne(new EntityWrapper<TaskWrk>()
.eq("task_no", param.getTaskNo())
- .eq("io_type",param.getIoType())
- .eq("barcode",param.getBarcode()));
+ .eq("io_type", param.getIoType())
+ .eq("barcode", param.getBarcode()));
if (Cools.isEmpty(taskWrk)){
- return R.error("鏈煡鍒板綋鍓嶄换鍔�---"+param);
+ return R.error("鏈煡鍒板綋鍓嶄换鍔�---" + param);
}
boolean sign =false;
- switch (param.getTaskStatus()){
+ switch (param.getTaskStatus()) {
case 1://姝ｅ父鍙栨秷
- if (taskWrk.getStatus()>1){
+ if (taskWrk.getStatus() > 1) {
return R.error("浠诲姟宸插紑濮嬫墽琛�");
}
break;
case 2://姝ｅ父瀹屾垚
- if (taskWrk.getStatus()>1){
+ if (taskWrk.getStatus() > 1) {
return R.error("浠诲姟宸插紑濮嬫墽琛�");
}
- sign=true;
+ sign = true;
break;
default:
return R.error("鏈煡鎿嶄綔");
}
- return taskWrkOperate(taskWrk,sign);
+ return taskWrkOperate(taskWrk, sign);
}
//浠诲姟鎿嶄綔
@@ -369,13 +353,13 @@
}
HashMap<String, Object> requestParam = new HashMap<>();
- requestParam.put("BoxNo", barcode);//鎵樼洏鐮�
- requestParam.put("TerminalNo", staNo);//鍏ュ簱鍙�
+ requestParam.put("barcode", barcode);//鎵樼洏鐮�
+ requestParam.put("stationCode", staNo);//鍏ュ簱鍙�
if (back) {
- requestParam.put("WCSStatus", 1);//澶辫触
- requestParam.put("WCSErrorMessage", errMsg);//澶辫触鍘熷洜
+ requestParam.put("wcsStatus", 1);//澶辫触
+ requestParam.put("wcsErrorMessage", errMsg);//澶辫触鍘熷洜
}else {
- requestParam.put("WCSStatus", 0);//鎴愬姛
+ requestParam.put("wcsStatus", 0);//鎴愬姛
}
String response = "";
@@ -389,67 +373,72 @@
.doPost();
JSONObject jsonObject = JSON.parseObject(response);
- int returnStatus = Integer.parseInt(jsonObject.get("ReturnStatus").toString());
- if (returnStatus == 0) {
- Result result = JSON.parseObject(jsonObject.get("Result").toString(), Result.class);
- // 鍒涙柊涓�涓叆搴撳伐浣滄。
- TaskWrk taskWrk = taskWrkService.selectByTaskNo(result.getTaskNo());
- if(taskWrk != null) {
- log.info("浠诲姟锛�" + result.getTaskNo() + "宸茬粡瀛樺湪");
- return R.error();
- }
+ JSONObject result = jsonObject.getJSONObject("data");
+ Integer resultWrkNo = result.getInteger("wrkNo");
+ Integer resultStaNo = result.getInteger("staNo");
+ String resultLocNo = result.getString("locNo");
- String locNo = Utils.getLocNo(result.getRow(), result.getFloor(), result.getColumn());
- LocMast locMast = locMastService.selectByLocNo(locNo);
- if (locMast == null) {
- log.info(locNo + "搴撲綅涓嶅瓨鍦�");
- return R.error();
- }
+ // 鍒涙柊涓�涓叆搴撳伐浣滄。
+ TaskWrk taskWrk = taskWrkService.selectByTaskNo(String.valueOf(resultWrkNo));
+ if(taskWrk != null) {
+ log.info("浠诲姟锛�" + resultWrkNo + "宸茬粡瀛樺湪");
+ return R.error();
+ }
- if (!locMast.getLocSts().equals("O")) {
- log.info(locNo + "搴撲綅涓嶅浜庣┖搴撲綅");
- return R.error();
- }
+ LocMast locMast = locMastService.selectByLocNo(resultLocNo);
+ if (locMast == null) {
+ log.info(resultLocNo + "搴撲綅涓嶅瓨鍦�");
+ return R.error();
+ }
- Date now = new Date();
- taskWrk = new TaskWrk();
- taskWrk.setTaskNo(result.getTaskNo());//浠诲姟鍙�
- taskWrk.setWrkNo(commonService.getWorkNo(WorkNoType.PAKIN.type));//鑾峰彇鍏ュ簱宸ヤ綔鍙�
- taskWrk.setStatus(TaskStatusType.RECEIVE.id);//浠诲姟鐘舵�侊細鎺ユ敹
- taskWrk.setWrkSts(2);//2.璁惧涓婅蛋
- taskWrk.setCreateTime(now);
- taskWrk.setIoType(1);//浠诲姟绫诲瀷
- taskWrk.setIoPri(13);//浼樺厛绾�
- taskWrk.setBarcode(barcode);//鏉＄爜
- taskWrk.setCrnNo(locMast.getCrnNo());
- taskWrk.setTargetPoint(locNo);
- taskWrk.setStartPoint(String.valueOf(staNo));
- if (!Cools.isEmpty(taskWrk.getTargetPoint())) {
- taskWrk.setOriginTargetPoint(taskWrk.getTargetPoint());
- }
+ if (!locMast.getLocSts().equals("O")) {
+ log.info(resultLocNo + "搴撲綅涓嶅浜庣┖搴撲綅");
+ return R.error();
+ }
- if (!taskWrkService.insert(taskWrk)) {
- log.info("浠诲姟锛�" + result.getTaskNo() + "浠诲姟鍒涘缓澶辫触");
- return R.error();
- }
+ Date now = new Date();
+ taskWrk = new TaskWrk();
+ taskWrk.setTaskNo(String.valueOf(resultWrkNo));//浠诲姟鍙�
+ taskWrk.setWrkNo(commonService.getWorkNo(WorkNoType.PAKIN.type));//鑾峰彇鍏ュ簱宸ヤ綔鍙�
+ taskWrk.setStatus(TaskStatusType.RECEIVE.id);//浠诲姟鐘舵�侊細鎺ユ敹
+ taskWrk.setWrkSts(2);//2.璁惧涓婅蛋
+ taskWrk.setCreateTime(now);
+ taskWrk.setIoType(1);//浠诲姟绫诲瀷
+ taskWrk.setIoPri(13);//浼樺厛绾�
+ taskWrk.setBarcode(barcode);//鏉＄爜
+ taskWrk.setCrnNo(locMast.getCrnNo());
+ taskWrk.setTargetPoint(resultLocNo);
+ taskWrk.setStartPoint(String.valueOf(staNo));
+ if (!Cools.isEmpty(taskWrk.getTargetPoint())) {
+ taskWrk.setOriginTargetPoint(taskWrk.getTargetPoint());
+ }
- locMast.setLocSts("S");
- locMast.setModiTime(new Date());
- locMastService.updateById(locMast);
+ if (!taskWrkService.insert(taskWrk)) {
+ log.info("浠诲姟锛�" + resultWrkNo + "浠诲姟鍒涘缓澶辫触");
+ return R.error();
+ }
- //涓婃姤
- HashMap<String, Object> hashMap = new HashMap<>();
- hashMap.put("TaskNo", taskWrk.getTaskNo());
+ locMast.setLocSts("S");
+ locMast.setModiTime(new Date());
+ locMastService.updateById(locMast);
- NotifyCustomDataDto customDataDto = new NotifyCustomDataDto();
- customDataDto.setUri(wmsUrl);
- customDataDto.setPath(taskStatusFeedbackPath);
- customDataDto.setData(JSON.toJSONString(hashMap));
- boolean notifyResult = notifyUtils.notify("task", 1, String.valueOf(taskWrk.getWrkNo()), taskWrk.getTaskNo(), NotifyMsgType.TASK_START, JSON.toJSONString(taskWrk), true, customDataDto);
- if(notifyResult) {
- taskWrk.setStatus(TaskStatusType.DISTRIBUTE.id);//浠诲姟娲惧彂
- taskWrkService.updateById(taskWrk);
- }
+ //涓婃姤
+ SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:ss:mm");
+ HashMap<String, Object> hashMap = new HashMap<>();
+ hashMap.put("taskNo", taskWrk.getTaskNo());
+ hashMap.put("status", TaskStatusType.DISTRIBUTE.id);
+ hashMap.put("ioType", 2);
+ hashMap.put("barcode", taskWrk.getBarcode());
+ hashMap.put("reportTime", format.format(new Date()));
+
+ NotifyCustomDataDto customDataDto = new NotifyCustomDataDto();
+ customDataDto.setUri(wmsUrl);
+ customDataDto.setPath(TaskExecCallback);
+ customDataDto.setData(JSON.toJSONString(hashMap));
+ boolean notifyResult = notifyUtils.notify("task", 1, String.valueOf(taskWrk.getWrkNo()), taskWrk.getTaskNo(), NotifyMsgType.TASK_START, JSON.toJSONString(taskWrk), true, customDataDto);
+ if(notifyResult) {
+ taskWrk.setStatus(TaskStatusType.DISTRIBUTE.id);//浠诲姟娲惧彂
+ taskWrkService.updateById(taskWrk);
}
} catch (Exception e) {
log.error("璇锋眰鍏ュ簱璋冪敤鎺ュ彛澶辫触");
--
Gitblit v1.9.1