From fbba53d92c247cef639f1c46a195aeae5682d38b Mon Sep 17 00:00:00 2001
From: psh <psh>
Date: Tue, 2 Jul 2024 14:13:29 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=82=E5=B8=B8=E5=9C=BA=E6=99=AF=E5=8F=96?=
 =?UTF-8?q?=E6=B6=88=E5=8F=8A=E6=89=8B=E5=8A=A8=E9=A1=B5=E9=9D=A2=E6=B8=85?=
 =?UTF-8?q?=E7=A9=BA=E6=9D=A5=E6=BA=90=E7=82=B9=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/nl/wms/sch/task_manage/task/tasks/KGHJRKTask.java     | 4 ++--
 lms/nladmin-ui/src/views/wms/sch/point/index.vue              | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/KGHJRKTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/KGHJRKTask.java
index ac948c0..0b8dc2d 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/KGHJRKTask.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/KGHJRKTask.java
@@ -217,12 +217,12 @@ public class KGHJRKTask extends AbstractTask {
         }
 
         String startPoint = taskObj.getPoint_code1(); // 获取起点
-        if (taskObj.getPoint_code2().startsWith("QHQ")) {
+        if (ObjectUtil.isNotEmpty(taskObj)&&ObjectUtil.isNotEmpty(taskObj.getPoint_code2())&&taskObj.getPoint_code2().startsWith("QHQ")) {
             taskObj.setPoint_code2("HCQ" + taskObj.getPoint_code2().substring(3));
         }
         String endPoint = taskObj.getPoint_code2(); // 获取终点
         SchBasePoint startPointObj = pointService.getById(startPoint);
-        if (endPoint.startsWith("ZJBDJW")) {
+        if (ObjectUtil.isNotEmpty(endPoint)&&endPoint.startsWith("ZJBDJW")) {
             endPoint = endPoint.substring(0, endPoint.length() - 2);
         }
         SchBasePoint endPointObj = pointService.getById(endPoint);
diff --git a/lms/nladmin-ui/src/views/wms/sch/point/index.vue b/lms/nladmin-ui/src/views/wms/sch/point/index.vue
index 78afd17..269774f 100644
--- a/lms/nladmin-ui/src/views/wms/sch/point/index.vue
+++ b/lms/nladmin-ui/src/views/wms/sch/point/index.vue
@@ -227,6 +227,9 @@
           <el-form-item label="载具数量" prop="vehicle_qty">
             <el-input-number v-model="form.vehicle_qty" style="width: 370px;" :controls="false" class="clear-number-input" :min="0" :precision="0" :max="99999" label="载具数量" size="mini" />
           </el-form-item>
+          <el-form-item label="当前来源" prop="ext_point_code">
+            <el-input v-model="form.ext_point_code" style="width: 370px;" />
+          </el-form-item>
           <el-form-item label="是否有工单">
             <el-radio v-for="item in dict.TrueOrFalse" :key="item.id" v-model="form.is_has_workder" :label="item.value">{{ item.label }}</el-radio>
           </el-form-item>
@@ -262,6 +265,7 @@
         <el-table-column prop="vehicle_type" label="物料类型" :min-width="flexWidth('vehicle_type',crud.data,'物料类型')" />
         <el-table-column prop="vehicle_code" label="载具编码" :min-width="flexWidth('vehicle_code',crud.data,'载具编码')" />
         <el-table-column prop="vehicle_qty" label="载具数量" :min-width="flexWidth('vehicle_qty',crud.data,'载具数量')" />
+        <el-table-column prop="ext_point_code" label="当前来源" :min-width="flexWidth('ext_point_code',crud.data,'当前来源')" />
         <el-table-column label="是否锁定" :min-width="flexWidth('vehicle_qty',crud.data,'是否锁定')">
           <template slot-scope="scope">
             {{ scope.row.ing_task_code?'是':'否' }}