From 54a42225ae5156dbd47c5aada2b960af35328774 Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期三, 28 五月 2025 09:27:45 +0800
Subject: [PATCH] #ZH
---
src/main/java/com/zy/asrs/controller/OpenController.java | 45 ++++++++++++++++++++++++++++++++++++++-------
1 files changed, 38 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 5a20234..33e41cb 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,12 +523,17 @@
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("鏈煡寮傚父");
+ }
+ if (crnProtocol.getMode()!=3){
+ basCrnpWmsParam.setCrnErr(999L);
+ basCrnpWmsParam.setCrnErrM("闈炶嚜鍔紒锛侊紒");
}
basCrnpWmsParamList.add(basCrnpWmsParam);
@@ -543,12 +551,17 @@
basRgvWmsParam.setStatusType(rgvStatus.getStatusType().desc);
basRgvWmsParam.setSteNo(rgvSlave.getId());
basRgvWmsParam.setSteErr(rgvStatus.getAlarm().longValue());
- try{
- BasRgvErr basRgvErr = basRgvErrService.selectById(rgvStatus.getAlarm().longValue());
-
- basRgvWmsParam.setSteErrM(basRgvErr.getErrName());
- } catch (Exception e){
- basRgvWmsParam.setSteErrM("鏈煡寮傚父");
+ 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);
@@ -561,5 +574,23 @@
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("/error")
+ @Transactional
+ public R errorRgv(@RequestHeader String appkey,
+ HttpServletRequest request) {
+ List<TaskWrkLog> taskWrkLogs = taskWrkLogService.selectList(new EntityWrapper<>());
+ return R.ok(taskWrkLogs);
+ }
+
}
--
Gitblit v1.9.1