From 11e6d75e62adfe0b6b5bc158fe2aa312b9398015 Mon Sep 17 00:00:00 2001
From: cpT <1@123>
Date: 星期四, 19 六月 2025 11:48:05 +0800
Subject: [PATCH] #改造

---
 src/main/java/com/zy/asrs/controller/OpenController.java |   69 ++++++++++++++++++++++++++++------
 1 files changed, 57 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 55a8a63..9dfc007 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")
@@ -491,6 +494,7 @@
         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());
@@ -501,7 +505,8 @@
             basDevpWmsParam.setOutEnable(basDevp.getOutEnable());
             basDevpWmsParam.setDevErr(basDevp.getStaErr().longValue());
             basDevpWmsParam.setDevErrM(basDevpWmsParam.getDevErr$());
-            list.add(basDevpWmsParam);
+//            list.add(basDevpWmsParam);
+            wcsStatusResponseModel.getChainList().add(basDevpWmsParam);
         }
         List<BasCrnpWmsParam> basCrnpWmsParamList = new ArrayList<>();
         for (CrnSlave crn : slaveProperties.getCrn()) {
@@ -518,17 +523,23 @@
             basCrnpWmsParam.sync(basCrnp);
 
             basCrnpWmsParam.setCrnNoH(crnProtocol.getLaneNo());
-            basCrnpWmsParamList.add(basCrnpWmsParam);
+            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);
 
-            list.add(basCrnpWmsParam);
+//            list.add(basCrnpWmsParam);
         }
+        wcsStatusResponseModel.setPilingCarList(basCrnpWmsParamList);
         for (RgvSlave rgvSlave : slaveProperties.getRgv()) {
             RgvProtocol rgvStatus = RgvStatusCache.getRgvStatus(rgvSlave.getId());
             if (Cools.isEmpty(rgvStatus)){
@@ -540,20 +551,54 @@
             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);
+//            list.add(basRgvWmsParam);
+            wcsStatusResponseModel.getRgvList().add(basRgvWmsParam);
+
         }
 //        List<BasCrnp> basCrnps = basCrnpService.selectList(new EntityWrapper<>());
 //        for (BasCrnp basCrnp:basCrnps){
 //            list.add(basCrnp);
 //        }
-        return R.ok(list);
+        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);
+    }
+
+    //璁惧鐘舵�佹煡璇㈡帴鍙�
+    @PostMapping("/wrkNo/wmsTaskNo")
+    @Transactional
+    public R wrkNoWmsTaskNo(@RequestHeader String appkey,
+                      HttpServletRequest request) {
+        List<TaskWrkLog> taskWrkLogs = taskWrkLogService.selectList(new EntityWrapper<>());
+        return R.ok(taskWrkLogs);
     }
 
 

--
Gitblit v1.9.1