From d3a2ea7b43c00c91f69a803cb375b7402c1ad01b Mon Sep 17 00:00:00 2001
From: yanps <yps00312>
Date: Mon, 25 Nov 2024 08:46:23 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E9=98=BB=E7=9B=98?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=95=B0=E6=8D=AE=E6=8A=A5=E9=94=99=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98,=20=E4=BC=98=E5=8C=96=E7=89=A9=E6=96=99=E5=9B=BE?=
 =?UTF-8?q?=E7=89=87=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...chBaseVehiclematerialgroupServiceImpl.java |  9 ++++++++-
 .../service/impl/SchBasePointServiceImpl.java |  4 +++-
 .../controller/SchBaseTaskController.java     |  9 +++++++++
 .../src/views/wms/sch/group/index.vue         |  2 +-
 .../src/views/wms/sch/task/index.vue          | 20 ++++++++++++++++++-
 .../src/views/wms/sch/task/schBaseTask.js     | 10 +++++++++-
 6 files changed, 49 insertions(+), 5 deletions(-)

diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/impl/SchBaseVehiclematerialgroupServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/impl/SchBaseVehiclematerialgroupServiceImpl.java
index a7b2e9a..8e8f08d 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/impl/SchBaseVehiclematerialgroupServiceImpl.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/impl/SchBaseVehiclematerialgroupServiceImpl.java
@@ -94,7 +94,7 @@ public class SchBaseVehiclematerialgroupServiceImpl extends ServiceImpl<SchBaseV
                     .ne(SchBaseVehiclematerialgroup::getGroup_id, item.getGroup_id()));
             if (CollUtil.isNotEmpty(schBaseVehiclematerialgroups)) {
                 item.setHasChildren(true);
-                item.setChildren(schBaseVehiclematerialgroups);
+                /*item.setChildren(schBaseVehiclematerialgroups);*/
             }
             item.setHas_work(true);
         });
@@ -192,6 +192,13 @@ public class SchBaseVehiclematerialgroupServiceImpl extends ServiceImpl<SchBaseV
         List<SchBaseVehiclematerialgroup> schBaseVehiclematerialgroups = vehiclematerialgroupMapper.selectList(Wrappers.lambdaQuery(SchBaseVehiclematerialgroup.class)
                 .eq(SchBaseVehiclematerialgroup::getVehicle_code, entity.getString("vehicle_code"))
                 .ne(SchBaseVehiclematerialgroup::getGroup_id, entity.getString("group_id")));
+        if(ObjectUtil.isNotEmpty(schBaseVehiclematerialgroups)){
+            schBaseVehiclematerialgroups.forEach(item->{
+                if(StrUtil.isEmpty(item.getRegion_code())){
+                    item.setRegion_code("未知");
+                }
+            });
+        }
         return schBaseVehiclematerialgroups;
     }
 
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 e90aefa..058f322 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
@@ -173,7 +173,9 @@ public class SchBasePointServiceImpl extends ServiceImpl<SchBasePointMapper, Sch
         entity.setUpdate_time(now);
         // 获取region_name
         SchBaseRegion baseRegion = regionMapper.selectById(entity.getRegion_code());
-        entity.setRegion_name(baseRegion.getRegion_name());
+        if (ObjectUtil.isNotEmpty(baseRegion)) {
+            entity.setRegion_name(baseRegion.getRegion_name());
+        }
         String pointStatus = entity.getPoint_status();
         String vehicle_code = entity.getVehicle_code();
         // 根据点位状态来判断更新内容
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/controller/SchBaseTaskController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/controller/SchBaseTaskController.java
index 542094f..9d65465 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/controller/SchBaseTaskController.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/controller/SchBaseTaskController.java
@@ -2,6 +2,7 @@ package org.nl.wms.sch.task.controller;
 
 import cn.dev33.satoken.annotation.SaIgnore;
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -86,4 +87,12 @@ public class SchBaseTaskController {
         return new ResponseEntity<>(HttpStatus.NO_CONTENT);
     }
 
+
+    @PostMapping("/upload")
+    @Log("导出数据")
+    @ApiOperation("导出数据")
+    public ResponseEntity<Object> upload(@RequestBody JSONObject json) {
+        return new ResponseEntity<>(HttpStatus.NO_CONTENT);
+    }
+
 }
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 9b93afa..1a42537 100644
--- a/lms/nladmin-ui/src/views/wms/sch/group/index.vue
+++ b/lms/nladmin-ui/src/views/wms/sch/group/index.vue
@@ -343,7 +343,7 @@
         <el-table-column prop="due_date" label="交期时间" show-overflow-tooltip :min-width="flexWidth('due_date',crud.data,'交期时间')" />
         <el-table-column v-if="false" prop="material_spec" label="物料规格" :min-width="flexWidth('material_spec',crud.data,'物料规格')" />
         <el-table-column prop="theLocation" label="存放点位" :min-width="flexWidth('theLocation',crud.data,'存放点位')" />
-        <el-table-column prop="remark" label="备注" :min-width="flexWidth('remark',crud.data,'备注')" />
+        <el-table-column prop="material_path" label="物料图片路径" :min-width="flexWidth('material_path',crud.data,'物料图片路径')" />
         <el-table-column prop="create_name" label="创建人" width="100" />
         <el-table-column prop="create_time" label="创建时间" :min-width="flexWidth('create_time',crud.data,'创建时间')" />
         <el-table-column v-if="false" prop="update_name" label="修改人" :min-width="flexWidth('update_name',crud.data,'修改人')" />
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 80d73aa..2a365a3 100644
--- a/lms/nladmin-ui/src/views/wms/sch/task/index.vue
+++ b/lms/nladmin-ui/src/views/wms/sch/task/index.vue
@@ -72,7 +72,19 @@
         </el-form>
       </div>
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
-      <crudOperation :permission="permission" />
+      <crudOperation :permission="permission">
+        <el-button
+          slot="right"
+          class="filter-item"
+          size="mini"
+          type="success"
+          icon="el-icon-upload"
+          :disabled="crud.selections.length === 0"
+          @click="uploadExcel()"
+        >
+          导出
+        </el-button>
+      </crudOperation>
       <!--表单组件-->
       <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=":">
@@ -329,6 +341,12 @@ export default {
     hand(value) {
       this.crud.toQuery()
     },
+    uploadExcel() {
+      const selectData = this.crud.selections
+      crudSchBaseTask.upload(selectData).then(res => {
+        console.log('++++++++++++++++++++', res)
+      })
+    },
     handTaskStatus(value) {
       this.crud.query.more_task_status = null
       if (value) {
diff --git a/lms/nladmin-ui/src/views/wms/sch/task/schBaseTask.js b/lms/nladmin-ui/src/views/wms/sch/task/schBaseTask.js
index 4497dff..8d07571 100644
--- a/lms/nladmin-ui/src/views/wms/sch/task/schBaseTask.js
+++ b/lms/nladmin-ui/src/views/wms/sch/task/schBaseTask.js
@@ -39,4 +39,12 @@ export function operation(data) {
   })
 }
 
-export default { add, edit, del, getTaskStatusList, operation }
+export function upload(data) {
+  return request({
+    url: 'api/schBaseTask/upload',
+    method: 'post',
+    data
+  })
+}
+
+export default { add, edit, del, getTaskStatusList, operation, upload }