From 0e05a3d0d1dae02ba07d0b63e48a6139f9ded733 Mon Sep 17 00:00:00 2001
From: shaoyong <yorkshao@163.com>
Date: Sat, 11 May 2024 13:10:38 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=88=90=E5=9E=8B=E6=9C=BA=E6=8A=A5?=
 =?UTF-8?q?=E8=A1=A8=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/mes/machineProduction/index.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/views/mes/machineProduction/index.vue b/src/views/mes/machineProduction/index.vue
index 3748bb70..2d2e88f3 100644
--- a/src/views/mes/machineProduction/index.vue
+++ b/src/views/mes/machineProduction/index.vue
@@ -11,8 +11,8 @@
       <el-form-item label="生产时间" prop="productDateArray">
         <el-date-picker
           v-model="queryParams.productDateArray"
-          format="yyyy-MM-dd HH:mm:ss"
-          type="datetimerange"
+          format="yyyy-MM-dd"
+          type="daterange"
           range-separator="至"
           start-placeholder="开始日期"
           end-placeholder="结束日期"
@@ -168,7 +168,7 @@ export default {
       var y = dd.getFullYear();
       var m = dd.getMonth() + 1; //获取当前月份的日期
       var d = dd.getDate();
-      return y + "-" + m + "-" + d ;
+      return y + "-" + m + "-" + d + " 00:00:00";
     },
 
     /** 查询设备小时产量列表 */

From 23890d2e2080f6cb9efd901c81baec224dd4fc85 Mon Sep 17 00:00:00 2001
From: shaoyong <yorkshao@163.com>
Date: Sat, 11 May 2024 14:53:17 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=88=90=E5=93=81=E5=85=A5=E5=BA=93?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/quality/qcWarehousing/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/quality/qcWarehousing/index.vue b/src/views/quality/qcWarehousing/index.vue
index dd8ab06c..0dc5cacf 100644
--- a/src/views/quality/qcWarehousing/index.vue
+++ b/src/views/quality/qcWarehousing/index.vue
@@ -671,7 +671,7 @@ export default {
 		},
 		//工单选择确认
 		onSelectWorkOrder(obj) {
-           this.form.orderNo = obj.orderNo;
+           this.form.orderNo = obj.workorderCode;
 		   this.form.materialName = obj.materialName;
 		   this.form.materialCode = obj.materialCode;
            this.form.quality = obj.quality;