From c52e0a39b78ffe0ff26eb304095c2f5e5fa9e351 Mon Sep 17 00:00:00 2001
From: psh <psh>
Date: Fri, 28 Jun 2024 15:06:34 +0800
Subject: [PATCH] =?UTF-8?q?=E9=AB=98=E6=B5=8B=E4=B8=B4=E6=97=B6=E5=85=A5?=
 =?UTF-8?q?=E5=BA=93=E9=A1=B5=E9=9D=A2=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/SchBasePointServiceImpl.java |  4 +++
 .../src/views/wms/basedata/vehicle/index.vue  |  2 +-
 .../src/views/wms/sch/group/index.vue         | 28 +++++++++++++++----
 .../src/views/wms/sch/material/index.vue      |  4 +--
 .../src/views/wms/sch/point/ViewDialog.vue    |  2 +-
 .../src/views/wms/sch/point/index.vue         | 26 ++++++++++++++---
 .../src/views/wms/sch/report/index.vue        |  4 +--
 .../src/views/wms/sch/task/index.vue          |  2 +-
 8 files changed, 55 insertions(+), 17 deletions(-)

diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/impl/SchBasePointServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/impl/SchBasePointServiceImpl.java
index d6c1d8a..64fd43c 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/impl/SchBasePointServiceImpl.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/impl/SchBasePointServiceImpl.java
@@ -52,6 +52,8 @@ public class SchBasePointServiceImpl extends ServiceImpl<SchBasePointMapper, Sch
         String region_code = ObjectUtil.isNotEmpty(whereJson.get("region_code")) ? whereJson.get("region_code").toString() : null;
         String point_type = ObjectUtil.isNotEmpty(whereJson.get("point_type")) ? whereJson.get("point_type").toString() : null;
         String point_status = ObjectUtil.isNotEmpty(whereJson.get("point_status")) ? whereJson.get("point_status").toString() : null;
+        String vehicle_code = ObjectUtil.isNotEmpty(whereJson.get("vehicle_code")) ? whereJson.get("vehicle_code").toString() : null;
+        String vehicle_code2 = ObjectUtil.isNotEmpty(whereJson.get("vehicle_code2")) ? whereJson.get("vehicle_code2").toString() : null;
         Boolean is_used = ObjectUtil.isNotEmpty(whereJson.get("is_used")) ? Boolean.valueOf(whereJson.get("is_used").toString()) : null;
         Boolean lock_type = ObjectUtil.isNotEmpty(whereJson.get("lock_type")) ? Boolean.valueOf(whereJson.get("lock_type").toString()) : false;
         Boolean parent_point = ObjectUtil.isNotEmpty(whereJson.get("parent_point")) ? Boolean.valueOf(whereJson.get("parent_point").toString()) : false;
@@ -64,6 +66,8 @@ public class SchBasePointServiceImpl extends ServiceImpl<SchBasePointMapper, Sch
                 .eq(ObjectUtil.isNotEmpty(point_type), SchBasePoint::getPoint_type, point_type)
                 .eq(ObjectUtil.isNotEmpty(point_status), SchBasePoint::getPoint_status, point_status)
                 .eq(ObjectUtil.isNotEmpty(is_used), SchBasePoint::getIs_used, is_used)
+                .like(ObjectUtil.isNotEmpty(vehicle_code), SchBasePoint::getVehicle_code, vehicle_code)
+                .like(ObjectUtil.isNotEmpty(vehicle_code2), SchBasePoint::getVehicle_code2, vehicle_code2)
                 .and(!lock_type, slam -> slam.isNull(SchBasePoint::getIng_task_code)
                         .or()
                         .eq(SchBasePoint::getIng_task_code, ""))
diff --git a/lms/nladmin-ui/src/views/wms/basedata/vehicle/index.vue b/lms/nladmin-ui/src/views/wms/basedata/vehicle/index.vue
index f1b3f4c..3072b1f 100644
--- a/lms/nladmin-ui/src/views/wms/basedata/vehicle/index.vue
+++ b/lms/nladmin-ui/src/views/wms/basedata/vehicle/index.vue
@@ -48,7 +48,7 @@
       <!--表单组件-->
       <el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="500px">
         <el-form ref="form" :model="form" :rules="rules" size="mini" label-width="80px">
-          <el-form-item label="载具编码">
+          <el-form-item label="母托盘编码">
             <el-input v-model="form.vehicle_code" style="width: 370px;" />
           </el-form-item>
           <el-form-item label="载具名称">
diff --git a/lms/nladmin-ui/src/views/wms/sch/group/index.vue b/lms/nladmin-ui/src/views/wms/sch/group/index.vue
index 8bdf9df..a62bef9 100644
--- a/lms/nladmin-ui/src/views/wms/sch/group/index.vue
+++ b/lms/nladmin-ui/src/views/wms/sch/group/index.vue
@@ -38,12 +38,12 @@
               />
             </el-select>
           </el-form-item>
-          <el-form-item label="载具编码">
+          <el-form-item label="托盘编码">
             <el-input
               v-model="query.vehicle_code"
               clearable
               size="mini"
-              placeholder="载具编码"
+              placeholder="托盘编码"
               @keyup.enter.native="crud.toQuery"
             />
           </el-form-item>
@@ -80,10 +80,10 @@
       <!--表单组件-->
       <el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="800px">
         <el-form ref="form" style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;" :inline="true" :model="form" :rules="rules" size="mini" label-width="115px" label-suffix=":">
-          <el-form-item label="载具编码">
+          <el-form-item label="托盘编码">
             <el-input v-model="form.vehicle_code" style="width: 240px;" />
           </el-form-item>
-          <!--<el-form-item label="子载具编码">
+          <!--<el-form-item label="子托盘编码">
             <el-input v-model="form.child_vehicle_code" style="width: 240px;" />
           </el-form-item>-->
           <!-- <el-form-item v-if="false" label="来源载具">
@@ -204,6 +204,22 @@
               />
             </el-select>
           </el-form-item>
+          <el-form-item label="组盘绑定状态">
+            <el-select
+              v-model="form.group_bind_material_status"
+              size="mini"
+              placeholder="点位状态"
+              class="filter-item"
+              style="width: 240px;"
+              clearable
+            >
+              <el-option
+                v-for="item in dict.group_bind_material_status"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
           <!--<el-form-item label="是否首个流程任务">
             <el-input v-model="form.is_first_flow_task" style="width: 240px;" />
           </el-form-item>-->
@@ -232,8 +248,8 @@
       <!--表格渲染-->
       <el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
         <el-table-column type="selection" width="55" />
-        <el-table-column prop="vehicle_code" label="载具编码" :min-width="flexWidth('vehicle_code',crud.data,'载具编码')" />
-        <!--        <el-table-column prop="child_vehicle_code" label="子载具编码" :min-width="flexWidth('child_vehicle_code',crud.data,'子载具编码')"/>-->
+        <el-table-column prop="vehicle_code" label="托盘编码" :min-width="flexWidth('vehicle_code',crud.data,'托盘编码')" />
+        <!--        <el-table-column prop="child_vehicle_code" label="子托盘编码" :min-width="flexWidth('child_vehicle_code',crud.data,'子托盘编码')"/>-->
         <!-- <el-table-column prop="source_vehicle_code" label="来源载具" :min-width="flexWidth('source_vehicle_code',crud.data,'来源载具')" /> -->
         <el-table-column prop="vehicle_type" label="载具类型" :min-width="flexWidth('vehicle_type',crud.data,'载具类型')">
           <template slot-scope="scope">
diff --git a/lms/nladmin-ui/src/views/wms/sch/material/index.vue b/lms/nladmin-ui/src/views/wms/sch/material/index.vue
index 9b406c6..a9226db 100644
--- a/lms/nladmin-ui/src/views/wms/sch/material/index.vue
+++ b/lms/nladmin-ui/src/views/wms/sch/material/index.vue
@@ -79,10 +79,10 @@
       <!--表单组件-->
       <el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="800px">
         <el-form ref="form" style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;" :inline="true" :model="form" :rules="rules" size="mini" label-width="115px" label-suffix=":">
-          <el-form-item label="载具编码">
+          <el-form-item label="母托盘编码">
             <el-input v-model="form.vehicle_code" style="width: 240px;" />
           </el-form-item>
-          <!--<el-form-item label="子载具编码">
+          <!--<el-form-item label="子托盘编码">
             <el-input v-model="form.child_vehicle_code" style="width: 240px;" />
           </el-form-item>-->
           <!-- <el-form-item v-if="false" label="来源载具">
diff --git a/lms/nladmin-ui/src/views/wms/sch/point/ViewDialog.vue b/lms/nladmin-ui/src/views/wms/sch/point/ViewDialog.vue
index a9a0944..1c9a274 100644
--- a/lms/nladmin-ui/src/views/wms/sch/point/ViewDialog.vue
+++ b/lms/nladmin-ui/src/views/wms/sch/point/ViewDialog.vue
@@ -34,7 +34,7 @@
         <el-form-item label="载具类型">
           <el-input v-model="form.vehicle_type" style="width: 200px;" />
         </el-form-item>
-        <el-form-item label="载具编码">
+        <el-form-item label="母托盘编码">
           <el-input v-model="form.vehicle_code" style="width: 200px;" />
         </el-form-item>
         <el-form-item label="载具数量">
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 993645f..d5f7886 100644
--- a/lms/nladmin-ui/src/views/wms/sch/point/index.vue
+++ b/lms/nladmin-ui/src/views/wms/sch/point/index.vue
@@ -108,6 +108,24 @@
               />
             </el-select>
           </el-form-item>
+          <el-form-item label="母托盘编码">
+            <el-input
+              v-model="query.vehicle_code"
+              clearable
+              size="mini"
+              placeholder="母托盘编码"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
+          <el-form-item label="子托盘编码">
+            <el-input
+              v-model="query.vehicle_code2"
+              clearable
+              size="mini"
+              placeholder="子托盘编码"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
           <el-form-item label="锁定类型">
             <el-switch
               v-model="query.lock_type"
@@ -234,10 +252,10 @@
           <el-form-item label="物料类型" prop="vehicle_type">
             <el-input v-model="form.vehicle_type" style="width: 370px;" />
           </el-form-item>
-          <el-form-item v-if="form.point_status !== '1'" label="载具编码" prop="vehicle_code">
+          <el-form-item v-if="form.point_status !== '1'" label="母托盘编码" prop="vehicle_code">
             <el-input v-model="form.vehicle_code" clearable style="width: 370px;" />
           </el-form-item>
-          <el-form-item v-if="form.point_status !== '1'" label="子载具编码" prop="vehicle_code2">
+          <el-form-item v-if="form.point_status !== '1'" label="子托盘编码" prop="vehicle_code2">
             <el-input v-model="form.vehicle_code2" clearable style="width: 370px;" />
           </el-form-item>
           <!-- <el-form-item label="可放载具类型" prop="can_vehicle_types">
@@ -286,8 +304,8 @@
           </template>
         </el-table-column> -->
         <!-- <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_code2" label="子载具编码" :min-width="flexWidth('vehicle_code2',crud.data,'子载具编码')" />
+        <el-table-column prop="vehicle_code" label="母托盘编码" :min-width="flexWidth('vehicle_code',crud.data,'母托盘编码')" />
+        <el-table-column prop="vehicle_code2" label="子托盘编码" :min-width="flexWidth('vehicle_code2',crud.data,'子托盘编码')" />
         <el-table-column prop="vehicle_qty" label="载具数量" :min-width="flexWidth('vehicle_qty',crud.data,'载具数量')" />
         <!-- <el-table-column prop="product_description" label="物料名称" :min-width="flexWidth('product_description',crud.data,'物料名称')" />
         <el-table-column prop="supplier_name" label="供应商名称" :min-width="flexWidth('supplier_name',crud.data,'供应商名称')" /> -->
diff --git a/lms/nladmin-ui/src/views/wms/sch/report/index.vue b/lms/nladmin-ui/src/views/wms/sch/report/index.vue
index 349dddb..e8e2be0 100644
--- a/lms/nladmin-ui/src/views/wms/sch/report/index.vue
+++ b/lms/nladmin-ui/src/views/wms/sch/report/index.vue
@@ -69,10 +69,10 @@
       <!--表单组件-->
       <el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="800px">
         <el-form ref="form" style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;" :inline="true" :model="form" :rules="rules" size="mini" label-width="115px" label-suffix=":">
-          <el-form-item label="载具编码">
+          <el-form-item label="母托盘编码">
             <el-input v-model="form.vehicle_code" style="width: 240px;" />
           </el-form-item>
-          <!--<el-form-item label="子载具编码">
+          <!--<el-form-item label="子托盘编码">
             <el-input v-model="form.child_vehicle_code" style="width: 240px;" />
           </el-form-item>-->
           <!-- <el-form-item v-if="false" label="来源载具">
diff --git a/lms/nladmin-ui/src/views/wms/sch/task/index.vue b/lms/nladmin-ui/src/views/wms/sch/task/index.vue
index 514b988..26d6a54 100644
--- a/lms/nladmin-ui/src/views/wms/sch/task/index.vue
+++ b/lms/nladmin-ui/src/views/wms/sch/task/index.vue
@@ -106,7 +106,7 @@
           <el-form-item label="载具数量">
             <el-input v-model="form.vehicle_qty" style="width: 240px;" />
           </el-form-item>
-          <el-form-item label="载具编码">
+          <el-form-item label="母托盘编码">
             <el-input v-model="form.vehicle_code" style="width: 240px;" />
           </el-form-item>
           <!--          <el-form-item label="优先级">-->