From 8bde5f69670e87124fbf05cea009e2481d678dba Mon Sep 17 00:00:00 2001
From: zds <2388969634@qq.com>
Date: Wed, 18 Sep 2024 17:52:45 +0800
Subject: [PATCH] =?UTF-8?q?opt:=E7=82=B9=E4=BD=8D=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E5=85=B3=E8=81=94=E5=9B=9E=E6=B8=A9=E5=B7=A5=E5=8D=95=E8=A1=A8?=
 =?UTF-8?q?=EF=BC=8C=E6=98=BE=E7=A4=BA=E5=B7=A5=E5=8D=95=E5=8F=B7=E5=92=8C?=
 =?UTF-8?q?=E5=B7=A5=E5=8D=95=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/dao/mapper/SchBasePointMapper.xml |  4 ++
 .../point/service/dto/SchBasePointDto.java    |  2 +
 .../point/service/dto/SchBasePointQuery.java  |  2 +
 .../src/views/wms/sch/point/index.vue         | 40 +++++++++++++++++--
 4 files changed, 45 insertions(+), 3 deletions(-)

diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/dao/mapper/SchBasePointMapper.xml b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/dao/mapper/SchBasePointMapper.xml
index f071aa6..724ccfb 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/dao/mapper/SchBasePointMapper.xml
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/dao/mapper/SchBasePointMapper.xml
@@ -27,6 +27,7 @@
         two.status
         FROM
         pdm_bd_workorder_two two
+        where two.status not in ('3','4')
         GROUP BY
         two.palletSN,
         two.moname,
@@ -58,6 +59,9 @@
         <if test="query.lock_type == true">
             and (p.ing_task_code IS NOT NULL and p.ing_task_code != '')
         </if>
+        <if test="query.status  != null">
+            and workorder_two.status  = #{query.status}
+        </if>
         ORDER BY p.region_code ASC, p.point_code ASC
     </select>
 </mapper>
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/dto/SchBasePointDto.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/dto/SchBasePointDto.java
index e8e0990..d9889e5 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/dto/SchBasePointDto.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/dto/SchBasePointDto.java
@@ -57,4 +57,6 @@ public class SchBasePointDto implements Serializable {
     private BigDecimal material_weight;
     private String instorage_time;
     private String pcsn;
+    private String moname;
+    private String status;
 }
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/dto/SchBasePointQuery.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/dto/SchBasePointQuery.java
index d9a10f2..21f922f 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/dto/SchBasePointQuery.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/dto/SchBasePointQuery.java
@@ -24,4 +24,6 @@ public class SchBasePointQuery implements Serializable {
     private Boolean is_used;
 
     private Boolean lock_type;
+
+    private Integer status;
 }
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 c08cd02..7bae133 100644
--- a/lms/nladmin-ui/src/views/wms/sch/point/index.vue
+++ b/lms/nladmin-ui/src/views/wms/sch/point/index.vue
@@ -78,6 +78,22 @@
               @keyup.enter.native="crud.toQuery"
             />
           </el-form-item>
+          <el-form-item label="工单状态">
+            <el-select
+              v-model="query.status"
+              clearable
+              size="mini"
+              placeholder="全部"
+              class="filter-item"
+              @change="crud.toQuery"
+            >
+              <el-option
+                v-for="item in dict.work_order_two_status"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
           <el-form-item label="锁定类型">
             <el-switch
               v-model="query.lock_type"
@@ -211,7 +227,7 @@
         </div>
       </el-dialog>
       <!--表格渲染-->
-      <el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
+      <el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" :cell-style="cellStyle" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
         <el-table-column type="selection" width="55" />
         <el-table-column prop="workshop_code" label="车间编码" :min-width="flexWidth('workshop_code',crud.data,'车间编码')" />
         <el-table-column prop="point_code" label="点位编码" :min-width="flexWidth('point_code',crud.data,'点位编码')" />
@@ -227,6 +243,8 @@
           </template>
         </el-table-column>
         <el-table-column prop="ing_task_code" label="当前任务编码" :min-width="flexWidth('ing_task_code',crud.data,'当前任务编码')" />
+        <el-table-column prop="moname" label="工单编号" :min-width="flexWidth('moname',crud.data,'工单编号')" />
+        <el-table-column prop="status" label="工单状态" :formatter="format_work_order_two_status" :min-width="flexWidth('status',crud.data,'工单状态')" />
         <el-table-column prop="row_num" label="排" :min-width="flexWidth('row_num',crud.data,'排')" />
         <el-table-column prop="col_num" label="列" :min-width="flexWidth('col_num',crud.data,'列')" />
         <el-table-column prop="layer_num" label="层" :min-width="flexWidth('layer_num',crud.data,'层')" />
@@ -244,7 +262,7 @@
         </el-table-column>
         <el-table-column prop="update_name" label="修改人" :min-width="flexWidth('update_name',crud.data,'修改人')" />
         <el-table-column prop="update_time" label="修改时间" :min-width="flexWidth('update_time',crud.data,'修改时间')" />
-        <el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
+        <el-table-column v-permission="[]" label="操作" width="185px" align="center" fixed="right">
           <template slot-scope="scope">
             <udOperation
               style="display: inline"
@@ -316,7 +334,7 @@ const defaultForm = {
 }
 export default {
   name: 'SchBasePoint',
-  dicts: ['vehicle_type', 'TrueOrFalse', 'reason'],
+  dicts: ['vehicle_type', 'TrueOrFalse', 'reason', 'work_order_two_status'],
   components: { PointDialog, ViewDialog, pagination, crudOperation, rrOperation, udOperation },
   mixins: [presenter(), header(), form(defaultForm), crud()],
   cruds() {
@@ -395,6 +413,22 @@ export default {
     hand(value) {
       this.crud.toQuery()
     },
+    cellStyle({ row, column, rowIndex, columnIndex }) {
+      const status = row.status
+
+      if (column.property === 'status') {
+        if (status == '0') {
+          return 'background: #FFBA00'
+        } else  if (status == '1') {
+          return 'background: #13ce66'
+        }else  if (status == '2') {
+          return 'background: #13ce66'
+        }
+      }
+    },
+    format_work_order_two_status(row, column) {
+      return this.dict.label.work_order_two_status[row.status]
+    },
     getWorkShopList() { // 获取车间列表
       crudMdBaseWorkShop.getWorkShopList().then(res => {
         this.workShopList = res