diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/MPS_PRODUCEDURE001.wql b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/MPS_PRODUCEDURE001.wql
index ea15295..0f5ba51 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/MPS_PRODUCEDURE001.wql
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/MPS_PRODUCEDURE001.wql
@@ -55,19 +55,11 @@
 		SELECT
         	ShiftOrder.*,
         	material.material_code,
-<<<<<<< Updated upstream
-        	material.material_name,
-        	material.material_spec
-        FROM
-        	PDM_BD_WORKORDER ShiftOrder
-        	LEFT JOIN md_me_materialbase material ON material.material_id = ShiftOrder.material_id
-=======
         	device.device_name
         FROM
         	PDM_BD_WORKORDER ShiftOrder
         	LEFT JOIN md_me_materialbase material ON material.material_id = ShiftOrder.material_id
         	LEFT JOIN pdm_bi_device device ON ShiftOrder.device_id = device.device_id
->>>>>>> Stashed changes
         WHERE
         	ShiftOrder.is_delete = '0'
             OPTION 输入.unFinish <> ""
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/wms.xls b/lms/nladmin-system/src/main/java/org/nl/wms/wms.xls
index 7d35c68..737a185 100644
Binary files a/lms/nladmin-system/src/main/java/org/nl/wms/wms.xls and b/lms/nladmin-system/src/main/java/org/nl/wms/wms.xls differ
diff --git a/lms/nladmin-ui/src/views/wms/pdm/workerorder/index.vue b/lms/nladmin-ui/src/views/wms/pdm/workerorder/index.vue
index 692e83e..162fe56 100644
--- a/lms/nladmin-ui/src/views/wms/pdm/workerorder/index.vue
+++ b/lms/nladmin-ui/src/views/wms/pdm/workerorder/index.vue
@@ -231,7 +231,6 @@
         </el-table-column>
         <el-table-column prop="planproducestart_date" label="计划开始时间" min-width="150" show-overflow-tooltip />
         <el-table-column prop="planproduceend_date" label="计划结束时间" min-width="150" show-overflow-tooltip />
-        <el-table-column v-if="false" prop="material_id" label="物料标识" />
         <el-table-column prop="device_name" label="设备" width="100" show-overflow-tooltip />
         <el-table-column prop="material_name" label="物料" width="100" show-overflow-tooltip />
         <el-table-column prop="plan_qty" label="计划数量" />
diff --git a/lms/nladmin-ui/src/views/wms/sch/task/index.vue b/lms/nladmin-ui/src/views/wms/sch/task/index.vue
index bf91f80..301cb27 100644
--- a/lms/nladmin-ui/src/views/wms/sch/task/index.vue
+++ b/lms/nladmin-ui/src/views/wms/sch/task/index.vue
@@ -113,8 +113,8 @@
         @selection-change="crud.selectionChangeHandler"
       >
         <el-table-column type="selection" width="50" />
-        <el-table-column v-if="true" prop="task_id" label="任务标识" min-width="150" show-overflow-tooltip />
-        <el-table-column v-if="true" prop="material_id" label="物料标识" min-width="150" show-overflow-tooltip />
+        <el-table-column v-if="false" prop="task_id" label="任务标识" min-width="150" show-overflow-tooltip />
+        <el-table-column v-if="false" prop="material_id" label="物料标识" min-width="150" show-overflow-tooltip />
         <el-table-column prop="task_code" label="任务编码" min-width="100" show-overflow-tooltip />
         <el-table-column v-if="false" prop="task_type" label="任务类型" />
         <el-table-column prop="acs_task_type" label="acs任务类型" min-width="120" show-overflow-tooltip >