From e9cdecd287c7ab88ae4b4ad28a9f9343ed9ae23f Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 08 九月 2022 13:38:26 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/SteController.java | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/SteController.java b/src/main/java/com/zy/asrs/controller/SteController.java
index ba77109..7ff7b92 100644
--- a/src/main/java/com/zy/asrs/controller/SteController.java
+++ b/src/main/java/com/zy/asrs/controller/SteController.java
@@ -134,6 +134,7 @@
}
vo.setSpeed(steProtocol.getSpeed()); // 閫熷害
vo.setCloser(steProtocol.getCloser()); // 杩戠偣璺濈
+ vo.setPakMk(steProtocol.getPakMk()); // 浣滀笟鏍囪
}
return R.ok().add(list);
}
@@ -164,6 +165,7 @@
vo.setLev(basSte.getLev());
vo.setCrnNo(basSte.getCrnNo());
vo.setWorkNo(basSte.getWrkNo());
+ vo.setPakMk(basSte.getPakMk());
}
break;
}
@@ -178,7 +180,18 @@
if (basSte == null) {
return R.error();
}
-
+ // 鑾峰彇绌挎杞︿俊鎭�
+ SteThread steThread = (SteThread) SlaveConnection.get(SlaveType.Ste, vo.getSteNo());
+ SteProtocol steProtocol = steThread.getSteProtocol();
+ if (steProtocol != null) {
+ throw new CoolException(vo.getSteNo() + "鍙风┛姊溅涓嶅湪绾匡紝鏃犳硶淇濆瓨");
+ }
+ if (!Cools.isEmpty(vo.getRow(), vo.getBay(), vo.getLev())) {
+ if (!steThread.modifyPosHandle(vo.getRow(), vo.getBay(), vo.getLev())) {
+ throw new CoolException("鏈嶅姟鍣ㄩ敊璇�");
+ }
+ }
+ basSte.setPakMk(vo.getPakMk());
basSte.setWrkNo(vo.getWorkNo());
basSte.setCrnNo(vo.getCrnNo());
basSte.setUpdateTime(new Date());
--
Gitblit v1.9.1