From e82ebf78cdc2b0c0579f8bc00f9956ce4f76bffc Mon Sep 17 00:00:00 2001 From: lsh <lsh@163.com> Date: 星期一, 28 四月 2025 13:11:57 +0800 Subject: [PATCH] * --- src/main/java/com/zy/core/model/protocol/StaProtocol.java | 42 +++++++++++++++++++++++++++++++++++++++--- 1 files changed, 39 insertions(+), 3 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 2290116..cfaf3d8 100644 --- a/src/main/java/com/zy/core/model/protocol/StaProtocol.java +++ b/src/main/java/com/zy/core/model/protocol/StaProtocol.java @@ -15,11 +15,11 @@ // ---------------------------------------------------------------- // 宸ヤ綔鍙� - private Short workNo = 0; + private Integer workNo = 0; // ---------------------------------------------------------------- // 鐩爣绔� - private Short staNo; + private Integer staNo; // ---------------------------------------------------------------- // 鑷姩 @@ -48,12 +48,47 @@ // 閿佸畾鏍囪 private boolean pakMk = true; + private boolean pakMkWalk = true; + // 鍏ュ簱鏆傚瓨鏁� + private Short inQty; + + // 闅斿绔欑偣锛堝彴杞︿綅缃級 + private String nearbySta; + + // 澶栧舰妫�娴� ------------------------------------------------------------------------ + + // 鍓嶈秴闄� + private boolean frontErr; + + // 鍚庤秴闄� + private boolean backErr; + + // 楂樿秴闄� + private boolean highErr; + + // 宸﹁秴闄� + private boolean leftErr; + + // 鍙宠秴闄� + private boolean rightErr; + + // 瓒呴噸 + private boolean weightErr; + + // 鎵爜澶辫触 + private boolean barcodeErr; + + // Super鏈夋棤淇℃伅 + private boolean loadingSuper = true; + + //鎸囦护ID + private Integer commandId; 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"); @@ -62,6 +97,7 @@ 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; } -- Gitblit v1.9.1