From 3ca4638e436076b583ae5da6ffef3e52a080b70a Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期二, 18 六月 2024 16:37:34 +0800
Subject: [PATCH] #

---
 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/model/protocol/StaProtocol.java |   20 ++++++++++++++++----
 1 files changed, 16 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 da95667..d3d46e2 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;
 
 /**
@@ -81,9 +81,9 @@
         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");
@@ -94,4 +94,16 @@
         return station;
     }
 
+    public Integer getLocType1() {
+        if (!this.high && !this.low) {
+            return 0;//鏈煡
+        }
+
+        if (this.low) {
+            return 1;//浣�
+        }else {
+            return 2;//楂�
+        }
+    }
+
 }

--
Gitblit v1.9.1