From d90e160a7659b21dbfd6bb225b00b86a0a68f24c Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 13 九月 2022 15:46:35 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/SteController.java | 30 +++++++++++++++++++++++++++++-
1 files changed, 29 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 2dfef4f..209e18d 100644
--- a/src/main/java/com/zy/asrs/controller/SteController.java
+++ b/src/main/java/com/zy/asrs/controller/SteController.java
@@ -31,6 +31,7 @@
import org.springframework.web.bind.annotation.*;
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
/**
@@ -133,6 +134,7 @@
}
vo.setSpeed(steProtocol.getSpeed()); // 閫熷害
vo.setCloser(steProtocol.getCloser()); // 杩戠偣璺濈
+ vo.setPakMk(steProtocol.getPakMk()); // 浣滀笟鏍囪
}
return R.ok().add(list);
}
@@ -163,6 +165,7 @@
vo.setLev(basSte.getLev());
vo.setCrnNo(basSte.getCrnNo());
vo.setWorkNo(basSte.getWrkNo());
+ vo.setPakMk(basSte.getPakMk());
}
break;
}
@@ -173,7 +176,28 @@
@PostMapping("/detl/update")
@ManagerAuth
public R steUpdate(SteDataVo vo){
-
+ BasSte basSte = basSteService.selectById(vo.getSteNo());
+ 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());
+ if (!basSteService.updateById(basSte)) {
+ throw new CoolException("淇敼澶辫触");
+ }
return R.ok();
}
@@ -205,6 +229,10 @@
steCommand.setSteNo(ste.getId()); // 绌挎杞︾紪鍙�
if (param.getSteTaskMode() == 16) {
steCommand.setComplete(true);
+ } else if (param.getSteTaskMode() == 17) {
+ steCommand.setControlMode((short) 1);
+ } else if (param.getSteTaskMode() == 18) {
+ steCommand.setControlMode((short) 0);
} else {
if (steTaskModeType == null) {
throw new CoolException("浠诲姟绫诲瀷閿欒");
--
Gitblit v1.9.1