From 9de40a82d1ebc4fc50e758449da4619a12c455bb Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 08 九月 2022 12:48:50 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/controller/SteController.java |   26 +++++++++++++++++++++++++-
 1 files changed, 25 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..7ff7b92 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();
     }
 

--
Gitblit v1.9.1