Merge branch 'dev' of http://git.pseer.com:8800/platform/hg-smart

src/main/java/com/baosight/hggp/common/DocRouteEnum.java

 package com.baosight.hggp.common;
 
 
+import com.baosight.hggp.hg.cw.domain.HGCW003;
+import com.baosight.hggp.hg.pz.domain.HGPZ005;
 import com.baosight.hggp.hg.sc.domain.HGSC004A;
+import com.baosight.hggp.hg.sc.domain.HGSC009;
+import com.baosight.hggp.hg.sj.domain.HGSJ003;
 
 /**
  * @author:songx
@@ -10,7 +14,10 @@ import com.baosight.hggp.hg.sc.domain.HGSC004A;
 public enum DocRouteEnum {
 
 	HGSC004A("route_001", "HGSC004A", "importData", HGSC004A.class),
-//	HPSC006("route_002", "HPSC006", "importData", HPSC006.class),
+	HGSC009("route_002", "HGSC009", "importData", HGSC009.class),
+	HGPZ005("route_003", "HGPZ005", "importData", HGPZ005.class),
+	HGCW003("route_004", "HGCW003", "importData", HGCW003.class),
+	HGSJ003("route_005", "HGSJ003", "importData", HGSJ003.class),
 	;
 	private String id;
 	private String serviceNme;

src/main/java/com/baosight/hggp/hg/pz/sql/HGPZ005A.xml

@@ -24,7 +24,7 @@
 <sqlMap namespace="HGPZ005A">
 
 	<sql id="condition">
-		<include refid="HGXSDataAuth.authCondition"/>
+		<!--<include refid="HGXSDataAuth.authCondition"/>-->
 		<isNotEmpty prepend=" AND " property="id">
 			ID = #id#
 		</isNotEmpty>

src/main/java/com/baosight/hggp/hg/sc/domain/HGSC009A.java

 package com.baosight.hggp.hg.sc.domain;
 
+import com.baosight.hggp.common.ExcelAnno;
 import com.baosight.iplat4j.core.util.NumberUtils;
 import java.math.BigDecimal;
 import com.baosight.iplat4j.core.ei.EiColumn;

src/main/webapp/HG/SC/HGSC009.js

@@ -174,7 +174,24 @@ $(function () {
 
     };
 
+    $("#IMPORT").on("click", function (e) {
+        let materialId = $("#inqu_status-0-materialId").val()
+        JSColorbox.open({
+            href: "HGSC097?methodName=initLoad&inqu_status-0-id=route_002",
+            title: "<div style='text-align: center;'>导入</div>",
+            width: "60%",
+            height: "50%",
+            callbackName: function () {
+                // 刷新列表
+                resultGrid.dataSource.page(1);
+                // 关闭弹窗
+                JSColorbox.close();
+            }
+        });
+    });
+
     grush.openImportBox();
+
     IPLATUI.EFUpload = {
         fileUpload: {
             showFileList: false,

src/main/webapp/HG/SC/HGSC097.jsp

@@ -8,7 +8,6 @@
 <EF:EFPage title="导入">
 
     <EF:EFRegion id="upload" title="文件导入区">
-
         <EF:EFInput ename="inqu_status-0-id" cname="服务Id" type="hidden"/>
         <EF:EFInput ename="inqu_status-0-parentProdCode" cname="父Id" type="hidden"/>
         <EF:EFInput ename="inqu_status-0-projCode" cname="项目代码" type="hidden"/>
@@ -17,9 +16,7 @@
         <EF:EFInput ename="inqu_status-0-productionOrderNo" cname="生产订单号" type="hidden"/>
         <EF:EFInput ename="inqu_status-0-materialId" cname="上级ID" type="hidden"/>
         <EF:EFInput ename="inqu_status-0-lv" cname="级别" type="hidden"/>
-        <EF:EFInput cname="上传文件" blockId="inqu_status" ename="file" row="0" type="file" />
-        <%--<button id="btn_upload"  type="submit">提交</button>--%>
-        <%--     <EF:EFButton cname="提交" ename="btn_upload"></EF:EFButton>--%>
+        <EF:EFInput cname="导入文件" blockId="inqu_status" ename="file" row="0" type="file" width="100%"/>
         <div class="row">
             <EF:EFButton ename="cancel"  cname="取消" type="button" class="btn-align-right"/>
             <EF:EFButton ename="btn_upload"  cname="确认" type="button" class="btn-align-right"/>