diff --git a/erp-produce/src/main/resources/template/js/erpPick/erpRequisitionPickList.js b/erp-produce/src/main/resources/template/js/erpPick/erpRequisitionPickList.js
index 6f1a5cec129e9091d156557e7f3d0d77a51c8f23..ca35a41c420bd7fc1be204c92d95aee5e8af15b4 100644
--- a/erp-produce/src/main/resources/template/js/erpPick/erpRequisitionPickList.js
+++ b/erp-produce/src/main/resources/template/js/erpPick/erpRequisitionPickList.js
@@ -87,7 +87,7 @@ layui.config({
     function turnRequisitionMaterialToOut(data) {
         _openNewWindows({
             url: "../../tpl/erpPick/turnRequisitionMaterialToOut.html?id=" + data.id,
-            title: "转领料出库",
+            title: "转补料出库",
             pageId: "turnRequisitionMaterialToOut",
             area: ['90vw', '90vh'],
             callBack: function (refreshCode) {
diff --git a/erp-produce/src/main/resources/template/js/workshopTasks/workshopTasksList.js b/erp-produce/src/main/resources/template/js/workshopTasks/workshopTasksList.js
index 19739dce2ae4b4eb7ce318de371befc3a36e0bc4..07d74f42bb799c85aa0589bb19fdb7a519250b11 100644
--- a/erp-produce/src/main/resources/template/js/workshopTasks/workshopTasksList.js
+++ b/erp-produce/src/main/resources/template/js/workshopTasks/workshopTasksList.js
@@ -7,8 +7,8 @@ layui.config({
 }).define(['window', 'table', 'jquery', 'winui', 'form'], function (exports) {
     winui.renderColor();
     var $ = layui.$,
-    form = layui.form,
-    table = layui.table;
+        form = layui.form,
+        table = layui.table;
     var selTemplate = getFileContent('tpl/template/select-option.tpl');
 
     // 加载当前用户所属车间
@@ -38,37 +38,47 @@ layui.config({
             limits: getLimits(),
             limit: getLimit(),
             cols: [[
-                {title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers', rowspan: '2'},
-                {field: 'oddNumber', title: '单号', rowspan: '2', width: 200, align: 'center', templet: function (d) {
-                    var str = '<a lay-event="details" class="notice-title-click">' + d.oddNumber + '</a>';
-                    if (!isNull(d.fromId)) {
-                        str += '<span class="state-new">[转]</span>';
-                    }
-                    return str;
-                } },
-                {field: 'operTime', title: '单据日期', rowspan: '2', align: 'center', width: 140},
-                {colspan: '2', title: '来源单据信息', align: 'center'},
-                {field: 'processInstanceId', title: '流程ID', rowspan: '2', width: 100, templet: function (d) {
-                    return '<a lay-event="processDetails" class="notice-title-click">' + getNotUndefinedVal(d.processInstanceId) + '</a>';
-                }},
-                {field: 'state', title: '状态', rowspan: '2', width: 90, templet: function (d) {
-                    return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("erpOrderStateEnum", 'id', d.state, 'name');
-                }},
-                {field: 'otherState', title: '出库状态', rowspan: '2', width: 90, templet: function (d) {
-                    return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("outLetState", 'id', d.otherState, 'name');
-                }},
-                {field: 'createName', title: systemLanguage["com.skyeye.createName"][languageType], rowspan: '2', width: 120 },
-                {field: 'createTime', title: systemLanguage["com.skyeye.createTime"][languageType], rowspan: '2', align: 'center', width: 150 },
-                {field: 'lastUpdateName', title: systemLanguage["com.skyeye.lastUpdateName"][languageType], rowspan: '2', align: 'left', width: 120 },
-                {field: 'lastUpdateTime', title: systemLanguage["com.skyeye.lastUpdateTime"][languageType], rowspan: '2', align: 'center', width: 150 },
+                // {field: 'processInstanceId', title: '流程ID', width: 100, templet: function (d) {
+                //         return '<a lay-event="processDetails" class="notice-title-click">' + getNotUndefinedVal(d.processInstanceId) + '</a>';
+                //     }},
+                { title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' },
+                { field: 'machinProcedureId', title: '车间ID',width: 280, templet: function (d) {
+                        return '<a lay-event="details" class="notice-title-click">' + getNotUndefinedVal(d.machinProcedureId) + '</a>';
+                    }},
+                { field: 'processInstanceId', title: '流程ID', width: 280, templet: function (d) {
+                        return '<a lay-event="processDetails" class="notice-title-click">' + getNotUndefinedVal(d.id) + '</a>';
+                    }},
+                { field: 'state', title: '状态',  width: 90, templet: function (d) {
+                        return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("machinProcedureFarmState", 'id', d.state, 'name');
+                    }},
+                { field: 'targetNum', title: '任务安排数量', align: 'center', width: 140 },
+                { field: 'planStartTime', title: '计划开始时间', align: 'center', width: 140, templet: function (d) {
+                        return getNotUndefinedVal(d.machinProcedureMation?.planStartTime);
+                    }},
+                { field: 'planEndTime', title: '计划结束时间', align: 'center', width: 140, templet: function (d) {
+                        return getNotUndefinedVal(d.machinProcedureMation?.planEndTime);
+                    }},
+                { field: 'actualStartTime', title: '实际开始时间', align: 'center', width: 140, templet: function (d) {
+                        return getNotUndefinedVal(d.machinProcedureMation?.actualStartTime);
+                    }},
+                { field: 'actualEndTime', title: '实际结束时间', align: 'center', width: 140, templet: function (d) {
+                        return getNotUndefinedVal(d.machinProcedureMation?.actualEndTime);
+                    }},
+                // {field: 'operTime', title: '单据日期', align: 'center', width: 140, templet: function (d) {
+                //         return getNotUndefinedVal(d.departmentMation?.createTime);
+                //     }},
+                { field: 'createTime', title: '创建时间', align: 'center', width: 140, templet: function (d) {
+                        return getNotUndefinedVal(d.machinMation?.createTime);
+                    }},
+
+                // {field: 'otherState', title: '出库状态', rowspan: '2', width: 90, templet: function (d) {
+                //     return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("outLetState", 'id', d.otherState, 'name');
+                // }},
+                // {field: 'createName', title: systemLanguage["com.skyeye.createName"][languageType], width: 120 },
+                // {field: 'createTime', title: systemLanguage["com.skyeye.createTime"][languageType], align: 'center', width: 150 },
+                // {field: 'lastUpdateName', title: systemLanguage["com.skyeye.lastUpdateName"][languageType], align: 'left', width: 120 },
+                // {field: 'lastUpdateTime', title: systemLanguage["com.skyeye.lastUpdateTime"][languageType], align: 'center', width: 150 },
                 {title: systemLanguage["com.skyeye.operation"][languageType], rowspan: '2', fixed: 'right', align: 'center', width: 200, toolbar: '#tableBar' }
-            ], [
-                {field: 'fromTypeId', title: '来源类型', width: 150, templet: function (d) {
-                    return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("pickFromType", 'id', d.fromTypeId, 'name');
-                }},
-                {field: 'fromId', title: '单据编号', width: 200, templet: function (d) {
-                    return getNotUndefinedVal(d.fromMation?.oddNumber);
-                }}
             ]],
             done: function (json) {
                 matchingLanguage();
diff --git a/erp-produce/src/main/resources/template/tpl/workshopTasks/workshopTasksList.html b/erp-produce/src/main/resources/template/tpl/workshopTasks/workshopTasksList.html
index f6261f1667123860c5ed0380487a232b7b3b70b9..8feaaa80230b3bb3c5dd369c070e87a47bc8fd22 100644
--- a/erp-produce/src/main/resources/template/tpl/workshopTasks/workshopTasksList.html
+++ b/erp-produce/src/main/resources/template/tpl/workshopTasks/workshopTasksList.html
@@ -19,7 +19,7 @@
     <div style="margin:auto 10px;">
         <table id="messageTable" lay-filter="messageTable"></table>
         <script type="text/html" id="tableBar">
-            {{# if(d.editRow == 1) { }}
+            {{# if(d.state == 'waitReceive') { }}
                 {{# if(auth('1720939511614')) { }}
                     <a class="layui-btn layui-btn-xs" lay-event="receive">接收</a>
                 {{# } }}