diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/BaseEmpRequisiteOrder.java b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/BaseEmpRequisiteOrder.java
index 32f0ca33..2ec09eae 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/BaseEmpRequisiteOrder.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/BaseEmpRequisiteOrder.java
@@ -1,6 +1,8 @@
 package com.ruoyi.system.domain;
 
 import java.math.BigDecimal;
+import java.util.List;
+
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
@@ -59,7 +61,18 @@ public class BaseEmpRequisiteOrder extends BaseEntity
     @Excel(name = "使用状态")
     private String useStatus;
 
-    public void setRequisiteId(Long requisiteId) 
+    private List<BaseEmpRequisiteOrderChild> baseEmpRequisiteOrderChildList;
+
+
+    public List<BaseEmpRequisiteOrderChild> getBaseEmpRequisiteOrderChildList() {
+        return baseEmpRequisiteOrderChildList;
+    }
+
+    public void setBaseEmpRequisiteOrderChildList(List<BaseEmpRequisiteOrderChild> baseEmpRequisiteOrderChildList) {
+        this.baseEmpRequisiteOrderChildList = baseEmpRequisiteOrderChildList;
+    }
+
+    public void setRequisiteId(Long requisiteId)
     {
         this.requisiteId = requisiteId;
     }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/IBaseEmpRequisiteOrderService.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/IBaseEmpRequisiteOrderService.java
index e3f853d3..3197ff7c 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/IBaseEmpRequisiteOrderService.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/IBaseEmpRequisiteOrderService.java
@@ -72,4 +72,6 @@ public interface IBaseEmpRequisiteOrderService
      * @return
      */
     int restoreBaseEmpRequisiteOrderById(Long requisiteId);
+
+    Object getId();
 }
diff --git a/ruoyi-admin/src/main/resources/templates/system/empRequisiteOrder/edit.html b/ruoyi-admin/src/main/resources/templates/system/empRequisiteOrder/edit.html
index 4aab6d11..bc2a1de5 100644
--- a/ruoyi-admin/src/main/resources/templates/system/empRequisiteOrder/edit.html
+++ b/ruoyi-admin/src/main/resources/templates/system/empRequisiteOrder/edit.html
@@ -88,7 +88,7 @@
                             return $.table.selectDictLabel(sysUnitClassDatas, value);
                         }
                     },
-                    {title: '加工方式',field: 'processMethod',align: 'center',
+                    {title: '半成品类型',field: 'processMethod',align: 'center',
                         formatter: function(value, row, index) {
                             return $.table.selectDictLabel(processMethodDatas, value);
                         }
diff --git a/ruoyi-admin/src/main/resources/templates/system/empRequisiteOrder/empRequisiteOrder.html b/ruoyi-admin/src/main/resources/templates/system/empRequisiteOrder/empRequisiteOrder.html
index 0188759f..10d756f5 100644
--- a/ruoyi-admin/src/main/resources/templates/system/empRequisiteOrder/empRequisiteOrder.html
+++ b/ruoyi-admin/src/main/resources/templates/system/empRequisiteOrder/empRequisiteOrder.html
@@ -19,7 +19,7 @@
                                 <input type="text" name="correlationCode"/>
                             </li>
                             <li>
-                                <label>创建人：</label>
+                                <label>领料人：</label>
                                 <input type="text" name="applyUser"/>
                             </li>
                             <li>
@@ -41,12 +41,6 @@
                 <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="system:empRequisiteOrder:add">
                     <i class="fa fa-plus"></i> 添加
                 </a>
-                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="system:empRequisiteOrder:edit">
-                    <i class="fa fa-edit"></i> 修改
-                </a>
-                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:empRequisiteOrder:remove">
-                    <i class="fa fa-remove"></i> 删除
-                </a>
                 <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:empRequisiteOrder:export">
                     <i class="fa fa-download"></i> 导出
                 </a>
@@ -77,82 +71,44 @@
                 restoreUrl: prefix + "/restore/{id}",
                 exportUrl: prefix + "/export",
                 modalName: "员工领料单",
-                columns: [{
-                    checkbox: true
-                },
-                {
-                    title: '员工号领料单索引id',
-                    field: 'requisiteId',
-                    visible: false
-                },
-                {
-                    title: '审核状态',
-                    field: 'auditStatus',
-                    formatter: function(value, row, index) {
-                       return $.table.selectDictLabel(auditStatusDatas, value);
-                    }
-                },
-                {
-                    title: '领料状态',
-                    field: 'requisitieStatus',
-                    formatter: function(value, row, index) {
-                       return $.table.selectDictLabel(requisitieStatusDatas, value);
-                    }
-                },
-                {
-                    title: '领料单编号',
-                    field: 'requisitieCode',
-                },
-                {
-                    title: '关联销售订单号',
-                    field: 'correlationCode',
-                },
-                {
-                    title: '物料合计',
-                    field: 'materialAmount',
-                },
-                {
-                    title: '数量总计',
-                    field: 'materialSum',
-                },
-                {
-                    title: '不含税总价(RMB)',
-                    field: 'noRmbSum',
-                },
-                {
-                    title: '含税总价(RMB)',
-                    field: 'rmbSum',
-                },
-                {
-                    title: '申请人',
-                    field: 'applyUser',
-                },
-                {
-                    title: '备注',
-                    field: 'remark',
-                },
-                {
-                    title: '使用状态',
-                    field: 'useStatus',
-                    formatter: function(value, row, index) {
-                       return $.table.selectDictLabel(useStatusDatas, value);
-                    }
-                },
-                {
-                    title: '操作',
-                    align: 'center',
-                    formatter: function(value, row, index) {
-                        var actions = [];
-                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.requisiteId + '\')"><i class="fa fa-edit"></i>编辑</a> ');
-                        actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.requisiteId + '\')"><i class="fa fa-remove"></i>删除</a> ');
-                        if(row.delFlag == '0'){
-                            actions.push('<a class="btn btn-danger btn-xs ' + cancelFlag + '" href="javascript:void(0)" onclick="$.operate.cancel(\'' + row.id + '\')"><i class="fa fa-remove"></i>作废</a> ');
-                        }else{
-                            actions.push('<a class="btn btn-success btn-xs ' + restoreFlag + '" href="javascript:void(0)" onclick="$.operate.restore(\'' + row.id + '\')"><i class="fa fa-window-restore"></i>恢复</a> ');
+                columns: [
+                    {checkbox: true},
+                    {title: '员工号领料单索引id',field: 'requisiteId',visible: false},
+                    {title: '审核状态',field: 'auditStatus',
+                        formatter: function(value, row, index) {return $.table.selectDictLabel(auditStatusDatas, value);}
+                    },
+                    {title: '领料状态',field: 'requisitieStatus',
+                        formatter: function(value, row, index) {return $.table.selectDictLabel(requisitieStatusDatas, value);}
+                    },
+                    {title: '领料单编号',field: 'requisitieCode',},
+                    {title: '领料人',field: 'createBy',},
+                    {title: '关联销售订单号',field: 'correlationCode',},
+                    {title: '物料合计',field: 'materialAmount', },
+                    {title: '数量总计',field: 'materialSum',},
+                    {title: '不含税总价(RMB)',field: 'noRmbSum',},
+                    {title: '含税总价(RMB)',field: 'rmbSum',},
+                    {title: '申请人',field: 'applyUser',visible: false},
+                    {title: '录入时间',field: 'createTime',},
+                    {title: '备注',field: 'remark'},
+                    {title: '使用状态',field: 'useStatus',
+                        formatter: function(value, row, index) {return $.table.selectDictLabel(useStatusDatas, value);}
+                    },
+                    {
+                        title: '操作',
+                        align: 'center',
+                        formatter: function(value, row, index) {
+                            var actions = [];
+                            actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.requisiteId + '\')"><i class="fa fa-edit"></i>编辑</a> ');
+                            actions.push('<a class="btn btn-danger btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.detail(\'' + row.requisiteId + '\')"><i class="fa fa-remove"></i>详情</a> ');
+                            if(row.delFlag == '0'){
+                                actions.push('<a class="btn btn-danger btn-xs ' + cancelFlag + '" href="javascript:void(0)" onclick="$.operate.cancel(\'' + row.id + '\')"><i class="fa fa-remove"></i>作废</a> ');
+                            }else{
+                                actions.push('<a class="btn btn-success btn-xs ' + restoreFlag + '" href="javascript:void(0)" onclick="$.operate.restore(\'' + row.id + '\')"><i class="fa fa-window-restore"></i>恢复</a> ');
+                            }
+                            return actions.join('');
                         }
-                        return actions.join('');
                     }
-                }]
+                ]
             };
             $.table.init(options);
         });