From 300b7f60d290e02dd3106ee78cc0ba6f01abca96 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期六, 20 五月 2023 16:17:08 +0800
Subject: [PATCH] #库位调整
---
src/main/java/com/zy/core/model/protocol/StaProtocol.java | 2 ++
src/main/java/com/zy/asrs/controller/SiteController.java | 21 +++++++++++++++++++--
src/main/java/com/zy/asrs/entity/BasDevp.java | 4 ++++
src/main/java/com/zy/asrs/entity/LocMast.java | 4 ++++
src/main/java/com/zy/common/model/LocTypeDto.java | 10 ++++++++--
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 16 +++++++++-------
6 files changed, 46 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/SiteController.java b/src/main/java/com/zy/asrs/controller/SiteController.java
index bbcb229..a6d5e48 100644
--- a/src/main/java/com/zy/asrs/controller/SiteController.java
+++ b/src/main/java/com/zy/asrs/controller/SiteController.java
@@ -80,7 +80,16 @@
vo.setEmptyMk(staProtocol.isEmptyMk()?"Y":"N"); // 绌烘澘淇″彿
vo.setStaNo(staProtocol.getStaNo()); // 鐩爣绔�
// vo.setLocType1(staProtocol.isHigh() != staProtocol.isLow() && staProtocol.isLow() ? "浣�" : "楂�"); //楂樹綆搴撲綅
- vo.setLocType1(devp.getDevNo()==102 ? "楂�" : "浣�");
+ if (staProtocol.isLow()) {
+ vo.setLocType1("浣�"); // 浣庡簱浣�
+ } else if (staProtocol.isHigh()){
+ vo.setLocType1("楂�"); // 楂樺簱浣�
+ } else if (staProtocol.isMedium()) {
+ vo.setLocType1("涓�"); //涓簱浣�
+ } else if (staProtocol.isMedium_high()) {
+ vo.setLocType1("涓珮"); //涓珮搴撲綅
+ }
+
}
return R.ok().add(list);
}
@@ -155,7 +164,15 @@
vo.setPakMk(staProtocol.isPakMk()?"Y":"N"); // 闇�姹�1
vo.setEmptyMk(staProtocol.isEmptyMk()?"Y":"N"); // 绌烘澘淇″彿
vo.setStaNo(staProtocol.getStaNo()); // 鐩爣绔�
- vo.setLocType1(staProtocol.isHigh() != staProtocol.isLow() && staProtocol.isLow() ? "浣�" : "楂�"); //楂樹綆搴撲綅
+ if (staProtocol.isLow()) {
+ vo.setLocType1("浣�"); // 浣庡簱浣�
+ } else if (staProtocol.isHigh()){
+ vo.setLocType1("楂�"); // 楂樺簱浣�
+ } else if (staProtocol.isMedium()) {
+ vo.setLocType1("涓�"); //涓簱浣�
+ } else if (staProtocol.isMedium_high()) {
+ vo.setLocType1("涓珮"); //涓珮搴撲綅
+ }
return R.ok().add(vo);
}
}
diff --git a/src/main/java/com/zy/asrs/entity/BasDevp.java b/src/main/java/com/zy/asrs/entity/BasDevp.java
index 1e3d022..f50fec5 100644
--- a/src/main/java/com/zy/asrs/entity/BasDevp.java
+++ b/src/main/java/com/zy/asrs/entity/BasDevp.java
@@ -231,6 +231,10 @@
return "浣庡簱浣�";
case 2:
return "楂樺簱浣�";
+ case 3:
+ return "涓簱浣�";
+ case 4:
+ return "涓珮搴撲綅";
default:
return String.valueOf(this.locType1);
}
diff --git a/src/main/java/com/zy/asrs/entity/LocMast.java b/src/main/java/com/zy/asrs/entity/LocMast.java
index cd931b9..5f92470 100644
--- a/src/main/java/com/zy/asrs/entity/LocMast.java
+++ b/src/main/java/com/zy/asrs/entity/LocMast.java
@@ -197,6 +197,10 @@
return "浣庡簱浣�";
case 2:
return "楂樺簱浣�";
+ case 3:
+ return "涓簱浣�";
+ case 4:
+ return "涓珮搴撲綅";
default:
return String.valueOf(this.locType1);
}
diff --git a/src/main/java/com/zy/common/model/LocTypeDto.java b/src/main/java/com/zy/common/model/LocTypeDto.java
index 4cb4b14..d360b7e 100644
--- a/src/main/java/com/zy/common/model/LocTypeDto.java
+++ b/src/main/java/com/zy/common/model/LocTypeDto.java
@@ -29,14 +29,20 @@
}
public LocTypeDto(StaProtocol staProtocol) {
- if (staProtocol.isHigh() == staProtocol.isLow()) {
+ if (staProtocol.isHigh() == staProtocol.isLow() == staProtocol.isMedium() == staProtocol.isMedium_high()) {
throw new CoolException("plc楂樹綆妫�娴嬪紓甯�");
}
if (staProtocol.isLow()) {
this.locType1 = 1; // 浣庡簱浣�
- } else {
+ } else if (staProtocol.isHigh()){
this.locType1 = 2; // 楂樺簱浣�
+ } else if (staProtocol.isMedium()) {
+ this.locType1 = 3;
+ } else if (staProtocol.isMedium_high()) {
+ this.locType1 = 4;
}
+
+
}
/**
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 2e3fb74..8bda488 100644
--- a/src/main/java/com/zy/core/model/protocol/StaProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/StaProtocol.java
@@ -45,6 +45,8 @@
// 浣�
private boolean low;
+ private boolean medium;
+ private boolean medium_high;
// 閿佸畾鏍囪
private boolean pakMk = true;
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 85e1ac7..c459208 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -232,6 +232,7 @@
for (int i = 0; i < staNoSize; i++) {
Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
boolean[] status = siemensS7Net.getByteTransform().TransBool(result1.Content, i*2, 1);
+ boolean[] status2 = siemensS7Net.getByteTransform().TransBool(result1.Content, i*2+1, 1);
StaProtocol staProtocol = station.get(siteId);
staProtocol.setAutoing(status[0]); // 鑷姩
staProtocol.setLoading(status[1]); // 鏈夌墿
@@ -239,9 +240,10 @@
staProtocol.setOutEnable(status[3]);// 鍙嚭
staProtocol.setEmptyMk(status[4]); // 绌烘澘淇″彿
staProtocol.setFullPlt(status[5]); // 婊℃墭鐩�
- staProtocol.setHigh(status[6]); // 楂樺簱浣�
- staProtocol.setLow(status[7]); // 浣庡簱浣�
-
+ staProtocol.setLow(status[6]); // 浣庡簱浣�
+ staProtocol.setMedium(status[7]); // 涓簱浣�
+ staProtocol.setMedium_high(status2[0]); //涓珮搴撲綅
+ staProtocol.setHigh(status2[1]); // 楂樺簱浣�
if (!staProtocol.isPakMk() && !staProtocol.isLoading()) {
staProtocol.setPakMk(true);
}
@@ -249,10 +251,10 @@
if (!staProtocol.isLoading()){
staProtocol.setStamp(0);
}
- if (staProtocol.getStamp()<2 && staProtocol.isLoading()){
- //lfd鍏ュ簱鍗拌 褰搒tamp>=2鏃舵墠鍏ュ簱
- staProtocol.setStamp(staProtocol.getStamp()+1);
- }
+// if (staProtocol.getStamp()<2 && staProtocol.isLoading()){
+// //lfd鍏ュ簱鍗拌 褰搒tamp>=2鏃舵墠鍏ュ簱
+// staProtocol.setStamp(staProtocol.getStamp()+1);
+// }
// //20230110锛屾棩蹇楁墦鍗帮紝纭鏀跺埌鍏ュ簱绔欏彲鍏ヤ俊鍙锋椂锛屽搴旀潯鐮佹暟鎹槸鍚﹀凡鏈�
// if ((siteId==101 || siteId==109 || siteId==117 || siteId==201 || siteId==207 || siteId==213)
--
Gitblit v1.9.1