diff --git a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseOutOrderServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseOutOrderServiceImpl.java
index 0cd82f3b..a8bfce46 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseOutOrderServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseOutOrderServiceImpl.java
@@ -309,14 +309,17 @@ public class WarehouseOutOrderServiceImpl implements IWarehouseOutOrderService
     //生成售后出库单
     private int buildAftersalesOutOrder(WarehouseOutOrder warehouseOutOrder) {
 
+        String outOrderCode = warehouseOutOrder.getOutOrderCode();
+        WarehouseOutOrder newWarehouseOutOrder = warehouseOutOrderMapper.selectWarehouseOutOrderByCode(outOrderCode);
+
         AftersalesOutOrder aftersalesOutOrder = new AftersalesOutOrder();
 
         String loginName = ShiroUtils.getLoginName();
-        warehouseOutOrder.setCreateBy(loginName);
-        warehouseOutOrder.setCreateTime(new Date());
+        newWarehouseOutOrder.setCreateBy(loginName);
+        newWarehouseOutOrder.setCreateTime(new Date());
         //更改出库状态为 第一次维护设备信息
-        warehouseOutOrder.setWarehouseOutStatus("1");
-        BeanUtils.copyProperties(warehouseOutOrder,aftersalesOutOrder);
+        newWarehouseOutOrder.setWarehouseOutStatus("1");
+        BeanUtils.copyProperties(newWarehouseOutOrder,aftersalesOutOrder);
        return aftersalesOutOrderMapper.insertAftersalesOutOrder(aftersalesOutOrder);
 
     }
diff --git a/ruoyi-admin/src/main/resources/templates/aftersales/aftersalesOutOrder/aftersalesOutOrder.html b/ruoyi-admin/src/main/resources/templates/aftersales/aftersalesOutOrder/aftersalesOutOrder.html
index d3af55f5..784e1b35 100644
--- a/ruoyi-admin/src/main/resources/templates/aftersales/aftersalesOutOrder/aftersalesOutOrder.html
+++ b/ruoyi-admin/src/main/resources/templates/aftersales/aftersalesOutOrder/aftersalesOutOrder.html
@@ -4,92 +4,81 @@
     <th:block th:include="include :: header('售后维护设备出库列表')" />
 </head>
 <body class="gray-bg">
-     <div class="container-div">
-        <div class="row">
-            <div class="col-sm-12 search-collapse">
-                <form id="formId">
-                    <div class="select-list">
-                        <ul>
-                            <li>
-                                <label>出库单号：</label>
-                                <input type="text" name="outOrderCode"/>
-                            </li>
-                            <li>
-                                <label>出库状态：</label>
-                                <select name="warehouseOutStatus" th:with="type=${@dict.getType('warehouse_out_status')}">
-                                    <option value="">所有</option>
-                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
-                                </select>
-                            </li>
-                            <li>
-                                <label>关联订单号：</label>
-                                <input type="text" name="relatedOrderCode"/>
-                            </li>
-                            <li>
-                                <label>出库订单类型：</label>
-                                <select name="warehouseOrderType" th:with="type=${@dict.getType('warehouse_order_type')}">
-                                    <option value="">所有</option>
-                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
-                                </select>
-                            </li>
-                            <li>
-                                <label>出库类型：</label>
-                                <select name="warehouseOutType" th:with="type=${@dict.getType('warehouse_out_type')}">
-                                    <option value="">所有</option>
-                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
-                                </select>
-                            </li>
-                            <li>
-                                <label>仓库人员：</label>
-                                <input type="text" name="warehouseName"/>
-                            </li>
-                            <li>
-                                <label>申请人：</label>
-                                <input type="text" name="applyName"/>
-                            </li>
-                            <li class="select-time">
-                                <label>录入时间：</label>
-                                <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginCreateTime]"/>
-                                <span>-</span>
-                                <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endCreateTime]"/>
-                            </li>
-                            <li>
-                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
-                                <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
-                            </li>
-                        </ul>
-                    </div>
-                </form>
-            </div>
-
-            <div class="btn-group-sm" id="toolbar" role="group">
-                <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="aftersales:aftersalesOutOrder:add">
-                    <i class="fa fa-plus"></i> 添加
-                </a>
-                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="aftersales:aftersalesOutOrder:edit">
-                    <i class="fa fa-edit"></i> 修改
-                </a>
-                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="aftersales:aftersalesOutOrder:remove">
-                    <i class="fa fa-remove"></i> 删除
-                </a>
-                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="aftersales:aftersalesOutOrder:export">
-                    <i class="fa fa-download"></i> 导出
-                </a>
-            </div>
-            <div class="col-sm-12 select-table table-striped">
-                <table id="bootstrap-table"></table>
-            </div>
+<div class="container-div">
+    <div class="row">
+        <div class="col-sm-12 search-collapse">
+            <form id="formId">
+                <div class="select-list">
+                    <ul>
+                        <li>
+                            <label>出库单号：</label>
+                            <input type="text" name="outOrderCode"/>
+                        </li>
+                        <li>
+                            <label>出库状态：</label>
+                            <select name="warehouseOutStatus" th:with="type=${@dict.getType('warehouse_out_status')}">
+                                <option value="">所有</option>
+                                <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                            </select>
+                        </li>
+                        <li>
+                            <label>关联订单号：</label>
+                            <input type="text" name="relatedOrderCode"/>
+                        </li>
+                        <li>
+                            <label>申请人员：</label>
+                            <input type="text" name="applyName"/>
+                        </li>
+                        <li>
+                            <label>仓库员：</label>
+                            <input type="text" name="warehouseName"/>
+                        </li>
+                        <li>
+                            <label>订单类型：</label>
+                            <select name="warehouseOrderType" th:with="type=${@dict.getType('warehouse_order_type')}">
+                                <option value="">所有</option>
+                                <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                            </select>
+                        </li>
+                        <li class="select-time">
+                            <label>录入时间：</label>
+                            <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginCreateTime]"/>
+                            <span>-</span>
+                            <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endCreateTime]"/>
+                        </li>
+                        <li>
+                            <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
+                            <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
+                        </li>
+                    </ul>
+                </div>
+            </form>
+        </div>
+        <div class="col-sm-12 select-table table-striped">
+            <table id="bootstrap-table"></table>
         </div>
     </div>
+</div>
     <th:block th:include="include :: footer" />
     <script th:inline="javascript">
         var editFlag = [[${@permission.hasPermi('aftersales:aftersalesOutOrder:edit')}]];
         var removeFlag = [[${@permission.hasPermi('aftersales:aftersalesOutOrder:remove')}]];
         var cancelFlag = [[${@permission.hasPermi('aftersales:aftersalesOutOrder:cancel')}]];
         var restoreFlag = [[${@permission.hasPermi('aftersales:aftersalesOutOrder:restore')}]];
+
+
+        var maintenanceEquipmentOneFlag = [[${@permission.hasPermi('aftersales:aftersalesOutOrder:maintenanceEquipmentOne')}]];
+
+        var maintenanceEquipmentTwoFlag = [[${@permission.hasPermi('aftersales:aftersalesOutOrder:maintenanceEquipmentTwo')}]];
+        var  confirmReceivingGoodsFlag = [[${@permission.hasPermi('aftersales:aftersalesOutOrder:confirmReceivingGoods')}]];
+        var  confirmCheckGoodsFlag = [[${@permission.hasPermi('aftersales:aftersalesOutOrder:confirmCheckGoods')}]];
+
         var warehouseOutStatusDatas = [[${@dict.getType('warehouse_out_status')}]];
         var warehouseOrderTypeDatas = [[${@dict.getType('warehouse_order_type')}]];
         var warehouseOutTypeDatas = [[${@dict.getType('warehouse_out_type')}]];
+
+
+
         var prefix = ctx + "aftersales/aftersalesOutOrder";
 
         $(function() {
@@ -97,127 +86,127 @@
                 url: prefix + "/list",
                 createUrl: prefix + "/add",
                 updateUrl: prefix + "/edit/{id}",
-                removeUrl: prefix + "/remove",
-                cancelUrl: prefix + "/cancel/{id}",
-                restoreUrl: prefix + "/restore/{id}",
                 exportUrl: prefix + "/export",
                 modalName: "售后维护设备出库",
                 columns: [{
                     checkbox: true
                 },
-                {
-                    title: '售后维护设备出库单Id',
-                    field: 'outOrderId',
-                    visible: false
-                },
-                {
-                    title: '出库单号',
-                    field: 'outOrderCode',
-                },
-                {
-                    title: '出库状态',
-                    field: 'warehouseOutStatus',
-                    formatter: function(value, row, index) {
-                       return $.table.selectDictLabel(warehouseOutStatusDatas, value);
-                    }
-                },
-                {
-                    title: '关联订单号',
-                    field: 'relatedOrderCode',
-                },
-                {
-                    title: '出库订单类型',
-                    field: 'warehouseOrderType',
-                    formatter: function(value, row, index) {
-                       return $.table.selectDictLabel(warehouseOrderTypeDatas, value);
-                    }
-                },
-                {
-                    title: '出库类型',
-                    field: 'warehouseOutType',
-                    formatter: function(value, row, index) {
-                       return $.table.selectDictLabel(warehouseOutTypeDatas, value);
-                    }
-                },
-                {
-                    title: '业务人员',
-                    field: 'businessName',
-                },
-                {
-                    title: '售后人员',
-                    field: 'aftersalesName',
-                },
-                {
-                    title: '仓库人员',
-                    field: 'warehouseName',
-                },
-                {
-                    title: '物料数合计',
-                    field: 'materialSum',
-                },
-                {
-                    title: '数量合计',
-                    field: 'enterpriseSum',
-                },
-                {
-                    title: '出库时间',
-                    field: 'outOrderTime',
-                },
-                {
-                    title: '计划交付时间',
-                    field: 'planDeliveryTime',
-                },
-                {
-                    title: '交付条件',
-                    field: 'deliveryCondition',
-                },
-                {
-                    title: '申请人',
-                    field: 'applyName',
-                },
-                {
-                    title: '收货地址',
-                    field: 'deliveryAddress',
-                },
-                {
-                    title: '收货联系人',
-                    field: 'deliveryName',
-                },
-                {
-                    title: '收货电话',
-                    field: 'deliveryNumber',
-                },
-                {
-                    title: '录入人',
-                    field: 'createBy',
-                },
-                {
-                    title: '录入时间',
-                    field: 'createTime',
-                },
-                {
-                    title: '更新人',
-                    field: 'updateBy',
-                },
-                {
-                    title: '上次更新时间',
-                    field: 'updateTime',
-                },
-                {
-                    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.outOrderId + '\')"><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.outOrderId + '\')"><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> ');
+                    {
+                        title: '出库单Id',
+                        field: 'outOrderId',
+                        visible: false
+                    },
+                    {
+                        title: '出库单号',
+                        field: 'outOrderCode',
+                    },
+                    {
+                        title: '出库状态',
+                        field: 'warehouseOutStatus',
+                        formatter: function(value, row, index) {
+                            return $.table.selectDictLabel(warehouseOutStatusDatas, value);
+                        }
+                    },
+                    {
+                        title: '关联订单号',
+                        field: 'relatedOrderCode',
+                        formatter: function(value, row, index) {
+                            return $.table.tooltip(value, 5, "open");
+                        }
+                    },
+                    {
+                        title: '订单类型',
+                        field: 'warehouseOrderType',
+                        formatter: function(value, row, index) {
+                            return $.table.selectDictLabel(warehouseOrderTypeDatas, value);
+                        }
+                    },
+                    {
+                        title: '业务人',
+                        field: 'businessName',
+                    },
+                    {
+                        title: '物料合计',
+                        field: 'materialSum',
+                    },
+                    {
+                        title: '数量合计',
+                        field: 'enterpriseSum',
+                    },
+                    {
+                        title: '计划交付时间',
+                        field: 'planDeliveryTime',
+                    },
+                    {
+                        title: '交付条件',
+                        field: 'deliveryCondition',
+                        formatter: function(value, row, index) {
+                            return $.table.tooltip(value, 5, "open");
+                        }
+                    },
+                    {
+                        title: '联系人',
+                        field: 'deliveryName',
+                    },
+                    {
+                        title: '联系电话',
+                        field: 'deliveryNumber',
+                    },
+                    {
+                        title: '收货地址',
+                        field: 'deliveryAddress',
+                        formatter: function(value, row, index) {
+                            return $.table.tooltip(value, 5, "open");
+                        }
+                    },
+                    {
+                        title: '录入时间',
+                        field: 'createTime',
+                    },
+                    {
+                        title: '出库时间',
+                        field: 'outOrderTime',
+                    },
+                    {
+                        title: '仓库员',
+                        field: 'warehouseName',
+                    },
+                    {
+                        title: '售后员',
+                        field: 'aftersalesName',
+                    },
+                    {
+                        title: '更新人',
+                        field: 'updateBy',
+                    },
+                    {
+                        title: '上次更新时间',
+                        field: 'updateTime',
+                    },
+                    {
+                        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.outOrderId + '\')"><i class="fa fa-edit"></i>编辑</a> ');
+                            //actions.push('<a class=" ' + detailFlag + '" href="javascript:void(0)" onclick="detail(\'' + row.outOrderId + '\')"><i class="fa fa-edit"></i>详情</a> ');
+                            if (row.warehouseOutStatus== "1"){
+                                actions.push('<a class="' + maintenanceEquipmentOneFlag + '" href="javascript:void(0)" onclick="maintenanceEquipmentOne(\'' + row.outOrderId + '\')"><i class="fa fa-edit"></i>维护设备1</a> ');
+                            }
+                            if (row.warehouseOutStatus== "3"){
+                                actions.push('<a class="' + maintenanceEquipmentTwoFlag + '" href="javascript:void(0)" onclick="maintenanceEquipmentTwo(\'' + row.outOrderId + '\')"><i class="fa fa-edit"></i>维护设备2</a> ');
+                            }
+                            if (row.warehouseOutStatus=="7"){
+                                actions.push('<a class="' + confirmReceivingGoodsFlag + '" href="javascript:void(0)" onclick="confirmReceivingGoods(\'' + row.outOrderId + '\')"><i class="fa fa-edit"></i>确认收货</a> ');
+                            }
+                            // if (row.warehouseOutStatus=="10"){
+                            //     actions.push('<a class="btn btn-success btn-xs ' + confirmCheckGoodsFlag + '" href="javascript:void(0)" onclick="confirmCheckGoods(\'' + row.outOrderId + '\')"><i class="fa fa-edit"></i>确认验收</a> ');
+                            // }
+
+                            var actionLinks = actions.join('');
+                            return $.table.dropdownToggle(actionLinks);
                         }
-                        return actions.join('');
-                    }
-                }]
+                    }]
             };
             $.table.init(options);
         });
