diff --git a/ruoyi-admin/src/main/java/com/ruoyi/aftersales/controller/AftersalesOrderController.java b/ruoyi-admin/src/main/java/com/ruoyi/aftersales/controller/AftersalesOrderController.java
index 1ee033c5..1b474d7d 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/aftersales/controller/AftersalesOrderController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/aftersales/controller/AftersalesOrderController.java
@@ -6,6 +6,7 @@ import com.ruoyi.aftersales.domain.vo.SelectDeviceVO;
 import com.ruoyi.aftersales.service.IAfterSalesShippingDeviceService;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.process.general.service.IProcessService;
+import com.ruoyi.sales.domain.SalesAftersalesNoticeDetail;
 import com.ruoyi.system.service.ISysUserService;
 import org.activiti.engine.RuntimeService;
 import org.activiti.engine.TaskService;
@@ -200,15 +201,14 @@ public class AftersalesOrderController extends BaseController
 
 
     /**
-     * 查询选择设备列表
+     * 查询售后通知单详情选择设备列表
      */
     @PostMapping("/optionDevices")
     @ResponseBody
     public TableDataInfo optionDevices(AftersalesOrder aftersalesOrder)
     {
-
         startPage();
-        List<SelectDeviceVO> list = afterSalesShippingDeviceService.selectOptionDevices(aftersalesOrder.getMakeNo());
+        List<SalesAftersalesNoticeDetail> list = afterSalesShippingDeviceService.selectOptionDevices(aftersalesOrder.getAftersalesOrderCode());
         return getDataTable(list);
     }
 
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/aftersales/service/IAfterSalesShippingDeviceService.java b/ruoyi-admin/src/main/java/com/ruoyi/aftersales/service/IAfterSalesShippingDeviceService.java
index 131d382d..a8ebd7b3 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/aftersales/service/IAfterSalesShippingDeviceService.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/aftersales/service/IAfterSalesShippingDeviceService.java
@@ -7,6 +7,8 @@ import com.ruoyi.aftersales.domain.dto.AfterSalesMakeOrderDto;
 import com.ruoyi.aftersales.domain.dto.AfterSalesShippingDeviceEditDto;
 import com.ruoyi.aftersales.domain.dto.WarehouseAndAfterSalesDto;
 import com.ruoyi.aftersales.domain.vo.SelectDeviceVO;
+import com.ruoyi.sales.domain.SalesAftersalesNotice;
+import com.ruoyi.sales.domain.SalesAftersalesNoticeDetail;
 import com.ruoyi.system.dto.SysEquipDetailDto;
 
 /**
@@ -93,7 +95,7 @@ public interface IAfterSalesShippingDeviceService
      * @param makeNo 生产单号
      * @return
      */
-    List<SelectDeviceVO> selectOptionDevices(String makeNo);
+    List<SalesAftersalesNoticeDetail> selectOptionDevices(String aftersalesOrderCode);
 
 
     /*
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/aftersales/service/impl/AfterSalesShippingDeviceServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/aftersales/service/impl/AfterSalesShippingDeviceServiceImpl.java
index 440c3d55..6ee1932f 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/aftersales/service/impl/AfterSalesShippingDeviceServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/aftersales/service/impl/AfterSalesShippingDeviceServiceImpl.java
@@ -13,6 +13,9 @@ import com.ruoyi.aftersales.mapper.AftersalesComplaintNoticeMapper;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.ShiroUtils;
 import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.sales.domain.SalesAftersalesNotice;
+import com.ruoyi.sales.domain.SalesAftersalesNoticeDetail;
+import com.ruoyi.sales.mapper.SalesAftersalesNoticeDetailMapper;
 import com.ruoyi.system.dto.SysEquipDetailDto;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -38,6 +41,9 @@ public class AfterSalesShippingDeviceServiceImpl implements IAfterSalesShippingD
     @Autowired
     private AftersalesComplaintNoticeMapper aftersalesComplaintNoticeMapper;
 
+    @Autowired
+    private SalesAftersalesNoticeDetailMapper aftersalesNoticeDetailMapper;
+
     /**
      * 查询出货设备
      * 
@@ -197,28 +203,9 @@ public class AfterSalesShippingDeviceServiceImpl implements IAfterSalesShippingD
      * 查询选择设备列表
      * */
     @Override
-    public List<SelectDeviceVO> selectOptionDevices(String makeNo) {
-        List<SelectDeviceVO> selectDeviceVos = new ArrayList<>();
-        SelectDeviceVO selectDeviceVo = new SelectDeviceVO();
-        AfterSalesShippingDevice afterSalesShippingDevice = afterSalesShippingDeviceMapper.selectShippingDeviceByMakeNo(makeNo);
-        if (StringUtils.isNotNull(afterSalesShippingDevice)){
-            selectDeviceVo.setMaterialNo(afterSalesShippingDevice.getMaterialNo());
-            selectDeviceVo.setMaterialPhotourl(afterSalesShippingDevice.getMaterialPhotourl());
-            selectDeviceVo.setMaterialName(afterSalesShippingDevice.getMaterialName());
-            selectDeviceVo.setMaterialType(afterSalesShippingDevice.getMaterialType());
-            selectDeviceVo.setMaterialUnit(afterSalesShippingDevice.getMaterialUnit());
-            selectDeviceVo.setMaterialBrand(afterSalesShippingDevice.getMaterialBrand());
-            selectDeviceVo.setMaterialDescribe(afterSalesShippingDevice.getMaterialDescribe());
-            selectDeviceVo.setSnCode(afterSalesShippingDevice.getSnCode());
-        }
-
-        AftersalesComplaintNotice aftersalesComplaintNotice = aftersalesComplaintNoticeMapper.selectComplaintNoticeByMakeNo(makeNo);
-        if (StringUtils.isNotNull(aftersalesComplaintNotice)){
-            selectDeviceVo.setComplaintProblem(aftersalesComplaintNotice.getRemark());
-        }
-
-        selectDeviceVos.add(selectDeviceVo);
-        return selectDeviceVos;
+    public List<SalesAftersalesNoticeDetail> selectOptionDevices(String aftersalesOrderCode) {
+        List<SalesAftersalesNoticeDetail> salesAftersalesNoticeDetails = aftersalesNoticeDetailMapper.selectSalesAftersalesNoticeDetailListByCode(aftersalesOrderCode);
+        return salesAftersalesNoticeDetails;
     }
 
     /*
diff --git a/ruoyi-admin/src/main/resources/templates/aftersales/aftersalesOrder/detail.html b/ruoyi-admin/src/main/resources/templates/aftersales/aftersalesOrder/detail.html
index 110055bc..fe678fd5 100644
--- a/ruoyi-admin/src/main/resources/templates/aftersales/aftersalesOrder/detail.html
+++ b/ruoyi-admin/src/main/resources/templates/aftersales/aftersalesOrder/detail.html
@@ -54,10 +54,10 @@
             </div>
         </div>
         <div class="form-group">
-            <label class="col-sm-4 control-label">客户要求出发日期：</label>
+            <label class="col-sm-3 control-label">客户要求出发日期：</label>
             <div class="col-sm-8">
                 <div class="input-group date">
-                    <input name="startDate" class="form-control" th:value="*{startDate}" placeholder="yyyy-mm-dd" type="text" readonly>
+                    <input name="startDate" th:value="${#dates.format(detail.startDate, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text">
                     <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
                 </div>
             </div>
@@ -257,11 +257,6 @@
             columns: [{
                 checkbox: true
             },
-                {
-                    title: '出货设备编号',
-                    field: 'shippingDeviceCode',
-                    visible: false
-                },
                 {
                     title: '料号',
                     field: 'materialNo',
@@ -291,20 +286,23 @@
                     field: 'materialDescribe',
                 },
                 {
-                    title: '流水号',
-                    field: 'deviceRunningNumber',
+                    title: '已出库数量',
+                    field: 'shippedGoodsSum',
                 },
                 {
-                    title: '生产图片',
-                    field: 'makePhotourl',
+                    title: '设备SN',
+                    field: 'snCode',
                 },
                 {
-                    title: 'SN号',
-                    field: 'snCode',
+                    title: '售后问题',
+                    field: 'aftersalesProblem',
                 },
                 {
-                    title: '售后图片',
-                    field: 'aftersalesPhotourl',
+                    title: '紧急程度',
+                    field: 'emergencyDegree',
+                    formatter: function(value, row, index) {
+                        return $.table.selectDictLabel(emergencyDegreeDatas, value);
+                    }
                 },
             ]
         };
@@ -324,11 +322,11 @@
         }
     }
 
-    // $("input[name='startDate']").datetimepicker({
-    //     format: "yyyy-mm-dd",
-    //     minView: "month",
-    //     autoclose: true
-    // });
+    $("input[name='startDate']").datetimepicker({
+        format: "yyyy-mm-dd",
+        minView: "month",
+        autoclose: true
+    });
     $(function() {
         var options = {
             url: prefix + "/optionDevices",
diff --git a/ruoyi-admin/src/main/resources/templates/aftersales/aftersalesOrder/sendOrders.html b/ruoyi-admin/src/main/resources/templates/aftersales/aftersalesOrder/sendOrders.html
index c566658a..e88a1415 100644
--- a/ruoyi-admin/src/main/resources/templates/aftersales/aftersalesOrder/sendOrders.html
+++ b/ruoyi-admin/src/main/resources/templates/aftersales/aftersalesOrder/sendOrders.html
@@ -52,14 +52,15 @@
             </div>
         </div>
         <div class="form-group">
-            <label class="col-sm-4 control-label">客户要求出发日期：</label>
+            <label class="col-sm-3 control-label">客户要求出发日期：</label>
             <div class="col-sm-8">
                 <div class="input-group date">
-                    <input name="startDate" class="form-control" th:value="*{startDate}" placeholder="yyyy-mm-dd" type="text">
+                    <input name="startDate" th:value="${#dates.format(sendOrders.startDate, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text">
                     <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
                 </div>
             </div>
         </div>
+
         <div class="form-group">
             <label class="col-sm-4 control-label">备注：</label>
             <div class="col-sm-8">
@@ -109,6 +110,7 @@
         autoclose: true
     });
 
+
     $(function() {
         $('.summernote').each(function(i) {
             $('#' + this.id).summernote({
@@ -160,11 +162,6 @@
             columns: [{
                 checkbox: true
             },
-                {
-                    title: '出货设备编号',
-                    field: 'shippingDeviceCode',
-                    visible: false
-                },
                 {
                     title: '料号',
                     field: 'materialNo',
@@ -194,20 +191,23 @@
                     field: 'materialDescribe',
                 },
                 {
-                    title: '流水号',
-                    field: 'deviceRunningNumber',
+                    title: '已出库数量',
+                    field: 'shippedGoodsSum',
                 },
                 {
-                    title: '生产图片',
-                    field: 'makePhotourl',
+                    title: '设备SN',
+                    field: 'snCode',
                 },
                 {
-                    title: 'SN号',
-                    field: 'snCode',
+                    title: '售后问题',
+                    field: 'aftersalesProblem',
                 },
                 {
-                    title: '售后图片',
-                    field: 'aftersalesPhotourl',
+                    title: '紧急程度',
+                    field: 'emergencyDegree',
+                    formatter: function(value, row, index) {
+                        return $.table.selectDictLabel(emergencyDegreeDatas, value);
+                    }
                 },
             ]
         };
diff --git a/ruoyi-admin/src/main/resources/templates/aftersales/aftersalesOrder/uploadReport.html b/ruoyi-admin/src/main/resources/templates/aftersales/aftersalesOrder/uploadReport.html
index 8165cb9c..5d37a083 100644
--- a/ruoyi-admin/src/main/resources/templates/aftersales/aftersalesOrder/uploadReport.html
+++ b/ruoyi-admin/src/main/resources/templates/aftersales/aftersalesOrder/uploadReport.html
@@ -54,10 +54,10 @@
             </div>
         </div>
         <div class="form-group">
-            <label class="col-sm-4 control-label">客户要求出发日期：</label>
+            <label class="col-sm-3 control-label">客户要求出发日期：</label>
             <div class="col-sm-8">
                 <div class="input-group date">
-                    <input name="startDate" class="form-control" th:value="*{startDate}" placeholder="yyyy-mm-dd" type="text">
+                    <input name="startDate" th:value="${#dates.format(uploadReport.startDate, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text">
                     <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
                 </div>
             </div>
@@ -202,11 +202,6 @@
             columns: [{
                 checkbox: true
             },
-                {
-                    title: '出货设备编号',
-                    field: 'shippingDeviceCode',
-                    visible: false
-                },
                 {
                     title: '料号',
                     field: 'materialNo',
@@ -236,20 +231,23 @@
                     field: 'materialDescribe',
                 },
                 {
-                    title: '流水号',
-                    field: 'deviceRunningNumber',
+                    title: '已出库数量',
+                    field: 'shippedGoodsSum',
                 },
                 {
-                    title: '生产图片',
-                    field: 'makePhotourl',
+                    title: '设备SN',
+                    field: 'snCode',
                 },
                 {
-                    title: 'SN号',
-                    field: 'snCode',
+                    title: '售后问题',
+                    field: 'aftersalesProblem',
                 },
                 {
-                    title: '售后图片',
-                    field: 'aftersalesPhotourl',
+                    title: '紧急程度',
+                    field: 'emergencyDegree',
+                    formatter: function(value, row, index) {
+                        return $.table.selectDictLabel(emergencyDegreeDatas, value);
+                    }
                 },
             ]
         };