批量推送增加推送条件，大屏接口部门排序

jeecg-boot-module-system/src/main/java/org/jeecg/modules/scas/mapper/xml/SupplierCapacityMapper.xml

@@ -294,6 +294,21 @@
         AND dArriveMonth  <= ${max}))
         GROUP BY darrivedate,darrivemonth,cdepcode
         ORDER BY darrivedate
+
+
+         select
+        cdepcode venname,
+        cast(sum(coefficient  *iquantity)/60 as decimal(20,2)) productionCapacity,
+        (select sum(capacity_quota) from sy_capacity_control where state!=-1)  quotaCapacity
+        from Supplier_Capacity_Test
+        right join sy_capacity_control
+        on supplier=cvencode and  state!=-1
+        where (dArriveYear > #{minYear} OR (dArriveYear = #{minYear} AND dArriveMonth >= #{minMonth} ))
+        AND (dArriveYear < #{maxYear} OR (dArriveYear = #{maxYear} AND dArriveMonth  <=#{maxMonth} ))
+        GROUP BY cdepcode
+        ORDER BY cdepcode
+
+
     </select>-->
 
     <select id="statement1" resultType="org.jeecg.modules.scas.entity.vo.SupplierCapacity5" parameterType="java.lang.String">
@@ -353,17 +368,22 @@
     </select>
 
     <select id="statement4" resultType="org.jeecg.modules.scas.entity.vo.SupplierCapacity5" parameterType="java.lang.String">
+
         select
-        cdepcode venname,
+        Supplier_Capacity_Test.cdepcode venname,
+        ideporder,
         cast(sum(coefficient  *iquantity)/60 as decimal(20,2)) productionCapacity,
         (select sum(capacity_quota) from sy_capacity_control where state!=-1)  quotaCapacity
         from Supplier_Capacity_Test
         right join sy_capacity_control
         on supplier=cvencode and  state!=-1
+        left join  Department
+        on Supplier_Capacity_Test.cDepCode=Department.cdepname
         where (dArriveYear > #{minYear} OR (dArriveYear = #{minYear} AND dArriveMonth >= #{minMonth} ))
         AND (dArriveYear &lt; #{maxYear} OR (dArriveYear = #{maxYear} AND dArriveMonth  &lt;=#{maxMonth} ))
-        GROUP BY cdepcode
-        ORDER BY cdepcode
+        GROUP BY Supplier_Capacity_Test.cdepcode,ideporder
+        ORDER BY ideporder
+
     </select>
 
 </mapper>

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splfi/controller/SyPackingListFabricController.java

@@ -1189,6 +1189,7 @@ public class SyPackingListFabricController implements Job {
 		 queryWrapper.nested(i->i.ne("recording_Status","1").nested(s->s.eq("push_State","3").or()
 				 .like("recording_Error","超时").or().eq("recording_Error","null")
 				 .or().eq("recording_Error","nullnull")
+				 .or().like("recording_Error","For input string:")
 				 .or().eq("recording_Error","nullnullnull"))) ;//推送中
 		 //queryWrapper.or();
 		 //queryWrapper.like();//超时

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splfi/service/impl/SyPackingListFabricServiceImpl.java

@@ -252,9 +252,10 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 	}
 
 	/**
-	 * 增删改都会调用的方法，用来计算剩余数量和超发数量
+	 * 新增数据时会调用的方法，用来计算剩余数量和超发数量
 	 * @param quantity 本次数量
 	 * @param syShippingDetailsItemId 出运明细id
+	 * @param master 单位
 	 * @return
 	 */
 	@Transactional
@@ -294,6 +295,11 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 		syPackingListFabricItemMapper.update(null,updateWrapper);
 	}
 
+	/**
+	 *
+	 * @param mapItems 取消了
+	 * @param ids 出运明细子表id集合
+	 */
 	@Transactional
 	public void  updateQuantitys(Map<String,SyPackingListFabricItem> mapItems,List<String> ids){
 		QueryWrapper queryWrapper=new QueryWrapper();

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splt/controller/SyPackingListTailoringController.java

@@ -1378,6 +1378,7 @@ public class SyPackingListTailoringController implements Job {
 		 queryWrapper.nested(i->i.ne("recording_Status","1").nested(s->s.eq("push_State","3").or()
 				 .like("recording_Error","超时").or().eq("recording_Error","null")
 				 .or().eq("recording_Error","nullnull")
+				 .or().like("recording_Error","For input string:")
 				 .or().eq("recording_Error","nullnullnull"))) ;//推送中
 		/* queryWrapper.eq("push_State","3");//推送中
 		 queryWrapper.or();
@@ -1505,6 +1506,14 @@ public class SyPackingListTailoringController implements Job {
 				 syPackingListTailoringService.updateById(main);//修改成衣
 			 }catch (Exception e){
 				 e.printStackTrace();
+				 String msg2= null;
+				 try {
+					 msg2 = getExceptionStr(e);
+				 } catch (IOException ex) {
+					 ex.printStackTrace();
+				 }
+				 System.out.println("成衣批量推送报错");
+				 log.info("成衣批量推送报错\t"+msg2);
 			 }
 		 }
 	 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splt/service/impl/SyPackingListTailoringServiceImpl.java

@@ -2002,7 +2002,7 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 			List<Map<String,Object>> invoices=getInvoices1(customers.get(customer));
 			JSONObject  jsonObject1=new JSONObject();
 			code=org.jeecg.modules.system.util.oConvertUtils.addOne(code);
-			redisUtil.set("pushsno002", code);//采购委外入库单
+			redisUtil.set("pushsno002", code);//采购委外发票单
 			codeMaps.put(code,listTailoringMaps.get(customer));
 //			String istc=syPackingListTailoring.getIsTc();
 //			if (istc!=null&&istc.equals("1")){