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/service/DynamicDataSourceService.java

@@ -31,6 +31,10 @@ public class DynamicDataSourceService {
         return mapper.getTodayBoxNum();
     }
 
+    public Integer getTodayErrBoxNum(){
+        return mapper.getTodayErrBoxNum();
+    }
+
     @DataSource("camline")
     @Transactional
     public float getPMPPBySubId(String subId){