From 664b83b2e10025a36b29ad086f68c66cb80e339c Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期三, 02 四月 2025 10:29:20 +0800
Subject: [PATCH] #
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/model/protocol/StaProtocol.java | 41 ++++++++++++++++++++++++++++++-----------
1 files changed, 30 insertions(+), 11 deletions(-)
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/model/protocol/StaProtocol.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/model/protocol/StaProtocol.java
index 0c0a429..48f6f21 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/model/protocol/StaProtocol.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/model/protocol/StaProtocol.java
@@ -1,6 +1,6 @@
package com.zy.asrs.wcs.rcs.model.protocol;
-import com.zy.asrs.wcs.core.entity.Station;
+import com.zy.asrs.wcs.core.entity.BasConveyorSta;
import lombok.Data;
/**
@@ -21,6 +21,17 @@
private Short staNo;
// ----------------------------------------------------------------
+
+ //宸插畬鎴愬伐浣滃彿
+ private Short finishWorkNo = 0;
+ //绌洪棽
+ private boolean idle;
+
+ //鏉＄爜
+ private String barcode;
+
+ //閲嶉噺
+ private Integer weight;
// 鑷姩
private boolean autoing;
@@ -71,6 +82,9 @@
// 鎵爜澶辫触
private boolean barcodeErr;
+ // 宸ヤ綔妯″紡
+ private Integer workMode;
+
@Override
public StaProtocol clone() {
try {
@@ -81,13 +95,15 @@
return null;
}
- public Station toSqlModel(Station station){
- station.setStaNo(String.valueOf(siteId));
- station.setTaskNo(String.valueOf(workNo));
+ public BasConveyorSta toSqlModel(BasConveyorSta station){
+ station.setSiteNo(siteId);
+ station.setTaskNo(workNo.intValue());
station.setAutoing(autoing?"Y":"N");
station.setLoading(loading?"Y":"N");
station.setInEnable(inEnable?"Y":"N");
station.setOutEnable(outEnable?"Y":"N");
+ station.setWorkMode(workMode);
+ station.setStaNo((int) staNo);
station.setLocType1(0); // 楂樹綆绫诲瀷{0:鏈煡,1:浣庡簱浣�,2:楂樺簱浣峿
station.setLocType2(0); // 瀹界獎绫诲瀷{0:鏈煡,1:绐勫簱浣�,2:瀹藉簱浣峿
station.setLocType3(0); // 杞婚噸绫诲瀷{0:鏈煡,1:杞诲簱浣�,2:閲嶅簱浣峿
@@ -95,15 +111,18 @@
}
public Integer getLocType1() {
- if (!this.high && !this.low) {
- return 0;//鏈煡
+ if (!this.low && !this.high){
+ return 0;
+ }
+ if (this.low && !this.high) {
+ return 1;
+ }else if (this.high && !this.low) {
+ return 2;
+ }else if (this.high && this.low) {
+ return 2;
}
- if (this.low) {
- return 1;//浣�
- }else {
- return 2;//楂�
- }
+ return 0;
}
}
--
Gitblit v1.9.1