From dbc0f5c69a35e5aaa62fdc7a77cb46f0498b702b Mon Sep 17 00:00:00 2001
From: yinq <yinq>
Date: Thu, 7 Dec 2023 09:51:40 +0800
Subject: [PATCH] =?UTF-8?q?update=20-=20=E8=AE=A2=E5=8D=95BOM=E3=80=81?=
 =?UTF-8?q?=E7=94=9F=E4=BA=A7BOM?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/production/baseBomInfo.js             |   9 ++
 src/views/base/materialInfo/index.vue         |  30 ++---
 src/views/base/orderBomInfo/addBom.vue        |   3 +-
 src/views/base/orderBomInfo/index.vue         | 118 ++++++++++--------
 src/views/base/orderInfo/index.vue            |  16 +--
 src/views/production/baseBomInfo/childBom.vue |  30 ++---
 src/views/production/baseBomInfo/index.vue    |  30 ++++-
 src/views/production/planInfo/index.vue       |  42 +++----
 8 files changed, 163 insertions(+), 115 deletions(-)

diff --git a/src/api/production/baseBomInfo.js b/src/api/production/baseBomInfo.js
index 6369d1f..b192410 100644
--- a/src/api/production/baseBomInfo.js
+++ b/src/api/production/baseBomInfo.js
@@ -9,6 +9,15 @@ export function listBaseBomInfo(query) {
   })
 }
 
+// 自动同步生产BOM
+export function addAutomaticSynchronizationBOM(query) {
+  return request({
+    url: '/production/baseBomInfo/addAutomaticSynchronizationBOM',
+    method: 'get',
+    params: query,
+    timeout: 60000
+  })
+}
 // 查询生产BOM列表
 export function listTreeBaseBomInfo(query) {
   return request({
diff --git a/src/views/base/materialInfo/index.vue b/src/views/base/materialInfo/index.vue
index cba5b77..ca5bb2e 100644
--- a/src/views/base/materialInfo/index.vue
+++ b/src/views/base/materialInfo/index.vue
@@ -29,8 +29,8 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="物料类型" prop="materialType">
-        <el-select v-model="queryParams.materialType" placeholder="请选择物料类型" clearable>
+      <el-form-item label="SAP物料类型" prop="materialType">
+        <el-select v-model="queryParams.materialType" placeholder="请选择SAP物料类型" clearable>
           <el-option
             v-for="dict in dict.type.material_type"
             :key="dict.value"
@@ -71,7 +71,7 @@
           size="mini"
           @click="handleAdd"
           v-hasPermi="['base:materialInfo:add']"
-        >新增</el-button>
+        >手动新增物料</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -123,7 +123,7 @@
           <dict-tag :options="dict.type.material_subclass" :value="scope.row.materialSubclass"/>
         </template>
       </el-table-column>
-      <el-table-column label="物料类型" align="center" prop="materialType" v-if="columns[5].visible">
+      <el-table-column label="SAP物料类型" align="center" prop="materialType" v-if="columns[5].visible">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.material_type" :value="scope.row.materialType"/>
         </template>
@@ -164,13 +164,13 @@
             @click="handleUpdate(scope.row)"
             v-hasPermi="['base:materialInfo:edit']"
           >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['base:materialInfo:remove']"
-          >删除</el-button>
+<!--          <el-button-->
+<!--            size="mini"-->
+<!--            type="text"-->
+<!--            icon="el-icon-delete"-->
+<!--            @click="handleDelete(scope.row)"-->
+<!--            v-hasPermi="['base:materialInfo:remove']"-->
+<!--          >删除</el-button>-->
         </template>
       </el-table-column>
     </el-table>
@@ -212,8 +212,8 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="物料类型" prop="materialType">
-          <el-select v-model="form.materialType" placeholder="请选择物料类型">
+        <el-form-item label="SAP物料类型" prop="materialType">
+          <el-select v-model="form.materialType" placeholder="请选择SAP物料类型">
             <el-option
               v-for="dict in dict.type.material_type"
               :key="dict.value"
@@ -337,10 +337,10 @@ export default {
         { key: 2, label: `物料名称`, visible: true },
         { key: 3, label: `物料大类`, visible: true },
         { key: 4, label: `物料小类`, visible: true },
-        { key: 5, label: `物料类型`, visible: true },
+        { key: 5, label: `SAP物料类型`, visible: true },
         { key: 6, label: `计量单位`, visible: true },
         { key: 7, label: `MATKL`, visible: true },
-        { key: 8, label: `物料规格`, visible: true },
+        { key: 8, label: `物料规格`, visible: false },
         { key: 9, label: `所属工厂`, visible: true },
         { key: 10, label: `产线工位`, visible: false },
         { key: 11, label: `启用标识`, visible: false },
diff --git a/src/views/base/orderBomInfo/addBom.vue b/src/views/base/orderBomInfo/addBom.vue
index ccb179d..003edab 100644
--- a/src/views/base/orderBomInfo/addBom.vue
+++ b/src/views/base/orderBomInfo/addBom.vue
@@ -99,6 +99,7 @@ import {
   addOrderBomInfo,
   updateOrderBomInfo
 } from '@/api/base/orderBomInfo'
+import { listMaterialInfo } from '@//api/base/materialInfo'
 
 export default {
   name: 'OrderBomInfo',
@@ -176,7 +177,7 @@ export default {
     /** 查询订单BOM列表 */
     getList() {
       this.loading = true
-      listOrderBomInfo(this.queryParams).then(response => {
+      listMaterialInfo(this.queryParams).then(response => {
         this.orderBomInfoList = response.rows
         this.total = response.total
         this.loading = false
diff --git a/src/views/base/orderBomInfo/index.vue b/src/views/base/orderBomInfo/index.vue
index 9fa4a81..befa40f 100644
--- a/src/views/base/orderBomInfo/index.vue
+++ b/src/views/base/orderBomInfo/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="90px">
       <!--      <el-form-item label="BOM编号" prop="bomCode">-->
       <!--        <el-input-->
       <!--          v-model="queryParams.bomCode"-->
@@ -9,31 +9,39 @@
       <!--          @keyup.enter.native="handleQuery"-->
       <!--        />-->
       <!--      </el-form-item>-->
-      <el-form-item label="物料编码" prop="materialCode">
+      <el-form-item label="子物料编号" prop="materialCode">
         <el-input
           v-model="queryParams.materialCode"
-          placeholder="请输入物料编码"
+          placeholder="请输入子物料编号"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="物料名称" prop="materialName">
+      <el-form-item label="子物料名称" prop="materialName">
         <el-input
           v-model="queryParams.materialName"
-          placeholder="请输入物料名称"
+          placeholder="请输入子物料名称"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="物料类别" prop="materialType">
-        <el-select v-model="queryParams.materialType" placeholder="请选择物料类别" clearable>
+      <el-form-item label="子物料小类" prop="materialType">
+        <el-select v-model="queryParams.materialType" placeholder="请选择子物料小类" clearable>
           <el-option
-            v-for="dict in dict.type.material_type"
+            v-for="dict in dict.type.material_subclass"
             :key="dict.value"
             :label="dict.label"
             :value="dict.value"
           />
         </el-select>
+        <el-form-item label="父物料编号" prop="parentId">
+          <el-input
+            v-model="queryParams.parentId"
+            placeholder="请输入父物料编号"
+            clearable
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -50,7 +58,7 @@
           size="mini"
           @click="handleAdd"
           v-hasPermi="['base:orderBomInfo:add']"
-        >新增
+        >手动新增BOM
         </el-button>
       </el-col>
       <el-col :span="1.5">
@@ -95,21 +103,27 @@
       <el-table-column type="selection" width="55" align="center"/>
       <el-table-column label="主键标识" align="center" prop="objId" v-if="columns[0].visible"/>
       <el-table-column label="BOM编号" align="center" prop="bomCode" v-if="columns[1].visible"/>
-      <el-table-column label="物料编码" align="center" prop="materialCode" v-if="columns[2].visible">
+      <el-table-column label="子物料编号" align="center" prop="materialCode" v-if="columns[2].visible">
         <template slot-scope="scope">
           <router-link :to="'/base/bom-info/index/' + scope.row.materialCode" class="link-type">
             <span>{{ scope.row.materialCode }}</span>
           </router-link>
         </template>
       </el-table-column>
-      <el-table-column label="物料名称" align="center" prop="materialName" v-if="columns[3].visible"/>
-      <el-table-column label="物料类别" align="center" prop="materialType" v-if="columns[4].visible">
+      <el-table-column label="子物料名称" align="center" prop="materialName" v-if="columns[3].visible"/>
+      <el-table-column label="子物料小类" align="center" prop="materialType" v-if="columns[4].visible">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.material_type" :value="scope.row.materialType"/>
+          <dict-tag :options="dict.type.material_subclass" :value="scope.row.materialType"/>
         </template>
       </el-table-column>
       <el-table-column label="标准数量" align="center" prop="standardAmount" v-if="columns[5].visible"/>
-      <el-table-column label="父级编号" align="center" prop="parentId" v-if="columns[6].visible"/>
+      <el-table-column label="父级物料编号" align="center" prop="parentId" v-if="columns[6].visible"/>
+      <el-table-column label="父级物料名称" align="center" prop="parentName" v-if="columns[16].visible"/>
+      <el-table-column label="父级物料小类" align="center" prop="parentMaterialType" v-if="columns[17].visible">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.material_subclass" :value="scope.row.parentMaterialType"/>
+        </template>
+      </el-table-column>
       <el-table-column label="是否标识" align="center" prop="isFlag" v-if="columns[7].visible"/>
       <el-table-column label="创建人" align="center" prop="createdBy" v-if="columns[8].visible"/>
       <el-table-column label="创建时间" align="center" prop="createdTime" width="180" v-if="columns[9].visible">
@@ -137,14 +151,14 @@
             v-hasPermi="['base:orderBomInfo:edit']"
           >修改
           </el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['base:orderBomInfo:remove']"
-          >删除
-          </el-button>
+<!--          <el-button-->
+<!--            size="mini"-->
+<!--            type="text"-->
+<!--            icon="el-icon-delete"-->
+<!--            @click="handleDelete(scope.row)"-->
+<!--            v-hasPermi="['base:orderBomInfo:remove']"-->
+<!--          >删除-->
+<!--          </el-button>-->
         </template>
       </el-table-column>
     </el-table>
@@ -159,31 +173,31 @@
 
     <!-- 添加或修改订单BOM对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="BOM编号" prop="bomCode">
-          <el-input v-model="form.bomCode" placeholder="请输入BOM编号"/>
-        </el-form-item>
-        <el-form-item label="物料编码" prop="materialCode">
-          <el-input v-model="form.materialCode" placeholder="请输入物料编码"/>
-        </el-form-item>
-        <el-form-item label="物料名称" prop="materialName">
-          <el-input v-model="form.materialName" placeholder="请输入物料名称"/>
-        </el-form-item>
-        <el-form-item label="物料类别" prop="materialType">
-          <el-select v-model="form.materialType" placeholder="请选择物料类别">
-            <el-option
-              v-for="dict in dict.type.material_type"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            ></el-option>
-          </el-select>
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+<!--        <el-form-item label="BOM编号" prop="bomCode">-->
+<!--          <el-input v-model="form.bomCode" placeholder="请输入BOM编号"/>-->
+<!--        </el-form-item>-->
+        <el-form-item label="子物料编号" prop="materialCode">
+          <el-input v-model="form.materialCode" placeholder="请输入子物料编号"/>
         </el-form-item>
+<!--        <el-form-item label="子物料名称" prop="materialName">-->
+<!--          <el-input v-model="form.materialName" placeholder="请输入子物料名称"/>-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="子物料小类" prop="materialType">-->
+<!--          <el-select v-model="form.materialType" placeholder="请选择子物料小类">-->
+<!--            <el-option-->
+<!--              v-for="dict in dict.type.material_type"-->
+<!--              :key="dict.value"-->
+<!--              :label="dict.label"-->
+<!--              :value="dict.value"-->
+<!--            ></el-option>-->
+<!--          </el-select>-->
+<!--        </el-form-item>-->
         <el-form-item label="标准数量" prop="standardAmount">
           <el-input v-model="form.standardAmount" placeholder="请输入标准数量"/>
         </el-form-item>
-        <el-form-item label="父级编号" prop="parentId">
-          <el-input v-model="form.parentId" placeholder="请输入父级编号"/>
+        <el-form-item label="父级物料编号" prop="parentId">
+          <el-input v-model="form.parentId" placeholder="请输入父级物料编号"/>
         </el-form-item>
 <!--        <el-form-item label="是否标识" prop="isFlag">-->
 <!--          <el-input v-model="form.isFlag" placeholder="请输入是否标识"/>-->
@@ -220,7 +234,7 @@ import {
 
 export default {
   name: 'OrderBomInfo',
-  dicts: ['material_type'],
+  dicts: ['material_type','material_subclass'],
   data() {
     return {
       // 遮罩层
@@ -248,7 +262,7 @@ export default {
         bomCode: null,
         materialCode: null,
         materialName: null,
-        materialType: 'FERT',
+        materialType: null,
         standardAmount: null,
         parentId: null,
         isFlag: null,
@@ -267,12 +281,12 @@ export default {
       rules: {},
       columns: [
         { key: 0, label: `主键标识`, visible: false },
-        { key: 1, label: `BOM编号`, visible: true },
-        { key: 2, label: `物料编码`, visible: true },
-        { key: 3, label: `物料名称`, visible: true },
-        { key: 4, label: `物料类别`, visible: true },
+        { key: 1, label: `BOM编号`, visible: false },
+        { key: 2, label: `子物料编号`, visible: true },
+        { key: 3, label: `子物料名称`, visible: true },
+        { key: 4, label: `子物料小类`, visible: true },
         { key: 5, label: `标准数量`, visible: true },
-        { key: 6, label: `父级编号`, visible: true },
+        { key: 6, label: `父级物料编号`, visible: true },
         { key: 7, label: `是否标识`, visible: false },
         { key: 8, label: `创建人`, visible: false },
         { key: 9, label: `创建时间`, visible: false },
@@ -281,7 +295,9 @@ export default {
         { key: 12, label: `工厂编号`, visible: true },
         { key: 13, label: `排序`, visible: true },
         { key: 14, label: `销售凭证`, visible: false },
-        { key: 15, label: `销售单据项目`, visible: false }
+        { key: 15, label: `销售单据项目`, visible: false },
+        { key: 16, label: `父级物料名称`, visible: true },
+        { key: 17, label: `父级物料小类`, visible: true }
       ]
     }
   },
diff --git a/src/views/base/orderInfo/index.vue b/src/views/base/orderInfo/index.vue
index 73df02f..6b34a79 100644
--- a/src/views/base/orderInfo/index.vue
+++ b/src/views/base/orderInfo/index.vue
@@ -107,12 +107,12 @@
           <dict-tag :options="dict.type.is_release" :value="scope.row.isRelease"/>
         </template>
       </el-table-column>
-      <el-table-column label="开始日期" align="center" prop="beginDate" width="180" v-if="columns[11].visible">
+      <el-table-column label="计划开始日期" align="center" prop="beginDate" width="180" v-if="columns[11].visible">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.beginDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="结束日期" align="center" prop="endDate" width="180" v-if="columns[12].visible">
+      <el-table-column label="计划结束日期" align="center" prop="endDate" width="180" v-if="columns[12].visible">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.endDate, '{y}-{m}-{d}') }}</span>
         </template>
@@ -221,20 +221,20 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="开始日期" prop="beginDate">
+        <el-form-item label="计划开始日期" prop="beginDate">
           <el-date-picker clearable
             v-model="form.beginDate"
             type="date"
             value-format="yyyy-MM-dd"
-            placeholder="请选择开始日期">
+            placeholder="请选择计划开始日期">
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="结束日期" prop="endDate">
+        <el-form-item label="计划结束日期" prop="endDate">
           <el-date-picker clearable
             v-model="form.endDate"
             type="date"
             value-format="yyyy-MM-dd"
-            placeholder="请选择结束日期">
+            placeholder="请选择计划结束日期">
           </el-date-picker>
         </el-form-item>
         <el-form-item label="工厂编码" prop="factoryCode">
@@ -341,8 +341,8 @@ export default {
             { key: 8, label: `完成数量`, visible: true },
             { key: 9, label: `工单类型`, visible: true },
             { key: 10, label: `工单状态`, visible: true },
-            { key: 11, label: `开始日期`, visible: true },
-            { key: 12, label: `结束日期`, visible: true },
+            { key: 11, label: `计划开始日期`, visible: true },
+            { key: 12, label: `计划结束日期`, visible: true },
             { key: 13, label: `工厂编码`, visible: true },
             { key: 14, label: `启用标识`, visible: false },
             { key: 15, label: `创建人`, visible: false },
diff --git a/src/views/production/baseBomInfo/childBom.vue b/src/views/production/baseBomInfo/childBom.vue
index 81b1973..5f2891a 100644
--- a/src/views/production/baseBomInfo/childBom.vue
+++ b/src/views/production/baseBomInfo/childBom.vue
@@ -60,13 +60,13 @@
       <el-table-column label="物料名称" align="center" prop="materialName" />
       <el-table-column label="物料类型" align="center" prop="materialType">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.material_type" :value="scope.row.materialType"/>
+          <dict-tag :options="dict.type.material_subclass" :value="scope.row.materialType"/>
         </template>
       </el-table-column>
       <el-table-column label="标准数量" align="center" prop="standardAmount" />
 <!--      <el-table-column label="父物料编号" align="center" prop="parentId" />-->
       <el-table-column label="工厂名称" align="center" prop="plantName" />
-      <el-table-column label="产线/工位" align="center" prop="productLineName" />
+<!--      <el-table-column label="产线/工位" align="center" prop="productLineName" />-->
 <!--      <el-table-column label="是否标识" align="center" prop="isFlag">-->
 <!--        <template slot-scope="scope">-->
 <!--          <dict-tag :options="dict.type.is_flag" :value="scope.row.isFlag"/>-->
@@ -135,7 +135,7 @@
         <el-form-item label="物料类型" prop="materialType">
           <el-select v-model="form.materialType" placeholder="请选择物料类型">
             <el-option
-              v-for="dict in dict.type.material_type"
+              v-for="dict in dict.type.material_subclass"
               :key="dict.value"
               :label="dict.label"
               :value="dict.value"
@@ -143,7 +143,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="所属工厂">
-          <el-select v-model="form.plantCode" placeholder="请选择所属工厂" :disabled="true">
+          <el-select v-model="form.plantCode" placeholder="请选择所属工厂" >
             <el-option
               v-for="item in factoryList"
               :key="item.factoryCode"
@@ -152,16 +152,16 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="产线工位">
-          <el-select v-model="form.productLineCode" placeholder="请选择产线工位">
-            <el-option
-              v-for="item in productLineList"
-              :key="item.productLineCode"
-              :label="item.productLineName"
-              :value="item.productLineCode"
-            ></el-option>
-          </el-select>
-        </el-form-item>
+<!--        <el-form-item label="产线工位">-->
+<!--          <el-select v-model="form.productLineCode" placeholder="请选择产线工位">-->
+<!--            <el-option-->
+<!--              v-for="item in productLineList"-->
+<!--              :key="item.productLineCode"-->
+<!--              :label="item.productLineName"-->
+<!--              :value="item.productLineCode"-->
+<!--            ></el-option>-->
+<!--          </el-select>-->
+<!--        </el-form-item>-->
 <!--        <el-form-item label="启用标识" prop="isFlag">-->
 <!--          <el-radio-group v-model="form.isFlag">-->
 <!--            <el-radio-->
@@ -205,7 +205,7 @@ import addBom from '@//views/base/orderBomInfo/addBom.vue';
 
 export default {
   name: "BaseBomInfo",
-  dicts: ['material_type', 'is_flag'],
+  dicts: ['material_type', 'is_flag','material_subclass'],
   components: {
     Treeselect,
     'add-bom': addBom
diff --git a/src/views/production/baseBomInfo/index.vue b/src/views/production/baseBomInfo/index.vue
index c8eeb6e..3db7bcf 100644
--- a/src/views/production/baseBomInfo/index.vue
+++ b/src/views/production/baseBomInfo/index.vue
@@ -66,6 +66,15 @@
           v-hasPermi="['production:baseBomInfo:export']"
         >导出</el-button>
       </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="AutomaticSynchronizationBOM"
+        >自动同步生产BOM</el-button>
+      </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
     </el-row>
 
@@ -157,7 +166,6 @@
               :key="item.factoryCode"
               :label="item.factoryName"
               :value="item.factoryCode"
-              :disabled="true"
             ></el-option>
           </el-select>
         </el-form-item>
@@ -208,9 +216,17 @@
 </template>
 
 <script>
-import { listBaseBomInfo, getBaseBomInfo, delBaseBomInfo, addBaseBomInfo, updateBaseBomInfo } from "@/api/production/baseBomInfo";
+import {
+  listBaseBomInfo,
+  getBaseBomInfo,
+  delBaseBomInfo,
+  addBaseBomInfo,
+  updateBaseBomInfo,
+  addAutomaticSynchronizationBOM
+} from '@/api/production/baseBomInfo'
 import {findFactoryList} from "@//api/base/factory";
 import addBom from '@//views/base/orderBomInfo/addBom.vue';
+import { addSAPCalendar } from '@//api/production/calendarInfo'
 
 export default {
   name: "BaseBomInfo",
@@ -247,7 +263,7 @@ export default {
         bomCode: null,
         materialCode: null,
         materialName: null,
-        materialType: 0,
+        materialType: 100,
         standardAmount: null,
         parentId: null,
         plantCode: null,
@@ -313,7 +329,7 @@ export default {
         bomCode: null,
         materialCode: null,
         materialName: null,
-        materialType: 0,
+        materialType: null,
         standardAmount: null,
         parentId: null,
         plantCode: null,
@@ -398,6 +414,12 @@ export default {
         }
       });
     },
+    AutomaticSynchronizationBOM(){
+        addAutomaticSynchronizationBOM(this.form).then(response => {
+          this.$modal.msgSuccess('同步成功')
+          this.getList()
+        })
+    },
     /** 删除按钮操作 */
     handleDelete(row) {
       const objIds = row.objId || this.ids;
diff --git a/src/views/production/planInfo/index.vue b/src/views/production/planInfo/index.vue
index 9d6dded..7089c8a 100644
--- a/src/views/production/planInfo/index.vue
+++ b/src/views/production/planInfo/index.vue
@@ -1,17 +1,17 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="计划编号" prop="planCode">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
+      <el-form-item label="计划编号" prop="orderCode">
         <el-input
-          v-model="queryParams.planCode"
+          v-model="queryParams.orderCode"
           placeholder="请输入计划编号"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="工单编号" prop="orderCode">
+      <el-form-item label="工单编号" prop="planCode">
         <el-input
-          v-model="queryParams.orderCode"
+          v-model="queryParams.planCode"
           placeholder="请输入工单编号"
           clearable
           @keyup.enter.native="handleQuery"
@@ -25,25 +25,25 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="开始时间">
+      <el-form-item label="实际开始时间">
         <el-date-picker
           v-model="daterangeBeginTime"
           style="width: 340px"
           value-format="yyyy-MM-dd HH:mm:ss"
           type="datetimerange"
           range-separator="-"
-          start-placeholder="开始时间"
+          start-placeholder="实际开始时间"
           end-placeholder="结束时间"
         ></el-date-picker>
       </el-form-item>
-      <el-form-item label="完成时间">
+      <el-form-item label="实际完成时间">
         <el-date-picker
           v-model="daterangeEndTime"
           style="width: 340px"
           value-format="yyyy-MM-dd HH:mm:ss"
           type="datetimerange"
           range-separator="-"
-          start-placeholder="开始时间"
+          start-placeholder="实际开始时间"
           end-placeholder="结束时间"
         ></el-date-picker>
       </el-form-item>
@@ -112,12 +112,12 @@
       <el-table-column label="计划工位" align="center" prop="productLineName" v-if="columns[7].visible"/>
       <el-table-column label="计划数量" align="center" prop="planAmount" v-if="columns[8].visible"/>
       <el-table-column label="完成数量" align="center" prop="completeAmount" v-if="columns[9].visible"/>
-      <el-table-column label="开始时间" align="center" prop="beginTime" width="180" v-if="columns[10].visible">
+      <el-table-column label="实际开始时间" align="center" prop="beginTime" width="180" v-if="columns[10].visible">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.beginTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="完成时间" align="center" prop="endTime" width="180" v-if="columns[11].visible">
+      <el-table-column label="实际完成时间" align="center" prop="endTime" width="180" v-if="columns[11].visible">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.endTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
         </template>
@@ -204,20 +204,20 @@
         <el-form-item label="完成数量" prop="completeAmount">
           <el-input v-model="form.completeAmount" placeholder="请输入完成数量" />
         </el-form-item>
-        <el-form-item label="开始时间" prop="beginTime">
+        <el-form-item label="实际开始时间" prop="beginTime">
           <el-date-picker clearable
             v-model="form.beginTime"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="请选择开始时间">
+            type="datetime"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            placeholder="请选择实际开始时间">
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="完成时间" prop="endTime">
+        <el-form-item label="实际完成时间" prop="endTime">
           <el-date-picker clearable
             v-model="form.endTime"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="请选择完成时间">
+            type="datetime"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            placeholder="请选择实际完成时间">
           </el-date-picker>
         </el-form-item>
       </el-form>
@@ -297,8 +297,8 @@ export default {
             { key: 7, label: `计划工位`, visible: true },
             { key: 8, label: `计划数量`, visible: true },
             { key: 9, label: `完成数量`, visible: true },
-            { key: 10, label: `开始时间`, visible: true },
-            { key: 11, label: `完成时间`, visible: true },
+            { key: 10, label: `实际开始时间`, visible: true },
+            { key: 11, label: `实际完成时间`, visible: true },
             { key: 12, label: `是否标识`, visible: false },
             { key: 13, label: `创建人`, visible: false },
             { key: 14, label: `创建时间`, visible: false },