From 3fbde4dd7e79fdb11f1fd140de0d5ada1f16d04d Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期二, 11 二月 2025 08:15:58 +0800
Subject: [PATCH] 兼容四期

---
 src/main/resources/mapper/OrderDetlMapper.xml                    |    6 +++---
 src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java     |    6 ++++++
 src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java |    2 +-
 src/main/java/com/zy/asrs/task/AutoMoveScheduler.java            |   23 +++++++++++++++--------
 src/main/java/com/zy/asrs/task/OrderSyncScheduler.java           |    2 --
 5 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java
index 8ac6675..ececff1 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java
@@ -880,7 +880,7 @@
             if (newLocMast.getLev1() == 1 && !factory.equals(AsrsConstants.SANCHANG)) {
                 agvWrkMast.setCtnNo("1");
             } else if (newLocMast.getLev1() == 2 && !factory.equals(AsrsConstants.ERCHANG)) {
-                agvWrkMast.setCtnNo("1");
+                agvWrkMast.setCtnNo("2");
             }
         }
         if (!agvWrkMastService.update(agvWrkMast, new EntityWrapper<AgvWrkMast>().eq("wrk_no", agvWrkMast.getWrkNo()))) {
diff --git a/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
index 56677f2..49eac78 100644
--- a/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
@@ -108,6 +108,9 @@
     @Override
     public void checkComplete(String orderNo, Integer pltType) {
         Order order = this.selectByNo(orderNo);
+        if (order.getDocType() == 38) {
+            return;
+        }
         if (Cools.isEmpty(order)) {
             return;
         }
@@ -154,6 +157,9 @@
     @Transactional
     public void checkComplete2(String orderNo) {
         Order order = this.selectByNo(orderNo);
+        if (order.getDocType() == 38) {
+            return;
+        }
         if (Cools.isEmpty(order)) {
             return;
         }
diff --git a/src/main/java/com/zy/asrs/task/AutoMoveScheduler.java b/src/main/java/com/zy/asrs/task/AutoMoveScheduler.java
index e8f5d8c..0c9018b 100644
--- a/src/main/java/com/zy/asrs/task/AutoMoveScheduler.java
+++ b/src/main/java/com/zy/asrs/task/AutoMoveScheduler.java
@@ -218,9 +218,7 @@
         // 鏌ヨ 涓嶄负1妤肩殑绌鸿揣鏋�
         List<AgvLocMast> agvLocMasts = agvLocMastService.selectList(new EntityWrapper<AgvLocMast>()
                 // TODO 鍥涙湡
-                .eq("loc_sts", "D").eq("loc_type1", 3)
-                .andNew()
-                .ne("floor", 1).or().ne("lev1", 1));
+                .eq("loc_sts", "D").eq("loc_type1", 3).andNew().ne("floor", 1).or().ne("lev1", 1));
         if (agvLocMasts.isEmpty()) {
             return;
         }
@@ -415,16 +413,25 @@
                     return;
                 }
 
-                List<AgvLocMast> agvLocMasts = agvLocMastService.selectList(new EntityWrapper<AgvLocMast>().eq("floor", 1).eq("loc_sts", "F").eq("loc_type1", 3).eq("ctn_no", "1"));
+                List<AgvLocMast> agvLocMasts = agvLocMastService.selectList(new EntityWrapper<AgvLocMast>().eq("floor", 1).eq("loc_sts", "F").eq("loc_type1", 3).isNotNull("ctn_no"));
                 if (agvLocMasts.isEmpty()) {
                     return;
                 }
                 for (AgvLocMast agvLocMast : agvLocMasts) {
-                    try {
-                        autoMoveHandler.autoTransfersV2(agvLocMast, maxTansk);
-                    } catch (Exception e) {
-                        log.error("搴撲綅鍙�" + agvLocMast.getLocNo() + "鍥涙湡瀹氭椂绉诲簱浠诲姟 鍚稿 --> 鍚稿,澶勭悊澶辫触锛�===銆嬪紓甯稿師鍥狅細" + e.getMessage());
+                    if (agvLocMast.getLev1() == 1 && !Cools.isEmpty(agvLocMast.getCtnNo()) && agvLocMast.getCtnNo().toString().equals("2")) {
+                        try {
+                            autoMoveHandler.autoTransfersV2(agvLocMast, maxTansk);
+                        } catch (Exception e) {
+                            log.error("搴撲綅鍙�" + agvLocMast.getLocNo() + "鍥涙湡瀹氭椂绉诲簱浠诲姟 鍚稿 --> 鍚稿,澶勭悊澶辫触锛�===銆嬪紓甯稿師鍥狅細" + e.getMessage());
+                        }
+                    } else if (agvLocMast.getLev1() == 2 && !Cools.isEmpty(agvLocMast.getCtnNo()) && agvLocMast.getCtnNo().toString().equals("1")) {
+                        try {
+                            autoMoveHandler.autoTransfersV2(agvLocMast, maxTansk);
+                        } catch (Exception e) {
+                            log.error("搴撲綅鍙�" + agvLocMast.getLocNo() + "鍥涙湡瀹氭椂绉诲簱浠诲姟 鍚稿 --> 鍚稿,澶勭悊澶辫触锛�===銆嬪紓甯稿師鍥狅細" + e.getMessage());
+                        }
                     }
+
                 }
             }
         }
diff --git a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
index b1230a1..c72487c 100644
--- a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
+++ b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
@@ -3,10 +3,8 @@
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.plugins.Page;
 import com.core.common.Cools;
-import com.zy.asrs.entity.AgvLocDetl;
 import com.zy.asrs.entity.DocType;
 import com.zy.asrs.entity.Order;
-import com.zy.asrs.entity.OrderDetl;
 import com.zy.asrs.mapper.OrderDetlMapper;
 import com.zy.asrs.service.*;
 import com.zy.asrs.task.core.ReturnT;
diff --git a/src/main/resources/mapper/OrderDetlMapper.xml b/src/main/resources/mapper/OrderDetlMapper.xml
index e42a436..62d230b 100644
--- a/src/main/resources/mapper/OrderDetlMapper.xml
+++ b/src/main/resources/mapper/OrderDetlMapper.xml
@@ -345,12 +345,12 @@
         <include refid="pakOutPageCondition"></include>
     </select>
 
-    <select id="getReportDetl" resultMap="BaseResultMap">
+    <select id="getReportDetl" resultType="String">
         select DISTINCT o.order_no
         from man_order_detl d
-                 join man_order o on d.id = d.order_id
+                 join man_order o on o.id = d.order_id
         where o.doc_type = #{docType}
-          and d.qty > d.report_qty
+          and d.qty > ISNULL(d.report_qty, 0)
           and d.qty > 0
     </select>
 

--
Gitblit v1.9.1