From 065e45b36c76ffd86e5daab203ea44b1556e8582 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 17 十一月 2025 10:04:50 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/CrnController.java | 16 ++--------------
1 files changed, 2 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/CrnController.java b/src/main/java/com/zy/asrs/controller/CrnController.java
index e076aaf..f6bda11 100644
--- a/src/main/java/com/zy/asrs/controller/CrnController.java
+++ b/src/main/java/com/zy/asrs/controller/CrnController.java
@@ -20,7 +20,6 @@
import com.zy.asrs.service.BasCrnpService;
import com.zy.asrs.service.LocMastService;
import com.zy.asrs.service.WrkMastService;
-import com.zy.asrs.service.impl.MainServiceImpl;
import com.zy.asrs.utils.VersionUtils;
import com.zy.core.CrnThread;
import com.zy.core.cache.MessageQueue;
@@ -66,8 +65,6 @@
@Autowired
private BasCrnpService basCrnpService;
@Autowired
- private MainServiceImpl mainService;
- @Autowired
private LocMastService locMastService;
@@ -99,7 +96,7 @@
}
@PostMapping("/table/crn/state")
- @ManagerAuth(memo = "鍫嗗灈鏈轰俊鎭〃")
+ //@ManagerAuth(memo = "鍫嗗灈鏈轰俊鎭〃")
public R crnStateTable(){
List<CrnStateTableVo> list = new ArrayList<>();
List<BasCrnp> crnps = basCrnpService.selectList(new EntityWrapper<BasCrnp>().orderBy("crn_no"));
@@ -137,7 +134,6 @@
}
@PostMapping("/table/crn/msg")
- @ManagerAuth(memo = "鍫嗗灈鏈烘暟鎹〃")
public R crnMsgTable(){
List<CrnMsgTableVo> list = new ArrayList<>();
List<BasCrnp> crnps = basCrnpService.selectList(new EntityWrapper<BasCrnp>().orderBy("crn_no"));
@@ -161,8 +157,6 @@
WrkMast wrkMast = wrkMastService.selectById(crnProtocol.getTaskNo());
if (wrkMast != null) {
vo.setStatus(CrnStatusType.process(wrkMast.getIoType()).getDesc()); // 妯″紡鐘舵��
- vo.setSourceStaNo(wrkMast.getSourceStaNo$()); // 婧愮珯
- vo.setStaNo(wrkMast.getStaNo$()); // 鐩爣绔�
vo.setSourceLocNo(wrkMast.getSourceLocNo()); // 婧愬簱浣�
vo.setLocNo(wrkMast.getLocNo()); // 鐩爣搴撲綅
}
@@ -385,13 +379,7 @@
return crnControl(command)?R.ok():R.error();
}
- @ManagerAuth(memo = "瑙ｉ攣灏忚溅")
- @PostMapping("/lock")
- public R lock(CrnOperatorParam param){
- RgvThread rgvThread = (RgvThread) SlaveConnection.get(SlaveType.Rgv, param.getCrnNo());
- rgvThread.setPakMk(true);
- return R.ok();
- }
+
// @ManagerAuth(memo = "鏆傚仠")
// @PostMapping("/operator/pause")
--
Gitblit v1.9.1