Merge branch 'dev' of http://git.pseer.com/platform/hp-smart into dev

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

@@ -247,10 +247,10 @@
                 a.PROJ_NAME,
                 a.DELIVERY_DATE,
                 concat(left(max(a.PLAN_COMPLETION_DATE),4),'/',substring(max(a.PLAN_COMPLETION_DATE),5,2),'/',right(max(a.PLAN_COMPLETION_DATE),2)) as JHDATE,
-                concat(format(ifnull(sum(b.NUM*b.UNIT_WT ),0),2),'吨') as JHCL,
+                concat(format(ifnull(sum(b.NUM*b.UNIT_WT/1000 ),0),2),'吨') as JHCL,
                 concat(format(ifnull(sum(c.WEIGHT),0),2),'吨') as SJCL,
-                concat(format((ifnull( sum( c.WEIGHT ), 0 ) / ifnull( sum( b.NUM*b.UNIT_WT ), 0 ) * 100),2),'%') as SCJD,
-                concat(format((ifnull( sum( d.WEIGHT ), 0 ) / ifnull( sum( b.NUM*b.UNIT_WT ), 0 ) * 100),2),'%') as FHJD
+                concat(format((ifnull( sum( c.AMOUNT*b.UNIT_WT/1000 ), 0 ) / ifnull( sum( b.NUM*b.UNIT_WT/1000 ), 0 ) * 100),2),'%') as SCJD,
+                concat(format((ifnull( sum( d.AMOUNT*d.UNIT_WEIGHT ), 0 ) / ifnull( sum( b.NUM*b.UNIT_WT ), 0 ) * 100),2),'%') as FHJD
                 from hpjx.T_HPSC003 a
                 join hpjx.T_HPSC004 b on b.PARENT_ID = a.PLAN_INFO_NO
                 left join  hpjx.T_HPkC003 c on c.PROD_ORDER_NO = b.PROD_ORDER_NO