From 1091de1e921d1f45a66fa959949adb1fce90d528 Mon Sep 17 00:00:00 2001
From: zds <2388969634@qq.com>
Date: Thu, 1 Dec 2022 12:24:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pda/st/vehicle/wql/QPAD_EMPTY_VEHICLE.wql |  4 +--
 .../service/impl/IostordailyServiceImpl.java  |  8 +++++
 mes/qd/src/views/system/dict/dictDetail.vue   | 10 +++---
 mes/qd/src/views/system/dict/index.vue        |  8 ++---
 .../views/wms/basedata/master/supp/index.vue  |  2 +-
 .../wms/statistics/powderOrderQuery/index.vue | 10 +++---
 .../wms/statistics/sendReceiveQuery/index.vue | 31 ++++++++++++++++---
 7 files changed, 52 insertions(+), 21 deletions(-)

diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/vehicle/wql/QPAD_EMPTY_VEHICLE.wql b/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/vehicle/wql/QPAD_EMPTY_VEHICLE.wql
index e706d2c7..26c81c94 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/vehicle/wql/QPAD_EMPTY_VEHICLE.wql
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/vehicle/wql/QPAD_EMPTY_VEHICLE.wql
@@ -99,8 +99,8 @@
                 mb.material_code
             FROM
                 pdm_bi_procedureoffline off
-                LEFT JOIN md_me_materialbase mb ON mb.material_id = off.material_id
-                LEFT JOIN md_pb_bucketrecord bucket ON bucket.bucketunique = off.bucketunique AND bucket.`status` = '02'
+                INNER JOIN md_me_materialbase mb ON mb.material_id = off.material_id
+                INNER JOIN md_pb_bucketrecord bucket ON bucket.bucketunique = off.bucketunique AND bucket.`status` = '02'
             WHERE
                 off.`status` = '0'
             AND
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/service/impl/IostordailyServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/service/impl/IostordailyServiceImpl.java
index 60d25c2a..8bfb303a 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/service/impl/IostordailyServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/service/impl/IostordailyServiceImpl.java
@@ -43,6 +43,14 @@ public class IostordailyServiceImpl implements IostordailyService {
         String class_idStr = MapUtil.getStr(whereJson, "class_idStr");
         HashMap<String, String> map = new HashMap<>(whereJson);
         map.put("flag", "1");
+        String begin_time = MapUtil.getStr(whereJson, "begin_time");
+        if (StrUtil.isNotEmpty(begin_time)) {
+            map.put("begin_time", begin_time.substring(0,10));
+        }
+        String end_time = MapUtil.getStr(whereJson, "end_time");
+        if (StrUtil.isNotEmpty(end_time)) {
+            map.put("end_time", end_time.substring(0,10));
+        }
         //处理物料当前节点的所有子节点
         if (!StrUtil.isEmpty(material_type_id)) {
             map.put("material_type_id", material_type_id);
diff --git a/mes/qd/src/views/system/dict/dictDetail.vue b/mes/qd/src/views/system/dict/dictDetail.vue
index be2785a4..40a1979a 100644
--- a/mes/qd/src/views/system/dict/dictDetail.vue
+++ b/mes/qd/src/views/system/dict/dictDetail.vue
@@ -32,13 +32,13 @@
       </el-dialog>
       <!--表格渲染-->
       <el-table ref="table" v-loading="crud.loading" :data="crud.data" highlight-current-row style="width: 100%;" @selection-change="crud.selectionChangeHandler">
-        <el-table-column label="所属字典" width="135">
+        <el-table-column label="所属字典" min-width="135">
           {{ query.dictName }}
         </el-table-column>
-        <el-table-column prop="label" label="字典标签" align="center" width="100" />
-        <el-table-column prop="value" label="字典值" align="center" width="60" />
-        <el-table-column prop="dictSort" label="排序" align="center" width="45" />
-        <el-table-column v-permission="['admin','dict:edit','dict:del']" label="操作" align="center" width="115px" fixed="right">
+        <el-table-column prop="label" label="字典标签" align="center" min-width="100" />
+        <el-table-column prop="value" label="字典值" align="center" min-width="60" />
+        <el-table-column prop="dictSort" label="排序" align="center" min-width="55" />
+        <el-table-column v-permission="['admin','dict:edit','dict:del']" label="操作" align="center" min-width="115px" fixed="right">
           <template slot-scope="scope">
             <udOperation
               :data="scope.row"
diff --git a/mes/qd/src/views/system/dict/index.vue b/mes/qd/src/views/system/dict/index.vue
index 1bcae2f4..48b0267d 100644
--- a/mes/qd/src/views/system/dict/index.vue
+++ b/mes/qd/src/views/system/dict/index.vue
@@ -30,10 +30,10 @@
           </div>
           <!--表格渲染-->
           <el-table ref="table" v-loading="crud.loading" :data="crud.data" highlight-current-row style="width: 100%;" @selection-change="crud.selectionChangeHandler" @current-change="handleCurrentChange">
-            <el-table-column type="selection" width="55" />
-            <el-table-column show-overflow-tooltip prop="name" label="名称" />
-            <el-table-column show-overflow-tooltip prop="description" label="描述" />
-            <el-table-column v-permission="['admin','dict:edit','dict:del']" label="操作" width="130px" align="center" fixed="right">
+            <el-table-column type="selection" width="35" />
+            <el-table-column  prop="name" label="名称" min-width="200" />
+            <el-table-column  prop="description" label="描述" min-width="100" />
+            <el-table-column v-permission="['admin','dict:edit','dict:del']" label="操作" min-width="130px" align="center" fixed="right">
               <template slot-scope="scope">
                 <udOperation
                   :data="scope.row"
diff --git a/mes/qd/src/views/wms/basedata/master/supp/index.vue b/mes/qd/src/views/wms/basedata/master/supp/index.vue
index 1a0e8856..e5860675 100644
--- a/mes/qd/src/views/wms/basedata/master/supp/index.vue
+++ b/mes/qd/src/views/wms/basedata/master/supp/index.vue
@@ -134,7 +134,7 @@
         @selection-change="crud.selectionChangeHandler"
       >
         <el-table-column prop="supp_code" label="供应商编码" min-width="100" />
-        <el-table-column prop="supp_name" label="供应商名称 " min-width="150" />
+        <el-table-column prop="supp_name" label="供应商名称 " min-width="250" />
         <el-table-column prop="corp_address" label="公司地址" min-width="100" />
         <el-table-column prop="corp_tele_no" label="公司电话" min-width="100" />
         <el-table-column prop="jurid_name" label="法人代表" min-width="100" />
diff --git a/mes/qd/src/views/wms/statistics/powderOrderQuery/index.vue b/mes/qd/src/views/wms/statistics/powderOrderQuery/index.vue
index 9d210c04..718aac99 100644
--- a/mes/qd/src/views/wms/statistics/powderOrderQuery/index.vue
+++ b/mes/qd/src/views/wms/statistics/powderOrderQuery/index.vue
@@ -161,16 +161,16 @@ export default {
     // 钩子：在获取表格数据之前执行，false 则代表不获取数据
     [CRUD.HOOK.beforeRefresh]() {
       this.crud.data = []
-      this.cols = []
       if (this.query_flag) {
         this.crud.query.begin_time = (new Date().daysAgo(7)).strftime('%F', 'zh')
         this.crud.query.end_time = (new Date()).strftime('%F', 'zh')
         this.query_flag = false
+        const now = this.crud.query
+        crudPowderorder.getHeader(now).then(res => {
+          this.cols = res
+        })
       }
-      const now = this.crud.query
-      crudPowderorder.getHeader(now).then(res => {
-        this.cols = res
-      })
+      return true
     },
     onInput() {
       this.$forceUpdate()
diff --git a/mes/qd/src/views/wms/statistics/sendReceiveQuery/index.vue b/mes/qd/src/views/wms/statistics/sendReceiveQuery/index.vue
index d6b2f417..d9ed96eb 100644
--- a/mes/qd/src/views/wms/statistics/sendReceiveQuery/index.vue
+++ b/mes/qd/src/views/wms/statistics/sendReceiveQuery/index.vue
@@ -36,12 +36,13 @@
             <el-date-picker
               v-model="query.createTime"
               type="daterange"
-              value-format="yyyy-MM-dd"
+              value-format="yyyy-MM-dd HH:mm:ss"
               start-placeholder="开始日期"
               end-placeholder="结束日期"
-              @change="crud.toQuery"
+              :default-time="['00:00:00', '23:59:59']"
+              @input="onInput()"
+              @change="mytoQuery"
             />
-
           </el-form-item>
 
           <el-form-item label="物料编码">
@@ -116,6 +117,8 @@ import Treeselect, {LOAD_CHILDREN_OPTIONS} from '@riophae/vue-treeselect'
 import '@riophae/vue-treeselect/dist/vue-treeselect.css'
 import crudMaterialbase from "@/api/wms/basedata/master/materialbase";
 import crudBucketrecord from "@/api/wms/basedata/master/bucketrecord";
+import Date from '@/utils/datetime'
+import crudPowderorder from '@/api/wms/statistics/powderorder'
 
 const defaultForm = {
   stordaily_id: null,
@@ -139,7 +142,7 @@ const defaultForm = {
 }
 export default {
   name: 'SendReceiveQuery',
-  components: {pagination, crudOperation, rrOperation, udOperation, DateRangePicker, Treeselect},
+  components: {pagination, crudOperation, rrOperation, Treeselect},
   mixins: [presenter(), header(), form(defaultForm), crud()],
   cruds() {
     return CRUD({
@@ -165,6 +168,7 @@ export default {
     return {
       permission: {},
       classes: [],
+      query_flag: true,
       QualityList: [],
       IvtList: [],
       class_idStr: null,
@@ -189,10 +193,16 @@ export default {
     crudBucketrecord.getIvtList().then(res => {
       this.IvtList = res
     })
+    this.crud.query.createTime = [new Date().daysAgo(30), new Date()]
   },
   methods: {
     // 钩子：在获取表格数据之前执行，false 则代表不获取数据
     [CRUD.HOOK.beforeRefresh]() {
+      if (this.query_flag) {
+        this.crud.query.begin_time = (new Date().daysAgo(30)).strftime('%F', 'zh')
+        this.crud.query.end_time = (new Date()).strftime('%F', 'zh')
+        this.query_flag = false
+      }
       return true
     },
     queryClassId() {
@@ -208,6 +218,19 @@ export default {
         })
       })
     },
+    onInput() {
+      this.$forceUpdate()
+    },
+    mytoQuery(array1) {
+      if (array1 === null) {
+        this.crud.query.begin_time = ''
+        this.crud.query.end_time = ''
+      } else {
+        this.crud.query.begin_time = array1[0]
+        this.crud.query.end_time = array1[1]
+      }
+      this.crud.toQuery()
+    },
     loadClass({ action, parentNode, callback}) {
       if (action === LOAD_CHILDREN_OPTIONS) {
         crudClassstandard.getClass({pid: parentNode.id}).then(res => {