From 03f7617b415bc653fa2e14c28e4f41663a130476 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期日, 04 一月 2026 09:27:27 +0800
Subject: [PATCH] 1.完善连接器库入库请求 2.完善电视机显示程序 3.新增PDA给输送线下发入库 4.新增绑定和解绑测试区域是否有空库位 5.新增AGV离站信号 6.完善空托盘入库
---
src/main/java/com/zy/core/model/protocol/StaProtocol.java | 51 +++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 45 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..d2dc0d0 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,64 @@
// 绌烘澘淇″彿
private boolean emptyMk;
- // 闇�姹�1
- private boolean inreq1;
+ // 婊℃墭鐩�
+ private boolean fullPlt;
+
+ // 楂�
+ private boolean high;
+
+ // 浣�
+ private boolean low;
// 閿佸畾鏍囪
private boolean pakMk = true;
- // 鍙拌溅浣嶇疆
- private Short position;
+ //鎶ヨ
+ private Short error;
+
+ // 鍓嶈秴鎶ヨ
+ private boolean frontError;
+
+ // 鍚庤秴鎶ヨ
+ private boolean backError;
+
+ // 瓒呴珮鎶ヨ
+ private boolean highError;
+
+ // 宸﹂珮鎶ヨ
+ private boolean leftError;
+
+ // 鍙抽珮鎶ヨ
+ private boolean rightError;
+
+ // 瓒呴噸鎶ヨ
+ private boolean weightError;
+
+ // 鎵爜鎶ヨ
+ private boolean barcodeError;
+
+ // 鎵樼洏灏哄
+ private Short palletSize;
+
+ //绌烘墭鍏ュ簱绫诲瀷
+ private Short emptyInType;
+
+ //绌烘枡鏋�
+ private boolean emptyOutType;
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);
+ basDevp.setInreq1(emptyOutType?"Y":"N");
return basDevp;
}
--
Gitblit v1.9.1