From d6a0fd27dde43c28bc37c63eac3addfb6b52926d Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期二, 13 五月 2025 10:49:25 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/model/protocol/StaProtocol.java | 102 ++++++++++++++++-----------------------------------
1 files changed, 32 insertions(+), 70 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 1cb666f..8883efe 100644
--- a/src/main/java/com/zy/core/model/protocol/StaProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/StaProtocol.java
@@ -1,11 +1,7 @@
package com.zy.core.model.protocol;
import com.zy.asrs.entity.BasDevp;
-import com.zy.core.enums.DevpType.*;
import lombok.Data;
-
-import java.util.ArrayList;
-import java.util.List;
/**
* 杈撻�佺嚎plc鍗曚釜绔欑偣璇︾粏淇℃伅
@@ -19,68 +15,36 @@
// ----------------------------------------------------------------
// 宸ヤ綔鍙�
- private Short workNo = 0;
+ private Integer workNo = 0;
// ----------------------------------------------------------------
// 鐩爣绔�
private Short staNo;
- //鎸囦护ID
- private Integer commandId;
-
// ----------------------------------------------------------------
- //妯″紡
- private Short mode;
- public DevpModeType modeType;
- //鐘舵��
- private Short state;
- public DevpStateType stateType;
- //宸ヤ綔鐘舵��
- private Short workIo;
- public DevpWorkType workType;
- //璇锋眰淇″彿
- private Short requestIo;
- public DevpRequestType requestType;
- //鎵樼洏鐘舵��
- private Short trayIo;
- public DevpTrayType trayType;
- //搴撲綅鐘舵��
- private Short locIo;
- public DevpLocType locType;
- //鏉＄爜淇℃伅
- private String barcode;
- //閲嶉噺淇℃伅
- private Double weightIo;
- //澶囩敤
- private Short spare;
+ // 鑷姩
+ private boolean autoing;
- public void setMode(Short mode) {
- this.mode = mode;
- this.modeType = DevpModeType.get(mode);
- }
- public void setState(Short state) {
- this.state = state;
- this.stateType = DevpStateType.get(state);
- }
- public void setWorkIo(Short workIo) {
- this.workIo = workIo;
- this.workType = DevpWorkType.get(workIo);
- }
- public void setRequestIo(Short requestIo) {
- this.requestIo = requestIo;
- this.requestType = DevpRequestType.get(requestIo);
- }
- public void setTrayIo(Short trayIo) {
- this.trayIo = trayIo;
- this.trayType = DevpTrayType.get(trayIo);
- }
- public void setLocIo(Short locIo) {
- this.locIo = locIo;
- this.locType = DevpLocType.get(locIo);
- }
+ // 鏈夌墿
+ private boolean loading;
+ // 鍙叆
+ private boolean inEnable;
+ // 鍙嚭
+ private boolean outEnable;
+ // 绌烘澘淇″彿
+ private boolean emptyMk;
+
+ // 婊℃墭鐩�
+ private boolean fullPlt;
+
+ // 楂�
+ private boolean high;
+
+ // 浣�
+ private boolean low;
// 閿佸畾鏍囪
private boolean pakMk = true;
@@ -88,9 +52,14 @@
// 鍏ュ簱鏆傚瓨鏁�
private Short inQty;
+ // 闅斿绔欑偣锛堝彴杞︿綅缃級
+ private String nearbySta;
+ //lfd鍏ュ簱鍗拌 褰搒tamp>=2鏃舵墠鍏ュ簱
+ private Integer stamp = 0;
-
+ //鎸囦护ID
+ private Integer commandId;
// 澶栧舰妫�娴� ------------------------------------------------------------------------
@@ -140,26 +109,19 @@
}
}
- public Boolean isPakReset(){
- if (workNo == 0 && workType == DevpWorkType.BUSY && requestType != DevpRequestType.IN){
- return true;
- }
- return false;
- }
-
public BasDevp toSqlModel(){
BasDevp basDevp = new BasDevp();
basDevp.setDevNo(siteId);
basDevp.setWrkNo(workNo.intValue());
- basDevp.setAutoing(stateType == DevpStateType.AUTO?"Y":"N");
- basDevp.setLoading(workType == DevpWorkType.BUSY?"Y":"N");
- basDevp.setInEnable(requestType == DevpRequestType.IN?"Y":"N");
- basDevp.setOutEnable(requestType == DevpRequestType.OUT?"Y":"N");
+ 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(DevpLocType.get(locIo).id.shortValue());
-// basDevp.setInQty(inQty !=null ?(int)inQty : 0);
+ basDevp.setLocType1(high != low && low ? (short) 1 : (short) 2);
+ basDevp.setInQty(inQty !=null ?(int)inQty : 0);
return basDevp;
}
--
Gitblit v1.9.1