Merge remote-tracking branch 'origin/dev' into dev

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

@@ -368,23 +368,23 @@ public class ServiceHPSC002 extends ServiceBase {
         //生产计划详情
         Map queryMap = new HashMap();
         queryMap.put("id", id);
-        List rows = this.dao.query("HPSC002.queryTreeNodeByParentPrtdCode", queryMap);
+        List<HPSC002> rows = this.dao.query("HPSC002.queryEntityByParentPrtdCode", queryMap);
 
         for (int i = 0; i < rows.size(); i++) {
-            Map domain = (Map)rows.get(i);
+            HPSC002 HPSC002 = rows.get(i);
             HPSC004 HPSC004 = new HPSC004();
             HPSC004.setCompanyCode("");
             HPSC004.setDeptCode("");
-            HPSC004.setProjCode(StringUtils.toString(domain.get("projCode")));
-            HPSC004.setProjName(StringUtils.toString(domain.get("projName")));
+            HPSC004.setProjCode(HPSC002.getProjCode());
+            HPSC004.setProjName(HPSC002.getProjName());
             HPSC004.setParentPrdtCode(StringUtils.toString(ent.getId()));
-            HPSC004.setParentPrdtName(StringUtils.toString(domain.get("parentPrdtName")));
-            HPSC004.setPrdtType(NumberUtils.toInteger(domain.get("prdtType")));
-            HPSC004.setPrdtCode(StringUtils.toString(domain.get("prdtCode")));
-            HPSC004.setPrdtName(StringUtils.toString(domain.get("prdtName")));
-            HPSC004.setNum(NumberUtils.toBigDecimal(domain.get("num")));
-            HPSC004.setUnitWt(NumberUtils.toBigDecimal(domain.get("unitWt")));
-            HPSC004.setFilePath1(StringUtils.toString(domain.get("id")));
+            HPSC004.setParentPrdtName(HPSC002.getParentPrdtName());
+            HPSC004.setPrdtType(HPSC002.getPrdtType());
+            HPSC004.setPrdtCode(HPSC002.getPrdtCode());
+            HPSC004.setPrdtName(HPSC002.getPrdtName());
+            HPSC004.setNum(HPSC002.getNum());
+            HPSC004.setUnitWt(HPSC002.getUnitWt());
+            HPSC004.setFilePath1(HPSC002.getId().toString());
             HPSC004.setPlanCommentDate("");
             HPSC004.setPlanCompletionDate("");
             HPSC004.setActualCompletionNum(NumberUtils.toBigDecimal(0.00));

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

@@ -350,6 +350,42 @@
 		FROM hpjx.t_hpsc002  WHERE PARENT_PRDT_CODE = #id#
 	</select>
 
+
+	<select id="queryEntityByParentPrtdCode" parameterClass="java.util.HashMap"
+			resultClass="com.baosight.hpjx.hp.sc.domain.HPSC002">
+		SELECT
+		ID	as "id",
+		COMPANY_CODE	as "companyCode",  <!-- 企业编码 预留 -->
+		DEPT_CODE	as "deptCode",  <!-- 部门编码 预留 -->
+		PROJ_CODE	as "projCode",  <!-- 项目编码 -->
+		PROJ_NAME	as "projName",  <!-- 项目名称 -->
+		PARENT_PRDT_CODE	as "parentPrdtCode",  <!-- 父节点-产品编码 -->
+		PARENT_PRDT_NAME	as "parentPrdtName",  <!-- 父节点-产品名称 -->
+		TYPE	as "type",  <!-- 类别 -->
+		LEAF	as "leaf",  <!-- 是否有叶子节点 -->
+		SORT	as "sort",  <!-- 排序字段 -->
+		ICON	as "icon",  <!-- 图片地址 -->
+		PRDT_TYPE	as "prdtType",
+		PRDT_CODE	as "prdtCode",  <!-- 产品编码 -->
+		PRDT_NAME	as "prdtName",  <!-- 产品名称 -->
+		NUM	as "num",  <!-- 数量 -->
+		UNIT_WT	as "unitWt",  <!-- 单重 -->
+		TOTAL_WT	as "totalWt",  <!-- 总重 -->
+		FILE_PATH1	as "filePath1",  <!-- 文件地址1 -->
+		FILE_PATH2	as "filePath2",  <!-- 文件地址2 -->
+		FILE_PATH3	as "filePath3",  <!-- 文件地址3 -->
+		FILE_PATH4	as "filePath4",  <!-- 文件地址4 -->
+		FILE_PATH5	as "filePath5",  <!-- 文件地址5 -->
+		STATUS	as "status",  <!-- 状态   0-未审核，1-已审核 -->
+		DEL_STATUS	as "delStatus",  <!-- 状态   1未删除，0已删除 -->
+		CREATED_BY	as "createdBy",  <!-- 创建人 -->
+		CREATED_TIME	as "createdTime",  <!-- 创建时间 -->
+		UPDATED_BY	as "updatedBy",  <!-- 更新人 -->
+		UPDATED_TIME	as "updatedTime",  <!-- 更新时间 -->
+		REMARK	as "remark" <!-- 备注 -->
+		FROM hpjx.t_hpsc002  WHERE PARENT_PRDT_CODE = #id#
+	</select>
+
 	<update id="updateTreeNodeLeaf">
 		UPDATE hpjx.t_hpsc002  SET  LEAF = #leaf# WHERE ID = #id#
 	</update>

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

@@ -30,7 +30,9 @@
             <EF:EFColumn enable="false" ename="projCode"   cname="项目号" readonly="true"/>
             <EF:EFColumn enable="false" ename="projName" cname="项目名称" readonly="true"/>
             <EF:EFColumn enable="false" ename="planInfoNo" cname="生产计划单号" readonly="true"/>
-            <EF:EFColumn enable="false" ename="prdtType" cname="产品类型" readonly="true"/>
+            <EF:EFComboColumn ename="prdtType" cname="产品类型" width="90" align="center" enable="false">
+                <EF:EFCodeOption codeName="hpjx.hpkc.inventType" />
+            </EF:EFComboColumn>
             <EF:EFColumn enable="false" ename="prdtCode" cname="产品编码" readonly="true"/>
             <EF:EFColumn enable="false" ename="prdtName" cname="产品名称" readonly="true"/>
             <EF:EFColumn ename="planCompletionDate" cname="计划完成日期" editType="date" dateFormat="yyyy/MM/dd" width="150"
@@ -48,7 +50,9 @@
     <EF:EFRegion id="detail" title="明细信息">
         <EF:EFGrid blockId="detail" autoDraw="no">
             <EF:EFColumn ename="id" cname="主键" hidden="true"/>
-            <EF:EFColumn enable="false" ename="prdtType" cname="部件类型" readonly="true"/>
+            <EF:EFComboColumn ename="prdtType" cname="部件类型" width="90" align="center" readonly="true">
+                <EF:EFCodeOption codeName="hpjx.hpkc.inventType" />
+            </EF:EFComboColumn>
             <EF:EFColumn enable="false" ename="prdtCode"  required='true' cname="部件编码"/>
             <EF:EFColumn enable="false" ename="prdtName" readonly="true" cname="部件名称"/>
             <EF:EFComboColumn enable="false" ename="delStatus" cname="状态">