From d9271883338de97164a36ea9a1e5fc7eef73e64d Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期三, 04 十月 2023 14:38:25 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/model/protocol/StaProtocol.java | 3 +++
src/main/java/com/zy/asrs/controller/SiteController.java | 1 +
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 2 +-
src/main/webapp/views/pipeline.html | 4 ++--
src/main/java/com/zy/asrs/domain/vo/SiteTableVo.java | 3 +++
src/main/java/com/zy/common/model/LocTypeDto.java | 13 +++++--------
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 21 ++++++++++++++++++---
7 files changed, 33 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/SiteController.java b/src/main/java/com/zy/asrs/controller/SiteController.java
index b6ae251..674434a 100644
--- a/src/main/java/com/zy/asrs/controller/SiteController.java
+++ b/src/main/java/com/zy/asrs/controller/SiteController.java
@@ -103,6 +103,7 @@
vo.setPakMk(staProtocol.isPakMk()?"Y":"N"); // 鍏ュ簱鏍囪
vo.setEmptyMk(staProtocol.isEmptyMk()?"Y":"N"); // 绌烘澘淇″彿
vo.setStaNo(staProtocol.getStaNo()); // 鐩爣绔�
+ vo.setLocType1(staProtocol.getLocType1().toString()); // 楂樹綆淇″彿
}
return R.ok().add(list);
}
diff --git a/src/main/java/com/zy/asrs/domain/vo/SiteTableVo.java b/src/main/java/com/zy/asrs/domain/vo/SiteTableVo.java
index a262df6..160f2c5 100644
--- a/src/main/java/com/zy/asrs/domain/vo/SiteTableVo.java
+++ b/src/main/java/com/zy/asrs/domain/vo/SiteTableVo.java
@@ -41,4 +41,7 @@
//鍥涘悜绌挎杞﹀彲鍙栦俊鍙�
private String shuttleTakeEnable = "-";
+ //楂樹綆淇″彿
+ private String locType1 = "-";
+
}
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 dfa2a60..15852c4 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -225,7 +225,7 @@
param.setBarcode(barcode);
param.setIoType(1);
param.setSourceStaNo(inSta.getStaNo());
-// param.setLocType1(locTypeDto.getLocType1());
+ param.setLocType1(locTypeDto.getLocType1());
String response = new HttpHandler.Builder()
.setUri(wmsUrl)
.setPath("/rpc/pakin/loc/v1")
diff --git a/src/main/java/com/zy/common/model/LocTypeDto.java b/src/main/java/com/zy/common/model/LocTypeDto.java
index 10e71fb..7dc5c7b 100644
--- a/src/main/java/com/zy/common/model/LocTypeDto.java
+++ b/src/main/java/com/zy/common/model/LocTypeDto.java
@@ -1,5 +1,6 @@
package com.zy.common.model;
+import com.core.exception.CoolException;
import com.zy.core.model.protocol.StaProtocol;
import lombok.Data;
@@ -22,14 +23,10 @@
}
public LocTypeDto(StaProtocol staProtocol) {
-// if (staProtocol.isHigh() == staProtocol.isLow()) {
-// throw new CoolException("plc楂樹綆妫�娴嬪紓甯�");
-// }
-// if (staProtocol.isLow()) {
-// this.locType1 = 1; // 浣庡簱浣�
-// } else {
-// this.locType1 = 2; // 楂樺簱浣�
-// }
+ if (staProtocol.getLocType1() == null || staProtocol.getLocType1() == 0) {
+ throw new CoolException("plc楂樹綆妫�娴嬪紓甯�");
+ }
+ this.locType1 = staProtocol.getLocType1();
}
/**
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 80ed721..8ba2510 100644
--- a/src/main/java/com/zy/core/model/protocol/StaProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/StaProtocol.java
@@ -87,6 +87,9 @@
//杈撻�佺嚎102绔欏洖閫�淇″彿
private Integer rollback102;
+ //楂樹綆淇″彿 0:鏃� 1:浣� 2:涓� 3:楂�
+ private Short locType1;
+
public BasDevp toSqlModel(){
BasDevp basDevp = new BasDevp();
basDevp.setDevNo(siteId);
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 2ce3d17..90c07db 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -57,9 +57,13 @@
add(333);add(339);
}};
- public static final ArrayList<Integer> outInStaNos = new ArrayList<Integer>() {{
- add(102);add(105);add(106);
- add(107);add(108);
+ //楂樹綆淇″彿绔欑偣
+ public static final ArrayList<Integer> locType1StaNos = new ArrayList<Integer>() {{
+ add(100);add(103);
+ add(105);add(200);
+ add(203);add(205);
+ add(300);add(341);
+ add(346);
}};
public boolean charge0;
@@ -184,6 +188,17 @@
}
}
+ //璇婚珮浣庝俊鍙�
+ Thread.sleep(100);
+ OperateResultExOne<byte[]> result3 = siemensS7Net.Read("DB1000.300", (short) (locType1StaNos.size()*2));
+ if (result3.IsSuccess) {
+ for (int i = 0; i < locType1StaNos.size(); i++) {
+ Integer siteId = locType1StaNos.get(i); // 绔欑偣缂栧彿
+ StaProtocol staProtocol = station.get(siteId);
+ staProtocol.setLocType1(siemensS7Net.getByteTransform().TransInt16(result3.Content, i * 2));//璇诲彇楂樹綆淇″彿
+ }
+ }
+
// 澶栧舰妫�娴� - 102
Thread.sleep(50);
OperateResultExOne<byte[]> result102 = siemensS7Net.Read("DB100.100", (short)2);
diff --git a/src/main/webapp/views/pipeline.html b/src/main/webapp/views/pipeline.html
index 354cc5e..c549366 100644
--- a/src/main/webapp/views/pipeline.html
+++ b/src/main/webapp/views/pipeline.html
@@ -103,7 +103,7 @@
<th>绌烘澘淇″彿</th>
<th>鐩爣绔�</th>
<th>鎻愬崌鏈哄埌浣嶄俊鍙�</th>
- <th>棰勭暀</th>
+ <th>楂樹綆淇″彿</th>
</tr>
</thead>
<!-- 琛ㄦ牸鍐呭 -->
@@ -290,7 +290,7 @@
setVal(tr.children("td").eq(7), table[i-1].emptyMk);
setVal(tr.children("td").eq(8), table[i-1].staNo);
setVal(tr.children("td").eq(9), table[i-1].liftArrival);
- setVal(tr.children("td").eq(10), table[i-1].shuttleTakeEnable);
+ setVal(tr.children("td").eq(10), table[i-1].locType1);
}
} else if (res.code === 403){
window.location.href = baseUrl+"/login";
--
Gitblit v1.9.1