Merge remote-tracking branch 'origin/dev' into dev

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

@@ -119,5 +119,5 @@ public interface AfterSalesShippingDeviceMapper
     /*
      *  根据sn号查询出货设备信息列表
      * */
-    List<AfterSalesShippingDevice> selectShippingDeviceListBySnCodeAndMaterialNo(String[] snCode,String materialNo);
+    List<AfterSalesShippingDevice> selectShippingDeviceListBySnCodeAndMaterialNo(String[] snCode);
 }

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

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

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

@@ -251,7 +251,7 @@ public class AfterSalesShippingDeviceServiceImpl implements IAfterSalesShippingD
     }
 
     @Override
-    public List<AfterSalesShippingDevice> selectShippingDeviceListBySnCode(String[] snCode,String materialNo) {
+    public List<AfterSalesShippingDevice> selectShippingDeviceListBySnCode(String[] snCode) {
-        return afterSalesShippingDeviceMapper.selectShippingDeviceListBySnCodeAndMaterialNo(snCode,materialNo);
+        return afterSalesShippingDeviceMapper.selectShippingDeviceListBySnCodeAndMaterialNo(snCode);
     }
 }

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

@@ -124,7 +124,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <foreach item="snCode" collection="array" open="(" separator="," close=")">
             #{snCode}
         </foreach>
-        and material_no = #{materialNo}
     </select>