From 61dbf118522a9ac98027b624b5d46761fe536bbe Mon Sep 17 00:00:00 2001
From: zc <zc@123>
Date: 星期五, 25 四月 2025 10:26:46 +0800
Subject: [PATCH] 初步调试
---
src/main/java/com/zy/core/model/protocol/StaProtocol.java | 1
src/main/java/com/zy/core/dispatcher/ShuttleDispatchUtils.java | 2
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 4 +-
src/main/java/com/zy/asrs/controller/TVController.java | 52 +++++++++++--------------
src/main/java/com/zy/core/thread/impl/FyDevpThread.java | 6 --
5 files changed, 28 insertions(+), 37 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/TVController.java b/src/main/java/com/zy/asrs/controller/TVController.java
index c8b1de2..bdaeea5 100644
--- a/src/main/java/com/zy/asrs/controller/TVController.java
+++ b/src/main/java/com/zy/asrs/controller/TVController.java
@@ -225,13 +225,13 @@
*/
@GetMapping("/led")
public R monitorLed(@RequestParam("ledId") Integer ledId) {
- int dev_no = 1012;
+ int dev_no = 1011;
if (ledId == 1) {
- dev_no = 1012;
+ dev_no = 1011;
} else if (ledId == 2) {
dev_no = 1014;
} else if (ledId == 3) {
- dev_no = 1022;
+ dev_no = 1021;
} else if (ledId == 4) {
dev_no = 1025;
}
@@ -239,36 +239,30 @@
if (Cools.isEmpty(basDevp)) {
return R.ok();
}
- WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wms_wrk_no", basDevp.getWrkNo()));
- if (Cools.isEmpty(wrkMast)) {
+ if (Cools.isEmpty(basDevp.getWrkNo1())) {
return R.ok();
}
List<LedCommand> commands = new ArrayList<>();
-
- if (wrkMast.getIoType() != 110 && wrkMast.getIoType() != 10) {
- Map<String, Object> param = new HashMap<>();
- param.put("taskNo", wrkMast.getWmsWrkNo());
- param.put("sta", wrkMast.getStaNo());
- String response = null;
- try {
- response = new HttpHandler.Builder()
- .setUri(wmsUrl)
- .setPath("/rpc/led/getTask2")
- .setJson(JSON.toJSONString(param))
- .build()
- .doPost();
- } catch (IOException e) {
- e.printStackTrace();
- }
- JSONObject jsonObject = JSON.parseObject(response);
- Integer code = jsonObject.getInteger("code");
- if (code.equals(200)) {
- String data = jsonObject.getString("data");
- List<LedCommand> wrkDetls = JSONArray.parseArray(data, LedCommand.class);
- commands.addAll(wrkDetls);
- }
+ Map<String, Object> param = new HashMap<>();
+ param.put("taskNo", basDevp.getWrkNo1());
+ String response = null;
+ try {
+ response = new HttpHandler.Builder()
+ .setUri(wmsUrl)
+ .setPath("/rpc/led/getTask2")
+ .setJson(JSON.toJSONString(param))
+ .build()
+ .doPost();
+ } catch (IOException e) {
+ e.printStackTrace();
}
-
+ JSONObject jsonObject = JSON.parseObject(response);
+ Integer code = jsonObject.getInteger("code");
+ if (code.equals(200)) {
+ String data = jsonObject.getString("data");
+ List<LedCommand> wrkDetls = JSONArray.parseArray(data, LedCommand.class);
+ commands.addAll(wrkDetls);
+ }
return R.ok().add(commands);
}
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 42514ac..acc29db 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -1289,8 +1289,8 @@
//鑾峰彇鎻愬崌鏈哄懡浠�
List<LiftCommand> liftCommands = liftThread.getPalletOutCommand(wrkMast.getWrkNo(), sourceLev, wrkMast.getStaNo());
LiftCommand liftCommand = liftCommands.get(0);
- if (wrkMast.getStaNo() == 1031) {
- liftCommand.setTaskNo(wrkMast.getWrkNo());
+ if (wrkMast.getMainWrkNo() != null) {
+ liftCommand.setTaskNo(wrkMast.getMainWrkNo());
} else {
int deviceWrk = commonService.getWorkNo(8);//鐢熸垚鎻愬崌鏈鸿澶囧伐浣滃彿
liftCommand.setTaskNo(deviceWrk);//鏇存崲闅忔満浠诲姟鍙�
diff --git a/src/main/java/com/zy/core/dispatcher/ShuttleDispatchUtils.java b/src/main/java/com/zy/core/dispatcher/ShuttleDispatchUtils.java
index bcbe6e4..7641516 100644
--- a/src/main/java/com/zy/core/dispatcher/ShuttleDispatchUtils.java
+++ b/src/main/java/com/zy/core/dispatcher/ShuttleDispatchUtils.java
@@ -436,7 +436,7 @@
//缁欏伐浣滄。缁戝畾灏忚溅鍙�
diffShuttles.put(-1, shuttleThread);
} else {
- if (tongLev) {
+ if (tongLev && diffLev.size() >= 2) {
//褰撳墠绌挎杞︾嚎绋嬪埌鐩爣鍦扮偣璺濈
List<NavigateNode> currentShuttlePath = navigateUtils.calc(currentLocNo, locNo, NavigationMapType.NORMAL.id, Utils.getShuttlePoints(shuttleProtocol.getShuttleNo(), Utils.getLev(currentLocNo)), null);//鎼滅储绌洪棽绌挎杞︼紝浣跨敤姝ｅ父閫氶亾鍦板浘
if (currentShuttlePath == null) {
diff --git a/src/main/java/com/zy/core/model/protocol/StaProtocol.java b/src/main/java/com/zy/core/model/protocol/StaProtocol.java
index 0c8bd03..e87cf3e 100644
--- a/src/main/java/com/zy/core/model/protocol/StaProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/StaProtocol.java
@@ -110,6 +110,7 @@
basDevp.setAutoing(autoing ? "Y" : "N");
basDevp.setLoading(loading ? "Y" : "N");
basDevp.setInEnable(inEnable ? "Y" : "N");
+ basDevp.setWrkNo1(finishWorkNo.intValue());
if (siteId == 105 || siteId == 205 || siteId == 346) {
basDevp.setOutEnable(outInModel == 2 ? "Y" : "N");
} else {
diff --git a/src/main/java/com/zy/core/thread/impl/FyDevpThread.java b/src/main/java/com/zy/core/thread/impl/FyDevpThread.java
index c379f03..676d8a2 100644
--- a/src/main/java/com/zy/core/thread/impl/FyDevpThread.java
+++ b/src/main/java/com/zy/core/thread/impl/FyDevpThread.java
@@ -204,11 +204,7 @@
BasDevp sqlModel = staProtocol.toSqlModel();
stations.add(sqlModel);
- //鏆傛椂鍐欏叆鏁版嵁搴�
- BasDevp basDevp = basConveyorStaService.selectById(sta);
- if (basDevp == null) {
- basConveyorStaService.insert(sqlModel);
- }
+
}
if (!stations.isEmpty()) {
if (null != basConveyorStaService && !basConveyorStaService.updateBatchById(stations)) {
--
Gitblit v1.9.1