From 065e45b36c76ffd86e5daab203ea44b1556e8582 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 17 十一月 2025 10:04:50 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/controller/CrnController.java |   33 +++++++++++++++++++++++++--------
 1 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/CrnController.java b/src/main/java/com/zy/asrs/controller/CrnController.java
index 4d02d12..f6bda11 100644
--- a/src/main/java/com/zy/asrs/controller/CrnController.java
+++ b/src/main/java/com/zy/asrs/controller/CrnController.java
@@ -20,7 +20,6 @@
 import com.zy.asrs.service.BasCrnpService;
 import com.zy.asrs.service.LocMastService;
 import com.zy.asrs.service.WrkMastService;
-import com.zy.asrs.service.impl.MainServiceImpl;
 import com.zy.asrs.utils.VersionUtils;
 import com.zy.core.CrnThread;
 import com.zy.core.cache.MessageQueue;
@@ -35,6 +34,7 @@
 import com.zy.core.model.protocol.CrnProtocol;
 import com.zy.core.properties.SlaveProperties;
 import com.zy.core.properties.SystemProperties;
+import com.zy.core.thread.RgvThread;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -64,8 +64,6 @@
     private BasCrnErrorMapper basCrnErrorMapper;
     @Autowired
     private BasCrnpService basCrnpService;
-    @Autowired
-    private MainServiceImpl mainService;
     @Autowired
     private LocMastService locMastService;
 
@@ -98,7 +96,7 @@
     }
 
     @PostMapping("/table/crn/state")
-    @ManagerAuth(memo = "鍫嗗灈鏈轰俊鎭〃")
+    //@ManagerAuth(memo = "鍫嗗灈鏈轰俊鎭〃")
     public R crnStateTable(){
         List<CrnStateTableVo> list = new ArrayList<>();
         List<BasCrnp> crnps = basCrnpService.selectList(new EntityWrapper<BasCrnp>().orderBy("crn_no"));
@@ -136,7 +134,6 @@
     }
 
     @PostMapping("/table/crn/msg")
-    @ManagerAuth(memo = "鍫嗗灈鏈烘暟鎹〃")
     public R crnMsgTable(){
         List<CrnMsgTableVo> list = new ArrayList<>();
         List<BasCrnp> crnps = basCrnpService.selectList(new EntityWrapper<BasCrnp>().orderBy("crn_no"));
@@ -160,8 +157,6 @@
                 WrkMast wrkMast = wrkMastService.selectById(crnProtocol.getTaskNo());
                 if (wrkMast != null) {
                     vo.setStatus(CrnStatusType.process(wrkMast.getIoType()).getDesc());   //  妯″紡鐘舵��
-                    vo.setSourceStaNo(wrkMast.getSourceStaNo$());    //  婧愮珯
-                    vo.setStaNo(wrkMast.getStaNo$());   //  鐩爣绔�
                     vo.setSourceLocNo(wrkMast.getSourceLocNo());    //  婧愬簱浣�
                     vo.setLocNo(wrkMast.getLocNo());    //  鐩爣搴撲綅
                 }
@@ -248,6 +243,8 @@
         command.setDestinationPosX(param.getRow());     // 鐩爣搴撲綅鎺�
         command.setDestinationPosY(param.getBay());     // 鐩爣搴撲綅鍒�
         command.setDestinationPosZ(param.getLev());     // 鐩爣搴撲綅灞�
+        boolean locSts = isLocSts(param.getRow().toString(), param.getBay().toString(), param.getLev().toString());
+        command.setTraySize(locSts);
         return crnControl(command)?R.ok():R.error();
     }
 
@@ -265,6 +262,8 @@
         command.setDestinationPosX(param.getRow());     // 鐩爣搴撲綅鎺�
         command.setDestinationPosY(param.getBay());     // 鐩爣搴撲綅鍒�
         command.setDestinationPosZ(param.getLev());     // 鐩爣搴撲綅灞�
+        boolean locSts = isLocSts(param.getSourceRow().toString(), param.getSourceBay().toString(), param.getSourceLev().toString());
+        command.setTraySize(locSts);
         return crnControl(command)?R.ok():R.error();
     }
 
@@ -286,7 +285,11 @@
                 .eq("bay1", command.getSourcePosY()).eq("lev1", command.getSourcePosZ()));
         LocMast loc = locMastService.selectOne(new EntityWrapper<LocMast>().eq("row1", command.getDestinationPosX())
                 .eq("bay1", command.getDestinationPosY()).eq("lev1", command.getDestinationPosZ()));
-        VersionUtils.locMoveCheckLocType(sourceLoc, loc);
+        if (sourceLoc.getLocType1() != loc.getLocType1()){
+            return R.error("搴撲綅绫诲瀷涓嶄竴鑷�");
+        }
+        command.setTraySize(loc.getLocType1() == 2);
+//        VersionUtils.locMoveCheckLocType(sourceLoc, loc);
         return crnControl(command)?R.ok():R.error();
     }
 
@@ -375,6 +378,8 @@
         command.setDestinationPosZ((short) 0);     // 鐩爣搴撲綅灞�
         return crnControl(command)?R.ok():R.error();
     }
+
+
 
 //    @ManagerAuth(memo = "鏆傚仠")
 //    @PostMapping("/operator/pause")
@@ -501,5 +506,17 @@
         }
     }
 
+    private boolean isLocSts(String row,String bay,String lev){
+        String loc = String.format("%2d",row)+String.format("%3d",bay)+String.format("%2d",lev);
+        LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", loc));
+        if (Cools.isEmpty(locMast)){
+            return false;
+        }
+        if (locMast.getLocType1() == 2){
+            return true;
+        }
+        return false;
+    }
+
 
 }

--
Gitblit v1.9.1