From f9ccc882fc1b1296f0c843a888a5962b45df236d Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期五, 09 一月 2026 12:25:35 +0800
Subject: [PATCH] #1
---
src/main/java/com/zy/core/enums/CrnTaskModeType.java | 4
src/main/java/com/zy/core/network/real/ZyStationRealConnect.java | 23 +++----
src/main/java/com/zy/asrs/utils/Utils.java | 2
src/main/java/com/zy/asrs/utils/NotifyUtils.java | 2
src/main/java/com/zy/core/thread/impl/ZySiemensCrnThread.java | 34 +++++++++++
src/main/java/com/zy/asrs/task/NotifyScheduler.java | 2
src/main/java/com/zy/core/utils/CrnOperateProcessUtils.java | 7 +
src/main/java/com/zy/asrs/controller/CrnController.java | 10 ++
src/main/java/com/zy/core/thread/CrnThread.java | 3 +
src/main/resources/application.yml | 4
src/main/java/com/zy/core/network/real/ZyCrnRealConnect.java | 7 +-
src/main/java/com/zy/core/plugin/FakeProcess.java | 36 ++++++------
12 files changed, 91 insertions(+), 43 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/CrnController.java b/src/main/java/com/zy/asrs/controller/CrnController.java
index d3435f5..b00aae1 100644
--- a/src/main/java/com/zy/asrs/controller/CrnController.java
+++ b/src/main/java/com/zy/asrs/controller/CrnController.java
@@ -134,8 +134,14 @@
if (crnThread == null) {
return R.error("绾跨▼涓嶅瓨鍦�");
}
-
- CrnCommand command = crnThread.getPickAndPutCommand(sourceLocNo, targetLocNo, 9999, crnNo);
+ CrnCommand command = new CrnCommand();
+ if (sourceLocNo.equals("1-1-1")){
+ command = crnThread.getPickCommand(sourceLocNo, targetLocNo, 9999, crnNo);
+ }else if (targetLocNo.equals("1-1-1")){
+ command = crnThread.getPutCommand(sourceLocNo, targetLocNo, 9999, crnNo);
+ }else {
+ command = crnThread.getPickAndPutCommand(sourceLocNo, targetLocNo, 9999, crnNo);
+ }
MessageQueue.offer(SlaveType.Crn, crnNo, new Task(2, command));
return R.ok();
}
diff --git a/src/main/java/com/zy/asrs/task/NotifyScheduler.java b/src/main/java/com/zy/asrs/task/NotifyScheduler.java
index 271b624..93e597f 100644
--- a/src/main/java/com/zy/asrs/task/NotifyScheduler.java
+++ b/src/main/java/com/zy/asrs/task/NotifyScheduler.java
@@ -123,6 +123,8 @@
//閫氱煡鎴愬姛
redisUtil.del(key);
+ httpRequestLog.setResult(1);
+
continue;
}
}catch (Exception e){
diff --git a/src/main/java/com/zy/asrs/utils/NotifyUtils.java b/src/main/java/com/zy/asrs/utils/NotifyUtils.java
index 5ad1a73..4875edf 100644
--- a/src/main/java/com/zy/asrs/utils/NotifyUtils.java
+++ b/src/main/java/com/zy/asrs/utils/NotifyUtils.java
@@ -96,7 +96,7 @@
dto.setSuperTaskNo(superTaskNo);
//閲嶈瘯娆℃暟
- Config notifyFailTimesConfig = configService.selectOne(new EntityWrapper<Config>().eq("code", "notifyFailTimes"));
+ Config notifyFailTimesConfig = configService.selectOne(new EntityWrapper<Config>().eq("code", "notifyRetryTimes"));
if (notifyFailTimesConfig != null) {
dto.setFailTimes(Integer.parseInt(notifyFailTimesConfig.getValue()));
}
diff --git a/src/main/java/com/zy/asrs/utils/Utils.java b/src/main/java/com/zy/asrs/utils/Utils.java
index 6fd6c90..8b34a3e 100644
--- a/src/main/java/com/zy/asrs/utils/Utils.java
+++ b/src/main/java/com/zy/asrs/utils/Utils.java
@@ -180,7 +180,7 @@
.eq("status", 1);
if (currentCircleTaskCrnNo != null) {
- currentCircleTaskCrnNo = currentCircleTaskCrnNo + 1;
+// currentCircleTaskCrnNo = currentCircleTaskCrnNo + 1;
BasCrnp basCrnp = basCrnpService.selectOne(new EntityWrapper<BasCrnp>().eq("crn_no", currentCircleTaskCrnNo));
List<WrkMast> currentCrnTask = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("crn_no", currentCircleTaskCrnNo));
if (currentCrnTask.size() <= 1) {
diff --git a/src/main/java/com/zy/core/enums/CrnTaskModeType.java b/src/main/java/com/zy/core/enums/CrnTaskModeType.java
index 4352064..924b3a5 100644
--- a/src/main/java/com/zy/core/enums/CrnTaskModeType.java
+++ b/src/main/java/com/zy/core/enums/CrnTaskModeType.java
@@ -3,8 +3,8 @@
public enum CrnTaskModeType {
NONE(0), // 鏃�
- PAKIN(1), // 鍏ュ簱
- PAKOUT(2), // 鍑哄簱
+ PAKIN(1), // 鍑哄簱
+ PAKOUT(2), // 鍏ュ簱
LOC_MOVE(3), // 搴撲綅绉昏浆
X_MOVE(4), // 绔欎綅绉昏浆
Y_MOVE(5), // 绔欎綅绉昏浆
diff --git a/src/main/java/com/zy/core/network/real/ZyCrnRealConnect.java b/src/main/java/com/zy/core/network/real/ZyCrnRealConnect.java
index cef6605..38205b5 100644
--- a/src/main/java/com/zy/core/network/real/ZyCrnRealConnect.java
+++ b/src/main/java/com/zy/core/network/real/ZyCrnRealConnect.java
@@ -108,15 +108,16 @@
OperateResultExOne<byte[]> commandReadResult = siemensNet.Read("DB100.0", (short) 2);
if (commandReadResult.IsSuccess) {
short commandRead = siemensNet.getByteTransform().TransInt16(commandReadResult.Content, 0);
- if (commandRead == 1) {
+ if (commandRead == 1 || commandRead == 2) {
Thread.sleep(500);
}else {
commandResult = true;
}
}
- } while (writeAck < 5);
+ }while (commandResult);
+// while (writeAck < 5);
- if (!commandResult) {
+ if (commandResult) {
response.setMessage("鍫嗗灈鏈哄懡浠や笅鍙慬id:{}] >>>>> {}" + command.getCrnNo() + "浠诲姟鐘舵�佷綅寮傚父");
return response;
}
diff --git a/src/main/java/com/zy/core/network/real/ZyStationRealConnect.java b/src/main/java/com/zy/core/network/real/ZyStationRealConnect.java
index c73de43..2083e72 100644
--- a/src/main/java/com/zy/core/network/real/ZyStationRealConnect.java
+++ b/src/main/java/com/zy/core/network/real/ZyStationRealConnect.java
@@ -22,6 +22,7 @@
import com.zy.core.network.api.ZyStationConnectApi;
import com.zy.core.network.entity.ZyStationStatusEntity;
import java.util.Collections;
+import java.util.Comparator;
import java.util.List;
import java.text.MessageFormat;
@@ -35,6 +36,7 @@
private List<ZyStationStatusEntity> statusList;
private List<ZyStationStatusEntity> barcodeStatusList;
+ private List<ZyStationStatusEntity> scaleStatusList;
private SiemensS7Net siemensNet;
private DeviceConfig deviceConfig;
private RedisUtil redisUtil;
@@ -87,34 +89,31 @@
}
statusList = JSONObject.parseArray(basDevp.getStationList(), ZyStationStatusEntity.class);
+ if (statusList != null) {
+ statusList.sort(Comparator.comparing(ZyStationStatusEntity::getStationId));
+ }
barcodeStatusList = JSONObject.parseArray(basDevp.getBarcodeStationList(), ZyStationStatusEntity.class);
}
- OperateResultExOne<byte[]> result = siemensNet.Read("DB101.0", (short) (statusList.size() * 2));
+ OperateResultExOne<byte[]> result = siemensNet.Read("DB100.0", (short) (statusList.size() * 8));
if (result.IsSuccess) {
for (int i = 0; i < statusList.size(); i++) {
ZyStationStatusEntity statusEntity = statusList.get(i); // 绔欑偣缂栧彿
- boolean[] status = siemensNet.getByteTransform().TransBool(result.Content, i * 2, 2);
+ boolean[] status = siemensNet.getByteTransform().TransBool(result.Content, i * 8 + 6, 2);
statusEntity.setAutoing(status[0]); // 鑷姩
statusEntity.setLoading(status[1]); // 鏈夌墿
statusEntity.setInEnable(status[2]); // 鍙叆
statusEntity.setOutEnable(status[3]);// 鍙嚭
statusEntity.setEmptyMk(status[4]); // 绌烘澘淇″彿
statusEntity.setFullPlt(status[5]); // 婊℃墭鐩�
- }
- }
- OperateResultExOne<byte[]> result1 = siemensNet.Read("DB100.0", (short) (statusList.size() * 4));
- if (result1.IsSuccess) {
- for (int i = 0; i < statusList.size(); i++) {
- ZyStationStatusEntity statusEntity = statusList.get(i);
- statusEntity.setTaskNo((int) siemensNet.getByteTransform().TransInt16(result1.Content, i * 4)); // 宸ヤ綔鍙�
- statusEntity.setTargetStaNo((int) siemensNet.getByteTransform().TransInt16(result1.Content, i * 4 + 2)); // 鐩爣绔�
+ statusEntity.setTaskNo(siemensNet.getByteTransform().TransInt32(result.Content, i * 8)); // 宸ヤ綔鍙�
+ statusEntity.setTargetStaNo((int) siemensNet.getByteTransform().TransInt16(result.Content, i * 8 + 4)); // 鐩爣绔�
}
}
// 鏉＄爜鎵弿鍣�
- OperateResultExOne<byte[]> result2 = siemensNet.Read("DB101.100", (short) (statusList.size() * 10));
+ OperateResultExOne<byte[]> result2 = siemensNet.Read("DB101.0", (short) (barcodeStatusList.size() * 16));
if (result2.IsSuccess) {
for (int i = 0; i < barcodeStatusList.size(); i++) {
ZyStationStatusEntity barcodeEntity = barcodeStatusList.get(i);
@@ -122,7 +121,7 @@
if (statusEntity == null) {
continue;
}
- String barcode = siemensNet.getByteTransform().TransString(result2.Content, i * 10 + 2, 8, "UTF-8");
+ String barcode = siemensNet.getByteTransform().TransString(result2.Content, i * 16, 4, "UTF-8");
barcode = barcode.trim();
barcodeEntity.setBarcode(barcode);
}
diff --git a/src/main/java/com/zy/core/plugin/FakeProcess.java b/src/main/java/com/zy/core/plugin/FakeProcess.java
index c0ca391..5779d9d 100644
--- a/src/main/java/com/zy/core/plugin/FakeProcess.java
+++ b/src/main/java/com/zy/core/plugin/FakeProcess.java
@@ -677,25 +677,25 @@
updateWrkSts = WrkStsType.OUTBOUND_RUN_COMPLETE.sts;
//鐢熸垚浠跨湡绔欑偣鏁版嵁
- List<StationObjModel> outStationList = basCrnp.getOutStationList$();
- if(outStationList.isEmpty()){
- News.info("鍫嗗灈鏈�:{} 鍑哄簱绔欑偣鏈缃�", basCrnp.getCrnNo());
- continue;
- }
-
- for (StationObjModel stationObjModel : outStationList) {
- if (!stationObjModel.getStationId().equals(wrkMast.getSourceStaNo())) {
- continue;
- }
-
- StationThread stationThread = (StationThread) SlaveConnection.get(SlaveType.Devp, stationObjModel.getDeviceNo());
- if (stationThread == null) {
- continue;
- }
+// List<StationObjModel> outStationList = basCrnp.getOutStationList$();
+// if(outStationList.isEmpty()){
+// News.info("鍫嗗灈鏈�:{} 鍑哄簱绔欑偣鏈缃�", basCrnp.getCrnNo());
+// continue;
+// }
+//
+// for (StationObjModel stationObjModel : outStationList) {
+// if (!stationObjModel.getStationId().equals(wrkMast.getSourceStaNo())) {
+// continue;
+// }
+//
+// StationThread stationThread = (StationThread) SlaveConnection.get(SlaveType.Devp, stationObjModel.getDeviceNo());
+// if (stationThread == null) {
+// continue;
+// }
//鐢熸垚浠跨湡绔欑偣鏁版嵁
- StationCommand command = stationThread.getMoveCommand(9998, wrkMast.getSourceStaNo(), 0, 0);
- MessageQueue.offer(SlaveType.Devp, stationObjModel.getDeviceNo(), new Task(2, command));
- }
+// StationCommand command = stationThread.getMoveCommand(9998, wrkMast.getSourceStaNo(), 0, 0);
+// MessageQueue.offer(SlaveType.Devp, stationObjModel.getDeviceNo(), new Task(2, command));
+// }
}else if(wrkMast.getWrkSts() == WrkStsType.LOC_MOVE_RUN.sts){
updateWrkSts = WrkStsType.COMPLETE_LOC_MOVE.sts;
}else{
diff --git a/src/main/java/com/zy/core/thread/CrnThread.java b/src/main/java/com/zy/core/thread/CrnThread.java
index 46cbd00..820ab96 100644
--- a/src/main/java/com/zy/core/thread/CrnThread.java
+++ b/src/main/java/com/zy/core/thread/CrnThread.java
@@ -17,4 +17,7 @@
CommandResponse sendCommand(CrnCommand command);//涓嬪彂鍛戒护
+ CrnCommand getPickCommand(String sourceLocNo, String locNo, Integer wrkNo, Integer crnNo);
+
+ CrnCommand getPutCommand(String sourceLocNo, String targetLocNo, Integer wrkNo, Integer crnNo);
}
diff --git a/src/main/java/com/zy/core/thread/impl/ZySiemensCrnThread.java b/src/main/java/com/zy/core/thread/impl/ZySiemensCrnThread.java
index 513fd34..6909386 100644
--- a/src/main/java/com/zy/core/thread/impl/ZySiemensCrnThread.java
+++ b/src/main/java/com/zy/core/thread/impl/ZySiemensCrnThread.java
@@ -230,6 +230,40 @@
return crnCommand;
}
+ //鍏ュ簱
+ @Override
+ public CrnCommand getPickCommand(String sourceLocNo, String targetLocNo, Integer taskNo, Integer crnNo) {
+ CrnCommand crnCommand = new CrnCommand();
+ crnCommand.setCrnNo(crnNo); // 鍫嗗灈鏈虹紪鍙�
+ crnCommand.setTaskNo(taskNo.shortValue()); // 宸ヤ綔鍙�
+ crnCommand.setTaskMode(CrnTaskModeType.PAKOUT.id.shortValue()); // 浠诲姟妯″紡: 閽堝浜挎棩杩涜淇敼
+ crnCommand.setSourcePosX((short) Utils.getRow(sourceLocNo)); // 婧愬簱浣嶆帓
+ crnCommand.setSourcePosY((short) Utils.getBay(sourceLocNo)); // 婧愬簱浣嶅垪
+ crnCommand.setSourcePosZ((short) Utils.getLev(sourceLocNo)); // 婧愬簱浣嶅眰
+ crnCommand.setDestinationPosX((short) Utils.getRow(targetLocNo)); // 鐩爣搴撲綅鎺�
+ crnCommand.setDestinationPosY((short) Utils.getBay(targetLocNo)); // 鐩爣搴撲綅鍒�
+ crnCommand.setDestinationPosZ((short) Utils.getLev(targetLocNo)); // 鐩爣搴撲綅灞�
+ crnCommand.setCommand((short) 1); // 浠诲姟纭
+ return crnCommand;
+ }
+
+ //鍑哄簱
+ @Override
+ public CrnCommand getPutCommand(String sourceLocNo, String targetLocNo, Integer taskNo, Integer crnNo) {
+ CrnCommand crnCommand = new CrnCommand();
+ crnCommand.setCrnNo(crnNo); // 鍫嗗灈鏈虹紪鍙�
+ crnCommand.setTaskNo(taskNo.shortValue()); // 宸ヤ綔鍙�
+ crnCommand.setTaskMode(CrnTaskModeType.PAKIN.id.shortValue()); // 浠诲姟妯″紡: 閽堝浜挎棩杩涜淇敼
+ crnCommand.setSourcePosX((short) Utils.getRow(sourceLocNo)); // 婧愬簱浣嶆帓
+ crnCommand.setSourcePosY((short) Utils.getBay(sourceLocNo)); // 婧愬簱浣嶅垪
+ crnCommand.setSourcePosZ((short) Utils.getLev(sourceLocNo)); // 婧愬簱浣嶅眰
+ crnCommand.setDestinationPosX((short) Utils.getRow(targetLocNo)); // 鐩爣搴撲綅鎺�
+ crnCommand.setDestinationPosY((short) Utils.getBay(targetLocNo)); // 鐩爣搴撲綅鍒�
+ crnCommand.setDestinationPosZ((short) Utils.getLev(targetLocNo)); // 鐩爣搴撲綅灞�
+ crnCommand.setCommand((short) 1); // 浠诲姟纭
+ return crnCommand;
+ }
+
@Override
public CrnCommand getMoveCommand(String targetLocNo, Integer taskNo, Integer crnNo) {
CrnCommand crnCommand = new CrnCommand();
diff --git a/src/main/java/com/zy/core/utils/CrnOperateProcessUtils.java b/src/main/java/com/zy/core/utils/CrnOperateProcessUtils.java
index d486a06..a28b91b 100644
--- a/src/main/java/com/zy/core/utils/CrnOperateProcessUtils.java
+++ b/src/main/java/com/zy/core/utils/CrnOperateProcessUtils.java
@@ -187,7 +187,9 @@
String sourceLocNo = Utils.getLocNo(stationObjModel.getDeviceRow(), stationObjModel.getDeviceBay(), stationObjModel.getDeviceLev());
- CrnCommand command = crnThread.getPickAndPutCommand(sourceLocNo, wrkMast.getLocNo(), wrkMast.getWrkNo(), crnNo);
+// CrnCommand command = crnThread.getPickAndPutCommand(sourceLocNo, wrkMast.getLocNo(), wrkMast.getWrkNo(), crnNo);
+ CrnCommand command = crnThread.getPickCommand(sourceLocNo, wrkMast.getLocNo(), wrkMast.getWrkNo(), crnNo);
+
wrkMast.setWrkSts(WrkStsType.INBOUND_RUN.sts);
wrkMast.setCrnNo(crnNo);
@@ -275,7 +277,8 @@
String targetLocNo = Utils.getLocNo(stationObjModel.getDeviceRow(), stationObjModel.getDeviceBay(), stationObjModel.getDeviceLev());
- CrnCommand command = crnThread.getPickAndPutCommand(wrkMast.getSourceLocNo(), targetLocNo, wrkMast.getWrkNo(), crnNo);
+// CrnCommand command = crnThread.getPickAndPutCommand(wrkMast.getSourceLocNo(), targetLocNo, wrkMast.getWrkNo(), crnNo);
+ CrnCommand command = crnThread.getPutCommand(wrkMast.getSourceLocNo(), targetLocNo, wrkMast.getWrkNo(), crnNo);
wrkMast.setWrkSts(WrkStsType.OUTBOUND_RUN.sts);
wrkMast.setCrnNo(crnNo);
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index cc1b962..50d0a35 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -12,7 +12,7 @@
validation-timeout: 3000
connection-test-query: select 1
driver-class-name: com.mysql.jdbc.Driver
- url: jdbc:mysql://127.0.0.1:3306/wcs?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
+ url: jdbc:mysql://127.0.0.1:3306/yrwcs?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
username: root
password: root
mvc:
@@ -56,7 +56,7 @@
#License鐩稿叧閰嶇疆
license:
- subject: crnWcsDev
+ subject: yrwcs
publicAlias: publicCert
storePass: public_zhongyang_123456789
licensePath: license.lic
--
Gitblit v1.9.1