From c7bcef9d03f58c984d475932710c247ee778d95b Mon Sep 17 00:00:00 2001 From: lsh <1> Date: 星期二, 09 四月 2024 23:31:39 +0800 Subject: [PATCH] # --- src/main/java/com/zy/core/model/protocol/StaProtocol.java | 39 +++++++++++++++++++++++++++++++++++++++ 1 files changed, 39 insertions(+), 0 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 16bae8e..c3012bf 100644 --- a/src/main/java/com/zy/core/model/protocol/StaProtocol.java +++ b/src/main/java/com/zy/core/model/protocol/StaProtocol.java @@ -111,6 +111,10 @@ private Short agvStartPlace; //鍏佽鏀捐揣 private Short agvTypeSign; //鍏佽鏀捐揣 + private Short agvTargetPick; //鍙栬揣瀹屾垚 + private Short agvTargetPlace; //鏀捐揣瀹屾垚 + private Short agvTypeSignEnd; //鏀捐揣瀹屾垚 + private List<Integer> alarm; @@ -151,6 +155,41 @@ basDevp.setWrkNo(workNo.intValue()); basDevp.setAutoing(autoing?"Y":"N"); basDevp.setLoading(loading?"Y":"N"); + if (frontErr){ + basDevp.setStaErr(11); + }else if (backErr){ + basDevp.setStaErr(12); + }else if (highErr){ + basDevp.setStaErr(13); + }else if (leftErr){ + basDevp.setStaErr(14); + }else if (rightErr){ + basDevp.setStaErr(15); + }else if (weightErr){ + basDevp.setStaErr(16); + }else if (barcodeErr){ + basDevp.setStaErr(17); + }else if (breakerErr){ + basDevp.setStaErr(18); + }else if (infraredErr){ + basDevp.setStaErr(19); + }else if (outTimeErr){ + basDevp.setStaErr(110); + }else if (seizeSeatErr){ + basDevp.setStaErr(111); + }else if (wrkYgoodsN){ + basDevp.setStaErr(112); + }else if (inverterErr){ + basDevp.setStaErr(113); + }else if (contactErr){ + basDevp.setStaErr(114); + }else if (upcontactErr){ + basDevp.setStaErr(115); + }else { + if (!loading){ + basDevp.setStaErr(0); + } + } basDevp.setInEnable(inEnable?"Y":"N"); basDevp.setOutEnable(outEnable?"Y":"N"); basDevp.setLocType1((short) 0); // 楂樹綆绫诲瀷{0:鏈煡,1:浣庡簱浣�,2:楂樺簱浣峿 -- Gitblit v1.9.1