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

src/main/java/com/baosight/hpjx/hp/bi/service/ServiceHPBI002.java

@@ -665,7 +665,7 @@ public class ServiceHPBI002 extends ServiceBase {
         Map result1 = (Map) result.get("a02eed6a3e3f4dd39dbd0851e6a7572a");
         List<Map> list1 = (List) result1.get("data");
         JSONArray tempArr = new JSONArray();
-        String json = "项目名称,计划完成时间,计划产量,实际产量,进度";
+        String json = "项目名称,计划完成时间,计划产量,实际产量,生产进度,发货进度";
         List tempContentList = Arrays.asList(json.split(","));
         tempArr.add(tempContentList);
         JSONObject item = new JSONObject();
@@ -676,7 +676,8 @@ public class ServiceHPBI002 extends ServiceBase {
             datalist.add(obj.get("计划完成时间"));
             datalist.add(obj.get("计划产量"));
             datalist.add(obj.get("实际产量"));
-            datalist.add(obj.get("进度"));
+            datalist.add(obj.get("生产进度"));
+            datalist.add(obj.get("发货进度"));
             tempArr.add(datalist);
         });
         JSONArray ids = new JSONArray();

src/main/java/com/baosight/hpjx/hp/sc/service/ServiceHPSC002.java

@@ -658,35 +658,31 @@ public class ServiceHPSC002 extends ServiceBase {
         inInfo.set("root",root);
         return inInfo;
     }
-	@OperationLogAnnotation(operModul = "物料清单",operType = "查询",operDesc = "树查询服务")
-    //树查询服务
-    public EiInfo queryTreeNode(EiInfo inInfo) {
-        //1 获取参数
-        String pEname = inInfo.getCellStr(EiConstant.queryBlock, 0, "node");
-        if(StringUtils.equals("$",pEname)){
-            pEname = "root";
-        }
-        String proj = inInfo.get(CommonConstant.Field.PROJ_ID).toString();
-        Long projId =  NumberUtils.toLong(proj.split("&")[0]);
-        Map queryMap = new HashMap();
-        queryMap.put("pEname", pEname);
-        if (projId != null) {
-            Map map = new HashMap();
-            map.put("id", projId);
-            List list = dao.query("HPSC001.queryDomainById", map);
-            if (list.size() > 0) {
-                String projCode = ((HPSC001)list.get(0)).getProjCode();
-                queryMap.put("projCode", projCode);
-            }
-        }
-	    //2 查询节点
-	    List rows = dao.query("HPSC002.queryTree", queryMap);
-	    //3 增加节点block块
-	    EiInfo outInfo = new EiInfo();
-	    EiBlock outBlock = outInfo.addBlock(BeanUtil.isEmpty(pEname) ? "" : pEname);
-	    outBlock.addRows(rows);
-	    return outInfo;
-    }
+	
+	/**
+	 * 查询树
+	 *
+	 * @param inInfo
+	 * @return
+	 */
+	@OperationLogAnnotation(operModul = "物料清单", operType = "查询", operDesc = "树查询服务")
+	public EiInfo queryTreeNode(EiInfo inInfo) {
+		Map queryRow = EiInfoUtils.getFirstRow(inInfo);
+		String node = MapUtils.getString(queryRow, "node");
+		Map map = new HashMap();
+		map.put("id", queryRow.get(CommonConstant.Field.PROJ_ID));
+		List<HPSC001> dbSc001s = dao.query("HPSC001.queryDomainById", map);
+		// 查询节点
+		Map queryMap = new HashMap();
+		queryMap.put("projCode", CollectionUtils.isEmpty(dbSc001s) ? "null" : dbSc001s.get(0).getProjCode());
+		queryMap.put("pEname", "$".equals(node) ? "root" : node);
+		List rows = dao.query("HPSC002.queryTree", queryMap);
+		// 增加节点block块
+		EiInfo outInfo = new EiInfo();
+		EiBlock outBlock = outInfo.addBlock(node);
+		outBlock.addRows(rows);
+		return outInfo;
+	}
 	
 	/**
 	 * 修改节点状态，是叶子或非叶子节点
@@ -864,7 +860,7 @@ public class ServiceHPSC002 extends ServiceBase {
 		}
 		return inInfo;
 
-				
+		
 	}
     /**
      * 部件类型下拉框

src/main/java/com/baosight/hpjx/hp/sc/service/ServiceHPSC008.java

@@ -20,6 +20,7 @@ import com.baosight.iplat4j.core.service.impl.ServiceEPBase;
 
 import java.util.Arrays;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -184,4 +185,21 @@ public class ServiceHPSC008 extends ServiceEPBase {
                 }});
         return inInfo;
     }
+
+    public EiInfo queryMaxDate(EiInfo inInfo) {
+        String companyCode = UserSessionUtils.getCompanyCode();
+        Map sqlMap = new HashMap();
+        sqlMap.put("companyCode", companyCode);
+        List<Map> result = this.dao.query("HPSC008.queryMaxDate", sqlMap);
+        String registerDate = (String) result.get(0).get("registerDate");
+        registerDate = registerDate.substring(0,4)+"-"+registerDate.substring(4,6)+"-"+registerDate.substring(6,8);
+        inInfo.set("registerDate",registerDate);
+        inInfo.setStatus(EiConstant.STATUS_DEFAULT);
+        return inInfo;
+    }
+
 }
+
+
+
+

src/main/java/com/baosight/hpjx/hp/sc/sql/HPSC002.xml

@@ -185,7 +185,7 @@
                 $order$
             </isNotEmpty>
             <isEmpty property="order">
-                A.ID DESC
+                A.ID ASC
             </isEmpty>
         </dynamic>
     </sql>
@@ -335,7 +335,7 @@
 		<isNotEmpty prepend=" AND " property="projCode">
 			PROJ_CODE = #projCode#
 		</isNotEmpty>
-		ORDER BY CREATED_TIME DESC
+		ORDER BY ID ASC
 	</select>
 
 

src/main/java/com/baosight/hpjx/hp/sc/sql/HPSC008.xml

@@ -450,7 +450,18 @@
 				CREATED_TIME desc
 			</isEmpty>
 		</dynamic>
-
 	</select>
 
+	<select id="queryMaxDate" parameterClass="java.util.HashMap" resultClass="java.util.HashMap">
+		SELECT
+			MAX(REGISTER_DATE)	as "registerDate"  <!-- 最新登记日期 -->
+		FROM ${hpjxSchema}.T_HPXS001
+		WHERE 1=1 AND DELETE_FLAG = 0
+		<isNotEmpty prepend=" AND " property="companyCode">
+			COMPANY_CODE = #companyCode#
+		</isNotEmpty>
+<!--		<isNotEmpty prepend=" AND " property="factoryCode">
+			FACTORY_CODE = #factoryCode#
+		</isNotEmpty>-->
+	</select>
 </sqlMap>

src/main/java/com/baosight/hpjx/hp/sc/tools/HPSCTools.java

@@ -943,6 +943,9 @@ public class HPSCTools {
 			Map queryMap = new HashMap();
 			queryMap.put("id", id);
 			List<HPSC006> results = DaoBase.getInstance().query(HPSC006.QUERY, queryMap);
+			if(results!=null&&results.size()==0){
+				results = null;
+			}
 			AssertUtils.isNull(results, String.format("生产下料ID[%s]信息不存在", id));
 			return results.get(0);
 		}

src/main/webapp/HP/SC/HPSC002.jsp

@@ -4,29 +4,27 @@
 <%@ taglib prefix="EF" tagdir="/WEB-INF/tags/EF" %>
 
 <c:set var="ctx" value="${pageContext.request.contextPath}"/>
-<head>
-    <%--    <link rel="stylesheet" href="${ctx}/css/simulatedOperation.css"/>--%>
-</head>
+
 <EF:EFPage title="物料清单">
-    <EF:EFRegion id="inqu" title="查询条件">
-        <div class="row">
-            <%--<EF:EFSelect ename="inqu_status-0-prdtType" cname="部件类型" colWidth="3" filter="contains"
-                         template="#=textField#" valueTemplate="#=textField#">
-                <EF:EFOption label="全部" value=""/>
-                <EF:EFCodeOption codeName="hpjx.hpkc.inventType" condition="ITEM_CODE IN ('3','4')"/>
-            </EF:EFSelect>--%>
-            <EF:EFSelect cname="部件名称" ename="inqu_status-0-prdtCode" colWidth="3" filter="contains" defultValue="">
-                <EF:EFOption label="全部" value=""/>
-                <EF:EFOptions blockId="invent_name_block_id" textField="textField" valueField="valueField"/>
-            </EF:EFSelect>
-            <EF:EFSelect cname="状态" optionLabel="全部" ename="inqu_status-0-status" colWidth="3">
-                <EF:EFOption label="未提交" value="0"/>
-                <EF:EFOption label="已提交" value="1"/>
-            </EF:EFSelect>
-                <EF:EFInput ename="inqu_status-0-projId" hidden="true"/>
-        </div>
-<%--        <EF:EFButton ename="QUERY" cname="查询" row="1" class="btn-align-right"></EF:EFButton>--%>
+	<EF:EFRegion id="inqu" title="查询条件">
+		<EF:EFInput ename="inqu_status-0-projId" type="hidden"/>
+		<div class="row">
+				<%--<EF:EFSelect ename="inqu_status-0-prdtType" cname="部件类型" colWidth="3" filter="contains"
+							 template="#=textField#" valueTemplate="#=textField#">
+					<EF:EFOption label="全部" value=""/>
+					<EF:EFCodeOption codeName="hpjx.hpkc.inventType" condition="ITEM_CODE IN ('3','4')"/>
+				</EF:EFSelect>--%>
+			<EF:EFSelect cname="部件名称" ename="inqu_status-0-prdtCode" colWidth="3" filter="contains" defultValue="">
+				<EF:EFOption label="全部" value=""/>
+				<EF:EFOptions blockId="invent_name_block_id" textField="textField" valueField="valueField"/>
+			</EF:EFSelect>
+			<EF:EFSelect cname="状态" optionLabel="全部" ename="inqu_status-0-status" colWidth="3">
+				<EF:EFOption label="未提交" value="0"/>
+				<EF:EFOption label="已提交" value="1"/>
+			</EF:EFSelect>
+		</div>
     </EF:EFRegion>
+
     <div id="splitter" class="i-fit-height" style="display: inline">
         <div id="left-pane" class="i-fit-height" style="width: 20%;float:left;">
             <EF:EFRegion id="projTree" title="BOM结构图" fitHeight="true">