From cfb1943832cc253f43cddd164f468dfe6a32cb35 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期日, 21 十二月 2025 18:50:21 +0800
Subject: [PATCH] 刀具库WMS功能完善
---
src/main/java/com/zy/asrs/service/impl/RcsServiceImpl.java | 306 ++++++++++++++++++++++++++++++++++++++------------
1 files changed, 231 insertions(+), 75 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/RcsServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/RcsServiceImpl.java
index baffd2c..12af9a8 100644
--- a/src/main/java/com/zy/asrs/service/impl/RcsServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/RcsServiceImpl.java
@@ -1,11 +1,12 @@
package com.zy.asrs.service.impl;
import com.alibaba.excel.util.StringUtils;
+import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.core.common.Cools;
import com.zy.asrs.entity.*;
-import com.zy.asrs.entity.mes.TransArrivalStation;
-import com.zy.asrs.entity.mes.TransParent;
+import com.zy.asrs.entity.mes.*;
import com.zy.asrs.entity.rcs.*;
import com.zy.asrs.enums.RcsRetMethodEnum;
import com.zy.asrs.mapper.BlockStationMapper;
@@ -22,6 +23,8 @@
import java.net.URL;
import java.net.URLConnection;
import java.nio.charset.StandardCharsets;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Objects;
@@ -39,6 +42,11 @@
@Value("${mes.defaultUserId}")
public long defaultUserId;
+ @Value("${dj.url}")
+ public String DJ_URL;
+
+ @Resource
+ private BasStationService basStationService;
@Resource
private MesService mesService;
@@ -52,6 +60,12 @@
private TaskDetlServiceImpl taskDetlService;
@Resource
private WrkMastService wrkMastService;
+
+ @Resource
+ private WrkDetlService wrkDetlService;
+
+ @Resource
+ private OrderPakoutService orderPakoutService;
// region 灏侀攣鍖洪�昏緫锛岀洰鍓嶅彧鏈変竴涓ぇ灏侀攣鍖猴紝浠诲姟鍏ㄩ儴杞埌婊戝潡搴撳鐞嗭紝鎴栫洿鎺ュ啓鍒版粦鍧楀簱
@@ -155,6 +169,9 @@
// region 娴峰悍RCS锛孉GV
+ @Resource
+ private ApiLogService apiLogService;
+
/**
* 2.1.2浠诲姟涓嬪彂鎺ュ彛
* 鍘傚锛氭捣閲忋�佸崕鏅�
@@ -163,23 +180,49 @@
* @param rcsFactory 1 娴峰悍锛�2 鍗庢檽锛�
* @return
*/
- public int submitTask(RcsTaskSubmit rcsTaskSubmit, int rcsFactory){
- return 1;
+ public RcsReturn submitTask(RcsTaskSubmit rcsTaskSubmit, int rcsFactory){
+ RcsReturn rcsReturn = new RcsReturn();
+ boolean success = false;
+ String url = rcsFactory == 2 ? HX_URL : HIK_URL + "api/robot/controller/task/submit";
+ String response = "";
+ try {
+ // 妯℃嫙杩斿洖
+// rcsReturn.setCode("SUCCESS");
+// success = true;
-// String url = rcsFactory == 2 ? HX_URL :HIK_URL + "api/robot/controller/task/submit";
-// String response = sendPost(url, rcsTaskSubmit.toString());
-// if (!StringUtils.isEmpty(response) && response.contains("code")){
-// RcsReturn rcsReturn = JSONObject.parseObject(response, RcsReturn.class);
-// if("SUCCESS".equals(rcsReturn.getCode())) {
-// JSONObject data = rcsReturn.getData();
-// String robotTaskCode = data.getString("robotTaskCode");
-// if (robotTaskCode.equals(rcsTaskSubmit.getRobotTaskCode())){
-// return 1;
-// }
-// }
-// }
-//
-// return 0;
+ response = sendPost(url, JSONObject.toJSONString(rcsTaskSubmit));
+ if (!StringUtils.isEmpty(response) && response.contains("code")) {
+ rcsReturn = JSONObject.parseObject(response, RcsReturn.class);
+ if ("SUCCESS".equals(rcsReturn.getCode())) {
+ success = true;
+
+ log.info("鍛煎彨agv鎼繍鎴愬姛锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", url, JSON.toJSONString(rcsTaskSubmit), response);
+ } else {
+ log.error("鍛煎彨agv鎼繍澶辫触锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", url, JSON.toJSONString(rcsTaskSubmit), response);
+ }
+ } else {
+ log.error("鍛煎彨agv鎼繍澶辫触锛宺esponse锛歿}",response);
+ rcsReturn.setCode("ERROR");
+ }
+ } catch (Exception e) {
+ log.error("鍛煎彨agv鎼繍寮傚父", e);
+ } finally {
+ try {
+ // 淇濆瓨鎺ュ彛鏃ュ織
+ apiLogService.save(
+ "鍛煎彨agv鎼繍",
+ url,
+ null,
+ "127.0.0.1",
+ JSON.toJSONString(rcsTaskSubmit),
+ response,
+ success
+ );
+ } catch (Exception e) {
+ log.error("鍛煎彨agv鎼繍淇濆瓨鎺ュ彛鏃ュ織寮傚父", e);
+ }
+ }
+ return rcsReturn;
}
/**
@@ -192,7 +235,7 @@
public int continueTask(RcsTaskContinue rcsTaskContinue, int rcsFactory){
String url = rcsFactory == 2 ? HX_URL :HIK_URL + "api/robot/controller/task/extend/continue";
- String response = sendPost(url, rcsTaskContinue.toString());
+ String response = sendPost(url, JSONObject.toJSONString(rcsTaskContinue));
if (!StringUtils.isEmpty(response) && response.contains("code")){
RcsReturn rcsReturn = JSONObject.parseObject(response, RcsReturn.class);
if("SUCCESS".equals(rcsReturn.getCode())) {
@@ -217,7 +260,7 @@
public int cancelTask(RcsTaskCancel rcsTaskCancel, int rcsFactory){
String url = rcsFactory == 2 ? HX_URL :HIK_URL + "api/robot/controller/task/cancel";
- String response = sendPost(url, rcsTaskCancel.toString());
+ String response = sendPost(url, JSONObject.toJSONString(rcsTaskCancel));
if (!StringUtils.isEmpty(response) && response.contains("code")){
RcsReturn rcsReturn = JSONObject.parseObject(response, RcsReturn.class);
if("SUCCESS".equals(rcsReturn.getCode())) {
@@ -242,7 +285,7 @@
private int notifyEqpt(RcsEqptNotify rcsEqptNotify, int rcsFactory){
String url = rcsFactory == 2 ? HX_URL :HIK_URL + "api/wcs/robot/eqpt/notify";
- String response = sendPost(url, rcsEqptNotify.toString());
+ String response = sendPost(url, JSONObject.toJSONString(rcsEqptNotify));
if (!StringUtils.isEmpty(response) && response.contains("code")){
RcsReturn rcsReturn = JSONObject.parseObject(response, RcsReturn.class);
if("SUCCESS".equals(rcsReturn.getCode())) {
@@ -274,9 +317,81 @@
// start : 浠诲姟寮�濮嬶紱outbin : 璧板嚭鍌ㄤ綅锛沞nd : 浠诲姟瀹屾垚
String method = values.getString("method");
String carrierType = values.getString("carrierType");
+ Date now = new Date();
try {
- if ("Q3".equals(carrierType) || "Q8".equals(carrierType)) { //AGV
+ if (singleRobotCode.equals("14") || singleRobotCode.equals("15")) { // 涓ゅ彴CTU搴撴満鍣ㄤ汉缂栧彿
+ WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("task_no", robotTaskCode));
+ if(wrkMast != null) {
+ Integer ioType = wrkMast.getIoType();
+ switch (Objects.requireNonNull(RcsRetMethodEnum.getEnum(method))) {
+ case TASK_START: {
+ if (ioType == 1 || ioType == 10 || ioType == 53) {
+ wrkMast.setModiTime(now);
+ wrkMastService.updateById(wrkMast);
+ } else if (ioType == 101 || ioType == 110 || ioType == 103) {
+ wrkMast.setModiTime(now);
+ wrkMastService.updateById(wrkMast);
+ } else {
+ log.error("{}ioType{}涓嶅湪end鍙嶉澶勭悊涓�", wrkMast.getWrkNo(), ioType);
+ }
+ }
+ break;
+ case TASK_END: {
+ if (ioType == 1 || ioType == 10 || ioType == 53) {
+ wrkMast.setWrkSts(4L);
+ wrkMast.setCrnEndTime(now);
+ wrkMast.setModiTime(now);
+ wrkMastService.updateById(wrkMast);
+ } else if (ioType == 101 || ioType == 110 || ioType == 103) {
+ wrkMast.setWrkSts(14L);
+ wrkMast.setCrnEndTime(now);
+ wrkMast.setModiTime(now);
+ wrkMastService.updateById(wrkMast);
+ // 缁橳MS鍙嶉鍑哄簱璐х墿淇℃伅
+ List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
+ if(!wrkDetls.isEmpty()) {
+ WrkDetl wrkDetl = wrkDetls.get(0);
+ String orderNo = wrkDetl.getOrderNo();
+ if(!Cools.isEmpty(orderNo)) {
+ OrderPakout orderPakout = orderPakoutService.selectByNo(orderNo);
+ if (orderPakout != null) {
+ MesInApply mesOutFeedback = new MesInApply();
+ mesOutFeedback.setBillType(String.valueOf(orderPakout.getDocType()));
+ mesOutFeedback.setOrderNo(orderNo);
+ mesOutFeedback.setCreateTime( new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(now));
+ List<MesItemDetails> details = new ArrayList<>();
+ for(WrkDetl detl:wrkDetls) {
+ MesItemDetails detail = new MesItemDetails();
+ detail.setItemNo(detl.getMatnr());
+ detail.setAnfme(detl.getAnfme());
+ details.add(detail);
+ }
+ mesOutFeedback.setDetails(details);
+ String url = DJ_URL + "api/OutboundOrder/WmsOutFinish";
+ String request = JSONObject.toJSONString(mesOutFeedback);
+ String response = RcsServiceImpl.sendPost(url, request);
+ if (!StringUtils.isEmpty(response) && response.contains("Success")){
+ MesReturn mesReturn = JSONObject.parseObject(response, MesReturn.class);
+ if("1".equals(mesReturn.getSuccess())) {
+ log.info("CTU鍑哄簱鍙嶉end,涓婃姤TMS鎴愬姛,宸ヤ綔鍙凤細{}锛屾槑缁嗭細{}",wrkMast.getWrkNo(),request);
+ } else {
+ log.error("CTU鍑哄簱鍙嶉end,涓婃姤TMS澶辫触锛�,宸ヤ綔鍙凤細{}锛屾槑缁嗭細{}",wrkMast.getWrkNo(),request);
+ }
+ }
+ }
+ }
+ }
+
+ } else {
+ log.error("{}ioType{}涓嶅湪end鍙嶉澶勭悊涓�", wrkMast.getWrkNo(), ioType);
+ }
+ }
+ break;
+ default:
+ }
+ }
+ } else { //AGV
EntityWrapper<Task> wrapper = new EntityWrapper<>();
wrapper.eq("task_no", robotTaskCode);
Task task = taskService.selectOne(wrapper);
@@ -292,6 +407,17 @@
switch (Objects.requireNonNull(RcsRetMethodEnum.getEnum(method))) {
case TASK_START: {
+ if(memo.getString("TransType").equals("05") || memo.getString("TransType").equals("01")) {
+ BasStation station = basStationService.selectOne(new EntityWrapper<BasStation>().eq("dev_no", task.getSourceStaNo()));
+ if(station.getLocSts().equals("R")) {
+ station.setLocSts("O");
+ station.setBarcode("");
+ station.setModiTime(new Date());
+ basStationService.updateById(station);
+ } else {
+ log.error("agv鍥炶皟start,鎺ラ┏鐐圭姸鎬佷笉涓篟,agv浠诲姟鍙凤細{},鐘舵�侊細{}",task.getTaskNo(),task.getWrkSts());
+ }
+ }
task.setWrkSts(302L); // 301 浠诲姟涓嬪彂銆�302 浠诲姟鎵ц銆�303 浠诲姟涓柇銆�304 浠诲姟缁撴潫
task.setModiTime(new Date());
task.setModiUser(defaultUserId);
@@ -300,12 +426,28 @@
// case TASK_OUT_BIN: {} break;
case TASK_END: {
// 鏇存柊浠诲姟鐘舵�佺瓑鍐呴儴閫昏緫
- task.setWrkSts(304L); // 301 浠诲姟涓嬪彂銆�302 浠诲姟鎵ц銆�303 浠诲姟涓柇銆�304 浠诲姟缁撴潫
+ if(memo.getString("TransType").equals("06") || memo.getString("TransType").equals("02")) {
+ // 06涓嬪垁鏉ョ殑绌哄垁鏋堕渶瑕佸洖鍘伙紝02鏉ョ殑瑕佷笂鍒�05鐨勭┖鍒�鏋朵笂婊″悗闇�瑕佸洖鍘伙紝pda涓婂仛浠诲姟杞崲
+ task.setWrkSts(305L); // 305.浠诲姟杞崲
+ BasStation station = basStationService.selectOne(new EntityWrapper<BasStation>().eq("dev_no", task.getStaNo()));
+ if(station.getLocSts().equals("S")) {
+ station.setLocSts("F");
+ station.setModiTime(new Date());
+ basStationService.updateById(station);
+ } else {
+ log.error("agv鍥炶皟end,鎺ラ┏鐐圭姸鎬佷笉涓篠,agv浠诲姟鍙凤細{},鐘舵�侊細{}",task.getTaskNo(),task.getWrkSts());
+ }
+ } else {
+ task.setWrkSts(304L); // 301 浠诲姟涓嬪彂銆�302 浠诲姟鎵ц銆�303 浠诲姟涓柇銆�304 浠诲姟缁撴潫
+ }
task.setModiTime(new Date());
task.setModiUser(defaultUserId);
taskService.updateById(task);
// 浠诲姟瀹屾垚
- mesService.reporterTask(rcsReporterTask);
+// mesService.reporterTask(rcsReporterTask);
+
+ // 鏇存柊鎺ラ┏浣嶇疆鐘舵��
+
// EntityWrapper<TaskDetl> wapper2 = new EntityWrapper<>();
// wapper2.eq("wrk_no", task.getWrkNo())
@@ -342,6 +484,15 @@
mesService.applyOutStation(apply);
} else if (RcsRetMethodEnum.ARRIVE_OFF_STATION.getCode().equals(method)) {
mesService.outStation(apply);
+ // agv缁х画鎵ц
+ // 婧愮珯鐐规槸浜х嚎锛岀绔欏畬鎴愬悗缁檙cs鍙嶉缁х画鎵ц
+ if(task.getSourceStaNo().contains("TOOL")) {
+ TransInOutStationAllow inOutStationAllow = new TransInOutStationAllow();
+ inOutStationAllow.setTaskno(robotTaskCode);
+ inOutStationAllow.setStatus("Y");
+ inOutStationAllow.setAgvCode(singleRobotCode);
+ mesService.allowOutStation(inOutStationAllow);
+ }
}
} break;
case ARRIVE_ON_STATION: {
@@ -353,7 +504,7 @@
TransArrivalStation arrivalStation = new TransArrivalStation();
arrivalStation.setTaskno(robotTaskCode);
arrivalStation.setTaskname(memo.getString("taskName"));
- arrivalStation.setTuoPanId(taskDetl == null || taskDetl.getZpallet() == null ? "" : taskDetl.getZpallet());
+// arrivalStation.setTuoPanId(taskDetl == null || taskDetl.getZpallet() == null ? "" : taskDetl.getZpallet());
arrivalStation.setDaotype(memo.getString("TransType"));
arrivalStation.setProductLineId(memo.getString("ProductLineId"));
// arrivalStation.setStationId(task.getStaNo());
@@ -379,53 +530,54 @@
} break;
default: {} break;
}
- } else if ("CTU".equals(carrierType)) { //CTU
- EntityWrapper<WrkMast> wrapper = new EntityWrapper<>();
- wrapper.eq("task_no", robotTaskCode);
- WrkMast task = wrkMastService.selectOne(wrapper);
- if (task == null || !task.getTaskNo().equals(robotTaskCode)) {
- rcsReturn.setCode("Err_RobotCodeNotMatch");
- rcsReturn.setMessage("");
- JSONObject data = new JSONObject();
- data.put("robotTaskCode", robotTaskCode);
- rcsReturn.setData(data);
- return rcsReturn;
- }
-// JSONObject memo = JSONObject.parseObject(task.getMemo());
-
- switch (Objects.requireNonNull(RcsRetMethodEnum.getEnum(method))) {
- case TASK_START: {
-// task.setWrkSts(302L); // 301 浠诲姟涓嬪彂銆�302 浠诲姟鎵ц銆�303 浠诲姟涓柇銆�304 浠诲姟缁撴潫
+ }
+// else if ("CTU".equals(carrierType)) { //CTU
+// EntityWrapper<WrkMast> wrapper = new EntityWrapper<>();
+// wrapper.eq("task_no", robotTaskCode);
+// WrkMast task = wrkMastService.selectOne(wrapper);
+// if (task == null || !task.getTaskNo().equals(robotTaskCode)) {
+// rcsReturn.setCode("Err_RobotCodeNotMatch");
+// rcsReturn.setMessage("");
+// JSONObject data = new JSONObject();
+// data.put("robotTaskCode", robotTaskCode);
+// rcsReturn.setData(data);
+// return rcsReturn;
+// }
+//// JSONObject memo = JSONObject.parseObject(task.getMemo());
+//
+// switch (Objects.requireNonNull(RcsRetMethodEnum.getEnum(method))) {
+// case TASK_START: {
+//// task.setWrkSts(302L); // 301 浠诲姟涓嬪彂銆�302 浠诲姟鎵ц銆�303 浠诲姟涓柇銆�304 浠诲姟缁撴潫
+//// task.setModiTime(new Date());
+//// task.setModiUser(defaultUserId);
+//// taskService.updateById(task);
+// } break;
+//// case TASK_OUT_BIN: {} break;
+// case TASK_END: {
+// // 鏇存柊浠诲姟鐘舵�佺瓑鍐呴儴閫昏緫
+// long wrkSts = task.getWrkSts(); // 1.鍏ュ簱锛�101.鍑哄簱锛�
+// if (task.getIoType() == 1) {
+// wrkSts = 4L;
+// } else if (task.getIoType() == 101) {
+// wrkSts = 14L;
+// }
+//
+// task.setWrkSts(wrkSts); // 4.鍏ュ簱瀹屾垚锛�14.宸插嚭搴撴湭纭锛�
// task.setModiTime(new Date());
// task.setModiUser(defaultUserId);
-// taskService.updateById(task);
- } break;
-// case TASK_OUT_BIN: {} break;
- case TASK_END: {
- // 鏇存柊浠诲姟鐘舵�佺瓑鍐呴儴閫昏緫
- long wrkSts = task.getWrkSts(); // 1.鍏ュ簱锛�101.鍑哄簱锛�
- if (task.getIoType() == 1) {
- wrkSts = 4L;
- } else if (task.getIoType() == 101) {
- wrkSts = 14L;
- }
-
- task.setWrkSts(wrkSts); // 4.鍏ュ簱瀹屾垚锛�14.宸插嚭搴撴湭纭锛�
- task.setModiTime(new Date());
- task.setModiUser(defaultUserId);
- wrkMastService.updateById(task);
-
- // TODO锛氫换鍔″畬鎴愯Е鍙戝嚭鍏ュ簱鍙樻洿鎿嶄綔
-
-
-// // 鍏ュ簱瀹屾垚
-// mesService.inFeedback(memo.getString("OrderNo"));
-// // 鍑哄簱瀹屾垚
-// mesService.outFeedback(memo.getString("OrderNo"));
- } break;
- default: {} break;
- }
- }
+// wrkMastService.updateById(task);
+//
+// // TODO锛氫换鍔″畬鎴愯Е鍙戝嚭鍏ュ簱鍙樻洿鎿嶄綔
+//
+//
+//// // 鍏ュ簱瀹屾垚
+//// mesService.inFeedback(memo.getString("OrderNo"));
+//// // 鍑哄簱瀹屾垚
+//// mesService.outFeedback(memo.getString("OrderNo"));
+// } break;
+// default: {} break;
+// }
+// }
// 杩斿洖RCS
rcsReturn.setCode("SUCCESS");
@@ -553,11 +705,15 @@
log.info("sendPost - {} - {}", url, param);
URL realUrl = new URL(url);
URLConnection conn = realUrl.openConnection();
- conn.setRequestProperty("accept", "*/*");
- conn.setRequestProperty("connection", "Keep-Alive");
- conn.setRequestProperty("user-agent", "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1;SV1)");
- conn.setRequestProperty("Accept-Charset", "utf-8");
- conn.setRequestProperty("Content-Type", "application/json;charset=utf-8");
+ conn.setRequestProperty("Content-Type", "application/json");
+ conn.setRequestProperty("Content-Length", "<calculated when request is sent>");
+ conn.setRequestProperty("Host", "<calculated when request is sent>");
+ conn.setRequestProperty("Accept", "*/*");
+ conn.setRequestProperty("Accept-Encoding", "gzip, deflate, br");
+ conn.setRequestProperty("Connection", "keep-alive");
+
+ conn.setRequestProperty("X-lr-request-id", String.valueOf(new Date().getTime()));
+ conn.setRequestProperty("X-lr-version", "4.3");
conn.setConnectTimeout(5000);
conn.setReadTimeout(5000);
conn.setDoOutput(true);
--
Gitblit v1.9.1