Skip to content

H
hp-smart
Commit c55430f9 by 宋祥
Options

1.物料清单页面优化

parent 3be9c7c8
Showing with 47 additions and 53 deletions
src/main/java/com/baosight/hpjx/hp/sc/service/ServiceHPSC002.java
...@@ -658,35 +658,31 @@ public class ServiceHPSC002 extends ServiceBase { ...@@ -658,35 +658,31 @@ public class ServiceHPSC002 extends ServiceBase {
inInfo.set("root",root); inInfo.set("root",root);
return inInfo; return inInfo;
} }
@OperationLogAnnotation(operModul = "物料清单",operType = "查询",operDesc = "树查询服务")
//树查询服务 /**
public EiInfo queryTreeNode(EiInfo inInfo) { * 查询树
//1 获取参数 *
String pEname = inInfo.getCellStr(EiConstant.queryBlock, 0, "node"); * @param inInfo
if(StringUtils.equals("$",pEname)){ * @return
pEname = "root"; */
} @OperationLogAnnotation(operModul = "物料清单", operType = "查询", operDesc = "树查询服务")
String proj = inInfo.get(CommonConstant.Field.PROJ_ID).toString(); public EiInfo queryTreeNode(EiInfo inInfo) {
Long projId = NumberUtils.toLong(proj.split("&")[0]); Map queryRow = EiInfoUtils.getFirstRow(inInfo);
Map queryMap = new HashMap(); String node = MapUtils.getString(queryRow, "node");
queryMap.put("pEname", pEname); Map map = new HashMap();
if (projId != null) { map.put("id", queryRow.get(CommonConstant.Field.PROJ_ID));
Map map = new HashMap(); List<HPSC001> dbSc001s = dao.query("HPSC001.queryDomainById", map);
map.put("id", projId); // 查询节点
List list = dao.query("HPSC001.queryDomainById", map); Map queryMap = new HashMap();
if (list.size() > 0) { queryMap.put("projCode", CollectionUtils.isEmpty(dbSc001s) ? "null" : dbSc001s.get(0).getProjCode());
String projCode = ((HPSC001)list.get(0)).getProjCode(); queryMap.put("pEname", "$".equals(node) ? "root" : node);
queryMap.put("projCode", projCode); List rows = dao.query("HPSC002.queryTree", queryMap);
} // 增加节点block块
} EiInfo outInfo = new EiInfo();
//2 查询节点 EiBlock outBlock = outInfo.addBlock(node);
List rows = dao.query("HPSC002.queryTree", queryMap); outBlock.addRows(rows);
//3 增加节点block块 return outInfo;
EiInfo outInfo = new EiInfo(); }
EiBlock outBlock = outInfo.addBlock(BeanUtil.isEmpty(pEname) ? "" : pEname);
outBlock.addRows(rows);
return outInfo;
}
/** /**
* 修改节点状态，是叶子或非叶子节点 * 修改节点状态，是叶子或非叶子节点
...@@ -864,7 +860,7 @@ public class ServiceHPSC002 extends ServiceBase { ...@@ -864,7 +860,7 @@ public class ServiceHPSC002 extends ServiceBase {
} }
return inInfo; return inInfo;
} }
/** /**
* 部件类型下拉框 * 部件类型下拉框
......
src/main/java/com/baosight/hpjx/hp/sc/sql/HPSC002.xml
...@@ -185,7 +185,7 @@ ...@@ -185,7 +185,7 @@
$order$ $order$
</isNotEmpty> </isNotEmpty>
<isEmpty property="order"> <isEmpty property="order">
A.ID DESC A.ID ASC
</isEmpty> </isEmpty>
</dynamic> </dynamic>
</sql> </sql>
...@@ -335,7 +335,7 @@ ...@@ -335,7 +335,7 @@
<isNotEmpty prepend=" AND " property="projCode"> <isNotEmpty prepend=" AND " property="projCode">
PROJ_CODE = #projCode# PROJ_CODE = #projCode#
</isNotEmpty> </isNotEmpty>
ORDER BY CREATED_TIME DESC ORDER BY ID ASC
</select> </select>
......
src/main/webapp/HP/SC/HPSC002.jsp
...@@ -4,29 +4,27 @@ ...@@ -4,29 +4,27 @@
<%@ taglib prefix="EF" tagdir="/WEB-INF/tags/EF" %> <%@ taglib prefix="EF" tagdir="/WEB-INF/tags/EF" %>
<c:set var="ctx" value="${pageContext.request.contextPath}"/> <c:set var="ctx" value="${pageContext.request.contextPath}"/>
<head>
<%-- <link rel="stylesheet" href="${ctx}/css/simulatedOperation.css"/>--%>
</head>
<EF:EFPage title="物料清单"> <EF:EFPage title="物料清单">
<EF:EFRegion id="inqu" title="查询条件"> <EF:EFRegion id="inqu" title="查询条件">
<div class="row"> <EF:EFInput ename="inqu_status-0-projId" type="hidden"/>
<%--<EF:EFSelect ename="inqu_status-0-prdtType" cname="部件类型" colWidth="3" filter="contains" <div class="row">
template="#=textField#" valueTemplate="#=textField#"> <%--<EF:EFSelect ename="inqu_status-0-prdtType" cname="部件类型" colWidth="3" filter="contains"
<EF:EFOption label="全部" value=""/> template="#=textField#" valueTemplate="#=textField#">
<EF:EFCodeOption codeName="hpjx.hpkc.inventType" condition="ITEM_CODE IN ('3','4')"/> <EF:EFOption label="全部" value=""/>
</EF:EFSelect>--%> <EF:EFCodeOption codeName="hpjx.hpkc.inventType" condition="ITEM_CODE IN ('3','4')"/>
<EF:EFSelect cname="部件名称" ename="inqu_status-0-prdtCode" colWidth="3" filter="contains" defultValue=""> </EF:EFSelect>--%>
<EF:EFOption label="全部" value=""/> <EF:EFSelect cname="部件名称" ename="inqu_status-0-prdtCode" colWidth="3" filter="contains" defultValue="">
<EF:EFOptions blockId="invent_name_block_id" textField="textField" valueField="valueField"/> <EF:EFOption label="全部" value=""/>
</EF:EFSelect> <EF:EFOptions blockId="invent_name_block_id" textField="textField" valueField="valueField"/>
<EF:EFSelect cname="状态" optionLabel="全部" ename="inqu_status-0-status" colWidth="3"> </EF:EFSelect>
<EF:EFOption label="未提交" value="0"/> <EF:EFSelect cname="状态" optionLabel="全部" ename="inqu_status-0-status" colWidth="3">
<EF:EFOption label="已提交" value="1"/> <EF:EFOption label="未提交" value="0"/>
</EF:EFSelect> <EF:EFOption label="已提交" value="1"/>
<EF:EFInput ename="inqu_status-0-projId" hidden="true"/> </EF:EFSelect>
</div> </div>
<%-- <EF:EFButton ename="QUERY" cname="查询" row="1" class="btn-align-right"></EF:EFButton>--%>
</EF:EFRegion> </EF:EFRegion>
<div id="splitter" class="i-fit-height" style="display: inline"> <div id="splitter" class="i-fit-height" style="display: inline">
<div id="left-pane" class="i-fit-height" style="width: 20%;float:left;"> <div id="left-pane" class="i-fit-height" style="width: 20%;float:left;">
<EF:EFRegion id="projTree" title="BOM结构图" fitHeight="true"> <EF:EFRegion id="projTree" title="BOM结构图" fitHeight="true">
......
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