生产排产排产日期取值逻辑调整为工单预计开始日期。

工单添加显示字段预计开始日期

src/views/mes/pro/scheduleList/arrangCodeList.vue

@@ -12,6 +12,11 @@
         <el-table-column :label="$t('生产订单数量')" v-if="isOrder" prop="quantity"/>
         <el-table-column :label="$t('规格')" width="140" prop="productSpc"/>
         <el-table-column :label="$t('需求日期')" width="140" prop="requestDate"/>
+        <el-table-column :label="$t('预计开工')" width="140" prop="expectStartDate">
+          <template slot-scope="scope">
+            <span>{{ scope.row.expectStartDate ? parseTime(scope.row.expectStartDate, '{y}-{m}-{d}') : '' }}</span>
+          </template>
+        </el-table-column>
       </el-table>
     </div>
 </template>

src/views/mes/pro/scheduleList/index.vue

@@ -142,20 +142,20 @@
           <el-form-item :label="$t('计划开始时间段')" label-width="130px" prop="scheduleStartDate">
             <el-date-picker
               v-model="queryParams.scheduleStartDate"
-              type="datetimerange"
+              type="daterange"
               :range-separator="$t('至')"
               :start-placeholder="$t('common.start_date')"
-              value-format="yyyy-MM-dd HH:mm:ss"
-              format="yyyy-MM-dd HH:mm:ss"
+              value-format="yyyy-MM-dd"
+              format="yyyy-MM-dd"
               :end-placeholder="$t('common.end_date')">
             </el-date-picker>
           </el-form-item>
           <el-form-item :label="$t('计划结束时间段')" label-width="130px" prop="scheduleEndDate">
             <el-date-picker
               v-model="queryParams.scheduleEndDate"
-              value-format="yyyy-MM-dd HH:mm:ss"
-              format="yyyy-MM-dd HH:mm:ss"
-              type="datetimerange"
+              value-format="yyyy-MM-dd"
+              format="yyyy-MM-dd"
+              type="daterange"
               :range-separator="$t('至')"
               :start-placeholder="$t('common.start_date')"
               :end-placeholder="$t('common.end_date')">
@@ -164,9 +164,9 @@
           <el-form-item :label="$t('排产日期')" label-width="130px" prop="scheduleDocCreateTime">
             <el-date-picker
               v-model="queryParams.scheduleDocCreateTime"
-              type="datetimerange"
-              value-format="yyyy-MM-dd HH:mm:ss"
-              format="yyyy-MM-dd HH:mm:ss"
+              type="daterange"
+              value-format="yyyy-MM-dd"
+              format="yyyy-MM-dd"
               :range-separator="$t('至')"
               :start-placeholder="$t('common.start_date')"
               :end-placeholder="$t('common.end_date')"
@@ -250,9 +250,9 @@
           {{scope.row.taskBatch.split('-').length > 1 ? scope.row.taskBatch.split('-')[scope.row.taskBatch.split('-').length - 1]: ''}}
         </template>
       </el-table-column>
-      <el-table-column :label="$t('排产日期')" align="center" prop="scheduleDocCreateTime" width="170">
+      <el-table-column :label="$t('排产日期')" align="center" prop="expectStartDate" width="170">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.scheduleDocCreateTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+          <span>{{ formatExpectScheduleDate(scope.row.expectStartDate) }}</span>
         </template>
       </el-table-column>
       <el-table-column :label="$t('任务单编码')" width="120" prop="taskCode">
@@ -704,19 +704,31 @@ export default {
     this.hanldeGetdefaultWorkCenterList()
   },
   methods: {
+    formatExpectScheduleDate(expectStartDate) {
+      if (!expectStartDate) {
+        return ''
+      }
+      return `${this.parseTime(expectStartDate, '{y}-{m}-{d}')} 08:00:00`
+    },
+    toDayStart(dateStr) {
+      return dateStr ? `${dateStr} 00:00:00` : null
+    },
+    toDayEnd(dateStr) {
+      return dateStr ? `${dateStr} 23:59:59` : null
+    },
     buildQueryParams() {
       const params = { ...this.queryParams, neWorkunitId: 1 }
       if (params.scheduleEndDate && params.scheduleEndDate.length > 0) {
-        params.scheduleEndDateFrom = params.scheduleEndDate[0]
-        params.scheduleEndDateTo = params.scheduleEndDate[1]
+        params.scheduleEndDateFrom = this.toDayStart(params.scheduleEndDate[0])
+        params.scheduleEndDateTo = this.toDayEnd(params.scheduleEndDate[1])
       }
       if (params.scheduleStartDate && params.scheduleStartDate.length > 0) {
-        params.scheduleStartDateFrom = params.scheduleStartDate[0]
-        params.scheduleStartDateTo = params.scheduleStartDate[1]
+        params.scheduleStartDateFrom = this.toDayStart(params.scheduleStartDate[0])
+        params.scheduleStartDateTo = this.toDayEnd(params.scheduleStartDate[1])
       }
       if (params.scheduleDocCreateTime && params.scheduleDocCreateTime.length > 0) {
-        params.scheduleDocCreateTimeFrom = params.scheduleDocCreateTime[0]
-        params.scheduleDocCreateTimeTo = params.scheduleDocCreateTime[1]
+        params.scheduleDocCreateTimeFrom = this.toDayStart(params.scheduleDocCreateTime[0])
+        params.scheduleDocCreateTimeTo = this.toDayEnd(params.scheduleDocCreateTime[1])
       }
       delete params.scheduleStartDate
       delete params.scheduleEndDate

src/views/mes/pro/scheduleList/orderList.vue

@@ -77,6 +77,11 @@
       <el-table-column :label="$t('产品名称')" align="center" prop="productName"/>
       <el-table-column :label="$t('产品图号')" align="center" prop="customerDrawingNo"/>
       <el-table-column :label="$t('首工序名称')" align="center" prop="firstProcessName" min-width="120" show-overflow-tooltip/>
+      <el-table-column :label="$t('预计开工')" align="center" prop="expectStartDate" width="120">
+        <template slot-scope="scope">
+          <span>{{ scope.row.expectStartDate ? parseTime(scope.row.expectStartDate, '{y}-{m}-{d}') : '' }}</span>
+        </template>
+      </el-table-column>
       <el-table-column :label="$t('预交日期')" align="center" prop="requestDate"/>
       <el-table-column :label="$t('未排数量')" align="center" prop="disQuantity"/>
       <el-table-column :label="$t('本次数量')" align="center" prop="scheduleQuantity" width="160">
@@ -170,21 +175,22 @@ export default {
     this.getList();
   },
   methods: {
-    
+    buildDefaultScheduleDate(expectStartDate) {
+      const dateStr = expectStartDate
+        ? this.parseTime(expectStartDate, '{y}-{m}-{d}')
+        : this.parseTime(new Date(), '{y}-{m}-{d}')
+      return `${dateStr} 08:00`
+    },
     /** 查询物料编码列表 */
     getList() {
       this.loading = true;
-      var defDate = new Date();
-      defDate.setHours(8);
-      defDate.setMinutes(0);
-      defDate.setSeconds(0)
       scheduleList(this.queryParams).then((response) => {
         response.rows = response.rows.map(v=>{
           return {
             ...v,
             disQuantity : v.quantity - v.quantityScheduled,
             scheduleQuantity: v.quantity - v.quantityScheduled,
-            scheduleDate:defDate
+            scheduleDate: this.buildDefaultScheduleDate(v.expectStartDate)
           }
         })
         this.itemList = response.rows;

src/views/mes/pro/workorder/indexApply.vue

@@ -238,6 +238,11 @@
           <span>{{ parseTime(scope.row.requestDate, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
+      <el-table-column :label="$t('预计开工')" align="center" prop="expectStartDate" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.expectStartDate, "{y}-{m}-{d}") }}</span>
+        </template>
+      </el-table-column>
       <el-table-column :label="$t('单位')" align="center" prop="unitOfMeasure" />
       <el-table-column :label="$t('工单数量')" align="center" prop="quantity" />
       <el-table-column :label="$t('已排产数量')" align="center" prop="quantityScheduled"/>
@@ -434,6 +439,14 @@
               </el-date-picker>
             </el-form-item>
           </el-col>
+          <el-col :span="8">
+            <el-form-item :label="$t('预计开工')" prop="expectStartDate">
+              <el-date-picker clearable v-model="form.expectStartDate" type="date" value-format="yyyy-MM-dd" disabled>
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
           <el-col :span="8">
             <el-form-item :label="$t('批次号')" prop="batchCode">
               <el-input v-model="form.batchCode" />
@@ -962,6 +975,7 @@ export default {
         vendorCode: null,
         vendorName: null,
         requestDate: null,
+        expectStartDate: null,
         parentId: null,
         status: "PREPARE",
         remark: null,

src/views/mes/pro/workorder/proofingInfo.vue

@@ -211,6 +211,18 @@
               </el-date-picker>
             </el-form-item>
           </el-col>
+          <el-col :lg="6" :md="8" :sm="12" :xs="12">
+            <el-form-item :label="$t('预计开工')" prop="expectStartDate">
+              <el-date-picker
+                clearable
+                v-model="form.expectStartDate"
+                type="date"
+                disabled
+                value-format="yyyy-MM-dd"
+              >
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
           <el-col :lg="6" :md="8" :sm="12" :xs="12">
             <el-form-item :label="$t('生产主管')" prop="productionAdministrator">
               <el-input
@@ -422,6 +434,7 @@ export default {
         vendorCode: null,
         vendorName: null,
         requestDate: null,
+        expectStartDate: null,
         parentId: null,
         status: "PREPARE",
         orderId: null,
@@ -800,6 +813,7 @@ export default {
         vendorCode: null,
         vendorName: null,
         requestDate: null,
+        expectStartDate: null,
         parentId: null,
         status: "PREPARE",
         remark: null,

src/views/mes/proTable/productProcess/index.vue

@@ -22,9 +22,9 @@
       <el-form-item :label="$t('排产日期')" label-width="100px" prop="scheduleDate">
         <el-date-picker
           v-model="queryParams.scheduleDate"
-          type="datetimerange"
-          value-format="yyyy-MM-dd HH:mm:ss"
-          format="yyyy-MM-dd HH:mm:ss"
+          type="daterange"
+          value-format="yyyy-MM-dd"
+          format="yyyy-MM-dd"
           :range-separator="$t('至')"
           :start-placeholder="$t('common.start_date')"
           :end-placeholder="$t('common.end_date')"
@@ -61,7 +61,7 @@
         <el-table-column :label="$t('排产次数')" align="center" prop="taskBatch"></el-table-column>
         <el-table-column :label="$t('排产日期')" align="center" prop="scheduleDate" width="170">
           <template slot-scope="scope">
-            <span>{{ parseTime(scope.row.scheduleDate, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+            <span>{{ formatExpectScheduleDate(scope.row.scheduleDate) }}</span>
           </template>
         </el-table-column>
         <el-table-column :label="$t('订单序号')" align="center" prop="orderSerial"></el-table-column>
@@ -347,6 +347,18 @@ export default {
       }
       return '';
     },
+    formatExpectScheduleDate(scheduleDate) {
+      if (!scheduleDate) {
+        return ''
+      }
+      return `${this.parseTime(scheduleDate, '{y}-{m}-{d}')} 08:00:00`
+    },
+    toDayStart(dateStr) {
+      return dateStr ? `${dateStr} 00:00:00` : null
+    },
+    toDayEnd(dateStr) {
+      return dateStr ? `${dateStr} 23:59:59` : null
+    },
     buildQueryParams() {
       const params = { ...this.queryParams, defectStatus: true }
       if (this.daterangePurchaseDate && this.daterangePurchaseDate.length > 0) {
@@ -354,8 +366,8 @@ export default {
         params.endDate = this.daterangePurchaseDate[1]
       }
       if (params.scheduleDate && params.scheduleDate.length > 0) {
-        params.scheduleDateFrom = params.scheduleDate[0]
-        params.scheduleDateTo = params.scheduleDate[1]
+        params.scheduleDateFrom = this.toDayStart(params.scheduleDate[0])
+        params.scheduleDateTo = this.toDayEnd(params.scheduleDate[1])
       } else {
         params.scheduleDateFrom = null
         params.scheduleDateTo = null