Merge branch 'master' of git.picaiba.com:CaiXiang/cigs4 into yanyang

 Conflicts:

	ym-packing/src/main/java/com/cnbm/dispatch/line2/KukaEvent1ThreadLine2.java

ym-packing/src/main/java/com/cnbm/packing/mapper/CamlineMapper.java

@@ -28,6 +28,7 @@ public interface CamlineMapper {
     CamlineExtendArgDTO getExtendArgFromCamline(@Param("subId") String subId);
 
     Integer getTodayBoxNum();
+    Integer getTodayErrBoxNum();
 
     CamlineSubIdDTO getSubIdByCamline(@Param("subId") String subId);