From 4cc7a3bb676402a73a704ccb0c559c2feb1dbb25 Mon Sep 17 00:00:00 2001 From: zc <zc@123> Date: 星期一, 21 四月 2025 16:51:37 +0800 Subject: [PATCH] 12 --- src/main/java/com/zy/core/model/protocol/StaProtocol.java | 115 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 110 insertions(+), 5 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 1c2ff6e..320a6ef 100644 --- a/src/main/java/com/zy/core/model/protocol/StaProtocol.java +++ b/src/main/java/com/zy/core/model/protocol/StaProtocol.java @@ -1,5 +1,6 @@ package com.zy.core.model.protocol; +import com.zy.asrs.entity.BasDevp; import lombok.Data; /** @@ -7,14 +8,17 @@ * Created by vincent on 2020/8/6 */ @Data -public class StaProtocol { +public class StaProtocol implements Cloneable { // 绔欑偣缂栧彿 private Integer siteId; // ---------------------------------------------------------------- // 宸ヤ綔鍙� - private Short workNo; + private Short workNo = 0; + + // + private Short finishWorkNo = 0; // ---------------------------------------------------------------- // 鐩爣绔� @@ -33,14 +37,115 @@ // 鍙嚭 private boolean outEnable; + //绌洪棽 + private boolean idle; + + // + private String barcode; + + // + private Integer weight; + // 绌烘澘淇″彿 private boolean emptyMk; - // 闇�姹�1 - private boolean inreq1; + // 婊℃墭鐩� + private boolean fullPlt; + + // 楂� + private boolean high; + + // 浣� + private boolean low; // 閿佸畾鏍囪 - private boolean pakMk; + private boolean pakMk = true; + // 鍏ュ簱鏆傚瓨鏁� + private Short inQty; + + // 闅斿绔欑偣锛堝彴杞︿綅缃級 + private String nearbySta; + + //lfd鍏ュ簱鍗拌 褰搒tamp>=2鏃舵墠鍏ュ簱 + private Integer stamp = 0; + + private boolean in = false; + + private boolean out = false; + + // 澶栧舰妫�娴� ------------------------------------------------------------------------ + + // 鍓嶈秴闄� + private boolean frontErr = false; + + // 鍚庤秴闄� + private boolean backErr = false; + + // 楂樿秴闄� + private boolean highErr = false; + + // 宸﹁秴闄� + private boolean leftErr = false; + + // 鍙宠秴闄� + private boolean rightErr = false; + + // 瓒呴噸 + private boolean weightErr = false; + + // 鎵爜澶辫触 + private boolean barcodeErr = false; + + //鏁呴殰----------------------------------------------------------------------- + private Boolean breakerErr = false; //鏂矾鍣ㄦ晠闅� + + private Boolean infraredErr = false; //鍏夌數寮傚父 + + private Boolean outTimeErr = false; //杩愯瓒呮椂 + + private Boolean seizeSeatErr = false; //鍗犱綅瓒呮椂 + + private Boolean wrkYgoodsN = false;//鏈変换鍔℃棤璐ф晠闅� + + private Boolean inverterErr = false; //鍙橀鍣ㄦ晠闅� + + private Boolean contactErr = false; //鐢垫満鎺ヨЕ鍣ㄦ晠闅� + + private Boolean upcontactErr = false; //椤跺崌鐢垫満鎺ヨЕ鍣ㄦ晠闅� + + public Boolean isErr(){ + if (frontErr || backErr || highErr || leftErr || rightErr || weightErr || barcodeErr){ + return true; + }else { + return false; + } + } + + public BasDevp toSqlModel(){ + BasDevp basDevp = new BasDevp(); + basDevp.setDevNo(siteId); + basDevp.setWrkNo(workNo.intValue()); + basDevp.setAutoing(autoing?"Y":"N"); + basDevp.setLoading(loading?"Y":"N"); + basDevp.setInEnable(inEnable?"Y":"N"); + basDevp.setOutEnable(outEnable?"Y":"N"); + basDevp.setLocType1((short) 0); // 楂樹綆绫诲瀷{0:鏈煡,1:浣庡簱浣�,2:楂樺簱浣峿 + basDevp.setLocType2((short) 0); // 瀹界獎绫诲瀷{0:鏈煡,1:绐勫簱浣�,2:瀹藉簱浣峿 + basDevp.setLocType3((short) 0); // 杞婚噸绫诲瀷{0:鏈煡,1:杞诲簱浣�,2:閲嶅簱浣峿 + basDevp.setLocType1(high != low && low ? (short) 1 : (short) 2); + basDevp.setInQty(inQty !=null ?(int)inQty : 0); + return basDevp; + } + + @Override + public StaProtocol clone() { + try { + return (StaProtocol) super.clone(); + } catch (CloneNotSupportedException e) { + e.printStackTrace(); + } + return null; + } } -- Gitblit v1.9.1