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/task/TaskLogScheduler.java | 12
src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java | 2
src/main/java/com/zy/asrs/controller/OpenController.java | 271 ++++++++++-----------
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 152 ++++++------
src/main/java/com/zy/asrs/service/impl/TaskWrkServiceImpl.java | 16 -
src/main/java/com/zy/asrs/service/OpenService.java | 6
src/main/java/com/zy/asrs/entity/TaskWrkLog.java | 2
/dev/null | 107 --------
src/main/java/com/zy/asrs/entity/param/TaskCancelParam.java | 20 +
src/main/java/com/zy/asrs/entity/param/TaskCreateParam.java | 38 ---
src/main/java/com/zy/asrs/entity/param/TaskCreateOutParam.java | 31 ++
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 57 +---
src/main/resources/application.yml | 4
13 files changed, 296 insertions(+), 422 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("璇锋眰鍏ュ簱璋冪敤鎺ュ彛澶辫触");
diff --git a/src/main/java/com/zy/asrs/entity/TaskWrkLog.java b/src/main/java/com/zy/asrs/entity/TaskWrkLog.java
index 0273b99..77b9ec2 100644
--- a/src/main/java/com/zy/asrs/entity/TaskWrkLog.java
+++ b/src/main/java/com/zy/asrs/entity/TaskWrkLog.java
@@ -249,6 +249,8 @@
return "鍙栨秷";
case 5:
return "瀹岀粨";
+ case 7:
+ return "鎵嬪姩瀹岀粨";
default:
return String.valueOf(this.status);
}
diff --git a/src/main/java/com/zy/asrs/entity/param/CarryParam.java b/src/main/java/com/zy/asrs/entity/param/CarryParam.java
deleted file mode 100644
index 63dc5ce..0000000
--- a/src/main/java/com/zy/asrs/entity/param/CarryParam.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.zy.asrs.entity.param;
-
-import lombok.Data;
-
-@Data
-public class CarryParam {
- //宸ヤ綔鍙�
- private String TaskNo;
-
- //鍏ュ嚭搴撶被鍨�
- private Integer StereoscopicTaskType;
-
- //浼樺厛绾�
- private Integer Priority;
-
- //瀹瑰櫒缂栫爜
- private String BoxNo;
-
- //婧愯揣浣嶆帓缂栧彿
- private Integer OriginalRowNo;
-
- //婧愯揣浣嶅眰缂栧彿
- private Integer OriginalFloorNo;
-
- //婧愯揣浣嶅垪缂栧彿
- private Integer OriginalColumnNo;
-
- //鐩爣搴撲綅鎺掔紪鍙�
- private Integer GoalRowNo;
-
- //鐩爣搴撲綅灞傜紪鍙�
- private Integer GoalFloorNo;
-
- //鐩爣搴撲綅鍒楃紪鍙�
- private Integer GoalColumnNo;
-
- //璧风偣
- private String startPoint;
-
- //缁堢缂栧彿锛堣緭閫佺嚎涓婃煇涓�鐐逛綅锛�
- private String TerminalNo;
-
- //澶囨敞
- private String meno;
-
-}
diff --git a/src/main/java/com/zy/asrs/entity/param/CarrysParam.java b/src/main/java/com/zy/asrs/entity/param/CarrysParam.java
deleted file mode 100644
index cdeb206..0000000
--- a/src/main/java/com/zy/asrs/entity/param/CarrysParam.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.zy.asrs.entity.param;
-
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-public class CarrysParam {
- private List<CarryParam> TaskList;
-}
diff --git a/src/main/java/com/zy/asrs/entity/param/Result.java b/src/main/java/com/zy/asrs/entity/param/Result.java
deleted file mode 100644
index d80d41f..0000000
--- a/src/main/java/com/zy/asrs/entity/param/Result.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.zy.asrs.entity.param;
-
-import lombok.Data;
-
-@Data
-public class Result {
- private Long ShelfUnitId; //鍒嗛厤鐨勮揣浣岻D
- private String Alley; //鍒嗛厤鐨勮揣浣嶆墍灞炲贩閬�
- private Long TaskId; //鍒嗛厤鐨勮揣浣嶆墍灞炰换鍔D
- private String TaskNo; //鍒嗛厤鐨勮揣浣嶆墍灞炰换鍔＄紪鍙�
- private int Row; //鍒嗛厤鐨勮揣浣嶆墍灞炴帓
- private int Floor; //鍒嗛厤鐨勮揣浣嶆墍灞炲眰
- private int Column; //鍒嗛厤鐨勮揣浣嶆墍灞炲垪
- //绔欎綅缂栧彿 鐢ㄦ埛鏄粠鍝釜鍙ｅ叆鐨�
- private Integer TerminalNo;
-}
diff --git a/src/main/java/com/zy/asrs/entity/param/StorageEscalationParam.java b/src/main/java/com/zy/asrs/entity/param/StorageEscalationParam.java
deleted file mode 100644
index a0505a5..0000000
--- a/src/main/java/com/zy/asrs/entity/param/StorageEscalationParam.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.zy.asrs.entity.param;
-
-import lombok.Data;
-
-@Data
-public class StorageEscalationParam {
- //鎵樼洏鐮�
- private String BoxNo;
- //鎵ц鐘舵�� 0锛氭垚鍔� 1锛氬け璐�
- private Integer WCSStatus=0;
- //閿欒淇℃伅 鍏蜂綋鐨勯敊璇俊鎭紙瓒呴珮锛岃秴閲嶇瓑锛�
- private String WCSErrorMessage="";
-}
diff --git a/src/main/java/com/zy/asrs/entity/param/TaskCancelParam.java b/src/main/java/com/zy/asrs/entity/param/TaskCancelParam.java
new file mode 100644
index 0000000..97b2559
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/param/TaskCancelParam.java
@@ -0,0 +1,20 @@
+package com.zy.asrs.entity.param;
+
+import lombok.Data;
+
+@Data
+public class TaskCancelParam {
+
+ //宸ヤ綔鍙�
+ private String taskNo;
+
+ //鍏ュ嚭搴撶被鍨�
+ private Integer ioType;
+
+ //鎵樼洏鐮�
+ private String barcode;
+
+ //鐘舵��
+ private Integer taskStatus;
+
+}
diff --git a/src/main/java/com/zy/asrs/entity/param/TaskCreateOutParam.java b/src/main/java/com/zy/asrs/entity/param/TaskCreateOutParam.java
new file mode 100644
index 0000000..4551c46
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/param/TaskCreateOutParam.java
@@ -0,0 +1,31 @@
+package com.zy.asrs.entity.param;
+
+import lombok.Data;
+
+@Data
+public class TaskCreateOutParam {
+
+ //浠诲姟鍙�
+ private String taskNo;
+
+ //浠诲姟绫诲瀷
+ private Integer ioType;
+
+ //璧风偣
+ private String startPoint;
+
+ //浼樺厛绾�
+ private Integer taskPriority;
+
+ //缁堢偣
+ private String targetPoint;
+
+ //鏉＄爜
+ private String barcode;
+
+ //澶囨敞
+ private String memo;
+
+ public TaskCreateOutParam(){};
+
+}
diff --git a/src/main/java/com/zy/asrs/entity/param/TaskCreateParam.java b/src/main/java/com/zy/asrs/entity/param/TaskCreateParam.java
index 4e6930e..dd7046e 100644
--- a/src/main/java/com/zy/asrs/entity/param/TaskCreateParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/TaskCreateParam.java
@@ -28,45 +28,7 @@
//澶囨敞
private String memo;
- //鍫嗗灈鏈�
- private Integer crn;
public TaskCreateParam(){};
-
- public TaskCreateParam(WMSAndAGVInterfaceParam param){
- this.taskNo = param.getTaskNo();
- this.ioType = convertParamIoType(param.getTaskType());
- this.barcode = param.getContainerCode();
- this.taskPriority = param.getTaskPriority();
- this.startPoint = param.getSourceLocationCode();
- this.targetPoint = param.getTargetLocationCode();
- this.emptyContainer = param.getEmptyContainer();
- this.crn = param.getTaskTunnel();
- };
-
- public TaskCreateParam(CarryParam param, Integer crn){
- this.taskNo = param.getTaskNo();
- this.ioType = param.getStereoscopicTaskType();
- this.barcode = param.getBoxNo();
- this.taskPriority = 12;
- this.startPoint = param.getStartPoint();
- this.targetPoint = param.getTerminalNo();
- this.emptyContainer = "N";
- this.crn = crn;
- };
-
-
- public static Integer convertParamIoType(String paramIoType){
- switch (paramIoType){
- case "RK":
- return 1;
- case "CK":
- return 2;
- case "YK":
- return 3;
- default:
- return 0;
- }
- }
}
diff --git a/src/main/java/com/zy/asrs/entity/param/TaskStatusFeedbackParam.java b/src/main/java/com/zy/asrs/entity/param/TaskStatusFeedbackParam.java
deleted file mode 100644
index c99af14..0000000
--- a/src/main/java/com/zy/asrs/entity/param/TaskStatusFeedbackParam.java
+++ /dev/null
@@ -1,107 +0,0 @@
-package com.zy.asrs.entity.param;
-
-import com.zy.asrs.entity.TaskWrk;
-import com.zy.asrs.utils.Utils;
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-public class TaskStatusFeedbackParam {
-
- private String taskNo; //浠诲姟鍙�
- private String warehouseId; //浠撳簱鏍囪瘑
- private String feedbackFrom; //鏉ユ簮
- private String equipmentCode; //璁惧缂栫爜
-
- //wms鍑哄簱浠诲姟涓嬪彂鎺ュ彛
- private String taskType; //浠诲姟绫诲瀷 CK銆乊K銆丷K銆丳D
- private int taskPriority; //浼樺厛绾�
- private String containerCode; //瀹瑰櫒缂栫爜
- private String containerTypeCode; //瀹瑰櫒绫诲瀷
- private String emptyContainer; //鏄惁绌烘墭鐩� Y:鏄� N锛氬惁
- private int taskTunnel; //浠诲姟宸烽亾
- private String sourceLocationCode; //璧峰璐т綅
- private String targetLocationCode; //鐩爣璐т綅
- private String groupNo; //浠诲姟缁� 鏍囪瘑鐫�鍝簺浠诲姟灞炰簬鍚屼竴缁�
- private int taskSerialNo; //浠诲姟鎵ц椤哄簭 鍚屼竴浠诲姟缁勭殑浠诲姟锛屾寜浠诲姟鎵ц椤哄簭鎵ц浠诲姟
- private String createTime; //鍒涘缓鏃堕棿 YYYY-MM-DD HH24:MI:SS
- private String targetWharf; //鐩爣鐮佸ご鍖哄煙 鏁版嵁瀛楀吀锛孏寮�澶�=7杞﹂棿锛孒寮�澶�=8灞傦紝J寮�澶�=9杞﹂棿
-
-
- //浠诲姟鐘舵�佸弽棣堟帴鍙�
-// feedbackFrom 鏉ユ簮 string
-// warehouseId 浠撳簱鏍囪瘑 string
-// taskType 浠诲姟绫诲瀷 string
-// equipmentCode 璁惧缂栫爜 string
-// taskNo 浠诲姟鍙� string
-// taskStatus 浠诲姟鐘舵�� string
-// sourceLocationCode 婧愬簱浣� string
-// targetLocationCode 鐩爣搴撲綅 string
-// containerCode 瀹瑰櫒缂栫爜 string
-// containerTypeCode 瀹瑰櫒绫诲瀷 string
-// emptyContainer 鏄惁绌烘墭鐩� string
-// errorCode 鏁呴殰缂栫爜 string
- /*
- * 銆�0001銆� 閲嶅叆寮傚父
- 銆�0002銆� 绌哄嚭寮傚父
- 銆�0003銆� 鏀炬繁娴呮湁
- 銆�0004銆� 鍙栨繁娴呮湁
- 銆�0005銆� 鏁版嵁鏍￠獙寮傚父
- * */
-
-
-
- //浠诲姟鍙栨秷鎺ュ彛
- /*鎿嶄綔绫诲瀷:
- * 1.姝ｅ父鍙栨秷--鍙兘鍙栨秷鏈墽琛岀殑浠诲姟锛岃揣鐗╁鍦ㄦ湭鎵ц浠诲姟鐘舵��
- * 2.寮哄埗鍙栨秷--鍙彇娑堝凡鎵ц鏈畬鎴愮殑浠诲姟锛岃揣鐗╁鍦ㄦ湭鎵ц浠诲姟鐘舵��
- * 3.姝ｅ父瀹屾垚--鍙兘瀹屾垚鏈墽琛岀殑浠诲姟锛岃揣鐗╁浜庝换鍔℃墽琛屽畬鎴愮姸鎬�
- * 4.寮哄埗瀹屾垚--鍙畬鎴愬凡鎵ц鏈畬鎴愮殑浠诲姟锛岃揣鐗╁浜庝换鍔℃墽琛屽畬鎴愮姸鎬�
- * */
- private String taskStatus; //鎿嶄綔绫诲瀷
- private String wharfSource; //婧愮爜澶�
- private List<String> freeWharfs;
- private String requestType; //璇锋眰绫诲瀷: 1=鍙栬揣锛�2=鏀捐揣
- private String wharfCode; //鐮佸ご缂栧彿
-
- public TaskStatusFeedbackParam(){}
-
- public TaskStatusFeedbackParam(TaskWrk taskWrk){
- this.taskNo = taskWrk.getTaskNo();
- this.feedbackFrom = "WCS";
- this.warehouseId = "1688469798893297665";
- this.taskType = getTaskType(taskWrk.getIoType());
- this.equipmentCode = Utils.getEquipmentCode(taskWrk.getTargetPoint());
-// this.taskStatus = "done";
-// 鏈墽琛� unExecute
-// 宸茬‘璁� confirmed
-// WCS宸蹭笅杈� wcsReleased
-// AGV宸蹭笅杈� agvReleased
-// 寮�濮嬫墽琛� executing
-// 璐т綅澶勭悊瀹屾垚 locationDone
-// 鑷姩瀹屾垚 done
-// 寮� 甯� exception
-// 宸插彇娑� cancelled
-// 鎵嬪姩瀹屾垚 handle
-
- this.sourceLocationCode = taskWrk.getStartPoint();
- this.targetLocationCode = taskWrk.getTargetPoint();
- }
-
- public static String getTaskType(Integer paramIoType){
- switch (paramIoType){
- case 1:
- return "RK";
- case 2:
- return "CK";
- case 3:
- return "YK";
- default:
- return "鏈煡";
- }
- }
-
-
-
-}
diff --git a/src/main/java/com/zy/asrs/service/OpenService.java b/src/main/java/com/zy/asrs/service/OpenService.java
index a997979..fe2b427 100644
--- a/src/main/java/com/zy/asrs/service/OpenService.java
+++ b/src/main/java/com/zy/asrs/service/OpenService.java
@@ -1,14 +1,14 @@
package com.zy.asrs.service;
+import com.core.common.R;
import com.zy.asrs.entity.param.TaskCreateInParam;
import com.zy.asrs.entity.param.TaskCreateParam;
-import java.util.HashMap;
public interface OpenService {
//鍒涘缓浠诲姟
- HashMap<String,Object> taskCreate(TaskCreateParam param);
+ R taskCreate(TaskCreateParam param);
- HashMap<String,Object> taskCreateIn(TaskCreateInParam param);
+ R taskCreateIn(TaskCreateInParam param);
}
diff --git a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
index ef957cb..145d911 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
@@ -8,8 +8,6 @@
import com.core.common.R;
import com.zy.asrs.entity.LocMast;
import com.zy.asrs.entity.WmsLocStatus;
-import com.zy.asrs.entity.param.TaskOverToWms;
-import com.zy.asrs.entity.param.WMSAndAGVInterfaceParam;
import com.zy.asrs.mapper.LocMastMapper;
import com.zy.asrs.service.ApiLogService;
import com.zy.asrs.service.LocMastService;
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index f20e742..b1ae386 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -10,7 +10,6 @@
import com.zy.asrs.domain.enums.TaskStatusType;
import com.zy.asrs.domain.enums.WorkNoType;
import com.zy.asrs.entity.*;
-import com.zy.asrs.entity.param.Result;
import com.zy.asrs.mapper.*;
import com.zy.asrs.service.*;
import com.zy.asrs.utils.CommandUtils;
@@ -42,6 +41,7 @@
import org.springframework.transaction.interceptor.TransactionAspectSupport;
import java.io.IOException;
+import java.text.SimpleDateFormat;
import java.util.*;
/**
@@ -96,9 +96,7 @@
@Value("${wms.inboundTaskApplyPath}")
private String inboundTaskApplyPath;
@Value("${wms.TaskExecCallback}")
- private String TaskExecCallback;
- @Value("${wms.taskStatusFeedbackPath}")
- private String taskStatusFeedbackPath;
+ private String taskExecCallback;
public synchronized void generateStoreWrkFile1() {
try {
@@ -167,13 +165,13 @@
}
HashMap<String, Object> requestParam = new HashMap<>();
- requestParam.put("BoxNo", barcode);//鎵樼洏鐮�
- requestParam.put("TerminalNo", inSta.getStaNo());//鍏ュ簱鍙�
+ requestParam.put("barcode", barcode);//鎵樼洏鐮�
+ requestParam.put("stationCode", inSta.getStaNo());//鍏ュ簱鍙�
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 = "";
@@ -193,73 +191,78 @@
continue;
}
- 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() + "宸茬粡瀛樺湪");
- continue;
- }
+ 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 + "搴撲綅涓嶅瓨鍦�");
- continue;
- }
+ // 鍒涙柊涓�涓叆搴撳伐浣滄。
+ TaskWrk taskWrk = taskWrkService.selectByTaskNo(String.valueOf(resultWrkNo));
+ if(taskWrk != null) {
+ log.info("浠诲姟锛�" + resultWrkNo + "宸茬粡瀛樺湪");
+ continue;
+ }
- if (!locMast.getLocSts().equals("O")) {
- log.info(locNo + "搴撲綅涓嶅浜庣┖搴撲綅");
- continue;
- }
+ LocMast locMast = locMastService.selectByLocNo(resultLocNo);
+ if (locMast == null) {
+ log.info(resultLocNo + "搴撲綅涓嶅瓨鍦�");
+ continue;
+ }
- 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(staProtocol.getStaNo()));
- if (!Cools.isEmpty(taskWrk.getTargetPoint())) {
- taskWrk.setOriginTargetPoint(taskWrk.getTargetPoint());
- }
+ if (!locMast.getLocSts().equals("O")) {
+ log.info(resultLocNo + "搴撲綅涓嶅浜庣┖搴撲綅");
+ continue;
+ }
- if (!taskWrkService.insert(taskWrk)) {
- log.info("浠诲姟锛�" + result.getTaskNo() + "浠诲姟鍒涘缓澶辫触");
- continue;
- }
+ 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(staProtocol.getStaNo()));
+ 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 + "浠诲姟鍒涘缓澶辫触");
+ continue;
+ }
- StaDesc staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>()
- .eq("crn_no", taskWrk.getCrnNo()).eq("type_no", 1).eq("stn_no", staProtocol.getSiteId()));
- staProtocol.setWorkNo(taskWrk.getWrkNo().shortValue());
- staProtocol.setStaNo(staDesc.getCrnStn().shortValue());
- MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
+ locMast.setLocSts("S");
+ locMast.setModiTime(new Date());
+ locMastService.updateById(locMast);
- //涓婃姤
- HashMap<String, Object> hashMap = new HashMap<>();
- hashMap.put("TaskNo", taskWrk.getTaskNo());
+ StaDesc staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>()
+ .eq("crn_no", taskWrk.getCrnNo()).eq("type_no", 1).eq("stn_no", staProtocol.getSiteId()));
+ staProtocol.setWorkNo(taskWrk.getWrkNo().shortValue());
+ staProtocol.setStaNo(staDesc.getCrnStn().shortValue());
+ MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
- 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", 1);
+ 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("璇锋眰鍏ュ簱璋冪敤鎺ュ彛澶辫触");
@@ -597,12 +600,17 @@
}
//涓婃姤-鍑哄簱浠诲姟寮�濮嬫椂锛學CS鍥炶皟WMS
+ SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:ss:mm");
HashMap<String, Object> hashMap = new HashMap<>();
- hashMap.put("TaskNo", taskWrk.getTaskNo());
+ hashMap.put("taskNo", taskWrk.getTaskNo());
+ hashMap.put("status", TaskStatusType.DISTRIBUTE.id);
+ hashMap.put("ioType", 1);
+ hashMap.put("barcode", taskWrk.getBarcode());
+ hashMap.put("reportTime", format.format(new Date()));
NotifyCustomDataDto customDataDto = new NotifyCustomDataDto();
customDataDto.setUri(wmsUrl);
- customDataDto.setPath(taskStatusFeedbackPath);
+ 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) {
@@ -690,7 +698,7 @@
response = new HttpHandler.Builder()
// .setHeaders(headParam)
.setUri(wmsUrl)
- .setPath(taskStatusFeedbackPath)
+ .setPath(taskExecCallback)
.setJson(JSON.toJSONString(headParam))
.build()
.doPost();
@@ -706,7 +714,7 @@
// throw new CoolException("wcs娲惧彂绉诲簱搴撲换鍔′笂鎶ms澶辫触");
}finally {
apiLogService.save("wcs娲惧彂绉诲簱浠诲姟涓婃姤wms"
- , wmsUrl + taskStatusFeedbackPath
+ , wmsUrl + taskExecCallback
, null
, "127.0.0.1"
, JSON.toJSONString(headParam)
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index 9adda8a..dfd82ab 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
+import com.core.common.R;
import com.zy.asrs.domain.enums.TaskStatusType;
import com.zy.asrs.domain.enums.WorkNoType;
import com.zy.asrs.entity.*;
@@ -25,13 +26,10 @@
private LocMastService locMastService;
@Override
- public HashMap<String, Object> taskCreate(TaskCreateParam param) {
- HashMap<String,Object> map=new HashMap<>();
+ public R taskCreate(TaskCreateParam param) {
TaskWrk taskWrk = taskWrkService.selectByTaskNo(param.getTaskNo());
if (taskWrk != null) {
- map.put("Code","0");
- map.put("Msg",param.getTaskNo()+"浠诲姟宸茬粡鐢熸垚锛�");
- return map;
+ return R.error(param.getTaskNo() + "浠诲姟宸茬粡鐢熸垚锛�");
}
Date now = new Date();
@@ -42,14 +40,6 @@
taskWrk.setWrkNo(workNo1);
taskWrk.setStatus(TaskStatusType.RECEIVE.id);//浠诲姟鐘舵�侊細鎺ユ敹
taskWrk.setCreateTime(now);
- try {
- if (param.getIoType() > 1) {
- if (Utils.locNoRowBoolean(locMast.getRow1())) {
- param.setTaskPriority(11);
- }
- }
- } catch (Exception e) {
- }
taskWrk.setIoType(param.getIoType());//浠诲姟绫诲瀷
taskWrk.setIoPri(param.getTaskPriority());//浼樺厛绾�
taskWrk.setBarcode(param.getBarcode());//鏉＄爜
@@ -68,52 +58,49 @@
taskWrk.setTargetPoint(param.getTargetPoint());
}
taskWrk.setTargetPoint(param.getTargetPoint());
+
+ locMast.setLocSts("R");
+ locMast.setModiTime(new Date());
+ locMastService.updateById(locMast);
+
} else if (param.getIoType() == 3) {
taskWrk.setWrkSts(11);
if (!Cools.isEmpty(param.getStartPoint())) {
taskWrk.setStartPoint(param.getStartPoint());//璧风偣
taskWrk.setTargetPoint(param.getTargetPoint());
}
- }
+ locMast.setLocSts("R");
+ locMast.setModiTime(new Date());
+ locMastService.updateById(locMast);
+ }
if (!Cools.isEmpty(param.getMemo())) {
taskWrk.setMemo(param.getMemo());//澶囨敞
}
if (!taskWrkService.insert(taskWrk)) {
- map.put("Code","0");
- map.put("Msg",param.getTaskNo()+"鍒涘缓浠诲姟澶辫触锛�");
- return map;
+ return R.error(param.getTaskNo() + "鍒涘缓浠诲姟澶辫触锛�");
}
- map.put("Code","1");
- map.put("Msg","ok");
- return map;
+ return R.ok();
}
@Override
- public HashMap<String, Object> taskCreateIn(TaskCreateInParam param) {
- HashMap<String, Object> map = new HashMap<>();
+ public R taskCreateIn(TaskCreateInParam param) {
TaskWrk taskWrk = taskWrkService.selectByTaskNo(param.getTaskNo());
if (taskWrk != null) {
- map.put("Code","0");
- map.put("Msg", param.getTaskNo() + "浠诲姟宸茬粡鐢熸垚锛�");
- return map;
+ return R.error(param.getTaskNo() + "浠诲姟宸茬粡鐢熸垚锛�");
}
Date now = new Date();
taskWrk = new TaskWrk();
LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", param.getTargetPoint()));
if (locMast == null) {
- map.put("Code","0");
- map.put("Msg", param.getTaskNo() + "搴撲綅涓嶅瓨鍦紒");
- return map;
+ return R.error(param.getTaskNo() + "搴撲綅涓嶅瓨鍦紒");
}
if (!locMast.getLocSts().equals("O")) {
- map.put("Code","0");
- map.put("Msg", param.getTaskNo() + "搴撲綅涓嶅浜庣┖搴撲綅锛�");
- return map;
+ return R.error(param.getTaskNo() + "搴撲綅涓嶅浜庣┖搴撲綅锛�");
}
locMast.setLocSts("S");
@@ -137,12 +124,8 @@
}
if (!taskWrkService.insert(taskWrk)) {
- map.put("Code", "0");
- map.put("Msg", param.getTaskNo() + "鍒涘缓浠诲姟澶辫触锛�");
- return map;
+ return R.error(param.getTaskNo() + "鍒涘缓浠诲姟澶辫触锛�");
}
- map.put("Code","1");
- map.put("Msg","ok");
- return map;
+ return R.ok();
}
}
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 5b20240..86086f7 100644
--- a/src/main/java/com/zy/asrs/service/impl/TaskWrkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/TaskWrkServiceImpl.java
@@ -3,14 +3,9 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.zy.asrs.mapper.TaskWrkMapper;
import com.zy.asrs.entity.TaskWrk;
-import com.zy.asrs.service.ApiLogService;
-import com.zy.asrs.service.StaDescService;
import com.zy.asrs.service.TaskWrkService;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
-import com.zy.common.service.CommonService;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
@@ -20,17 +15,6 @@
@Slf4j
@Service("taskWrkService")
public class TaskWrkServiceImpl extends ServiceImpl<TaskWrkMapper, TaskWrk> implements TaskWrkService {
-
- @Autowired
- private CommonService commonService;
- @Autowired
- private StaDescService staDescService;
- @Value("${wms.url}")
- private String wmsUrl;
- @Value("${wms.taskStatusFeedbackPath}")
- private String taskStatusFeedbackPath;
- @Autowired
- private ApiLogService apiLogService;
@Override
public TaskWrk selectByTaskNo(String taskNo) {
diff --git a/src/main/java/com/zy/asrs/task/TaskLogScheduler.java b/src/main/java/com/zy/asrs/task/TaskLogScheduler.java
index 0cbe8a0..1d3c71e 100644
--- a/src/main/java/com/zy/asrs/task/TaskLogScheduler.java
+++ b/src/main/java/com/zy/asrs/task/TaskLogScheduler.java
@@ -18,6 +18,7 @@
import org.springframework.stereotype.Component;
import java.io.IOException;
+import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.HashMap;
@@ -47,12 +48,16 @@
@Scheduled(cron = "0/3 * * * * ? ")
public void execute() throws IOException {
for (TaskWrk taskWrk : taskWrkService.selectToBeHistoryData()) {
+ SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:ss:mm");
HashMap<String, Object> headParam = new HashMap<>();
- headParam.put("TaskNo", taskWrk.getTaskNo());
+ headParam.put("taskNo", taskWrk.getTaskNo());
+ headParam.put("barcode", taskWrk.getBarcode());
+ headParam.put("reportTime", format.format(new Date()));
NotifyMsgType notifyMsgType = null;
if (taskWrk.getStatus().equals(TaskStatusType.OVER.id) || taskWrk.getStatus().equals(TaskStatusType.MANUAL_OVER.id)) {//瀹屾垚
- headParam.put("Result", 1);//瀹屾垚
+ headParam.put("status", TaskStatusType.OVER.id);
+ headParam.put("ioType", 1);
notifyMsgType = NotifyMsgType.TASK_COMPLETE;
if (taskWrk.getIoType() == 1) {//鍏ュ簱浠诲姟瀹屾垚搴撲綅涓篎
@@ -114,7 +119,8 @@
}
} else if (taskWrk.getStatus().equals(TaskStatusType.CANCEL.id)) {
- headParam.put("Result", 2);//鍙栨秷
+ headParam.put("status", TaskStatusType.CANCEL.id);
+ headParam.put("ioType", 2);
notifyMsgType = NotifyMsgType.TASK_CANCEL;
if (taskWrk.getIoType() == 1) {//鍏ュ簱浠诲姟
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index ea1a810..02a050c 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -52,9 +52,7 @@
url: 192.168.10.12:8001
# 鍏ュ簱浠诲姟鐢宠鎺ュ彛
inboundTaskApplyPath: /wes/api/drivers/zy/asrs/inboundTaskApply
- # 浠诲姟寮�濮嬫椂锛學CS鍥炶皟WMSz
- taskStatusFeedbackPath: /wes/api/drivers/zy/asrs/callBack
- # 浠诲姟瀹屾垚缁撴潫鏃讹紝WCS鍥炶皟WMS
+ # WCS鍥炶皟WMS
TaskExecCallback: /wes/api/drivers/zy/asrs/callBack
# 绉诲簱鐢宠鎺ュ彛
movePath: /wes/api/get_InterFace_TestStorage
--
Gitblit v1.9.1