From 75d0daa4f8dc2010ec92f35cac08a19d240ca45d Mon Sep 17 00:00:00 2001
From: ynhfasrs <ynhfasrs@qq.com>
Date: 星期五, 27 六月 2025 14:23:37 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/controller/CrnController.java |   56 ++++++++++++++++++++++++--------------------------------
 1 files changed, 24 insertions(+), 32 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/CrnController.java b/src/main/java/com/zy/asrs/controller/CrnController.java
index c459918..5b152d6 100644
--- a/src/main/java/com/zy/asrs/controller/CrnController.java
+++ b/src/main/java/com/zy/asrs/controller/CrnController.java
@@ -16,8 +16,7 @@
 import com.zy.asrs.entity.*;
 import com.zy.asrs.mapper.BasCrnErrorMapper;
 import com.zy.asrs.service.BasCrnpService;
-import com.zy.asrs.service.LocMastService;
-import com.zy.asrs.service.WrkMastService;
+import com.zy.asrs.service.TaskWrkService;
 import com.zy.asrs.utils.CommandUtils;
 import com.zy.asrs.utils.CrnOperaUtils;
 import com.zy.core.CrnThread;
@@ -35,7 +34,6 @@
 import com.zy.core.properties.SystemProperties;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.ArrayList;
@@ -51,22 +49,16 @@
 @RestController
 public class CrnController {
 
-    @Value("${wms.url}")
-    private String wmsUrl;
-    @Value("${wms.movePath}")
-    private String movePath;
     @Autowired
     private SlaveProperties slaveProperties;
-    @Autowired
-    private WrkMastService wrkMastService;
     @Autowired
     private BasCrnErrorMapper basCrnErrorMapper;
     @Autowired
     private BasCrnpService basCrnpService;
     @Autowired
-    private LocMastService locMastService;
-    @Autowired
     private CrnOperaUtils crnOperaUtils;
+    @Autowired
+    private TaskWrkService taskWrkService;
 
 
     @ManagerAuth(memo = "杩涜涓殑鍛戒护")
@@ -190,13 +182,13 @@
 
             vo.setWorkNo(crnProtocol.getTaskNo());  //  浠诲姟鍙�
             if (crnProtocol.getTaskNo()>0) {
-                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());    //  鐩爣搴撲綅
+                TaskWrk taskWrk = taskWrkService.selectByWrkNo(crnProtocol.getTaskNo().intValue());
+                if (taskWrk != null) {
+                    vo.setStatus(CrnStatusType.process(taskWrk.getIoType()).getDesc());   //  妯″紡鐘舵��
+                    vo.setSourceStaNo(null);    //  婧愮珯
+                    vo.setStaNo(null);   //  鐩爣绔�
+                    vo.setSourceLocNo(taskWrk.getStartPoint());    //  婧愬簱浣�
+                    vo.setLocNo(taskWrk.getTargetPoint());    //  鐩爣搴撲綅
                 }
             } else {
                 vo.setStatus(crnProtocol.modeType.equals(CrnModeType.AUTO)? CrnStatusType.MACHINE_AUTO.getDesc(): CrnStatusType.MACHINE_UN_AUTO.getDesc());   //  妯″紡鐘舵��
@@ -231,13 +223,13 @@
 
         vo.setWorkNo(crnProtocol.getTaskNo());  //  浠诲姟鍙�
         if (crnProtocol.getTaskNo()>0) {
-            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());    //  鐩爣搴撲綅
+            TaskWrk taskWrk = taskWrkService.selectByWrkNo(crnProtocol.getTaskNo().intValue());
+            if (taskWrk != null) {
+                vo.setStatus(CrnStatusType.process(taskWrk.getIoType()).getDesc());   //  妯″紡鐘舵��
+                vo.setSourceStaNo(null);    //  婧愮珯
+                vo.setStaNo(null);   //  鐩爣绔�
+                vo.setSourceLocNo(taskWrk.getStartPoint());    //  婧愬簱浣�
+                vo.setLocNo(taskWrk.getTargetPoint());    //  鐩爣搴撲綅
             }
         } else {
             vo.setStatus(crnProtocol.modeType.equals(CrnModeType.AUTO)? CrnStatusType.MACHINE_AUTO.getDesc(): CrnStatusType.MACHINE_UN_AUTO.getDesc());   //  妯″紡鐘舵��
@@ -274,13 +266,13 @@
 
             vo.setWorkNo(crnProtocol.getTaskNo());  //  浠诲姟鍙�
             if (crnProtocol.getTaskNo()>0) {
-                WrkMast wrkMast = wrkMastService.selectById(crnProtocol.getTaskNo());
-                if (wrkMast != null) {
-                    vo.setDeviceStatus(CrnStatusType.process(wrkMast.getIoType()).getDesc());   //  妯″紡鐘舵��
-                    vo.setSourceStaNo(wrkMast.getSourceStaNo$());    //  婧愮珯
-                    vo.setStaNo(wrkMast.getStaNo$());   //  鐩爣绔�
-                    vo.setSourceLocNo(wrkMast.getSourceLocNo());    //  婧愬簱浣�
-                    vo.setLocNo(wrkMast.getLocNo());    //  鐩爣搴撲綅
+                TaskWrk taskWrk = taskWrkService.selectByWrkNo(crnProtocol.getTaskNo().intValue());
+                if (taskWrk != null) {
+                    vo.setDeviceStatus(CrnStatusType.process(taskWrk.getIoType()).getDesc());   //  妯″紡鐘舵��
+                    vo.setSourceStaNo(null);    //  婧愮珯
+                    vo.setStaNo(null);   //  鐩爣绔�
+                    vo.setSourceLocNo(taskWrk.getStartPoint());    //  婧愬簱浣�
+                    vo.setLocNo(taskWrk.getTargetPoint());    //  鐩爣搴撲綅
                 }
             } else {
                 vo.setDeviceStatus(crnProtocol.modeType.equals(CrnModeType.AUTO)? CrnStatusType.MACHINE_AUTO.getDesc(): CrnStatusType.MACHINE_UN_AUTO.getDesc());   //  妯″紡鐘舵��

--
Gitblit v1.9.1