From 80d97d40c44165674ee0168be5f08c8ca52d3c06 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期一, 09 六月 2025 09:36:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jxgtwcs' into jxgtwcs
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/model/protocol/StaProtocol.java | 30 ++++++++++++++++++++++++++++++
1 files changed, 30 insertions(+), 0 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 26eeb64..b6f6e20 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,5 +1,6 @@
package com.zy.asrs.wcs.rcs.model.protocol;
+import com.zy.asrs.wcs.core.entity.BasConveyorSta;
import lombok.Data;
/**
@@ -28,6 +29,8 @@
// 鍙叆
private boolean inEnable;
+
+ private Short isIn = 0;
// 鍙嚭
private boolean outEnable;
@@ -70,6 +73,9 @@
// 鎵爜澶辫触
private boolean barcodeErr;
+ // 宸ヤ綔妯″紡
+ private Integer workMode;
+
@Override
public StaProtocol clone() {
try {
@@ -80,4 +86,28 @@
return null;
}
+ 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:閲嶅簱浣峿
+ return station;
+ }
+
+ public Integer getLocType1() {
+
+ if (this.low) {
+ return 1;//浣�
+ }else {
+ return 2;//楂�
+ }
+ }
+
}
--
Gitblit v1.9.1