From b6b9d9bc03c2116b662c9bd7488309afd14934a0 Mon Sep 17 00:00:00 2001
From: psh <psh>
Date: Mon, 15 Jan 2024 09:28:49 +0800
Subject: [PATCH] =?UTF-8?q?1.=E6=AD=A3=E6=9E=81=E6=9D=BF=E5=AF=B9=E6=8E=A5?=
 =?UTF-8?q?=E4=BD=8D=E7=94=B1=E4=B8=80=E5=B1=82=E6=94=B9=E4=B8=BA=E4=B8=89?=
 =?UTF-8?q?=E5=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/org/nl/wms/sch/task_manage/task/tasks/BPSLTask.java  | 4 ++--
 .../org/nl/wms/sch/task_manage/task/tasks/ghs/GHSQHTask.java  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/BPSLTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/BPSLTask.java
index 51f32d4..a74a618 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/BPSLTask.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/BPSLTask.java
@@ -90,7 +90,7 @@ public class BPSLTask extends AbstractTask {
             // 设置起点并修改创建成功状态
             // 取料先去等待点
             task.setTask_type("3");
-            task.setPoint_code1(point.getStart_wait_point());
+            task.setPoint_code1(point.getNext_wait_point());
             task.setTask_status(TaskStatus.CREATED.getCode());
             task.setRemark("");
             taskService.update(task);
@@ -240,7 +240,7 @@ public class BPSLTask extends AbstractTask {
         SchBasePoint point = this.findNextPoint(jsonObject,schBaseTask);
         //正极板现在不堆叠
         if( "1".equals(jsonObject.getString("material_type"))) {
-            schBaseTask.setPoint_code1(point.getPoint_code());
+            schBaseTask.setPoint_code1(point.getPoint_code()+"0"+(point.getVehicle_qty()));
         }else{
             schBaseTask.setPoint_code1(point.getPoint_code().replace("HCQ","QHQ"));
         }
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/ghs/GHSQHTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/ghs/GHSQHTask.java
index 726a4e8..c7af0b0 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/ghs/GHSQHTask.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/ghs/GHSQHTask.java
@@ -102,7 +102,7 @@ public class GHSQHTask extends AbstractTask {
             return;
         }
         // 放料先去等待点
-        this.createTask(schBasePoint, nextPoint.getNext_wait_point());
+        this.createTask(schBasePoint, nextPoint.getStart_wait_point());
 
     }