From 0d394d745cb1ff26359a8f6c35c8169b4e658c3e Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 11 一月 2021 15:30:17 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/controller/CrnController.java |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/CrnController.java b/src/main/java/com/zy/asrs/controller/CrnController.java
index 0c202b1..6b5eede 100644
--- a/src/main/java/com/zy/asrs/controller/CrnController.java
+++ b/src/main/java/com/zy/asrs/controller/CrnController.java
@@ -127,8 +127,15 @@
             vo.setLoading(crnProtocol.getLoaded()==1?"鏈夌墿":"鏃犵墿");  //  鏈夌墿
             vo.setBay(crnProtocol.getBay());    //  鍒�
             vo.setLev(crnProtocol.getLevel());  //  灞�
-            vo.setXOrigin(crnProtocol.getBay()==1?"鏄�":"鍚�");     //  璧拌鍘熺偣
-            vo.setYOrigin(crnProtocol.getLevel()==1?"鏄�":"鍚�");     // 鍗囬檷鍘熺偣
+            vo.setLiftPos(crnProtocol.getLiftPosType().desc);
+            if (crnProtocol.getPlatformHigh()) {
+                vo.setSitePos("绔欏彴楂樹綅");
+            }
+            if (crnProtocol.getPlatformLow()) {
+                vo.setSitePos("绔欏彴楂樹綅");
+            }
+//            vo.setXOrigin(crnProtocol.getBay()==1?"鏄�":"鍚�");     //  璧拌鍘熺偣
+//            vo.setYOrigin(crnProtocol.getLevel()==1?"鏄�":"鍚�");     // 鍗囬檷鍘熺偣
             vo.setForkOffset(crnProtocol.getForkPosType().desc);    // 璐у弶浣嶇疆
             vo.setXLocation(crnProtocol.getWalkPos() == 1?"鏄�":"鍚�");      // 璧拌瀹氫綅
             vo.setYLocation(crnProtocol.getLiftPosType().equals(CrnLiftPosType.NONE)?"鍚�":"鏄�");      // 鍗囬檷瀹氫綅

--
Gitblit v1.9.1