From d9cea3d7757a8d580bb0574d419ba6dd9c2478e7 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期五, 13 十二月 2024 15:11:50 +0800
Subject: [PATCH] #search shuttle
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/model/protocol/StaProtocol.java | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 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..eb0c913 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;
/**
@@ -71,6 +71,9 @@
// 鎵爜澶辫触
private boolean barcodeErr;
+ // 宸ヤ綔妯″紡
+ private Integer workMode;
+
@Override
public StaProtocol clone() {
try {
@@ -81,13 +84,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,9 +100,6 @@
}
public Integer getLocType1() {
- if (!this.high && !this.low) {
- return 0;//鏈煡
- }
if (this.low) {
return 1;//浣�
--
Gitblit v1.9.1