Skip to content

H
hp-smart
Commit 119fb4ec by yukang
Options

1，规格（MM），重量(T)列头要带单位 

2，生产任务详情优化，参考生产订单
3，详情下方新增领料记录列表
parent 268b1487
Showing with 112 additions and 8 deletions
src/main/java/com/baosight/hpjx/hp/sc/service/ServiceHPSC006A.java
......@@ -6,6 +6,7 @@ import com.baosight.hpjx.common.HPConstants;
import com.baosight.hpjx.core.constant.CommonConstant;
import com.baosight.hpjx.core.dao.DaoUtils;
import com.baosight.hpjx.hp.pz.tools.HPPZTools;
import com.baosight.hpjx.hp.sc.domain.HPSC005A;
import com.baosight.hpjx.hp.sc.domain.HPSC006;
import com.baosight.hpjx.util.CommonMethod;
import com.baosight.hpjx.util.EiInfoUtils;
......@@ -16,11 +17,13 @@ import com.baosight.iplat4j.core.ei.EiConstant;
import com.baosight.iplat4j.core.ei.EiInfo;
import com.baosight.iplat4j.core.exception.PlatException;
import com.baosight.iplat4j.core.service.impl.ServiceBase;
import com.sun.org.apache.bcel.internal.generic.NEW;
import org.apache.commons.lang.StringUtils;
import org.springframework.util.CollectionUtils;
import java.math.BigDecimal;
import java.text.DecimalFormat;
import java.util.Arrays;
import java.util.Map;
import java.util.*;
/**
*
......@@ -59,9 +62,34 @@ public class ServiceHPSC006A extends ServiceBase {
HPSC006 HPSC006 = new HPSC006();
/* 调用EI查询方法.*/
EiInfo outInfo = super.query(inInfo, "HPSC006A.query", new HPSC006());
EiBlock blcok = outInfo.addBlock(HPConstants.BLOCK_DETAIL);
List<Map> resultRows = outInfo.getBlock(EiConstant.resultBlock).getRows();
List<Map> list = new ArrayList<>();
if (!CollectionUtils.isEmpty(resultRows)) {
for (Map resultRow : resultRows) {
HPSC006 hpsc006 = new HPSC006();
hpsc006.fromMap(resultRow);
String projCode = hpsc006.getProjCode();
if (StringUtils.isNotBlank(projCode)) {
Map map = new HashMap();
map.put("projCode", projCode);
map.put("hpsc006Id", hpsc006.getId());
List reqNum = dao.query("HPKC002.query",map);
hpsc006.setReqNum(reqNum.size());
}
resultRow = hpsc006.toMap();
list.add(resultRow);
}
}
EiInfo outInfo1 = new EiInfo();
//添加返回到前台的块，块名和前台的对应
EiBlock eiBlock = outInfo1.addBlock(EiConstant.resultBlock);
EiBlock blcok = outInfo1.addBlock(HPConstants.BLOCK_DETAIL);
blcok.setBlockMeta(new HPSC006().eiMetadata);
return outInfo;
outInfo1.addBlock(EiConstant.resultBlock).addBlockMeta(HPSC006.eiMetadata);
outInfo1.addBlock(EiConstant.resultBlock).addRows(list);
outInfo1.getBlock(EiConstant.resultBlock).set("limit", list.size());
return outInfo1;
}
......
src/main/java/com/baosight/hpjx/hp/sc/service/ServiceHPSC006B.java
......@@ -6,9 +6,7 @@ import com.baosight.hpjx.common.HPConstants;
import com.baosight.hpjx.core.constant.CommonConstant;
import com.baosight.hpjx.core.dao.DaoUtils;
import com.baosight.hpjx.hp.pz.tools.HPPZTools;
import com.baosight.hpjx.hp.sc.domain.HPSC005;
import com.baosight.hpjx.hp.sc.domain.HPSC005A;
import com.baosight.hpjx.hp.sc.domain.HPSC006;
import com.baosight.hpjx.hp.sc.domain.*;
import com.baosight.hpjx.hp.sc.tools.HPSCTools;
import com.baosight.hpjx.util.CommonMethod;
import com.baosight.hpjx.util.EiInfoUtils;
......@@ -19,6 +17,7 @@ import com.baosight.iplat4j.core.ei.EiConstant;
import com.baosight.iplat4j.core.ei.EiInfo;
import com.baosight.iplat4j.core.exception.PlatException;
import com.baosight.iplat4j.core.service.impl.ServiceBase;
import com.baosight.iplat4j.core.util.NumberUtils;
import java.math.BigDecimal;
import java.text.DecimalFormat;
......@@ -39,6 +38,11 @@ public class ServiceHPSC006B extends ServiceBase {
try {
Map queryMap = EiInfoUtils.getFirstRow(inInfo);
String prodOrderNo = MapUtils.getString(queryMap, CommonConstant.Field.ID);
HPSC006 hpsc006 = HPSCTools.Hpsc006.getById(NumberUtils.toLong(prodOrderNo));
if (hpsc006 != null) {
HPSC005C dbSc005 = HPSCTools.HpSc005.getDetails(hpsc006.getProductionOrderNo());
inInfo.addBlock(EiConstant.resultBlock).addRow(dbSc005);
}
HPSC006 dbSc006 = HPSCTools.HpSc005.getHPSC006(prodOrderNo);
inInfo.addBlock(CommonConstant.Field.DETAIL).addRow(dbSc006);
inInfo.addBlock(EiConstant.resultBlock).addBlockMeta(new HPSC006().eiMetadata);
......
src/main/webapp/HP/SC/HPSC006A.js
......@@ -15,6 +15,17 @@ $(function () {
+ 'onclick="tearDetails(\'' + id + '\')" >查看详情</a>';
return template
}
},{
field: "reqNum",
template: function (item) {
let reqNum = item.reqNum;
let projCode = item.projCode;
let template = '';
template += '<a style="cursor: pointer;display: inline-flex" '
+' onclick="reqDetails(\'' + projCode + '\')" >' + reqNum + '</a>';
return template
}
}]
}
}
......@@ -38,7 +49,18 @@ $(function () {
function query() {
resultGrid.dataSource.page(1);
}
/**
* 领料详情
* @param projCode
*/
function reqDetails(projCode) {
JSColorbox.open({
href: "HPSC006C?methodName=initLoad&inqu_status-0-projCode=" + projCode,
title: "<div style='text-align: center;'>领料记录</div>",
width: "80%",
height: "90%"
});
}
//厂区组类型下拉联动
$('input[name="inqu_status-0-factoryCode"]').change(function () {
var inInfo=new EiInfo();
......
src/main/webapp/HP/SC/HPSC006A.jsp
......@@ -34,6 +34,7 @@
<EF:EFGrid blockId="result" autoDraw="override">
<EF:EFColumn ename="id" cname="主键" hidden="true"/>
<EF:EFColumn ename="operator" cname="操作" locked="true" enable="false" width="100" align="center"/>
<EF:EFColumn enable="false" ename="reqNum" cname="领料记录" width="80" align="center" readonly="true"/>
<EF:EFColumn ename="productionOrderNo" cname="生产订单号" enable="false" width="150" align="center" hidden="true"/>
<EF:EFColumn ename="projName" cname="项目名称" enable="false" width="140" align="center"/>
<EF:EFColumn ename="factoryName" cname="厂区名称" enable="false" width="100" align="center"/>
......
src/main/webapp/HP/SC/HPSC006B.jsp
......@@ -6,6 +6,55 @@
<c:set var="ctx" value="${pageContext.request.contextPath}"/>
<EF:EFPage title="下料详情">
<EF:EFRegion id="inqu" title="任务详情">
<EF:EFInput ename="inqu_status-0-prodOrderNo" cname="项目号" type="hidden"/>
<div class="row">
<EF:EFInput ename="result-0-productionOrderNo" cname="生产订单号" colWidth="4" readonly="true"/>
<EF:EFInput ename="result-0-projCode" cname="项目号" colWidth="4" readonly="true"/>
<EF:EFInput ename="result-0-projName" cname="项目名称" colWidth="4" readonly="true"/>
</div>
<div class="row">
<EF:EFInput ename="result-0-prdtName" cname="部件名称" colWidth="4" readonly="true"/>
<EF:EFInput ename="result-0-prdtLength" cname="部件长" colWidth="4" readonly="true"/>
<EF:EFInput ename="result-0-prdtWidth" cname="部件宽" colWidth="4" readonly="true"/>
</div>
<div class="row">
<EF:EFInput ename="result-0-prdtThick" cname="部件厚" colWidth="4" readonly="true"/>
<EF:EFInput ename="result-0-num" cname="部件数量" colWidth="4" readonly="true"/>
<EF:EFInput ename="result-0-unitWt" cname="部件重量" colWidth="4" readonly="true"/>
</div>
<div class="row">
<EF:EFInput ename="result-0-remark" cname="部件备注" colWidth="4" readonly="true"/>
<EF:EFSelect ename="result-0-partType" cname="零件类型" colWidth="4" readonly="true">
<EF:EFCodeOption codeName="hpjx.hpkc.inventType"/>
</EF:EFSelect>
<EF:EFInput ename="result-0-partName" cname="零件名称" colWidth="4" readonly="true"/>
</div>
<div class="row">
<EF:EFInput ename="result-0-partLength" cname="零件长" colWidth="4" readonly="true"/>
<EF:EFInput ename="result-0-partWidth" cname="零件宽" colWidth="4" readonly="true"/>
<EF:EFInput ename="result-0-partThick" cname="零件厚" colWidth="4" readonly="true"/>
</div>
<div class="row">
<EF:EFInput ename="result-0-remark1" cname="零件备注" colWidth="4" readonly="true"/>
<EF:EFInput ename="result-0-num" cname="零件数量" colWidth="4" readonly="true"/>
<EF:EFInput ename="result-0-unitWt" cname="零件重量" colWidth="4" readonly="true"/>
</div>
<div class="row">
<EF:EFInput ename="result-0-assignedNum" cname="派工数量" colWidth="4" readonly="true"/>
<EF:EFInput ename="result-0-totalWt" cname="派工重量" colWidth="4" readonly="true"/>
<EF:EFInput ename="result-0-unassignedNum" cname="剩余数量" colWidth="4" readonly="true"/>
</div>
<div class="row">
<EF:EFInput ename="result-0-unTotalWt" cname="剩余重量" colWidth="4" readonly="true"/>
<EF:EFInput ename="result-0-completeNum" cname="完成数量" colWidth="4" readonly="true"/>
<EF:EFInput ename="result-0-actualCompletionTotalWt" cname="完成重量" colWidth="4" readonly="true"/>
</div>
<div class="row">
<EF:EFDatePicker ename="result-0-planCompletionDate" cname="计划完成日期" role="date" format="yyyy-MM-dd" parseFormats="['yyyyMMdd']" colWidth="4" readonly="true" />
<EF:EFDatePicker ename="result-0-actualCompletionDate" cname="实际完成时间" role="date" format="yyyy-MM-dd" parseFormats="['yyyyMMdd']" colWidth="4" readonly="true" />
</div>
</EF:EFRegion>
<EF:EFRegion id="inqu" title="下料详情">
<EF:EFInput ename="inqu_status-0-prodOrderNo" cname="项目号" type="hidden"/>
......
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