From 89fb5d375b19fcb00ad3b1d187fa0880c8c68e2b Mon Sep 17 00:00:00 2001
From: zhangzhiqiang <zhangzhiqiang@yoycol.com>
Date: Tue, 22 Aug 2023 13:35:11 +0800
Subject: [PATCH] =?UTF-8?q?opt:=E4=BF=AE=E6=94=B9=E6=88=90=E5=93=81?=
 =?UTF-8?q?=E5=87=BA=E5=BA=93=E4=BC=98=E5=85=88=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wms/scheduler_manage/service/point/dao/SchBasePoint.java | 5 +++++
 .../service/point/impl/SchBasePointServiceImpl.java          | 1 +
 .../iostorInv/impl/StIvtIostorinvCpOutServiceImpl.java       | 2 ++
 mes/qd/src/views/login.vue                                   | 2 +-
 4 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/point/dao/SchBasePoint.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/point/dao/SchBasePoint.java
index 7bd80c52..5410f918 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/point/dao/SchBasePoint.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/point/dao/SchBasePoint.java
@@ -224,5 +224,10 @@ public class SchBasePoint implements Serializable {
      */
     private String control_point;
 
+    /**
+     * 点位优先级默认1
+     */
+    private String priority;
+
 
 }
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/point/impl/SchBasePointServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/point/impl/SchBasePointServiceImpl.java
index 6a750e3f..0222fecc 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/point/impl/SchBasePointServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/point/impl/SchBasePointServiceImpl.java
@@ -138,6 +138,7 @@ public class SchBasePointServiceImpl extends ServiceImpl<SchBasePointMapper, Sch
         schBasePoint.setCreate_id(SecurityUtils.getCurrentUserId());
         schBasePoint.setCreate_name(SecurityUtils.getCurrentNickName());
         schBasePoint.setCreate_time(new Date());
+        schBasePoint.setPriority("1");
         this.save(schBasePoint);
     }
 
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/impl/StIvtIostorinvCpOutServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/impl/StIvtIostorinvCpOutServiceImpl.java
index d271dcc6..74baab2c 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/impl/StIvtIostorinvCpOutServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/impl/StIvtIostorinvCpOutServiceImpl.java
@@ -486,6 +486,7 @@ public class StIvtIostorinvCpOutServiceImpl extends ServiceImpl<StIvtIostorinvCp
                     .task_group_id(IdUtil.getStringId())
                     .point_code1(disDao.getStruct_code())
                     .point_code3(pointDao.getPoint_code())
+                    .priority(pointDao.getPriority())
                     .vehicle_code(disDao.getStoragevehicle_code())
                     .product_area("A1") // 暂时写死
                     .callback((Consumer<String>) disDao::setTask_id)
@@ -594,6 +595,7 @@ public class StIvtIostorinvCpOutServiceImpl extends ServiceImpl<StIvtIostorinvCp
                             .task_group_id(IdUtil.getStringId())
                             .point_code1(struct_code)
                             .point_code3(dao.getPoint_code())
+                            .priority(dao.getPriority())
                             .vehicle_code(disDao.getStoragevehicle_code())
                             .product_area("A1") // 暂时写死
                             .callback((Consumer<String>) disDao::setTask_id)
diff --git a/mes/qd/src/views/login.vue b/mes/qd/src/views/login.vue
index 29777e50..26ce01d4 100644
--- a/mes/qd/src/views/login.vue
+++ b/mes/qd/src/views/login.vue
@@ -2,7 +2,7 @@
   <div class="login" :style="'background-image:url('+ Background +');'">
     <el-form ref="loginForm" :model="loginForm" :rules="loginRules" label-position="left" label-width="0px" class="login-form">
       <h3 class="title">
-        海亮lms系统
+        海亮LMS系统
       </h3>
       <el-form-item prop="username">
         <el-input v-model="loginForm.username" type="text" auto-complete="off" placeholder="账号">