[feat]

售后管理 出货设备
修改出货设备列表页面，调整表格字段，合并操作栏按钮；
新增根据sn号查找出货设备信息mapper和service方法；

ruoyi-admin/src/main/java/com/ruoyi/aftersales/mapper/AfterSalesShippingDeviceMapper.java

@@ -175,4 +175,8 @@ public interface AfterSalesShippingDeviceMapper
      *  根据物料号查询出货设备信息列表
      * */
     List<AfterSalesShippingDevice> selectShippingDevicesByMaterialNo(String materialNo);
+
+    /*
+    * 根据sn号查找出货设备信息*/
+    AfterSalesShippingDevice selectShippingDevicesBySnCode(String snCode);
 }

ruoyi-admin/src/main/java/com/ruoyi/aftersales/service/IAfterSalesShippingDeviceService.java

@@ -112,4 +112,8 @@ public interface IAfterSalesShippingDeviceService
      *  根据sn号查询出货设备信息列表
      * */
     List<AfterSalesShippingDevice> selectShippingDeviceListBySnCode(String[] snCode);
+
+    /*
+     * 根据sn号查找出货设备信息*/
+    AfterSalesShippingDevice selectShippingDevicesBySnCode(String snCode);
 }

ruoyi-admin/src/main/java/com/ruoyi/aftersales/service/impl/AfterSalesShippingDeviceServiceImpl.java

@@ -282,4 +282,11 @@ public class AfterSalesShippingDeviceServiceImpl implements IAfterSalesShippingD
     public List<AfterSalesShippingDevice> selectShippingDeviceListBySnCode(String[] snCode) {
         return afterSalesShippingDeviceMapper.selectShippingDeviceListBySnCodeAndMaterialNo(snCode);
     }
+
+    /*
+     * 根据sn号查找出货设备信息*/
+    @Override
+    public AfterSalesShippingDevice selectShippingDevicesBySnCode(String snCode){
+        return afterSalesShippingDeviceMapper.selectShippingDevicesBySnCode(snCode);
+    }
 }

ruoyi-admin/src/main/resources/mapper/aftersales/AfterSalesShippingDeviceMapper.xml

@@ -384,4 +384,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         update aftersales_shipping_device set del_flag = '0' where shipping_device_code = #{shippingDeviceCode}
     </update>
 
+    <select id="selectShippingDevicesBySnCode" parameterType="String" resultMap="AfterSalesShippingDeviceResult">
+        <include refid="selectAfterSalesShippingDeviceVo"/>
+        where sn_code = #{snCode}
+    </select>
+
 </mapper>

ruoyi-admin/src/main/resources/templates/aftersales/shippingDevice/shippingDevice.html

@@ -157,25 +157,20 @@
                     align: 'center',
                     field: 'makeNo',
                 },
-                {
-                    title: 'SN号',
-                    align: 'center',
-                    field: 'snCode',
-                },
                 {
                     title: '料号',
                     align: 'center',
                     field: 'materialNo',
                 },
                     {
-                    title: '物料名称',
+                        title: '图片',
                         align: 'center',
-                    field: 'materialName',
+                        field: 'materialPhotourl',
                     },
                     {
-                    title: '图片',
+                        title: '物料名称',
                         align: 'center',
-                    field: 'materialPhotourl',
+                        field: 'materialName',
                     },
                     {
                         title: '物料类型',
@@ -186,14 +181,14 @@
                         }
                     },
                     {
-                    title: '型号',
+                        title: '设备型号',
                         align: 'center',
-                    field: 'materialModelCode',
+                        field: 'deviceModelCode',
                     },
                     {
-                    title: '单位',
+                        title: '描述',
                         align: 'center',
-                    field: 'materialUnit',
+                        field: 'materialDescribe',
                     },
                     {
                         title: '品牌',
@@ -201,14 +196,20 @@
                         field: 'materialBrand',
                     },
                     {
-                    title: '描述',
+                        title: '单位',
                         align: 'center',
-                    field: 'materialDescribe',
+                        field: 'materialUnit',
                     },
                     {
-                    title: '设备型号',
+                        title: '物料型号',
                         align: 'center',
-                    field: 'deviceModelCode',
+                        field: 'materialModelCode',
+                    },
+
+                {
+                    title: 'SN号',
+                    align: 'center',
+                    field: 'snCode',
                 },
                 {
                     title: '追踪码',
@@ -225,22 +226,16 @@
                     align: 'center',
                     field: 'endMakeTime',
                 },
-                {
-                    title: '生产图片',
-                    align: 'center',
-                    field: 'makePhotourl',
-                },
-
-                {
-                    title: '售后图片',
-                    align: 'center',
-                    field: 'aftersalesPhotourl',
-                },
                 {
                     title: '出厂日期',
                     align: 'center',
                     field: 'factoryDate',
                 },
+                // {
+                //     title: '软件版本',
+                //     align: 'center',
+                //     field: 'factoryDate',
+                // },
                 {
                     title: '保修期',
                     align: 'center',
@@ -341,9 +336,10 @@
                     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.shippingDeviceCode + '\')"><i class="fa fa-edit"></i>编辑</a> ');
+                        actions.push('<a class="' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.shippingDeviceCode + '\')"><i class="fa fa-edit"></i>编辑</a> ');
-                        actions.push('<a class="btn btn-success btn-xs ' + detailFlag + '" href="javascript:void(0)" onclick="detail(\'' + row.shippingDeviceCode + '\')"><i class="fa fa-edit"></i>详情</a> ');
+                        actions.push('<a class="' + detailFlag + '" href="javascript:void(0)" onclick="detail(\'' + row.shippingDeviceCode + '\')"><i class="fa fa-edit"></i>详情</a> ');
-                        return actions.join('');
+                        var actionLinks = actions.join('');
+                        return $.table.dropdownToggle(actionLinks);
                     }
                 }]
             };