From dd4fa22af8110d0787bfa8f76295bd40656f0019 Mon Sep 17 00:00:00 2001
From: psh <psh>
Date: Mon, 8 Jul 2024 08:46:11 +0800
Subject: [PATCH] =?UTF-8?q?=E5=91=A8=E6=9C=ABfix?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../agv/server/impl/NDCAgvServiceImpl.java    |  5 ++--
 .../run/OneNDCSocketConnectionAutoRun.java    | 21 ++++++++--------
 .../task_manage/task/tasks/tbx/TBXMLTask.java | 25 +++++++++++++------
 3 files changed, 31 insertions(+), 20 deletions(-)

diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/server/impl/NDCAgvServiceImpl.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/server/impl/NDCAgvServiceImpl.java
index c2d61a6..d6abfb0 100644
--- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/server/impl/NDCAgvServiceImpl.java
+++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/server/impl/NDCAgvServiceImpl.java
@@ -240,8 +240,9 @@ public class NDCAgvServiceImpl implements NDCAgvService {
                     (byte) 0X64, (byte) 0X80,
                     (byte) 0X00, (byte) 0X01,
                     (byte) ikeyhigh, (byte) ikeylow,
-                    (byte) satationhigh, (byte) satationlow,
-                    (byte) carhigh, (byte) carlow
+                    (byte) carhigh, (byte) carlow,
+                    (byte) satationhigh, (byte) satationlow
+
             };
             log.info("下发AGV充电任务--{}", str1);
 
diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/OneNDCSocketConnectionAutoRun.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/OneNDCSocketConnectionAutoRun.java
index f6a924d..54b814c 100644
--- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/OneNDCSocketConnectionAutoRun.java
+++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/OneNDCSocketConnectionAutoRun.java
@@ -209,16 +209,17 @@ public class OneNDCSocketConnectionAutoRun extends AbstractAutoRunnable {
                         }
                         //充电成功
                     }else if (phase == 0x65){
-                        log.info("AGV车号{}反馈充电成功，释放充电桩{}",agvaddr,station);
-                        List<Dict> dictList= dictService.getDictByName("station");
-                        for(Dict dict : dictList){
-                            if (Integer.parseInt(dict.getPara1())==station){
-                                dict.setValue("0");
-                                dict.setPara2("");
-                                dictService.updateDetail(dict);
-                                break;
-                            }
-                        }
+                          log.info("AGV车号{}反馈充电中，充电桩{}",agvaddr,station);
+//                        log.info("AGV车号{}反馈充电成功，释放充电桩{}",agvaddr,station);
+//                        List<Dict> dictList= dictService.getDictByName("station");
+//                        for(Dict dict : dictList){
+//                            if (Integer.parseInt(dict.getPara1())==station){
+//                                dict.setValue("0");
+//                                dict.setPara2("");
+//                                dictService.updateDetail(dict);
+//                                break;
+//                            }
+//                        }
                         //充电取消上报
                     }else if (phase == 0x66){
                         log.info("AGV车号{}反馈充电任务已取消，释放充电桩{}",agvaddr,station);
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/tbx/TBXMLTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/tbx/TBXMLTask.java
index 2676cfa..b6b2ab6 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/tbx/TBXMLTask.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/tbx/TBXMLTask.java
@@ -210,11 +210,7 @@ public class TBXMLTask extends AbstractTask {
 //                }
 //            }
 //        }
-//        // 2 没有对应的固化室、没有同工艺号的固化室、没有计划方案对应的固化室，就找新的固化室
-        if (points.size() == 0) {
-            points = tbxMapper.getEmptyPoint(nextRegionStr, vehicle_type, workorder.getMaterial_id());
-        }
-        SchBasePoint schBasePoint =new SchBasePoint();
+        SchBasePoint schBasePoint =null;
         for(SchBasePoint temp:points){
             for(String ghs:ghsList) {
                 if (ghs.equals(temp.getParent_point_code())) {
@@ -223,10 +219,23 @@ public class TBXMLTask extends AbstractTask {
                 }
             }
         }
-        if (schBasePoint != null) {
-            schBasePoint.setCan_material_type(workorder.getMaterial_id());
-            pointService.updateById(schBasePoint);
+//        // 2 没有对应的固化室、没有同工艺号的固化室、没有计划方案对应的固化室，就找新的固化室
+        if (ObjectUtil.isEmpty(schBasePoint)) {
+            points = tbxMapper.getEmptyPoint(nextRegionStr, vehicle_type, workorder.getMaterial_id());
+            for(SchBasePoint temp:points){
+                for(String ghs:ghsList) {
+                    if (ghs.equals(temp.getParent_point_code())) {
+                        schBasePoint=temp;
+                        break;
+                    }
+                }
+            }
         }
+
+//        if (schBasePoint != null) {
+//            schBasePoint.setCan_material_type(workorder.getMaterial_id());
+//            pointService.updateById(schBasePoint);
+//        }
         return schBasePoint;
     }