From 586605cbe95aaca03844763b74392ba70644fecc Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期一, 03 七月 2023 16:39:14 +0800
Subject: [PATCH] map_1.json
---
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 89 ++++++++++++++++++++++++--------------------
1 files changed, 49 insertions(+), 40 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 8b093b6..f571401 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -10,7 +10,6 @@
import com.core.common.SpringUtils;
import com.zy.asrs.entity.BasDevp;
import com.zy.asrs.service.BasDevpService;
-import com.zy.common.utils.CommonUtils;
import com.zy.core.DevpThread;
import com.zy.core.News;
import com.zy.core.cache.MessageQueue;
@@ -49,9 +48,13 @@
add(106);add(107);add(108);
}};
+ public static final ArrayList<Integer> outInStaNos = new ArrayList<Integer>() {{
+ add(102);add(105);add(106);
+ add(107);add(108);
+ }};
+
public boolean charge0;
public boolean charge1;
- public boolean charge2;
public SiemensDevpThread(DevpSlave slave) {
this.slave = slave;
@@ -144,8 +147,8 @@
staProtocol.setOutEnable(status[3]);// 鍙嚭
staProtocol.setEmptyMk(status[4]); // 绌烘澘淇″彿
staProtocol.setFullPlt(status[5]); // 婊℃墭鐩�
- staProtocol.setHigh(status[6]); // 楂樺簱浣�
- staProtocol.setLow(status[7]); // 浣庡簱浣�
+ staProtocol.setLiftArrival(status[6]); // 鎻愬崌鏈哄埌浣嶄俊鍙�
+ staProtocol.setShuttleTakeEnable(status[7]); // 鎻愬崌鏈哄彲鍙栦俊鍙�
if (!staProtocol.isPakMk() && !staProtocol.isLoading()) {
staProtocol.setPakMk(true);
@@ -158,9 +161,9 @@
OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB100.200",(short)24);
if (result2.IsSuccess) {
for (int i = 0; i <= barcodeSize; i++) {
- byte[] bytes = siemensS7Net.getByteTransform().TransByte(result2.Content, i * 8, 8);
- String barcode = CommonUtils.bytesToBarcode(bytes);
-// String barcode = siemensS7Net.getByteTransform().TransString(result2.Content,i*8,8, "UTF-8");
+// byte[] bytes = siemensS7Net.getByteTransform().TransByte(result2.Content, i * 8, 8);
+// String barcode = CommonUtils.bytesToBarcode(bytes);
+ String barcode = siemensS7Net.getByteTransform().TransString(result2.Content,i*8,8, "UTF-8");
BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, i + 1);
if(!Cools.isEmpty(barcodeThread) && !barcodeThread.getBarcode().equals(barcode)) {
barcodeThread.setBarcode(barcode);
@@ -192,35 +195,39 @@
StaProtocol staProtocol = station.get(102);
staProtocol.setOutInModel(outInModel);
}
-// // 澶栧舰妫�娴� - 201
-// Thread.sleep(50);
-// OperateResultExOne<byte[]> result201 = siemensS7Net.Read("DB102.112", (short)1);
-// if (result201.IsSuccess) {
-// boolean[] status = siemensS7Net.getByteTransform().TransBool(result201.Content, 0, 1);
-// StaProtocol staProtocol = station.get(201);
-// staProtocol.setFrontErr(status[0]);
-// staProtocol.setBackErr(status[1]);
-// staProtocol.setHighErr(status[2]);
-// staProtocol.setLeftErr(status[3]);
-// staProtocol.setRightErr(status[4]);
-// staProtocol.setWeightErr(status[5]);
-// staProtocol.setBarcodeErr(status[6]);
-// }
-// // 澶栧舰妫�娴� - 301
-// Thread.sleep(50);
-// OperateResultExOne<byte[]> result301 = siemensS7Net.Read("DB102.114", (short)1);
-// if (result301.IsSuccess) {
-// boolean[] status = siemensS7Net.getByteTransform().TransBool(result301.Content, 0, 1);
-// StaProtocol staProtocol = station.get(301);
-// staProtocol.setFrontErr(status[0]);
-// staProtocol.setBackErr(status[1]);
-// staProtocol.setHighErr(status[2]);
-// staProtocol.setLeftErr(status[3]);
-// staProtocol.setRightErr(status[4]);
-// staProtocol.setWeightErr(status[5]);
-// staProtocol.setBarcodeErr(status[6]);
-// }
+ Thread.sleep(50);
+ for (Integer siteId : outInStaNos) {
+ String dbAddress = "DB100.300";
+ switch (siteId) {
+ case 102:
+ dbAddress = "DB100.300";
+ break;
+ case 105:
+ dbAddress = "DB100.302";
+ break;
+ case 106:
+ dbAddress = "DB100.304";
+ break;
+ case 107:
+ dbAddress = "DB100.306";
+ break;
+ case 108:
+ dbAddress = "DB100.308";
+ break;
+ }
+
+ OperateResultExOne<byte[]> resultRead = siemensS7Net.Read(dbAddress, (short) 2);
+ if (resultRead.IsSuccess) {
+ //閾炬潯杞姩鎯呭喌
+ short direction = siemensS7Net.getByteTransform().TransInt16(resultRead.Content, 0);
+ StaProtocol staProtocol = station.get(siteId);
+ if (direction != 0 && !staProtocol.isLoading()) {
+ //鐘舵�佷负姝ｈ浆鎴栧弽杞笖鏃犵墿鏃讹紝灏嗛摼鏉¤浆鍔ㄤ俊鍙蜂綅澶嶄綅
+ write4(siteId, 0);
+ }
+ }
+ }
if (result.IsSuccess && result1.IsSuccess) {
OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛",DateUtils.convert(new Date()), slave.getId()));
@@ -282,11 +289,9 @@
}
Short outAndIn = staProtocol.getOutInModel();
Integer siteId = staProtocol.getSiteId();
- Short run = 1;//姝ｈ浆
- if (outAndIn == 1) {//鍏ュ簱
- run = 1;//姝ｈ浆
- } else {
- run = 2;//鍙嶈浆
+ Short run = 0;//鍋滄杞姩
+ if (staProtocol.getRotationDire() != null) {
+ run = staProtocol.getRotationDire().shortValue();//杞姩鏂瑰悜
}
switch (siteId) {
case 102:
@@ -306,6 +311,10 @@
break;
}
+ if (staProtocol.getStaNo() != null && staProtocol.getWorkNo() != null) {
+ write(staProtocol);//鍐欏叆宸ヤ綔鍙峰拰鐩爣绔�
+ }
+
}
/**
--
Gitblit v1.9.1