From 230d1ab7bd9e27b3590103667510d1930c21749e Mon Sep 17 00:00:00 2001
From: liyongde <1419499670@qq.com>
Date: Tue, 28 May 2024 14:18:26 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=B7=B7=E7=A2=BE=E9=80=81=E6=96=99?=
 =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E9=A1=BA=E5=BA=8F=E4=BA=92=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/org/nl/wms/sch/task/p2p/PDATask.java |  2 +-
 .../send/material/HLSendMaterialTask.java     | 39 ++++++++++---------
 2 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/task/p2p/PDATask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/task/p2p/PDATask.java
index f57ac90..4fe7d53 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/task/p2p/PDATask.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/task/p2p/PDATask.java
@@ -47,7 +47,7 @@ public class PDATask extends AbstractAcsTask {
                 "-",
                 "-",
                 8,
-                RGCDTask.class.getName(),
+                PDATask.class.getName(),
                 form.getString("create_mode"),
                 form.getString("request_param"),
                 ObjectUtil.isEmpty(form.getString("create_id")) ? "1" : form.getString("create_id"),
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/task/send/material/HLSendMaterialTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/task/send/material/HLSendMaterialTask.java
index cddd8c6..80d94e5 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/task/send/material/HLSendMaterialTask.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/task/send/material/HLSendMaterialTask.java
@@ -111,46 +111,49 @@ public class HLSendMaterialTask extends AbstractAcsTask {
                             .addParam("point_code", task.getString("point_code1"))
                             .process()
                             .uniqueResult(0);
+                    // 如果有关联压机
                     if (ObjectUtil.isNotEmpty(object.getString("associated_device"))) {
-                        // 如果有关联压机(状态：4，锁定：1)，直接送到对应的布料机上
+                        // 如果有关联压机(状态：4等待，锁定：1)，直接送到对应的布料机上
                         nextPoint = WQL.getWO("SEND_MATERIAL_TASK")
                                 .addParam("flag", "12")
                                 .addParam("point_code", object.getString("associated_device"))
                                 .process()
                                 .uniqueResult(0);
+                        if (ObjectUtil.isEmpty(nextPoint)) {
+                            // 通过工单的关联压机送到对应位置，如果不满足就走以下流程
+                            flag = false;
+                            nextPoint = WQL.getWO("SEND_MATERIAL_TASK")
+                                    .addParam("flag", "8")
+                                    .addParam("point_code", startPoint.getString("device_code"))
+                                    .process()
+                                    .uniqueResult(0);
+                        }
                     }
-                    if (ObjectUtil.isEmpty(nextPoint)) {
+                    if (ObjectUtil.isEmpty(nextPoint) || ObjectUtil.isEmpty(nextPoint.get("point_code"))) {
                         // 判断压机上是否有点位状态是4，物料对应
+                        flag = true;
                         nextPoint = WQL.getWO("SEND_MATERIAL_TASK")
                                 .addParam("flag", "10")
                                 .addParam("material_id", task.getString("material_id"))
                                 .process()
                                 .uniqueResult(0);
+                    } else {
+                        task.put("priority", "4");
                     }
                     if (ObjectUtil.isEmpty(nextPoint)) {
                         flag = false;
-                        // 通过工单的关联压机送到对应位置，如果不满足就走以下流程
+                        // 先去普通压机困料货位
                         nextPoint = WQL.getWO("SEND_MATERIAL_TASK")
-                                .addParam("flag", "8")
-                                .addParam("point_code", startPoint.getString("device_code"))
+                                .addParam("flag", "4")
+                                .addParam("material_id", task.getString("material_id"))
                                 .process()
                                 .uniqueResult(0);
-                        if (ObjectUtil.isEmpty(nextPoint) || ObjectUtil.isEmpty(nextPoint.get("point_code"))) {
-                            // 先去普通压机困料货位
+                        if (ObjectUtil.isEmpty(nextPoint)) {
+                            // 公共货位
                             nextPoint = WQL.getWO("SEND_MATERIAL_TASK")
-                                    .addParam("flag", "4")
-                                    .addParam("material_id", task.getString("material_id"))
+                                    .addParam("flag", "5")
                                     .process()
                                     .uniqueResult(0);
-                            if (ObjectUtil.isEmpty(nextPoint)) {
-                                // 公共货位
-                                nextPoint = WQL.getWO("SEND_MATERIAL_TASK")
-                                        .addParam("flag", "5")
-                                        .process()
-                                        .uniqueResult(0);
-                            }
-                        } else {
-                            task.put("priority", "4");
                         }
                     }
                 }