Commit bcc06ede by liuyang

修复生产驾驶舱项目产量bug

parent 96b6288d
...@@ -405,10 +405,10 @@ ...@@ -405,10 +405,10 @@
b.PARENT_ID , b.PARENT_ID ,
a.PLAN_INFO_NO, a.PLAN_INFO_NO,
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(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)* sum(b.UNIT_WT)/ 1000), 0), 2), '吨') as JHCL, concat(format(ifnull((sum(b.NUM * b.UNIT_WT) / 1000), 0), 2), '吨') as JHCL,
concat(format(ifnull( sum(c.AMOUNT)* sum(b.UNIT_WT)/ 1000 , 0 ), 2) , '吨') as SJCL, concat(format(ifnull( sum(c.AMOUNT * b.UNIT_WT) / 1000 , 0 ), 2) , '吨') as SJCL,
concat(format((ifnull( sum(c.AMOUNT)* sum(b.UNIT_WT)/ 1000 , 0 ) / ifnull( sum(b.NUM)* sum(b.UNIT_WT)/ 1000 , 0 ) * 100), 2), '%') as SCJD, 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)* sum(d.UNIT_WEIGHT), 0 ) / ifnull( sum(b.NUM)* sum(b.UNIT_WT) , 0 ) * 100), 2), '%') as FHJD concat(format((ifnull( sum(d.AMOUNT * d.UNIT_WEIGHT), 0 ) / ifnull( sum(b.NUM * b.UNIT_WT) , 0 ) * 100), 2), '%') as FHJD
from ${hpjxSchema}.T_HPSC003 a from ${hpjxSchema}.T_HPSC003 a
left join left join
( (
......
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
<EF:EFOption label="全部" value=""/> <EF:EFOption label="全部" value=""/>
<EF:EFOptions blockId="customer_record_block_id" textField="textField" valueField="valueField"/> <EF:EFOptions blockId="customer_record_block_id" textField="textField" valueField="valueField"/>
</EF:EFSelect> </EF:EFSelect>
<EF:EFSelect ename="inqu_status-0-contractStatus" cname="合同状态" colWidth="3"> <EF:EFSelect ename="inqu_status-0-contractStatus" cname="明细状态" colWidth="3">
<EF:EFOption label="全部" value=""/> <EF:EFOption label="全部" value=""/>
<EF:EFOption label="未录入" value="0"/> <EF:EFOption label="未录入" value="0"/>
<EF:EFOption label="已录入" value="1"/> <EF:EFOption label="已录入" value="1"/>
...@@ -65,7 +65,7 @@ ...@@ -65,7 +65,7 @@
displayType="0.000" sort="true" align="right" maxLength="20" required="true" displayType="0.000" sort="true" align="right" maxLength="20" required="true"
data-regex="/^-?[0-9]{1,17}([.][0-9]{1,3})?$/" data-regex="/^-?[0-9]{1,17}([.][0-9]{1,3})?$/"
data-errorprompt="请输入数字,该值最大可设置17位整数和3位小数!"/> data-errorprompt="请输入数字,该值最大可设置17位整数和3位小数!"/>
<EF:EFComboColumn ename="contractStatus" cname="合同状态" enable="false" width="60" align="center" defaultValue="0"> <EF:EFComboColumn ename="contractStatus" cname="明细状态" enable="false" width="60" align="center" defaultValue="0">
<EF:EFOption label="未录入" value="0"/> <EF:EFOption label="未录入" value="0"/>
<EF:EFOption label="已录入" value="1"/> <EF:EFOption label="已录入" value="1"/>
</EF:EFComboColumn> </EF:EFComboColumn>
......
...@@ -190,7 +190,7 @@ $(function () { ...@@ -190,7 +190,7 @@ $(function () {
return "生产计划零件_" + kendo.toString(new Date(), IPLAT.FORMAT.DATE_14_PR); return "生产计划零件_" + kendo.toString(new Date(), IPLAT.FORMAT.DATE_14_PR);
}, },
exportFileType: "xls", // 默认值是xls,可选值为pdf[规划中] exportFileType: "xls", // 默认值是xls,可选值为pdf[规划中]
exportBlockId: "result", // 默认值和blockId相同,导出的EiInfo中的指定数据块被导出 exportBlockId: "detail", // 默认值和blockId相同,导出的EiInfo中的指定数据块被导出
}, },
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment