From c5698e42c67e32892424a1a94ed9e7b532f0f7b8 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期一, 08 十二月 2025 09:43:49 +0800
Subject: [PATCH] 济南二机床wcs功能调试完善
---
src/main/java/com/zy/core/model/protocol/StaProtocol.java | 29 ++++++++++++++++++-----------
1 files changed, 18 insertions(+), 11 deletions(-)
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 c844cae..c90516c 100644
--- a/src/main/java/com/zy/core/model/protocol/StaProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/StaProtocol.java
@@ -40,11 +40,20 @@
// 婊℃墭鐩�
private boolean fullPlt;
- // 楂�
+ // 楂樺簱浣� 鏀�6灞�
private boolean high;
- // 浣�
+ // 涓�
+ private boolean center;
+
+ // 浣� 15灞�
private boolean low;
+
+ // 闀挎墭鐩� 鏀惧悗涓夊垪
+ private boolean chang;
+
+ // 鐭墭鐩� 2-14 鍒�
+ private boolean duan;
// 閿佸畾鏍囪
private boolean pakMk = true;
@@ -75,11 +84,17 @@
// 鍙宠秴闄�
private boolean rightErr = false;
+ // 鏈粍鎵樻姤璀�
+ private boolean groupSupportErr = false;
+
// 瓒呴噸
private boolean weightErr = false;
// 鎵爜澶辫触
private boolean barcodeErr = false;
+
+ // 璐х墿楂樺害 1.浣� 2.涓� 3.楂�
+ private short goodsHeight;
//鏁呴殰-----------------------------------------------------------------------
private Boolean breakerErr = false; //鏂矾鍣ㄦ晠闅�
@@ -98,18 +113,10 @@
private Boolean upcontactErr = false; //椤跺崌鐢垫満鎺ヨЕ鍣ㄦ晠闅�
- private Boolean ifOpenDoor = false; // 鏄惁鎵撳紑
-
- private Boolean ifCloseDoor = false; // 鏄惁鍏抽棴
-
- private Boolean openAskDoor = false; // 璇锋眰寮�闂�
-
- private Boolean closeAskDoor = false; // 璇锋眰鍏抽棬
-
public BasDevp toSqlModel(){
BasDevp basDevp = new BasDevp();
basDevp.setDevNo(siteId);
- basDevp.setWrkNo(workNo.intValue());
+ basDevp.setWrkNo(workNo);
basDevp.setAutoing(autoing?"Y":"N");
basDevp.setLoading(loading?"Y":"N");
basDevp.setInEnable(inEnable?"Y":"N");
--
Gitblit v1.9.1