From 3d40ce7e16a9e53bad6637bbed824507f06148b4 Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期一, 26 五月 2025 10:20:51 +0800
Subject: [PATCH] #ZH
---
src/main/java/com/zy/asrs/controller/OpenController.java | 101 ++++++++------------------------------------------
1 files changed, 17 insertions(+), 84 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 605e473..ee44e22 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -11,6 +11,7 @@
import com.zy.asrs.entity.param.*;
import com.zy.asrs.service.*;
import com.zy.asrs.service.impl.BasCrnErrorServiceImpl;
+import com.zy.asrs.service.impl.TaskWrkLogServiceImpl;
import com.zy.asrs.utils.Utils;
import com.zy.common.web.BaseController;
import com.zy.core.CrnThread;
@@ -70,6 +71,8 @@
public static final ArrayList<String> APP_KEY_LIST = new ArrayList<String>() {{
add("ea1f0459efc02a79f046f982767939ae");
}};
+ @Autowired
+ private TaskWrkLogServiceImpl taskWrkLogService;
//agv浠诲姟瀹屾垚
@PostMapping("/toAgvTaskOver")
@@ -520,9 +523,10 @@
basCrnpWmsParam.sync(basCrnp);
basCrnpWmsParam.setCrnNoH(crnProtocol.getLaneNo());
+ basCrnpWmsParam.setCrnSts(crnProtocol.getStatus().intValue());
try{
- BasCrnError basCrnError = basCrnErrorService.selectById(basCrnp.getCrnErr());
+ BasCrnError basCrnError = basCrnErrorService.selectById(crnProtocol.getAlarm());
basCrnpWmsParam.setCrnErrM(basCrnError.getErrName());
} catch (Exception e){
basCrnpWmsParam.setCrnErrM("鏈煡寮傚父");
@@ -569,93 +573,22 @@
return R.ok(wcsStatusResponseModel);
}
-
+ //璁惧鐘舵�佹煡璇㈡帴鍙�
+ @PostMapping("/taskWrkLogs")
+ @Transactional
+ public R taskWrkLogs(@RequestHeader String appkey,
+ HttpServletRequest request) {
+ List<TaskWrkLog> taskWrkLogs = taskWrkLogService.selectList(new EntityWrapper<>());
+ return R.ok(taskWrkLogs);
+ }
//璁惧鐘舵�佹煡璇㈡帴鍙�
- @PostMapping("/errorRgv1")
+ @PostMapping("/error")
@Transactional
public R errorRgv(@RequestHeader String appkey,
- HttpServletRequest request) {
- auth(appkey, "璁惧鐘舵�佹煡璇㈡帴鍙�", request);
- List<BasDevp> basDevps = basDevpService.selectList(new EntityWrapper<>());
- List<Object> list = new ArrayList<>();
- WcsStatusResponseModel wcsStatusResponseModel = new WcsStatusResponseModel();
- for (BasDevp basDevp:basDevps){
- BasDevpWmsParam basDevpWmsParam = new BasDevpWmsParam();
- basDevpWmsParam.setDevNo(basDevp.getDevNo());
- basDevpWmsParam.setWrkNo(basDevp.getWrkNo().longValue());
- basDevpWmsParam.setAutoing(basDevp.getAutoing());
- basDevpWmsParam.setLoading(basDevp.getLoading());
- basDevpWmsParam.setInEnable(basDevp.getInEnable());
- basDevpWmsParam.setOutEnable(basDevp.getOutEnable());
- basDevpWmsParam.setDevErr(basDevp.getStaErr().longValue());
- basDevpWmsParam.setDevErrM(basDevpWmsParam.getDevErr$());
-// list.add(basDevpWmsParam);
- wcsStatusResponseModel.getChainList().add(basDevpWmsParam);
- }
- List<BasCrnpWmsParam> basCrnpWmsParamList = new ArrayList<>();
- for (CrnSlave crn : slaveProperties.getCrn()) {
- // 鑾峰彇鍫嗗灈鏈轰俊鎭�
- CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, crn.getId());
- CrnProtocol crnProtocol = crnThread.getCrnProtocol();
- if (crnProtocol == null) { continue; }
- BasCrnp basCrnp = basCrnpService.selectById(crn.getId());
- if (basCrnp == null) {
- log.error("{}鍙峰爢鍨涙満灏氭湭鍦ㄦ暟鎹簱杩涜缁存姢锛�", crn.getId());
- continue;
- }
- BasCrnpWmsParam basCrnpWmsParam = new BasCrnpWmsParam();
- basCrnpWmsParam.sync(basCrnp);
-
- basCrnpWmsParam.setCrnNoH(crnProtocol.getLaneNo());
-
- try{
- BasCrnError basCrnError = basCrnErrorService.selectById(basCrnp.getCrnErr());
- basCrnpWmsParam.setCrnErrM(basCrnError.getErrName());
- } catch (Exception e){
- basCrnpWmsParam.setCrnErrM("鏈煡寮傚父");
- }
- if (crnProtocol.getMode()!=3){
- basCrnpWmsParam.setCrnErr(999L);
- basCrnpWmsParam.setCrnErrM("闈炶嚜鍔紒锛侊紒");
- }
- basCrnpWmsParamList.add(basCrnpWmsParam);
-
-// list.add(basCrnpWmsParam);
- }
- wcsStatusResponseModel.setPilingCarList(basCrnpWmsParamList);
- for (RgvSlave rgvSlave : slaveProperties.getRgv()) {
- RgvProtocol rgvStatus = RgvStatusCache.getRgvStatus(rgvSlave.getId());
- if (Cools.isEmpty(rgvStatus)){
- continue;
- }
- BasRgvWmsParam basRgvWmsParam = new BasRgvWmsParam();
- basRgvWmsParam.setWrkNo(rgvStatus.getTaskNo());
- basRgvWmsParam.setCrnSts(rgvStatus.getStatus().intValue());
- basRgvWmsParam.setStatusType(rgvStatus.getStatusType().desc);
- basRgvWmsParam.setSteNo(rgvSlave.getId());
- basRgvWmsParam.setSteErr(rgvStatus.getAlarm().longValue());
- basRgvWmsParam.setSteErrM(rgvStatus.getAlarmM());
- try{
-// BasRgvErr basRgvErr = basRgvErrService.selectById((long)rgvStatus.getAlarm$());
-
-// basRgvWmsParam.setSteErrM(basRgvErr.getErrName());
- } catch (Exception e){
- basRgvWmsParam.setSteErrM("鏈煡寮傚父");
- }
- if (rgvStatus.getMode()!=1){
- basRgvWmsParam.setSteErr(999L);
- basRgvWmsParam.setSteErrM("闈炶嚜鍔紒锛侊紒");
- }
-// list.add(basRgvWmsParam);
- wcsStatusResponseModel.getRgvList().add(basRgvWmsParam);
-
- }
-// List<BasCrnp> basCrnps = basCrnpService.selectList(new EntityWrapper<>());
-// for (BasCrnp basCrnp:basCrnps){
-// list.add(basCrnp);
-// }
- return R.ok(wcsStatusResponseModel);
+ HttpServletRequest request) {
+ List<TaskWrkLog> taskWrkLogs = taskWrkLogService.selectList(new EntityWrapper<>());
+ return R.ok(taskWrkLogs);
}
--
Gitblit v1.9.1