diff --git a/src/views/modules/orderIssure/soIssueNotify/searchIssureNotify.vue b/src/views/modules/orderIssure/soIssueNotify/searchIssureNotify.vue
index 80ada50..5d27a64 100644
--- a/src/views/modules/orderIssure/soIssueNotify/searchIssureNotify.vue
+++ b/src/views/modules/orderIssure/soIssueNotify/searchIssureNotify.vue
@@ -3073,8 +3073,7 @@
       // 查加工中心
       getWorkCenterList() {
         let inData = {
-          site: this.userBuList[0].buNo.split('_')[0],
-          buNo: this.userBuList[0].buNo.split('_')[1]
+          username: this.$store.state.user.name
         }
         getWorkCenterList(inData).then(({data}) =>{
           if (data && data.code === 0) {
diff --git a/src/views/modules/orderIssure/soIssueNotify/searchIssureNotifyForCK.vue b/src/views/modules/orderIssure/soIssueNotify/searchIssureNotifyForCK.vue
index ef0fd65..b0c53f0 100644
--- a/src/views/modules/orderIssure/soIssueNotify/searchIssureNotifyForCK.vue
+++ b/src/views/modules/orderIssure/soIssueNotify/searchIssureNotifyForCK.vue
@@ -454,11 +454,8 @@ export default {
     },
     // 加载加工中心列表
     loadWorkCenterList() {
-      if (this.userBuList.length === 0) return
-      const buNo = this.userBuList[0].buNo
       const inData = {
-        site: buNo.split('_')[0],
-        buNo: buNo.split('_')[1]
+        username: this.$store.state.user.name
       }
       getWorkCenterList(inData).then(({data}) => {
         if (data && data.code === 0) {
diff --git a/src/views/modules/qc/FQCResultEntry.vue b/src/views/modules/qc/FQCResultEntry.vue
index 1c1e476..bbb9033 100644
--- a/src/views/modules/qc/FQCResultEntry.vue
+++ b/src/views/modules/qc/FQCResultEntry.vue
@@ -661,8 +661,14 @@
           :min-width="item.columnWidth"
           :label="item.columnLabel">
           <template slot-scope="scope">
-            <span v-if="!item.columnHidden">{{scope.row[item.columnProp]}}</span>
-            <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
+            <!-- 标准值、上限值、下限值可编辑 -->
+            <template v-if="item.columnProp === 'defaultValue' || item.columnProp === 'minValue' || item.columnProp === 'maxValue'">
+              <el-input v-model="scope.row[item.columnProp]" style="height: 11px; width: 98%"></el-input>
+            </template>
+            <template v-else>
+              <span v-if="!item.columnHidden">{{scope.row[item.columnProp]}}</span>
+              <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
+            </template>
           </template>
         </el-table-column>
         <el-table-column
diff --git a/src/views/modules/qc/IPQCResultEntry.vue b/src/views/modules/qc/IPQCResultEntry.vue
index c5d7743..af4511a 100644
--- a/src/views/modules/qc/IPQCResultEntry.vue
+++ b/src/views/modules/qc/IPQCResultEntry.vue
@@ -105,9 +105,21 @@
             </el-col>
           </el-row>
 
-          <!-- 第三行：工序及检验相关信息 -->
+          <!-- 第四行：检验相关信息 -->
           <el-row :gutter="16">
             <el-col :span="4">
+              <el-form-item label="加工中心">
+                <el-select v-model="searchData.workCenterNo" clearable filterable placeholder="请选择加工中心">
+                  <el-option
+                    v-for="i in workCenterList"
+                    :key="i.workCenterNo"
+                    :label="i.workCenterDesc"
+                    :value="i.workCenterNo">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="5">
               <el-form-item label="检验结论">
                 <el-select v-model="searchData.inspectionResult" clearable placeholder="请选择检验结论">
                   <el-option label="合格" value="合格">
@@ -146,7 +158,6 @@
                 <el-input v-model="searchData.inspectorName" placeholder="请输入质检员姓名" clearable></el-input>
               </el-form-item>
             </el-col>
-
           </el-row>
 
           <!-- 第四行：日期信息 -->
@@ -687,8 +698,14 @@
           :min-width="item.columnWidth"
           :label="item.columnLabel">
           <template slot-scope="scope">
-            <span v-if="!item.columnHidden">{{ scope.row[item.columnProp] }}</span>
-            <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
+            <!-- 标准值、上限值、下限值可编辑 -->
+            <template v-if="item.columnProp === 'defaultValue' || item.columnProp === 'minValue' || item.columnProp === 'maxValue'">
+              <el-input v-model="scope.row[item.columnProp]" @change="updateDetailRecord(scope.row)" style="height: 11px; width: 98%"></el-input>
+            </template>
+            <template v-else>
+              <span v-if="!item.columnHidden">{{ scope.row[item.columnProp] }}</span>
+              <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
+            </template>
           </template>
         </el-table-column>
         <el-table-column
@@ -1476,6 +1493,7 @@
     importIPQCTemplateItems // 导入IPQC模板项目
   } from "@/api/qc/qc.js"
   import {getTableDefaultListLanguage, getTableUserListLanguage} from "@/api/table.js"
+  import { getWorkCenterList } from "@/api/orderIssure/soIssueNotify.js"
   import Chooselist from '@/views/modules/common/Chooselist_eam'
   import {getInspectionFile} from '@/api/eam/eam_object_list.js'
   import { searchQcSopFileList, downloadSopFile } from '@/api/qc/qc.js'
@@ -1597,7 +1615,8 @@
           limit: 10,
           seqNo: '',
           states: ['未开始','待检验'],
-          inspectionShift: ''
+          inspectionShift: '',
+          workCenterNo: ''
         },
         pageIndex: 1,
         pageSize: 20,
@@ -1861,6 +1880,24 @@
             fixed: '',
             columnWidth: 120,
           },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 301014,
+            serialNumber: '301014Table1WorkCenterDesc',
+            tableId: "301014Table1",
+            tableName: "IPQC检验记录表",
+            columnProp: 'workCenterDesc',
+            headerAlign: "center",
+            align: "left",
+            columnLabel: '加工中心',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 120,
+          },
           {
             userId: this.$store.state.user.name,
             functionId: 301014,
@@ -2857,6 +2894,7 @@
         userBuList: [],
         buList: [],
         resourceList3: [],
+        workCenterList: [],
         authSearch: false,
         authSave: false,
         authCheck: false,
@@ -3019,6 +3057,8 @@
       this.getUserRoleList()
       //查询工序列表
       this.queryResourceList()
+      //查询加工中心列表
+      this.loadWorkCenterList()
     },
 
     methods: {
@@ -3053,7 +3093,8 @@
           resourceId: '',
           orderNo: '',
           seqNo: '',
-          operationDesc: ''
+          operationDesc: '',
+          workCenterNo: ''
         }
       },
 
@@ -3068,12 +3109,25 @@
           }
         })
       },
+
       queryResourceList (){
         queryResourceList3().then(( {data} ) => {
           this.resourceList3 = data.rows
         })
       },
 
+      // 加载加工中心列表
+      loadWorkCenterList() {
+        const inData = {
+          username: this.$store.state.user.name
+        }
+        getWorkCenterList(inData).then(({data}) => {
+          if (data && data.code === 0) {
+            this.workCenterList = data.rows || []
+          }
+        })
+      },
+
       // 批量打印标签
       printList () {
         if (this.IPQCSelections.length === 0) {
diff --git a/src/views/modules/qc/IQCResultEntry.vue b/src/views/modules/qc/IQCResultEntry.vue
index 917ba3b..e7df99a 100644
--- a/src/views/modules/qc/IQCResultEntry.vue
+++ b/src/views/modules/qc/IQCResultEntry.vue
@@ -576,8 +576,14 @@
             :min-width="item.columnWidth"
             :label="item.columnLabel">
             <template slot-scope="scope">
-              <span v-if="!item.columnHidden">{{scope.row[item.columnProp]}}</span>
-              <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
+              <!-- 标准值、上限值、下限值可编辑 -->
+              <template v-if="item.columnProp === 'defaultValue' || item.columnProp === 'minValue' || item.columnProp === 'maxValue'">
+                <el-input v-model="scope.row[item.columnProp]" style="height: 11px; width: 98%"></el-input>
+              </template>
+              <template v-else>
+                <span v-if="!item.columnHidden">{{scope.row[item.columnProp]}}</span>
+                <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
+              </template>
             </template>
           </el-table-column>
           <el-table-column
diff --git a/src/views/modules/qc/OQCResultEntry.vue b/src/views/modules/qc/OQCResultEntry.vue
index e8d0861..cc13d40 100644
--- a/src/views/modules/qc/OQCResultEntry.vue
+++ b/src/views/modules/qc/OQCResultEntry.vue
@@ -540,8 +540,14 @@
             :min-width="item.columnWidth"
             :label="item.columnLabel">
             <template slot-scope="scope">
-              <span v-if="!item.columnHidden">{{scope.row[item.columnProp]}}</span>
-              <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
+              <!-- 标准值、上限值、下限值可编辑 -->
+              <template v-if="item.columnProp === 'defaultValue' || item.columnProp === 'minValue' || item.columnProp === 'maxValue'">
+                <el-input v-model="scope.row[item.columnProp]" style="height: 11px; width: 98%"></el-input>
+              </template>
+              <template v-else>
+                <span v-if="!item.columnHidden">{{scope.row[item.columnProp]}}</span>
+                <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
+              </template>
             </template>
           </el-table-column>
           <el-table-column
diff --git a/src/views/modules/warehouse/labelTransactionLog.vue b/src/views/modules/warehouse/labelTransactionLog.vue
index a4a1b00..e2f73d5 100644
--- a/src/views/modules/warehouse/labelTransactionLog.vue
+++ b/src/views/modules/warehouse/labelTransactionLog.vue
@@ -169,6 +169,7 @@
       <el-table-column prop="orderLineNo" label="关联单行号" header-align="center" align="center" width="100"></el-table-column>
       <el-table-column prop="rollNo" label="标签条码" header-align="center" align="left" min-width="180" show-overflow-tooltip></el-table-column>
       <el-table-column prop="rollQty" label="变动数量" header-align="center" align="right" width="100"></el-table-column>
+      <el-table-column prop="batchNo" label="合约号码" header-align="center" align="left" min-width="150" show-overflow-tooltip></el-table-column>
       <el-table-column prop="partNo" label="物料编码" header-align="center" align="left" min-width="150" show-overflow-tooltip></el-table-column>
       <el-table-column prop="warehouseId" label="仓库编码" header-align="center" align="center" width="100"></el-table-column>
       <el-table-column prop="warehouseName" label="仓库名称" header-align="center" align="left" min-width="120" show-overflow-tooltip></el-table-column>
diff --git a/src/views/modules/yieldReport/com_process_inspection.vue b/src/views/modules/yieldReport/com_process_inspection.vue
index bcdcaaf..fbd5e2a 100644
--- a/src/views/modules/yieldReport/com_process_inspection.vue
+++ b/src/views/modules/yieldReport/com_process_inspection.vue
@@ -547,6 +547,29 @@
               align="center"
               min-width="100"
               label="标准值">
+              <template slot-scope="scope">
+                <el-input v-model="scope.row.defaultValue" style="height: 11px; width: 98%"></el-input>
+              </template>
+            </el-table-column>
+            <el-table-column
+              prop="minValue"
+              header-align="center"
+              align="center"
+              min-width="80"
+              label="下限值">
+              <template slot-scope="scope">
+                <el-input v-model="scope.row.minValue" style="height: 11px; width: 98%"></el-input>
+              </template>
+            </el-table-column>
+            <el-table-column
+              prop="maxValue"
+              header-align="center"
+              align="center"
+              min-width="80"
+              label="上限值">
+              <template slot-scope="scope">
+                <el-input v-model="scope.row.maxValue" style="height: 11px; width: 98%"></el-input>
+              </template>
             </el-table-column>
             <el-table-column
               prop=""