From 29d3f24dc43df41103bc5f483bfc439494a80971 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期三, 17 十二月 2025 09:30:32 +0800
Subject: [PATCH] 对接mes 对接华晓agv 对接海康agv 初始化开发

---
 src/main/java/com/zy/asrs/task/AutoLocMoveScheduler.java |  126 +++++++++++++++++++++---------------------
 1 files changed, 63 insertions(+), 63 deletions(-)

diff --git a/src/main/java/com/zy/asrs/task/AutoLocMoveScheduler.java b/src/main/java/com/zy/asrs/task/AutoLocMoveScheduler.java
index 698e864..bacfd9b 100644
--- a/src/main/java/com/zy/asrs/task/AutoLocMoveScheduler.java
+++ b/src/main/java/com/zy/asrs/task/AutoLocMoveScheduler.java
@@ -40,67 +40,67 @@
     @Autowired
     private AutoMoveService autoMoveService;
 
-    //瀹氭椂鍑哄簱   缁忓吀鍙屼几
-    @Scheduled(cron = "0/3 * * * * ? ")
-    public void locToLocAutoLocMove(){
-        if (slaveWmsParameterProperties.isAutoLocMoveBoolean()){
-            Config config = configService.selectConfigByCode("AutoLocMove");
-            if (Cools.isEmpty(config) || config.getValue().equals("false")) {
-                return;
-            }
-            OrderPakout orderPakout = orderPakoutService.selectOrderMoveStatus();
-            if (!Cools.isEmpty(orderPakout)){
-//                autoMoveService.selectList()
-            }else {
-                orderPakout = orderPakoutService.selectOrderMoveStatusInitial();
-                if (Cools.isEmpty(orderPakout)){
-                    return;
-                }
-                orderPakout.setMoveStatus(2);
-                orderPakoutService.updateById(orderPakout);
-            }
-        }
-    }
-
-    //瀹氭椂鍑哄簱
-    @Scheduled(cron = "0/3 * * * * ? ")
-    public void locToLoc11(){
-        if (slaveWmsParameterProperties.isAutoLocMoveUnilateralBoolean()){
-            Config config = configService.selectConfigByCode("AutoLocMoveUnilateral");
-            if (Cools.isEmpty(config) || config.getValue().equals("false")) {
-                return;
-            }
-            int crnCount = basCrnpService.selectCount(new EntityWrapper<>());
-            for (int crnNo = 1;crnNo < crnCount;crnNo++){
-                WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("io_type", 11).eq("crn_no", crnNo));
-                WrkMast wrkMast1 = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("io_type", 111).eq("crn_no", crnNo));
-                if (Cools.isEmpty(wrkMast) && Cools.isEmpty(wrkMast1)){
-                    autoLocMoveHandler.start(crnNo,11);
-                }
-            }
-        }
-    }
-
-    //瀹氭椂鍏ュ簱
-    @Scheduled(cron = "0/3 * * * * ? ")
-    public void locToLoc111() {
-        if (slaveWmsParameterProperties.isAutoLocMoveUnilateralBoolean()){
-            Config config = configService.selectConfigByCode("AutoLocMoveUnilateral");
-            if (Cools.isEmpty(config) || config.getValue().equals("false")) {
-                return;
-            }
-            int crnCount = basCrnpService.selectCount(new EntityWrapper<>());
-            for (int crnNo = 1;crnNo < crnCount;crnNo++){
-                BasCrnp basCrnp = basCrnpService.selectById(crnNo);
-                if (basCrnp == null) {
-                    continue;
-                }
-                WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("io_type", 111).eq("crn_no", crnNo));
-                WrkMast wrkMast1 = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("io_type", 11).eq("crn_no", crnNo));
-                if (Cools.isEmpty(wrkMast)  && Cools.isEmpty(wrkMast1)){
-                    autoLocMoveHandler.start(crnNo,111);
-                }
-            }
-        }
-    }
+//    //瀹氭椂鍑哄簱   缁忓吀鍙屼几
+//    @Scheduled(cron = "0/3 * * * * ? ")
+//    public void locToLocAutoLocMove(){
+//        if (slaveWmsParameterProperties.isAutoLocMoveBoolean()){
+//            Config config = configService.selectConfigByCode("AutoLocMove");
+//            if (Cools.isEmpty(config) || config.getValue().equals("false")) {
+//                return;
+//            }
+//            OrderPakout orderPakout = orderPakoutService.selectOrderMoveStatus();
+//            if (!Cools.isEmpty(orderPakout)){
+////                autoMoveService.selectList()
+//            }else {
+//                orderPakout = orderPakoutService.selectOrderMoveStatusInitial();
+//                if (Cools.isEmpty(orderPakout)){
+//                    return;
+//                }
+//                orderPakout.setMoveStatus(2);
+//                orderPakoutService.updateById(orderPakout);
+//            }
+//        }
+//    }
+//
+//    //瀹氭椂鍑哄簱
+//    @Scheduled(cron = "0/3 * * * * ? ")
+//    public void locToLoc11(){
+//        if (slaveWmsParameterProperties.isAutoLocMoveUnilateralBoolean()){
+//            Config config = configService.selectConfigByCode("AutoLocMoveUnilateral");
+//            if (Cools.isEmpty(config) || config.getValue().equals("false")) {
+//                return;
+//            }
+//            int crnCount = basCrnpService.selectCount(new EntityWrapper<>());
+//            for (int crnNo = 1;crnNo < crnCount;crnNo++){
+//                WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("io_type", 11).eq("crn_no", crnNo));
+//                WrkMast wrkMast1 = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("io_type", 111).eq("crn_no", crnNo));
+//                if (Cools.isEmpty(wrkMast) && Cools.isEmpty(wrkMast1)){
+//                    autoLocMoveHandler.start(crnNo,11);
+//                }
+//            }
+//        }
+//    }
+//
+//    //瀹氭椂鍏ュ簱
+//    @Scheduled(cron = "0/3 * * * * ? ")
+//    public void locToLoc111() {
+//        if (slaveWmsParameterProperties.isAutoLocMoveUnilateralBoolean()){
+//            Config config = configService.selectConfigByCode("AutoLocMoveUnilateral");
+//            if (Cools.isEmpty(config) || config.getValue().equals("false")) {
+//                return;
+//            }
+//            int crnCount = basCrnpService.selectCount(new EntityWrapper<>());
+//            for (int crnNo = 1;crnNo < crnCount;crnNo++){
+//                BasCrnp basCrnp = basCrnpService.selectById(crnNo);
+//                if (basCrnp == null) {
+//                    continue;
+//                }
+//                WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("io_type", 111).eq("crn_no", crnNo));
+//                WrkMast wrkMast1 = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("io_type", 11).eq("crn_no", crnNo));
+//                if (Cools.isEmpty(wrkMast)  && Cools.isEmpty(wrkMast1)){
+//                    autoLocMoveHandler.start(crnNo,111);
+//                }
+//            }
+//        }
+//    }
 }

--
Gitblit v1.9.1