From 62b68627fc86bbc0705f3c14d19e18b7eacc0059 Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期六, 24 五月 2025 18:17:36 +0800
Subject: [PATCH] 初始化
---
src/main/java/com/zy/asrs/task/TaskLogScheduler.java | 3
src/main/java/com/zy/asrs/controller/OpenController.java | 16 +++++
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 33 ++++++++---
src/main/webapp/static/wcs/js/console.map.js | 26 +-------
src/main/java/com/zy/asrs/entity/ToWmsDTO.java | 5 +
src/main/java/com/zy/common/utils/HttpHandler.java | 2
src/main/resources/application-prod.yml | 12 ++++
src/main/java/com/zy/core/MainProcess.java | 2
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 2
src/main/resources/application.yml | 20 ++++--
src/main/java/com/zy/asrs/utils/PostMesDataUtils.java | 3
11 files changed, 81 insertions(+), 43 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index c542982..605e473 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -527,6 +527,10 @@
} catch (Exception e){
basCrnpWmsParam.setCrnErrM("鏈煡寮傚父");
}
+ if (crnProtocol.getMode()!=3){
+ basCrnpWmsParam.setCrnErr(999L);
+ basCrnpWmsParam.setCrnErrM("闈炶嚜鍔紒锛侊紒");
+ }
basCrnpWmsParamList.add(basCrnpWmsParam);
// list.add(basCrnpWmsParam);
@@ -549,6 +553,10 @@
basRgvWmsParam.setSteErrM(basRgvErr.getErrName());
} catch (Exception e){
basRgvWmsParam.setSteErrM("鏈煡寮傚父");
+ }
+ if (rgvStatus.getMode()!=1){
+ basRgvWmsParam.setSteErr(999L);
+ basRgvWmsParam.setSteErrM("闈炶嚜鍔紒锛侊紒");
}
// list.add(basRgvWmsParam);
wcsStatusResponseModel.getRgvList().add(basRgvWmsParam);
@@ -607,6 +615,10 @@
} catch (Exception e){
basCrnpWmsParam.setCrnErrM("鏈煡寮傚父");
}
+ if (crnProtocol.getMode()!=3){
+ basCrnpWmsParam.setCrnErr(999L);
+ basCrnpWmsParam.setCrnErrM("闈炶嚜鍔紒锛侊紒");
+ }
basCrnpWmsParamList.add(basCrnpWmsParam);
// list.add(basCrnpWmsParam);
@@ -631,6 +643,10 @@
} catch (Exception e){
basRgvWmsParam.setSteErrM("鏈煡寮傚父");
}
+ if (rgvStatus.getMode()!=1){
+ basRgvWmsParam.setSteErr(999L);
+ basRgvWmsParam.setSteErrM("闈炶嚜鍔紒锛侊紒");
+ }
// list.add(basRgvWmsParam);
wcsStatusResponseModel.getRgvList().add(basRgvWmsParam);
diff --git a/src/main/java/com/zy/asrs/entity/ToWmsDTO.java b/src/main/java/com/zy/asrs/entity/ToWmsDTO.java
index 418f3a3..b576de7 100644
--- a/src/main/java/com/zy/asrs/entity/ToWmsDTO.java
+++ b/src/main/java/com/zy/asrs/entity/ToWmsDTO.java
@@ -16,6 +16,7 @@
private List<Integer> canInboundTunnels;
// 瀹瑰櫒缂栫爜
+ private String barCode;
private String barcode;
//瀹瑰櫒绫诲瀷
private String ioType;
@@ -25,6 +26,7 @@
private Integer locType;
private Integer status;//绌烘弧鐗�
private Double grossWt;
+ private Double weight;
// public ToWmsDTO(String barcode, Integer stationCode, Integer locType){
// this.barcode = barcode;
@@ -34,14 +36,17 @@
public ToWmsDTO(String barcode, Integer stationCode, Integer status){
this.barcode = barcode;
+ this.barCode = barcode;
this.stationCode = stationCode;
this.status = status;
}
public ToWmsDTO(Integer stationCode, Double grossWt, String barcode, Integer status) {
this.stationCode = stationCode;
+ this.weight = grossWt;
this.grossWt = grossWt;
this.barcode = barcode;
+ this.barCode = barcode;
this.status = status;
}
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 5f596f5..540bbb8 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -121,7 +121,7 @@
staProtocol = staProtocol.clone();
}
Integer workNo = staProtocol.getWorkNo();
- if (workNo!=9998){
+ if (workNo!=9998 && workNo!=9997){
continue;
}
Integer stano = staProtocol.getStaNo();
@@ -189,7 +189,7 @@
// 鍒ゆ柇鏄惁婊¤冻鍏ュ簱鏉′欢
if (staProtocol.isAutoing() && staProtocol.isLoading()
&& staProtocol.isInEnable()
- && workNo == 9998
+ && (workNo == 9998 || workNo == 9997)
&& staProtocol.isPakMk()
&& staProtocol.isPakMkWalk()
) {
@@ -199,9 +199,10 @@
continue;
}
String barcode = barcodeThread.getBarcode();
- if (!Cools.isEmpty(barcode) && !barcode.equals("99999999")) {
+ if (!Cools.isEmpty(barcode) && !barcode.equals("99999999") && !barcode.equals("000000")) {
// 璇锋眰wms鎺ュ彛锛岃幏鍙栧伐浣滃彿鍜岀洰鏍囧簱浣�
- ToWmsDTO toWmsDTO = new ToWmsDTO(staProtocol.getSiteId(),staProtocol.getGrossWt(),barcode, 0);
+ ToWmsDTO toWmsDTO = new ToWmsDTO(staProtocol.getSiteId(),staProtocol.getGrossWt(),barcode, workNo == 9998? 0 : 1);
+
TaskWrk taskWrk1 = taskWrkService.selectOne(new EntityWrapper<TaskWrk>().eq("barcode", barcode));
if (!Cools.isEmpty(taskWrk1)) {
log.info("鎵樼洏鐮侊細" + barcode + "浠诲姟妗ｅ瓨鍦�");
@@ -215,6 +216,7 @@
} else {
staProtocol.setWorkNo(taskWrk1.getWrkNo());
staProtocol.setStaNo(staProtocol.getSiteId());
+ devpThread.setPakMkWalk(staProtocol.getSiteId(), false);
MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
}
}
@@ -249,6 +251,7 @@
staProtocol.setWorkNo(9999);
staProtocol.setStaNo(inSta.getBackSta());
devpThread.setPakMk(staProtocol.getSiteId(), false);
+ devpThread.setPakMkWalk(staProtocol.getSiteId(), false);
MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
continue;
}
@@ -264,7 +267,7 @@
);
log.info("鍏ュ簱璇锋眰鍙傛暟{}" + JSON.toJSONString(toWmsDTO));
log.info("鍏ュ簱璇锋眰杩斿洖鍙傛暟{}" + JSON.toJSONString(response));
- if (jsonObject.getInteger("code").equals(200)) {
+ if (!Cools.isEmpty(jsonObject.getInteger("code")) && jsonObject.getInteger("code").equals(200)) {
try {
devpThread.setPakMk(staProtocol.getSiteId(), false);
} catch (Exception e) {
@@ -384,9 +387,21 @@
&& staProtocol.isPakMk()
&& staProtocol.isPakMkWalk()
) {
+ // 鑾峰彇鏉＄爜鎵弿浠俊鎭�
+ BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, inSta.getBarcode());
+ if (barcodeThread == null) {
+ continue;
+ }
+ String barcode = barcodeThread.getBarcode();
+ if (Cools.isEmpty(barcode) || barcode.equals("0") || barcode.equals("000000")) {
+ staProtocol.setWorkNo(9999);
+ staProtocol.setStaNo(inSta.getBackSta());
+ devpThread.setPakMk(staProtocol.getSiteId(), false);
+ MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
+ continue;
+ }
// 璇锋眰wms鎺ュ彛锛岃幏鍙栧伐浣滃彿鍜岀洰鏍囧簱浣�
- ToWmsDTO toWmsDTO = new ToWmsDTO("", staProtocol.getSiteId(), 1);
-
+ ToWmsDTO toWmsDTO = new ToWmsDTO(staProtocol.getSiteId(),staProtocol.getGrossWt(),barcode, 1);
HashMap<String, Object> headParam = new HashMap<>();
headParam.put("Content-Type", "application/json");
String response;
@@ -431,7 +446,7 @@
);
log.info("鍏ュ簱璇锋眰鍙傛暟{}" + JSON.toJSONString(toWmsDTO));
log.info("鍏ュ簱璇锋眰杩斿洖鍙傛暟{}" + JSON.toJSONString(response));
- if (jsonObject.getInteger("code").equals(200)) {
+ if (!Cools.isEmpty(jsonObject.getInteger("code")) && jsonObject.getInteger("code").equals(200)) {
try {
devpThread.setPakMk(staProtocol.getSiteId(), false);
} catch (Exception e) {
@@ -792,7 +807,7 @@
// //寮�濮嬭繍琛�
// String response = CrnStartRunning(taskWrk);
// JSONObject jsonObject = JSON.parseObject(response);
-// if (jsonObject.getInteger("code").equals(200)) {
+// if (!Cools.isEmpty(jsonObject.getInteger("code")) && jsonObject.getInteger("code").equals(200)) {
//
// }else {
// log.error("鍏ュ簱寮�濮嬭繍琛岄�氳澶辫触,"+jsonObject.get("msg"));
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 e79af91..338659a 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -187,7 +187,7 @@
,true
);
- if (jsonObject.getInteger("code").equals(200)) {
+ if (!Cools.isEmpty(jsonObject.getInteger("code")) && jsonObject.getInteger("code").equals(200)) {
//瑙ｆ瀽
List<WMSAndAGVInterfaceParam> params = new ArrayList<>();
params.add(param);
diff --git a/src/main/java/com/zy/asrs/task/TaskLogScheduler.java b/src/main/java/com/zy/asrs/task/TaskLogScheduler.java
index 174fbdf..2b65667 100644
--- a/src/main/java/com/zy/asrs/task/TaskLogScheduler.java
+++ b/src/main/java/com/zy/asrs/task/TaskLogScheduler.java
@@ -3,6 +3,7 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.core.common.Cools;
import com.core.exception.CoolException;
import com.zy.asrs.domain.enums.TaskStatusType;
import com.zy.asrs.entity.*;
@@ -76,7 +77,7 @@
.doPost();
jsonObject = JSON.parseObject(response);
- if (jsonObject.getInteger("code").equals(200)) {
+ if (!Cools.isEmpty(jsonObject.getInteger("code")) && jsonObject.getInteger("code").equals(200)) {
if (taskWrkService.saveToHistory(taskWrk.getTaskNo()) == 0) {
log.error("浠诲姟妗ｈ浆浠诲姟鍘嗗彶妗ｅけ璐�" + taskWrk);
return ;
diff --git a/src/main/java/com/zy/asrs/utils/PostMesDataUtils.java b/src/main/java/com/zy/asrs/utils/PostMesDataUtils.java
index 04cc0db..87f2d7b 100644
--- a/src/main/java/com/zy/asrs/utils/PostMesDataUtils.java
+++ b/src/main/java/com/zy/asrs/utils/PostMesDataUtils.java
@@ -2,6 +2,7 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
+import com.core.common.Cools;
import com.core.common.SpringUtils;
import com.core.exception.CoolException;
import com.zy.asrs.task.AbstractHandler;
@@ -40,7 +41,7 @@
System.out.println("response:"+response);
JSONObject jsonObject = JSON.parseObject(response);
- if (jsonObject.getInteger("code").equals(200)) {
+ if (!Cools.isEmpty(jsonObject.getInteger("code")) && jsonObject.getInteger("code").equals(200)) {
success = true;
} else {
log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", URL+"/"+mesPath, JSON.toJSONString(combParam), response);
diff --git a/src/main/java/com/zy/common/utils/HttpHandler.java b/src/main/java/com/zy/common/utils/HttpHandler.java
index b305399..438ea88 100644
--- a/src/main/java/com/zy/common/utils/HttpHandler.java
+++ b/src/main/java/com/zy/common/utils/HttpHandler.java
@@ -15,7 +15,7 @@
*/
public class HttpHandler {
- private static final Integer DEFAULT_TIMEOUT_SECONDS = 5;
+ private static final Integer DEFAULT_TIMEOUT_SECONDS = 10;
private static final MediaType MEDIA_TYPE = MediaType.parse("application/json");
private String uri;
diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index eadecb6..54b49d7 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -41,7 +41,7 @@
// 鍏ュ簱 ===>> 鍏ュ簱绔欏埌鍫嗗灈鏈虹珯锛屾牴鎹潯鐮佹壂鎻忕敓鎴愬叆搴撳伐浣滄。
mainService.generateStoreWrkFile(); // 缁勬墭
- mainService.generateStoreWrkFileIsEmptyMk(); // 缁勬墭 绌烘墭
+// mainService.generateStoreWrkFileIsEmptyMk(); // 缁勬墭 绌烘墭
mainService.generateStoreWrkFileWalk(); // 浠诲姟涓嬪彂
diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml
index 72c2225..d02a0f0 100644
--- a/src/main/resources/application-prod.yml
+++ b/src/main/resources/application-prod.yml
@@ -58,6 +58,18 @@
barcode: ${wcs-slave.barcode[1].id}
backSta: 1012
barcodeSign: false
+ # 鍏ュ簱涓嬪彂鍙�1
+ inWalkSta[3]:
+ staNo: 1020
+ barcode: ${wcs-slave.barcode[2].id}
+ backSta: 1021
+ barcodeSign: false
+ # 鍏ュ簱涓嬪彂鍙�1
+ inWalkSta[4]:
+ staNo: 1004
+ barcode: ${wcs-slave.barcode[0].id}
+ backSta: 1005
+ barcodeSign: false
# 鍑哄簱鍙�1
outSta[0]:
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 10fd60a..5aa6059 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -12,11 +12,11 @@
# username: sa
# password: sa@123
driver-class-name: dm.jdbc.driver.DmDriver
-# url: jdbc:dm://27.172.2.102:5236/SOURCE
- url: jdbc:dm://27.172.1.129:5236/SOURCE
+ url: jdbc:dm://27.172.2.102:5236/SOURCE
+# url: jdbc:dm://27.172.1.129:5236/SOURCE
# url: jdbc:dm://127.0.0.1:5236/SOURCE
-# username: SYSDBA
-# password: Zy@12345
+ username: SYSDBA
+ password: Zy@12345
# username: ZOS_ZEMIC
# password: k3Mq6xRv9frOxb7n
# username: ENC(++MryJD2j+X3rpmocG4vPH5vxXbpJNrF)
@@ -71,15 +71,19 @@
#url: 10.32.53.195:8080
# WMS绯荤粺ip
# url: 10.210.157.109:8090
- url: 27.172.1.135:9027
+ url: 27.172.1.135:20006
+# url: 27.172.2.104:9027
# 鍏ュ簱浠诲姟鐢宠鎺ュ彛
#inboundTaskApplyPath: api/InterFace/inboundTaskApply
- inboundTaskApplyPath: api/external/wcs/inboundTaskApply
+ inboundTaskApplyPath: xf-management/api/external/wcs/inboundTaskApply
+# inboundTaskApplyPath: api/external/wcs/inboundTaskApply
# inboundTaskApplyPath: open/asrs/inboundTaskApply
# 浠诲姟鐘舵�佸弽棣堟帴鍙�
- taskStatusFeedbackPath: api/external/wcs/taskStatusFeedback
+ taskStatusFeedbackPath: xf-management/api/external/wcs/taskStatusFeedback
+# taskStatusFeedbackPath: api/external/wcs/taskStatusFeedback
# 璐т綅鐘舵�佹洿鏂版帴鍙�
# locationUpdatePath: api/InterFace/get_InterFace_TestStorage
# 绉诲簱鐢宠鎺ュ彛
# movePath: api/InterFace/get_InterFace_TestStorage
- wmsHeartBeat: api/external/wcs/wmsHeartBeat
+ wmsHeartBeat: xf-management/api/external/wcs/wmsHeartBeat
+# wmsHeartBeat: api/external/wcs/wmsHeartBeat
diff --git a/src/main/webapp/static/wcs/js/console.map.js b/src/main/webapp/static/wcs/js/console.map.js
index f77ad12..dd0d9a1 100644
--- a/src/main/webapp/static/wcs/js/console.map.js
+++ b/src/main/webapp/static/wcs/js/console.map.js
@@ -294,19 +294,11 @@
"height": 23
}, {
"type": "stn",
- "id": "site-1010",
- "text": "1010",
- "top": 231,
- "left": 240,
- "width": 45,
- "height": 23
- }, {
- "type": "stn",
"id": "site-1011",
"text": "1011",
"top": 231,
- "left": 193,
- "width": 45,
+ "left": 220,
+ "width": 65,
"height": 23
}, {
"type": "stn",
@@ -326,26 +318,18 @@
"height": 23
}, {
"type": "stn",
- "id": "site-1015",
- "text": "1015",
- "top": 172,
- "left": 240,
- "width": 45,
- "height": 23
- }, {
- "type": "stn",
"id": "site-1016",
"text": "1016",
"top": 172,
- "left": 193,
- "width": 45,
+ "left": 220,
+ "width": 65,
"height": 23
}, {
"type": "stn",
"id": "site-1012",
"text": "1012",
"top": 196,
- "left": 193,
+ "left": 220,
"width": 45,
"height": 34
}, {
--
Gitblit v1.9.1