From 92c572e50893a93a810bbe6adb6d3cdbfc225073 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期二, 20 五月 2025 14:17:33 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/controller/SiteController.java | 171 ++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 146 insertions(+), 25 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/SiteController.java b/src/main/java/com/zy/asrs/controller/SiteController.java
index 9cc5b94..cdb066b 100644
--- a/src/main/java/com/zy/asrs/controller/SiteController.java
+++ b/src/main/java/com/zy/asrs/controller/SiteController.java
@@ -37,6 +37,7 @@
@Autowired
private BasDevpService basDevpService;
+
@GetMapping("/io/mode/info/site")
@ManagerAuth(memo = "鍏ュ嚭搴撴ā寮�")
public R ioMode(){
@@ -125,29 +126,12 @@
Map<Integer, StaProtocol> station = devpThread.getStation();
for(Map.Entry<Integer, StaProtocol> entry : station.entrySet()) {
- StaProtocol staProtocol = entry.getValue();
-// if (staProtocol) {
-// PlcErrorTableVo vo = new PlcErrorTableVo();
-// vo.setNo(entry.getKey()); // 搴忓彿
-//
-// vo.setPlcDesc(""); // todo:luxiaotao plc閿欒鎻忚堪
-// vo.setError(""); // todo:luxiaotao 寮傚父淇℃伅
-// list.add(vo);
-// }
- }
+ if (!Cools.isEmpty(staPlcErr(entry))){
+ list.add(staPlcErr(entry).get(0)) ;
+ }
+ }
}
-
- list.sort((o1, o2) -> {
- if (o1.getNo().compareTo(o2.getNo()) > 0){
- return 1;
- }else if (o1.getNo().compareTo(o2.getNo()) < 0){
- return 0;
- }else{
- return -1;
- }
-
- });
return R.ok().add(list);
}
@@ -187,7 +171,7 @@
vo.setEmptyMk(staProtocol.isEmptyMk()?"Y":"N"); // 绌烘澘淇″彿
vo.setStaNo(staProtocol.getStaNo()); // 鐩爣绔�
vo.setLocType1(staProtocol.isHigh() != staProtocol.isLow() && staProtocol.isLow() ? "浣�" : "楂�"); //楂樹綆搴撲綅
- vo.setCar(staProtocol.isCar() ? "鏈�": "鏃�");
+// vo.setCar(staProtocol.isCar() ? "鏈�": "鏃�");
return R.ok().add(vo);
}
}
@@ -198,8 +182,8 @@
@PostMapping("/detl/update")
@ManagerAuth(memo = "淇敼绔欑偣鏁版嵁")
public R siteDetlUpdate(@RequestParam Integer devNo,
- @RequestParam Short workNo,
- @RequestParam Short staNo,
+ @RequestParam Integer workNo,
+ @RequestParam Integer staNo,
@RequestParam(required = false) String pakMk,
@RequestParam(required = false) Boolean inEnable,
@RequestParam(required = false) Boolean outEnable
@@ -237,7 +221,7 @@
basDevp.setOutEnable(outEnable ? "Y" : "N");
}
basDevpService.updateById(basDevp);
- boolean result = CommandUtils.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol), false);
+ boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
if (result) {
return R.ok();
} else {
@@ -248,6 +232,143 @@
}
return R.error("鏇存柊澶辫触");
}
+ @PostMapping("/detl/out")
+ @ManagerAuth(memo = "淇敼绔欑偣鏁版嵁")
+ public R siteDetlout(@RequestParam Integer devNo,
+ @RequestParam Short workNo,
+ @RequestParam Short staNo,
+ @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 (devNo.equals(entry.getKey())) {
+ StaProtocol staProtocol = entry.getValue();
+ if (staProtocol == null) {
+ continue;
+ } else {
+ staProtocol = staProtocol.clone();
+ }
+ if (pakMk != null) {
+ staProtocol.setPakMk(pakMk.equals("Y"));
+ }
+ if (inEnable != null) {
+ staProtocol.setInEnable(inEnable);
+ basDevp.setInEnable(inEnable ? "Y" : "N");
+ }
+ if (outEnable != null) {
+ staProtocol.setOutEnable(outEnable);
+ basDevp.setOutEnable(outEnable ? "Y" : "N");
+ }
+ staProtocol.setWorkNo(0);
+ staProtocol.setStaNo(0);
+ basDevpService.updateById(basDevp);
+ boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(3, staProtocol));
+ if (result) {
+ return R.ok();
+ } else {
+ return R.error("涓嬪彂鍛戒护澶辫触");
+ }
+ }
+ }
+ }
+ return R.error("鏇存柊澶辫触");
+ }
+ @PostMapping("/detl/in")
+ @ManagerAuth(memo = "淇敼绔欑偣鏁版嵁")
+ public R siteDetlint(@RequestParam Integer devNo,
+ @RequestParam Short workNo,
+ @RequestParam Short staNo,
+ @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()) {
+ // 閬嶅巻鍏ュ簱鍙�
+ for (DevpSlave.Sta inSta : devp.getInSta()) {
+ if (!devNo.equals(inSta.getBackSta()) ){
+ continue;
+ }
+ // 鑾峰彇鍏ュ簱绔欎俊鎭�
+ DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
+ StaProtocol staProtocol = devpThread.getStation().get(inSta.getBackSta());
+ if (staProtocol == null) {
+ continue;
+ } else {
+ staProtocol = staProtocol.clone();
+ }
+ staProtocol.setWorkNo( 9999);
+ staProtocol.setStaNo(inSta.getStaNo());
+ boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(3, staProtocol));
+ if (result) {
+ return R.ok();
+ } else {
+ return R.error("涓嬪彂鍛戒护澶辫触");
+ }
+ }
+ }
+ return R.error("鏇存柊澶辫触");
+ }
+ public List<PlcErrorTableVo> staPlcErr(Map.Entry<Integer, StaProtocol> entry){
+ List<PlcErrorTableVo> list = new ArrayList<>();
+ StaProtocol staProtocol = entry.getValue();
+ if (staProtocol.isFrontErr()){
+ PlcErrorTableVo vo = new PlcErrorTableVo();
+ vo.setNo(entry.getKey()); // 搴忓彿
+ vo.setPlcDesc("鍓嶈秴闄�");
+ vo.setError("鍓嶈秴闄�");
+ list.add(vo);
+ }
+ if (staProtocol.isBackErr()){
+ PlcErrorTableVo vo = new PlcErrorTableVo();
+ vo.setNo(entry.getKey()); // 搴忓彿
+ vo.setPlcDesc("鍚庤秴闄�");
+ vo.setError("鍚庤秴闄�");
+ list.add(vo);
+ }
+ if (staProtocol.isHighErr()){
+ PlcErrorTableVo vo = new PlcErrorTableVo();
+ vo.setNo(entry.getKey()); // 搴忓彿
+ vo.setPlcDesc("楂樿秴闄�");
+ vo.setError("楂樿秴闄�");
+ list.add(vo);
+ }
+ if (staProtocol.isLeftErr()){
+ PlcErrorTableVo vo = new PlcErrorTableVo();
+ vo.setNo(entry.getKey()); // 搴忓彿
+ vo.setPlcDesc("宸﹁秴闄�");
+ vo.setError("宸﹁秴闄�");
+ list.add(vo);
+ }
+ if (staProtocol.isRightErr()){
+ PlcErrorTableVo vo = new PlcErrorTableVo();
+ vo.setNo(entry.getKey()); // 搴忓彿
+ vo.setPlcDesc("鍙宠秴闄�");
+ vo.setError("鍙宠秴闄�");
+ list.add(vo);
+ }
+ if (staProtocol.isBarcodeErr()){
+ PlcErrorTableVo vo = new PlcErrorTableVo();
+ vo.setNo(entry.getKey()); // 搴忓彿
+ vo.setPlcDesc("鎵爜澶辫触");
+ vo.setError("鎵爜澶辫触");
+ list.add(vo);
+ }
+
+
+ return list;
+ }
}
--
Gitblit v1.9.1