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

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

@@ -2,6 +2,7 @@ package com.baosight.hpjx.hp.sc.service;
 
 import com.baosight.hpjx.common.DdynamicEnum;
 import com.baosight.hpjx.core.dao.DaoUtils;
+import com.baosight.hpjx.core.security.UserSessionUtils;
 import com.baosight.hpjx.hp.constant.HPConstant;
 import com.baosight.hpjx.util.CommonMethod;
 import com.baosight.hpjx.util.LogUtils;
@@ -12,6 +13,7 @@ import com.baosight.iplat4j.core.exception.PlatException;
 import com.baosight.iplat4j.core.service.impl.ServiceBase;
 import com.baosight.iplat4j.core.service.soa.XLocalManager;
 import com.baosight.hpjx.hp.sc.domain.HPSC001;
+import com.baosight.iplat4j.core.web.threadlocal.UserSession;
 import com.baosight.iplat4j.ed.util.SequenceGenerator;
 
 import java.text.SimpleDateFormat;
@@ -28,7 +30,9 @@ public class ServiceHPSC001 extends ServiceBase {
      */
     public EiInfo initLoad(EiInfo inInfo) {
         try {
-            CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.USER_BLOCK_ID), null);
+            Map map = new HashMap();
+            map.put("companyCode", UserSessionUtils.getCompanyCode());
+            CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.USER_BLOCK_ID), map);
             CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.CUSTOMER_RECORD_BLOCK_ID), null);
             inInfo.addBlock(EiConstant.resultBlock).addBlockMeta(new HPSC001().eiMetadata);
         } catch (PlatException e) {

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

@@ -210,11 +210,7 @@ public class ServiceHPSC003 extends ServiceBase {
                 HPSC005.setStatus(0);
                 HPSC005.setCreatedBy(UserSession.getUserId());
                 HPSC005.setCreatedTime(sdf.format(new Date()));
-                HPSC005.setFilePath1(HPSC004.getFilePath1());
-                HPSC005.setFilePath2(HPSC004.getFilePath2());
-                HPSC005.setFilePath3(HPSC004.getFilePath3());
-                HPSC005.setFilePath4(HPSC004.getFilePath4());
-                HPSC005.setFilePath5(HPSC004.getFilePath5());
+                HPSC005.setFilePath1(HPSC004.getId().toString());
                 this.dao.insert("HPSC005.insert", HPSC005.toMap());
 
                 HPSC004.setProductionOrderNo(SCDD);

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

@@ -76,7 +76,7 @@
     <select id="query" resultClass="com.baosight.hpjx.hp.sc.domain.HPSC002B">
         SELECT
         <include refid="column"/>
-        FROM ${hpjxSchema}.T_HPSC002B A, ${platSchema}.TEUDM02 B
+        FROM ${hpjxSchema}.T_HPSC002A A, ${platSchema}.TEUDM02 B
         WHERE 1=1
         AND A.DOC_ID = B.DOC_ID
         <include refid="condition"/>
@@ -85,14 +85,14 @@
     </select>
 
     <select id="count" resultClass="int">
-        SELECT COUNT(*) FROM ${hpjxSchema}.T_HPSC002B A, ${platSchema}.TEUDM02 B
+        SELECT COUNT(*) FROM ${hpjxSchema}.T_HPSC002A A, ${platSchema}.TEUDM02 B
         WHERE 1=1
         <include refid="condition"/>
         <include refid="customCondition"/>
     </select>
 
 	<insert id="insert">
-		INSERT INTO ${hpjxSchema}.T_HPSC002B (
+		INSERT INTO ${hpjxSchema}.T_HPSC002A (
             COMPANY_CODE,  <!-- 企业编码 预留 -->
             DEPT_CODE,  <!-- 部门编码 预留 -->
             MAT_ID,  <!-- 物料ID -->
@@ -107,7 +107,7 @@
 	</insert>
 
 	<delete id="delete">
-		DELETE FROM ${hpjxSchema}.T_HPSC002B WHERE ID = #id#
+		DELETE FROM ${hpjxSchema}.T_HPSC002A WHERE ID = #id#
 	</delete>
 
 </sqlMap>

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

@@ -415,6 +415,7 @@
 		LEAF	as "leaf",  <!-- 是否有叶子节点 -->
 		SORT	as "sort",  <!-- 排序字段 -->
 		ICON	as "icon",  <!-- 图片地址 -->
+		PRDT_TYPE	as "prdtType",
 		PRDT_CODE	as "prdtCode",  <!-- 产品编码 -->
 		PRDT_NAME	as "prdtName",  <!-- 产品名称 -->
 		NUM	as "num",  <!-- 数量 -->

src/main/resources/application.properties

@@ -32,9 +32,11 @@ customerName=\u6B66\u6C49\u5B9D\u4FE1\u5927\u6570\u636E\u4E8B\u4E1A\u90E8
 enterpriseName=\u6B66\u6C49\u5B9D\u4FE1\u5927\u6570\u636E\u4E8B\u4E1A\u90E8
 datasource.type=dbcp
 jdbc.driverClassName=com.mysql.jdbc.Driver
+#jdbc.url=jdbc:mysql://127.0.0.1:3306/iplat?useSSL=false&useUnicode=true&characterEncoding=utf-8
 jdbc.url=jdbc:mysql://10.24.1.94:3306/iplat?useSSL=false&useUnicode=true&characterEncoding=utf-8
 jdbc.username=root
 jdbc.password=fnvu~aKs9LTDYUxe
+#jdbc.password=root
 jdbc.maxActive=20
 jdbc.validationQuery=SELECT 1 FROM ${platSchema}.TEDFA00
 

src/main/resources/quartz.properties

@@ -27,7 +27,10 @@ org.quartz.jobStore.isClustered = true
 org.quartz.jobStore.clusterCheckinInterval = 20000
 org.quartz.dataSource.appDS.driver = com.mysql.jdbc.Driver
 org.quartz.dataSource.appDS.URL = jdbc:mysql://10.24.1.94:3306/iplat?useSSL=false&useUnicode=true&characterEncoding=utf-8
+#org.quartz.dataSource.appDS.URL = jdbc:mysql://127.0.0.1:3306/iplat?useSSL=false&useUnicode=true&characterEncoding=utf-8
+
 org.quartz.dataSource.appDS.user = root
+#org.quartz.dataSource.appDS.password =root
 org.quartz.dataSource.appDS.password =fnvu~aKs9LTDYUxe
 org.quartz.dataSource.appDS.maxConnections = 30
 

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

@@ -96,11 +96,9 @@ $(function () {
                     template: function (item) {
                         let filePath1 = item.filePath1;
                         let template = '';
-                        if (filePath1 === ' ') {
-                            template = '';
-                        } else {
-                            template = '<a style="cursor: pointer;display: inline-flex;justify-content: center;margin:auto 5px" ' +
-                                'href="'+ctx+'/EU/DM/EUDM06.jsp?docId=' + filePath1 + '" >下载</a>';
+                        if (filePath1) {
+                            template += '<a style="cursor: pointer;display: inline-flex;justify-content: center;margin:auto 5px" '
+                                + 'onclick="showUploadFile(' + filePath1 + ')"  >附件清单</a>';
                         }
                         return template
                     }
@@ -111,6 +109,15 @@ $(function () {
 
     }
 });
+
+function showUploadFile(id) {
+    JSColorbox.open({
+        href: "HPSC002B?methodName=initLoad&inqu_status-0-id=" + id,
+        title: "<div style='text-align: center;'>附件清单</div>",
+        width: "80%",
+        height: "80%",
+    });
+}
 function check(id, auditStatus) {
     const inEiInfo = new EiInfo();
     inEiInfo.set("id", id);

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

@@ -53,7 +53,7 @@
             <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="prdtCode"  cname="部件编码"/>
             <EF:EFColumn enable="false" ename="prdtName" readonly="true" cname="部件名称"/>
             <EF:EFComboColumn enable="false" ename="delStatus" cname="状态">
                 <EF:EFOption label="已删除" value="0"/>
@@ -61,9 +61,9 @@
             </EF:EFComboColumn>
             <EF:EFColumn enable="false" ename="num" readonly="true" cname="计划数量"/>
             <EF:EFColumn enable="false" ename="unitWt" readonly="true" cname="计划重量"/>
-            <EF:EFColumn ename="planCommentDate" cname="计划开始时间" editType="date" dateFormat="yyyy/MM/dd" width="150"
+            <EF:EFColumn ename="planCommentDate" required='true' cname="计划开始时间" editType="date" dateFormat="yyyy/MM/dd" width="150"
                          />
-            <EF:EFColumn ename="planCompletionDate" cname="计划结束时间" editType="date" dateFormat="yyyy/MM/dd" width="150"
+            <EF:EFColumn ename="planCompletionDate" required='true' cname="计划结束时间" editType="date" dateFormat="yyyy/MM/dd" width="150"
                          />
             <EF:EFColumn ename="actualCompletionDate" cname="实际完成时间" editType="date" dateFormat="yyyy/MM/dd" width="150"
                          enable="false"/>

src/main/webapp/HP/SC/HPSC005.js

@@ -46,11 +46,9 @@ $(function () {
                 template: function (item) {
                     let filePath1 = item.filePath1;
                     let template = '';
-                    if (filePath1 === ' ') {
-                        template = '';
-                    } else {
-                        template = '<a style="cursor: pointer;display: inline-flex;justify-content: center;margin:auto 5px" ' +
-                            'href="'+ctx+'/EU/DM/EUDM06.jsp?docId=' + filePath1 + '" >下载</a>';
+                    if (filePath1) {
+                        template += '<a style="cursor: pointer;display: inline-flex;justify-content: center;margin:auto 5px" '
+                            + 'onclick="showUploadFile(' + filePath1 + ')"  >附件清单</a>';
                     }
                     return template
                 }
@@ -58,7 +56,14 @@ $(function () {
         ],
     }
 });
-
+function showUploadFile(id) {
+    JSColorbox.open({
+        href: "HPSC002B?methodName=initLoad&inqu_status-0-id=" + id,
+        title: "<div style='text-align: center;'>附件清单</div>",
+        width: "80%",
+        height: "80%",
+    });
+}
 let assignCallback = function (orgId) {
     var info = new EiInfo()
     info.set("ids",ids.join(','));