From 89bb145e02e79b267d78a55cc737da6073bc96ac Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期六, 16 十二月 2023 15:53:27 +0800
Subject: [PATCH] #锁定路径时，路径存在小车，禁止锁定
---
src/main/java/com/zy/asrs/controller/SiteController.java | 19 ++++++++++++++++++-
1 files changed, 18 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/SiteController.java b/src/main/java/com/zy/asrs/controller/SiteController.java
index 2961e44..5706a21 100644
--- a/src/main/java/com/zy/asrs/controller/SiteController.java
+++ b/src/main/java/com/zy/asrs/controller/SiteController.java
@@ -104,7 +104,24 @@
vo.setEmptyMk(staProtocol.isEmptyMk()?"Y":"N"); // 绌烘澘淇″彿
vo.setStaNo(staProtocol.getStaNo()); // 鐩爣绔�
vo.setLocType1(staProtocol.getLocType1()==null?"-":staProtocol.getLocType1().toString()); // 楂樹綆淇″彿
- vo.setOutInModel(staProtocol.getOutInModel()==null?"-":staProtocol.getOutInModel().toString()); // 鍑哄叆搴撴ā寮�
+
+ String outInModel = "-";
+ if (staProtocol.getOutInModel() != null) {
+ switch (staProtocol.getOutInModel().intValue()) {
+ case 0:
+ outInModel = "default";
+ break;
+ case 1:
+ outInModel = "in";
+ break;
+ case 2:
+ outInModel = "out";
+ break;
+ default:
+ outInModel = "-";
+ }
+ }
+ vo.setOutInModel(outInModel); // 鍑哄叆搴撴ā寮�
}
return R.ok().add(list);
}
--
Gitblit v1.9.1