From 64417d272e7a2a332ebbe51bb3ceec1f52274a07 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期二, 25 七月 2023 10:21:41 +0800
Subject: [PATCH] 捡料
---
src/main/java/com/zy/core/model/protocol/StaProtocol.java | 55 +++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 49 insertions(+), 6 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 64e43af..80ed721 100644
--- a/src/main/java/com/zy/core/model/protocol/StaProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/StaProtocol.java
@@ -37,25 +37,68 @@
// 绌烘澘淇″彿
private boolean emptyMk;
- // 闇�姹�1
- private boolean inreq1;
+ // 婊℃墭鐩�
+ private boolean fullPlt;
+
+ //鎻愬崌鏈哄埌浣嶄俊鍙�
+ private boolean liftArrival;
+
+ //鍥涘悜绌挎杞﹀彲鍙栦俊鍙�
+ private boolean shuttleTakeEnable;
+
+ // 楂�
+ private boolean high;
+
+ // 浣�
+ private boolean low;
// 閿佸畾鏍囪
private boolean pakMk = true;
- // 鍙拌溅浣嶇疆
- private Short position;
+ // 澶栧舰妫�娴� ------------------------------------------------------------------------
+
+ // 鍓嶈秴闄�
+ private boolean frontErr;
+
+ // 鍚庤秴闄�
+ private boolean backErr;
+
+ // 楂樿秴闄�
+ private boolean highErr;
+
+ // 宸﹁秴闄�
+ private boolean leftErr;
+
+ // 鍙宠秴闄�
+ private boolean rightErr;
+
+ // 瓒呴噸
+ private boolean weightErr;
+
+ // 鎵爜澶辫触
+ private boolean barcodeErr;
+
+ //鍑哄叆搴撴ā寮�
+ private Short outInModel;
+
+ //杈撻�佺嚎鑱斿姩杞姩鏂瑰悜锛�0锛氬仠姝㈣浆鍔紝1锛氭鍚戣浆鍔紝2锛氬弽鍚戣浆鍔�
+ private Integer rotationDire;
+
+ //杈撻�佺嚎102绔欏洖閫�淇″彿
+ private Integer rollback102;
public BasDevp toSqlModel(){
BasDevp basDevp = new BasDevp();
basDevp.setDevNo(siteId);
basDevp.setWrkNo(workNo.intValue());
- // 绔欑偣 todo:luxiaotao
basDevp.setAutoing(autoing?"Y":"N");
basDevp.setLoading(loading?"Y":"N");
basDevp.setInEnable(inEnable?"Y":"N");
basDevp.setOutEnable(outEnable?"Y":"N");
- basDevp.setInreq1(inreq1?"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);
return basDevp;
}
--
Gitblit v1.9.1