Merge branch 'dev-2.13.0' of http://101.36.160.140:21044/province-qinghai/province-all into dev-2.13.0

unis-plugin/unis-plugin-biz/src/main/java/com/unis/rotationPlan/info/modular/rpWarnThreshold/mapper/mapping/RpWarnThresholdMapper.xml

@@ -13,7 +13,7 @@
 		LEFT JOIN depot_qh.business_rp_outbound b ON a.id = b.rp_report_id
     LEFT JOIN biz_rp_issuance c ON a.id = c.rp_report_id
     WHERE
-        c.issuance_date IS NULL
+        c.issuance_date IS NOT NULL
     AND DATE_FORMAT(NOW(), "%Y-%m-%d") BETWEEN c.start_date AND c.end_date
     </select>
     <select id="getReportsInfoByIssuanceId" resultType="java.util.Map">

unis-plugin/unis-plugin-biz/src/main/java/com/unis/rotationPlan/info/modular/rpWarnThreshold/service/impl/RpWarnThresholdServiceImpl.java

@@ -167,7 +167,7 @@ public class RpWarnThresholdServiceImpl extends ServiceImpl<RpWarnThresholdMappe
             String fristCarDate = null;
             List<String> hwids = new ArrayList<>();//对应的货位的数据
             //得到第一车入库时间
-            for (int i = 0; i < list.size(); i++) {
+            for (int i = 0; i < list1.size(); i++) {
                 Map<String,Object> map = list1.get(i);
               //  String rpReportId = map.getOrDefault("rpReportId","").toString(); //轮换 计划id
             //    String outId = map.getOrDefault("outId","").toString(); //轮换出库id