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/resources/mapper/CamlineMapper.xml

@@ -195,5 +195,17 @@
             twpb.model = 2
     </select>
 
+    <select id="getTodayErrBoxNum" resultType="java.lang.Integer">
+            select count(1)
+            from t_wo_packaging_box twpb
+            where
+            twpb.CREATE_TIME BETWEEN DATE_FORMAT(NOW(),'%Y-%m-%d 00:00:00') AND DATE_FORMAT(NOW(),'%Y-%m-%d 23:59:59')
+            and
+            twpb.model = 2
+            and twpb.BOX_NO like '444%'
+    </select>
+
+
+
 
 </mapper>

ym-packing/src/main/resources/mapper/WoCompensationPowerMapper.xml

@@ -6,7 +6,7 @@
             <id column="actl_pmpp_low" property="actlPmppLow" />
             <id column="actl_pmpp_high" property="actlPmppHigh" />
             <id column="formula" property="formula" />
-            <id column="line_body" property="lineBody" />
+            <id column="line_body" prope】/rty="lineBody" />
             <id column="coefficient_a" property="coefficientA" />
             <id column="coefficient_b" property="coefficientB" />
             <id column="remark" property="remark" />
@@ -43,7 +43,7 @@
           <if test="param.pmpp != null">
               and twcp.actl_pmpp_high <![CDATA[ > ]]> #{param.pmpp} and  twcp.actl_pmpp_low <![CDATA[ <= ]]> #{param.pmpp}
           </if>
-
+        limit 1
     </select>
 
 </mapper>

ym-packing/src/main/resources/mapper/WoPowerLevelMapper.xml

@@ -40,6 +40,7 @@
         <if test="param.pmpp != null">
             and twpl.pmpp_high <![CDATA[ > ]]> #{param.pmpp} and  twpl.pmpp_low <![CDATA[ <= ]]> #{param.pmpp}
         </if>
+        limit 1
     </select>
 
 </mapper>