Skip to content

H
hp-smart
Commit 0b0b26c3 by 宋祥
Options

Merge branch 'dev-sx' of http://129.211.46.84:8800/platform/hp-smart into dev

parents b98976d3 6524d461
Showing with 36 additions and 27 deletions
src/main/java/com/baosight/hpjx/hp/kc/service/ServiceHPKC009.java
...@@ -20,7 +20,6 @@ import com.baosight.hpjx.util.DateUtils; ...@@ -20,7 +20,6 @@ import com.baosight.hpjx.util.DateUtils;
import com.baosight.hpjx.util.EiInfoUtils; import com.baosight.hpjx.util.EiInfoUtils;
import com.baosight.hpjx.util.LogUtils; import com.baosight.hpjx.util.LogUtils;
import com.baosight.hpjx.util.ObjectUtils; import com.baosight.hpjx.util.ObjectUtils;
import com.baosight.hpjx.util.StringUtil;
import com.baosight.iplat4j.core.data.DaoEPBase; import com.baosight.iplat4j.core.data.DaoEPBase;
import com.baosight.iplat4j.core.ei.EiConstant; import com.baosight.iplat4j.core.ei.EiConstant;
import com.baosight.iplat4j.core.ei.EiInfo; import com.baosight.iplat4j.core.ei.EiInfo;
...@@ -80,10 +79,9 @@ public class ServiceHPKC009 extends ServiceBase { ...@@ -80,10 +79,9 @@ public class ServiceHPKC009 extends ServiceBase {
public EiInfo query(EiInfo inInfo) { public EiInfo query(EiInfo inInfo) {
try { try {
Map queryRow = EiInfoUtils.getFirstRow(inInfo); Map queryRow = EiInfoUtils.getFirstRow(inInfo);
String receiptDate = MapUtils.getString(queryRow, "dateProc"); String dateProc = MapUtils.getString(queryRow, HPKC009.FIELD_DATE_PROC);
queryRow.put("dateProc", StringUtil.removeSpecifiedCharacter(receiptDate, queryRow.put(HPKC009.FIELD_DATE_PROC, DateUtils.formatShort(dateProc));
StringUtil.DEFAULT_CHARACTER_TO_BE_REMOVED)); queryRow.put(HPKC009.FIELD_DATE_TYPE, CommonConstant.DateType.MONTH);
queryRow.put("dateType", CommonConstant.DateType.MONTH);
inInfo = super.query(inInfo, HPKC009.QUERY, new HPKC009()); inInfo = super.query(inInfo, HPKC009.QUERY, new HPKC009());
List sum = dao.query(HPSqlConstant.HPKC009.QUERY_SUM, queryRow); List sum = dao.query(HPSqlConstant.HPKC009.QUERY_SUM, queryRow);
inInfo.getBlock(EiConstant.resultBlock).set(EiConstant.COLUMN_TOTAL_SUM, sum.get(0)); inInfo.getBlock(EiConstant.resultBlock).set(EiConstant.COLUMN_TOTAL_SUM, sum.get(0));
......
src/main/webapp/HP/KC/HPKC009.jsp
...@@ -8,8 +8,8 @@ ...@@ -8,8 +8,8 @@
<EF:EFPage title="库存收发存"> <EF:EFPage title="库存收发存">
<EF:EFRegion id="inqu" title="查询条件"> <EF:EFRegion id="inqu" title="查询条件">
<div class="row"> <div class="row">
<EF:EFDatePicker cname="单据日期" ename="inqu_status-0-receiptDate" colWidth="3" <EF:EFDatePicker ename="dateProc" cname="日期" blockId="inqu_status" row="0" colWidth="3"
role="date" format="yyyy-MM-dd" readonly="true"/> role="date" format="yyyy-MM" start="year" depth="year" readonly="true"/>
<EF:EFSelect cname="存货类型" ename="inqu_status-0-inventType" colWidth="3" filter="contains"> <EF:EFSelect cname="存货类型" ename="inqu_status-0-inventType" colWidth="3" filter="contains">
<EF:EFOption label="全部" value=""/> <EF:EFOption label="全部" value=""/>
<EF:EFCodeOption codeName="hpjx.hpkc.inventType"/> <EF:EFCodeOption codeName="hpjx.hpkc.inventType"/>
...@@ -31,11 +31,11 @@ ...@@ -31,11 +31,11 @@
</div> </div>
</EF:EFRegion> </EF:EFRegion>
<EF:EFRegion id="result" title="记录集"> <EF:EFRegion id="result" title="记录集" fitHeight="true">
<EF:EFGrid blockId="result" autoDraw="override" isFloat="true"> <EF:EFGrid blockId="result" autoDraw="override" isFloat="true" height="69vh">
<EF:EFColumn ename="id" cname="主键" hidden="true"/> <EF:EFColumn ename="id" cname="主键" hidden="true"/>
<EF:EFColumn ename="dateProc" cname="日期" enable="false" width="90" align="center"/> <EF:EFColumn ename="dateProc" cname="日期" enable="false" width="100" align="center"/>
<EF:EFComboColumn ename="inventType" cname="存货类型" enable="false" width="90" align="center"> <EF:EFComboColumn ename="inventType" cname="存货类型" enable="false" width="100" align="center">
<EF:EFCodeOption codeName="hpjx.hpkc.inventType"/> <EF:EFCodeOption codeName="hpjx.hpkc.inventType"/>
</EF:EFComboColumn> </EF:EFComboColumn>
<EF:EFComboColumn ename="whCode" cname="仓库名称" enable="false" width="100" align="center" <EF:EFComboColumn ename="whCode" cname="仓库名称" enable="false" width="100" align="center"
...@@ -52,39 +52,50 @@ ...@@ -52,39 +52,50 @@
</EF:EFComboColumn> </EF:EFComboColumn>
<EF:EFColumn ename="initAmount" cname="期初数量" enable="false" width="100" align="right" format="{0:N0}" <EF:EFColumn ename="initAmount" cname="期初数量" enable="false" width="100" align="right" format="{0:N0}"
sumType="all"/> sumType="all"/>
<EF:EFColumn ename="initWeight" cname="期初重量（T）" enable="false" width="100" align="right" format="{0:N3}" <EF:EFColumn ename="initWeight" cname="期初重量(T)" enable="false" width="100" align="right" format="{0:N3}"
sumType="all"/> sumType="all"/>
<EF:EFColumn ename="cgEnterAmount" cname="采购入库数量" enable="false" width="100" align="right" format="{0:N0}" <EF:EFColumn ename="cgEnterAmount" cname="采购入库数量" enable="false" width="100" align="right" format="{0:N0}"
sumType="all"/> sumType="all"/>
<EF:EFColumn ename="cgEnterWeight" cname="采购入库重量（T）" enable="false" width="100" align="right" format="{0:N3}" <EF:EFColumn ename="cgEnterWeight" cname="采购入库重量(T)" enable="false" width="120" align="right"
format="{0:N3}"
sumType="all"/> sumType="all"/>
<EF:EFColumn ename="qtEnterAmount" cname="其它入库数量" enable="false" width="90" align="right" format="{0:N0}" <EF:EFColumn ename="qtEnterAmount" cname="其它入库数量" enable="false" width="100" align="right"
format="{0:N0}"
sumType="all"/> sumType="all"/>
<EF:EFColumn ename="qtEnterWeight" cname="其它入库重量（T）" enable="false" width="90" align="right" format="{0:N3}" <EF:EFColumn ename="qtEnterWeight" cname="其它入库重量(T)" enable="false" width="120" align="right"
format="{0:N3}"
sumType="all"/> sumType="all"/>
<EF:EFColumn ename="enterAmount" cname="入库数量" enable="false" width="90" align="right" format="{0:N0}" <EF:EFColumn ename="enterAmount" cname="入库数量" enable="false" width="100" align="right" format="{0:N0}"
sumType="all"/> sumType="all"/>
<EF:EFColumn ename="enterWeight" cname="入库重量（T）" enable="false" width="90" align="right" format="{0:N3}" <EF:EFColumn ename="enterWeight" cname="入库重量(T)" enable="false" width="100" align="right"
format="{0:N3}"
sumType="all"/> sumType="all"/>
<EF:EFColumn ename="scOuterAmount" cname="生产领料数量" enable="false" width="90" align="right" format="{0:N0}" <EF:EFColumn ename="scOuterAmount" cname="生产领料数量" enable="false" width="100" align="right"
format="{0:N0}"
sumType="all"/> sumType="all"/>
<EF:EFColumn ename="scOuterWeight" cname="生产领料重量（T）" enable="false" width="90" align="right" format="{0:N3}" <EF:EFColumn ename="scOuterWeight" cname="生产领料重量(T)" enable="false" width="120" align="right"
format="{0:N3}"
sumType="all"/> sumType="all"/>
<EF:EFColumn ename="qtOuterAmount" cname="其它出库数量" enable="false" width="90" align="right" format="{0:N0}" <EF:EFColumn ename="qtOuterAmount" cname="其它出库数量" enable="false" width="100" align="right"
format="{0:N0}"
sumType="all"/> sumType="all"/>
<EF:EFColumn ename="qtOuterWeight" cname="其它出库重量（T）" enable="false" width="90" align="right" format="{0:N3}" <EF:EFColumn ename="qtOuterWeight" cname="其它出库重量(T)" enable="false" width="120" align="right"
format="{0:N3}"
sumType="all"/> sumType="all"/>
<EF:EFColumn ename="outerAmount" cname="出库数量" enable="false" width="90" align="right" format="{0:N0}" <EF:EFColumn ename="outerAmount" cname="出库数量" enable="false" width="100" align="right" format="{0:N0}"
sumType="all"/> sumType="all"/>
<EF:EFColumn ename="outerWeight" cname="出库重量（T）" enable="false" width="90" align="right" format="{0:N3}" <EF:EFColumn ename="outerWeight" cname="出库重量(T)" enable="false" width="100" align="right"
format="{0:N3}"
sumType="all"/> sumType="all"/>
<EF:EFColumn ename="pdDiffAmount" cname="盘点差异数量" enable="false" width="90" align="right" format="{0:N0}" <EF:EFColumn ename="pdDiffAmount" cname="盘点差异数量" enable="false" width="100" align="right"
format="{0:N0}"
sumType="all"/> sumType="all"/>
<EF:EFColumn ename="pdDiffWeight" cname="盘点差异重量（T）" enable="false" width="90" align="right" format="{0:N3}" <EF:EFColumn ename="pdDiffWeight" cname="盘点差异重量(T)" enable="false" width="120" align="right"
format="{0:N3}"
sumType="all"/> sumType="all"/>
<EF:EFColumn ename="endAmount" cname="期末数量" enable="false" width="90" align="right" format="{0:N0}" <EF:EFColumn ename="endAmount" cname="期末数量" enable="false" width="100" align="right" format="{0:N0}"
sumType="all"/> sumType="all"/>
<EF:EFColumn ename="endWeight" cname="期末重量（T）" enable="false" width="90" align="right" format="{0:N3}" <EF:EFColumn ename="endWeight" cname="期末重量(T)" enable="false" width="100" align="right" format="{0:N3}"
sumType="all"/> sumType="all"/>
</EF:EFGrid> </EF:EFGrid>
</EF:EFRegion> </EF:EFRegion>
......
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