From a1a4ad1bae70e948320cb2226cbe2d7be273a10d Mon Sep 17 00:00:00 2001
From: liyongde <1419499670@qq.com>
Date: Tue, 1 Apr 2025 22:29:11 +0800
Subject: [PATCH] =?UTF-8?q?opt:=20=E4=B8=8B=E5=8D=B7=E6=8E=92=E5=BA=8F?=
 =?UTF-8?q?=E4=B8=8E=E5=BB=B6=E6=97=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ext/mes/service/impl/MesToLmsServiceImpl.java    | 12 +++++++++---
 .../org/nl/wms/sch/manage/AutoCallEmptyVehicle.java  |  1 +
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java
index 94d87f151..5f30db8cc 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java
@@ -60,6 +60,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.util.Comparator;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -1081,6 +1082,11 @@ public class MesToLmsServiceImpl implements MesToLmsService {
             }
 
             if ("2".equals(Status)) {
+                // 按 ContainerPosition 进行升序排序
+                List<JSONObject> paramList = param.toJavaList(JSONObject.class);
+                paramList.sort(Comparator.comparing(obj -> Integer.parseInt(obj.getString("ContainerPosition"))));
+//                param.sort(Comparator.comparing(obj -> Integer.parseInt(((JSONObject) obj).getString("ContainerPosition"))));
+                log.info("排序的数组：{}", paramList);
                 JSONObject jsonObject = param.getJSONObject(0);
                 JSONObject plan = WQLObject.getWQLObject("pdm_bi_slittingproductionplan").query("container_name = '" + jsonObject.getString("ContainerGroup") + "' AND is_delete = '0'").uniqueResult(0);
                 if (ObjectUtil.isEmpty(plan)) {
@@ -1099,8 +1105,8 @@ public class MesToLmsServiceImpl implements MesToLmsService {
                         JSONArray down_rows = new JSONArray();
                         String up_qzz = "";
                         String down_qzz = "";
-                        for (int i = 0; i < param.size(); i++) {
-                            JSONObject row = param.getJSONObject(i);
+                        for (int i = 0; i < paramList.size(); i++) {
+                            JSONObject row = paramList.get(i);
                             //查询对应的分切计划
                             JSONObject plan_jo = WQLObject.getWQLObject("pdm_bi_slittingproductionplan").query("container_name = '" + row.getString("ContainerGroup") + "' AND is_delete = '0'").uniqueResult(0);
                             if (ObjectUtil.isEmpty(plan_jo)) {
@@ -1160,7 +1166,6 @@ public class MesToLmsServiceImpl implements MesToLmsService {
                             result.put("RTDAT", null);
                             return result;
                         }
-
                         //查询输送线上该分切机下一分切组可用的气涨轴
                         JSONObject group_jo = WQL.getWO("PDA_02").addParam("flag", "14").addParam("resource_name", ResourceName).process().uniqueResult(0);
                         if (ObjectUtil.isEmpty(group_jo)) {
@@ -1216,6 +1221,7 @@ public class MesToLmsServiceImpl implements MesToLmsService {
                             whereJson.put("cut_rows", del_row);
                             inService.confirm(whereJson);
                         }
+                        Thread.sleep(500);
                     }
                 }
             }
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoCallEmptyVehicle.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoCallEmptyVehicle.java
index bbef2f09b..30807d010 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoCallEmptyVehicle.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoCallEmptyVehicle.java
@@ -85,6 +85,7 @@ public class AutoCallEmptyVehicle {
                     if (ObjectUtil.isEmpty(nbj_jo)) {
                         continue;
                     }
+                    // todo: 待优化
                     if (nbj_jo.getString("is_used").equals("1")) {
                         //上半部分
                         this.callEmptyVehicle(product_area, "0", integer);