From a77530a0e917f8d2dca1bae55a3730471c8e10a2 Mon Sep 17 00:00:00 2001
From: cpT <1@123>
Date: 星期三, 02 七月 2025 09:22:32 +0800
Subject: [PATCH] #改造
---
src/main/java/com/zy/asrs/controller/SiteController.java | 185 ++++++++++++++++++++++++++-------------------
1 files changed, 107 insertions(+), 78 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/SiteController.java b/src/main/java/com/zy/asrs/controller/SiteController.java
index 45efdff..ada482c 100644
--- a/src/main/java/com/zy/asrs/controller/SiteController.java
+++ b/src/main/java/com/zy/asrs/controller/SiteController.java
@@ -18,6 +18,7 @@
import com.zy.core.model.protocol.StaProtocol;
import com.zy.core.properties.SlaveProperties;
import com.zy.core.DevpThread;
+import com.zy.core.thread.BarcodeThread;
import com.zy.core.thread.SiemensDevpThread;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -104,15 +105,21 @@
StaProtocol staProtocol = station.get(devp.getDevNo());
if (null == staProtocol) { continue; }
vo.setWorkNo(staProtocol.getWorkNo()); // 宸ヤ綔鍙�
- vo.setAutoing(staProtocol.isAutoing()?"Y":"N"); // 鑷姩
- vo.setLoading(staProtocol.isLoading()?"Y":"N"); // 鏈夌墿
- vo.setInEnable(staProtocol.isInEnable()?"Y":"N"); // 鍙叆
- vo.setOutEnable(staProtocol.isOutEnable()?"Y":"N"); // 鍙嚭
- vo.setPakMk(staProtocol.isPakMk()?"Y":"N"); // 鍏ュ簱鏍囪
- vo.setEmptyMk(staProtocol.isEmptyMk()?"Y":"N"); // 绌烘澘淇″彿
+ vo.setAutoing(staProtocol.isAutoing()?"鑷姩":"闈炶嚜鍔�"); // 鑷姩
+ vo.setLoading(staProtocol.isLoading()?"鏈夌墿":"鏃犵墿"); // 鏈夌墿
+ vo.setInEnable(staProtocol.isInEnable()?"鍙叆":"涓嶅彲鍏�"); // 鍙叆
+ vo.setOutEnable(staProtocol.isOutEnable()?"鍙嚭":"涓嶅彲鍑�"); // 鍙嚭
+ vo.setPakMk(staProtocol.isPakMk()? "鏈攣瀹�":"宸查攣瀹�"); // 鍏ュ簱鏍囪
+ vo.setEmptyMk(staProtocol.isEmptyMk()?"绌烘澘":"闈炵┖鏉�"); // 绌烘澘淇″彿
vo.setStaNo(staProtocol.getStaNo()); // 鐩爣绔�
// vo.setLocType1(staProtocol.isHigh() != staProtocol.isLow() && staProtocol.isLow() ? "浣�" : "楂�"); //楂樹綆搴撲綅
vo.setLocType1(devp.getDevNo()==102 ? "楂�" : "浣�");
+ vo.setWeight(staProtocol.getGrossWt().toString()+"kg");
+ vo.setBarcode(staProtocol.getBarcodeNow());
+ vo.setErrorDev(staProtocol.getErrorDev$());
+ vo.setPakMkRun(staProtocol.isPakMkRun()? "鏈攣瀹�":"宸查攣瀹�"); // 灏忚溅浠诲姟涓嬪彂鏍囪
+ vo.setPakMkTask(staProtocol.isPakMkTask()? "鏈攣瀹�":"宸查攣瀹�"); // 灏忚溅浠诲姟涓嬪彂鏍囪
+ vo.setPakMkWalk(staProtocol.isPakMkWalk()? "鏈攣瀹�":"宸查攣瀹�"); // 灏忚溅浠诲姟涓嬪彂鏍囪
}
return R.ok().add(list);
}
@@ -171,7 +178,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);
}
}
@@ -182,8 +189,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
@@ -221,7 +228,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 {
@@ -229,6 +236,90 @@
}
}
}
+ }
+ return R.error("鏇存柊澶辫触");
+ }
+
+ @PostMapping("/detl/pakMk")
+ @ManagerAuth(memo = "淇敼绔欑偣鏁版嵁")
+ public R siteDetlPakMk(@RequestParam Integer devNo,
+ @RequestParam Integer workNo,
+ @RequestParam Integer 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());
+ devpThread.setPakMk(devNo, true);
+ return R.ok("鏇存柊鎴愬姛");
+ }
+ return R.error("鏇存柊澶辫触");
+ }
+
+ @PostMapping("/detl/pakMkRun")
+ @ManagerAuth(memo = "淇敼绔欑偣鏁版嵁")
+ public R siteDetlPakMkRun(@RequestParam Integer devNo,
+ @RequestParam Integer workNo,
+ @RequestParam Integer 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());
+ devpThread.setPakMkRun(devNo, true);
+ return R.ok("鏇存柊鎴愬姛");
+ }
+ return R.error("鏇存柊澶辫触");
+ }
+
+ @PostMapping("/detl/pakMkTask")
+ @ManagerAuth(memo = "淇敼绔欑偣鏁版嵁")
+ public R siteDetlPakMkTask(@RequestParam Integer devNo,
+ @RequestParam Integer workNo,
+ @RequestParam Integer 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());
+ devpThread.setPakMkTask(devNo, true);
+ return R.ok("鏇存柊鎴愬姛");
+ }
+ return R.error("鏇存柊澶辫触");
+ }
+
+ @PostMapping("/detl/pakMkWalk")
+ @ManagerAuth(memo = "淇敼绔欑偣鏁版嵁")
+ public R siteDetlPakMkWalk(@RequestParam Integer devNo,
+ @RequestParam Integer workNo,
+ @RequestParam Integer 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());
+ devpThread.setPakMkWalk(devNo, true);
+ return R.ok("鏇存柊鎴愬姛");
}
return R.error("鏇存柊澶辫触");
}
@@ -267,10 +358,10 @@
staProtocol.setOutEnable(outEnable);
basDevp.setOutEnable(outEnable ? "Y" : "N");
}
- staProtocol.setWorkNo((short) 0);
- staProtocol.setStaNo((short) 0);
+ staProtocol.setWorkNo(0);
+ staProtocol.setStaNo(0);
basDevpService.updateById(basDevp);
- boolean result = CommandUtils.offer(SlaveType.Devp, devp.getId(), new Task(3, staProtocol), false);
+ boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(3, staProtocol));
if (result) {
return R.ok();
} else {
@@ -308,9 +399,9 @@
} else {
staProtocol = staProtocol.clone();
}
- staProtocol.setWorkNo((short) 9999);
- staProtocol.setStaNo(inSta.getStaNo().shortValue());
- boolean result = CommandUtils.offer(SlaveType.Devp, devp.getId(), new Task(3, staProtocol), false);
+ 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 {
@@ -324,68 +415,6 @@
public List<PlcErrorTableVo> staPlcErr(Map.Entry<Integer, StaProtocol> entry){
List<PlcErrorTableVo> list = new ArrayList<>();
StaProtocol staProtocol = entry.getValue();
- if (staProtocol.getBreakerErr()){
- PlcErrorTableVo vo = new PlcErrorTableVo();
- vo.setNo(entry.getKey()); // 搴忓彿
- vo.setPlcDesc("鏂矾鍣ㄦ晠闅�");
- vo.setError("鏂矾鍣ㄦ晠闅�");
- list.add(vo);
- }
- if (staProtocol.getInfraredErr()){
- PlcErrorTableVo vo = new PlcErrorTableVo();
- vo.setNo(entry.getKey()); // 搴忓彿
- vo.setPlcDesc("鍏夌數寮傚父");
- vo.setError("鍏夌數寮傚父");
- list.add(vo);
- }
- if (staProtocol.getOutTimeErr()){
- PlcErrorTableVo vo = new PlcErrorTableVo();
- vo.setNo(entry.getKey()); // 搴忓彿
-
- vo.setPlcDesc("杩愯瓒呮椂");
- vo.setError("杩愯瓒呮椂");
- list.add(vo);
- }
- if (staProtocol.getSeizeSeatErr()){
- PlcErrorTableVo vo = new PlcErrorTableVo();
- vo.setNo(entry.getKey()); // 搴忓彿
-
- vo.setPlcDesc("鍗犱綅瓒呮椂");
- vo.setError("鍗犱綅瓒呮椂");
- list.add(vo);
- }
- if (staProtocol.getWrkYgoodsN()){
- PlcErrorTableVo vo = new PlcErrorTableVo();
- vo.setNo(entry.getKey()); // 搴忓彿
-
- vo.setPlcDesc("鏈変换鍔℃棤璐ф晠闅�");
- vo.setError("鏈変换鍔℃棤璐ф晠闅�");
- list.add(vo);
- }
- if (staProtocol.getInverterErr()){
- PlcErrorTableVo vo = new PlcErrorTableVo();
- vo.setNo(entry.getKey()); // 搴忓彿
-
- vo.setPlcDesc("鍙橀鍣ㄦ晠闅�");
- vo.setError("鍙橀鍣ㄦ晠闅�");
- list.add(vo);
- }
- if (staProtocol.getContactErr()){
- PlcErrorTableVo vo = new PlcErrorTableVo();
- vo.setNo(entry.getKey()); // 搴忓彿
-
- vo.setPlcDesc("鐢垫満鎺ヨЕ鍣ㄦ晠闅�");
- vo.setError("鐢垫満鎺ヨЕ鍣ㄦ晠闅�");
- list.add(vo);
- }
- if (staProtocol.getUpcontactErr()){
- PlcErrorTableVo vo = new PlcErrorTableVo();
- vo.setNo(entry.getKey()); // 搴忓彿
-
- vo.setPlcDesc("椤跺崌鐢垫満鎺ヨЕ鍣ㄦ晠闅�");
- vo.setError("椤跺崌鐢垫満鎺ヨЕ鍣ㄦ晠闅�");
- list.add(vo);
- }
if (staProtocol.isFrontErr()){
PlcErrorTableVo vo = new PlcErrorTableVo();
vo.setNo(entry.getKey()); // 搴忓彿
--
Gitblit v1.9.1