From d296b68e131d3b9dd7601e5581da3d610d2a3c90 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期六, 02 十二月 2023 14:16:07 +0800
Subject: [PATCH] #入库
---
src/main/java/com/zy/asrs/controller/SiteController.java | 34 +++++++++++++++++++++++++---------
1 files changed, 25 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/SiteController.java b/src/main/java/com/zy/asrs/controller/SiteController.java
index 1370c6e..9cc5b94 100644
--- a/src/main/java/com/zy/asrs/controller/SiteController.java
+++ b/src/main/java/com/zy/asrs/controller/SiteController.java
@@ -2,11 +2,13 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.annotations.ManagerAuth;
+import com.core.common.Cools;
import com.core.common.R;
import com.zy.asrs.domain.vo.PlcErrorTableVo;
import com.zy.asrs.domain.vo.SiteTableVo;
import com.zy.asrs.entity.BasDevp;
import com.zy.asrs.service.BasDevpService;
+import com.zy.asrs.utils.CommandUtils;
import com.zy.core.cache.MessageQueue;
import com.zy.core.cache.OutputQueue;
import com.zy.core.cache.SlaveConnection;
@@ -20,10 +22,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
/**
* 杈撻�佽澶囨帴鍙�
@@ -188,6 +187,7 @@
vo.setEmptyMk(staProtocol.isEmptyMk()?"Y":"N"); // 绌烘澘淇″彿
vo.setStaNo(staProtocol.getStaNo()); // 鐩爣绔�
vo.setLocType1(staProtocol.isHigh() != staProtocol.isLow() && staProtocol.isLow() ? "浣�" : "楂�"); //楂樹綆搴撲綅
+ vo.setCar(staProtocol.isCar() ? "鏈�": "鏃�");
return R.ok().add(vo);
}
}
@@ -197,15 +197,22 @@
@PostMapping("/detl/update")
@ManagerAuth(memo = "淇敼绔欑偣鏁版嵁")
- public R siteDetlUpdate(@RequestParam Integer siteId,
+ public R siteDetlUpdate(@RequestParam Integer devNo,
@RequestParam Short workNo,
@RequestParam Short staNo,
- @RequestParam String pakMk){
+ @RequestParam(required = false) String pakMk,
+ @RequestParam(required = false) Boolean inEnable,
+ @RequestParam(required = false) Boolean outEnable
+ ) {
+ BasDevp basDevp = basDevpService.selectById(devNo);
+ if (basDevp == null) {
+ return R.error("绔欑偣涓嶅瓨鍦�");
+ }
for (DevpSlave devp : slaveProperties.getDevp()) {
DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
Map<Integer, StaProtocol> station = devpThread.getStation();
for (Map.Entry<Integer, StaProtocol> entry : station.entrySet()) {
- if (siteId.equals(entry.getKey())) {
+ if (devNo.equals(entry.getKey())) {
StaProtocol staProtocol = entry.getValue();
if (staProtocol == null) {
continue;
@@ -221,7 +228,16 @@
if (pakMk != null) {
staProtocol.setPakMk(pakMk.equals("Y"));
}
- boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
+ if (inEnable != null) {
+ staProtocol.setInEnable(inEnable);
+ basDevp.setInEnable(inEnable ? "Y" : "N");
+ }
+ if (outEnable != null) {
+ staProtocol.setOutEnable(outEnable);
+ basDevp.setOutEnable(outEnable ? "Y" : "N");
+ }
+ basDevpService.updateById(basDevp);
+ boolean result = CommandUtils.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol), false);
if (result) {
return R.ok();
} else {
@@ -230,7 +246,7 @@
}
}
}
- return R.error("plc宸叉帀绾�");
+ return R.error("鏇存柊澶辫触");
}
--
Gitblit v1.9.1