From 93c192a2dded7c8fc6b64b556a4e263d390b45d1 Mon Sep 17 00:00:00 2001 From: zjj <3272660260@qq.com> Date: 星期六, 13 七月 2024 15:27:35 +0800 Subject: [PATCH] # --- zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/model/protocol/StaProtocol.java | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 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..3af0a8a 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:閲嶅簱浣峿 -- Gitblit v1.9.1