From 62aa9d143a12ba3c8094dc9542c11c83b2c0c6d1 Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期日, 25 五月 2025 11:00:27 +0800
Subject: [PATCH] 初始化

---
 src/main/java/com/zy/asrs/controller/OpenController.java |  116 ++++++++++++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 109 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 16769ba..605e473 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -343,7 +343,7 @@
 //        List<WMSAndAGVInterfaceParam> params1 =new ArrayList<>();
         for (CarryParam param:params){
             param.updateIoTyoe(param.getIoType());//涓埅涓嬪彂  1锛氬嚭搴擄紝2锛氱Щ搴� 3锛氬叆搴�   ====杞崲涓�====>  1锛氬叆搴擄紝2锛氬嚭搴擄紝3锛氱Щ搴�
-
+            param.updateLocNo();
             if (Cools.isEmpty(param)){
                 return R.error("鍙傛暟涓虹┖锛�");
             } else if (Cools.isEmpty(param.getTaskNo())){
@@ -491,6 +491,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 +502,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,7 +520,6 @@
             basCrnpWmsParam.sync(basCrnp);
 
             basCrnpWmsParam.setCrnNoH(crnProtocol.getLaneNo());
-            basCrnpWmsParamList.add(basCrnpWmsParam);
 
             try{
                 BasCrnError basCrnError = basCrnErrorService.selectById(basCrnp.getCrnErr());
@@ -526,9 +527,15 @@
             } 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)){
@@ -541,19 +548,114 @@
             basRgvWmsParam.setSteNo(rgvSlave.getId());
             basRgvWmsParam.setSteErr(rgvStatus.getAlarm().longValue());
             try{
-                BasRgvErr basRgvErr = basRgvErrService.selectById(rgvStatus.getAlarm().longValue());
+                BasRgvErr basRgvErr = basRgvErrService.selectById((long)rgvStatus.getAlarm$());
 
                 basRgvWmsParam.setSteErrM(basRgvErr.getErrName());
             } catch (Exception e){
                 basRgvWmsParam.setSteErrM("鏈煡寮傚父");
             }
-            list.add(basRgvWmsParam);
+            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(list);
+        return R.ok(wcsStatusResponseModel);
+    }
+
+
+
+    //璁惧鐘舵�佹煡璇㈡帴鍙�
+    @PostMapping("/errorRgv1")
+    @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);
     }
 
 

--
Gitblit v1.9.1