Merge branch 'dev'

src/main/java/com/baosight/hpjx/hp/mt/sql/HPMT001.xml

@@ -61,7 +61,7 @@
         WHERE
         SUBSTR(DOCUMENT_DATE,1,6) = #queryMonth#
         AND A.COMPANY_CODE = #companyCode#
-        GROUP BY B.FACTORY_CODE
+        GROUP BY B.FACTORY_CODE,B.FACTORY_NAME
         ) B ON A.orgId=B.FACTORY_CODE AND A.orgCname=B.FACTORY_NAME
     </select>
 

src/main/java/com/baosight/hpjx/hp/mt/sql/HPMT002.xml

@@ -116,7 +116,7 @@
                 <isNotEmpty prepend=" AND " property="queryMonth">
                  SUBSTR(CREATED_TIME,1,6) = #queryMonth#
                 </isNotEmpty>
-                GROUP BY POOR_TYPE
+                GROUP BY POOR_TYPE,ITEM_CNAME
         </select>
 
         <select id="pmQualityList" resultClass="java.util.HashMap">

src/main/java/com/baosight/hpjx/hp/mt/sql/HPMT003.xml

@@ -292,7 +292,7 @@
                 left join  ${hpjxSchema}.T_HPkC003 c on c.PROD_ORDER_NO = b.PROD_ORDER_NO
                 left join  ${hpjxSchema}.T_HPkC004 d on d.PROD_NO = b.PROD_ORDER_NO
                 where a.COMPANY_CODE = #companyCode# and c.FACTORY_CODE  = #factorycode#
-                group by a.PROJ_NAME) a
+                group by a.PROJ_NAME,a.DELIVERY_DATE) a
                 where left(a.SCJD,3) <![CDATA[<>]]> '100' and left(a.FHJD,3) <![CDATA[<>]]> '100' and a.DELIVERY_DATE > DATE_FORMAT(DATE_SUB(CURRENT_DATE(), INTERVAL 3 MONTH), '%Y%m%d')
         </select>