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

src/main/java/com/baosight/hggp/hg/kc/tools/HGKCTools.java

@@ -163,6 +163,7 @@ public class HGKCTools {
 		/**
 		 * 生产入库(入库质检单)
 		 *
+		 * @param fZl001
 		 * @param dbCg003B
 		 */
 		public static void putInStorageData(HGZL001 fZl001, HGCG003B dbCg003B) {

src/main/java/com/baosight/hggp/hg/sc/sql/HGSC004A.xml

@@ -569,7 +569,7 @@
 		FROM ${hggpSchema}.HGSC004A a
 		left join ${hggpSchema}.HGSC004 b on a.material_id = b.id
 		WHERE 1=1
-		and a.lv NOT IN (1,2)
+		and a.lv = 4
 		and b.material_status = 2
 		<isNotEmpty prepend=" AND " property="projName">
 			a.proj_name like CONCAT('%', #projName#, '%')
@@ -582,15 +582,11 @@
 		</isNotEmpty>
 		<!-- 材料名称查询 -->
 		<isNotEmpty prepend=" AND " property="materialName">
-			(a.lv = 4
-				and a.product_name like CONCAT('%', #materialName#, '%')
-			)
+			a.product_name like CONCAT('%', #materialName#, '%')
 		</isNotEmpty>
 		<!-- 产品名称查询 -->
 		<isNotEmpty prepend=" AND " property="productName">
-			(a.lv = 3
-			and a.product_name like CONCAT('%', #productName#, '%')
-			)
+			a.parent_prod_name like CONCAT('%', #productName#, '%')
 		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="id">
 			a.id = #id#

src/main/resources/application.properties

@@ -18,7 +18,7 @@ spring.servlet.multipart.file-size-threshold=0
 componentEname=hggp
 projectName=hggp
 moduleName=ep
-projectEnv=dev
+projectEnv=run
 platSchema=iplat_hggp
 eplatSchema=EPLAT_HGGP
 lowcodedbSchema=lowcodedb_hggp
@@ -33,12 +33,12 @@ 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.cj.jdbc.Driver
-#jdbc.url=jdbc:mysql://rm-uf60e9vbmanleydq4.mysql.rds.aliyuncs.com:3306/iplat_hggp?useSSL=false&useUnicode=true&characterEncoding=utf-8
-jdbc.url=jdbc:mysql://129.211.46.84:3306/iplat_hggp?useSSL=false&useUnicode=true&characterEncoding=utf-8
-#jdbc.username=hggp
-jdbc.username=root
-#jdbc.password=hggp_Twhxz2024Aly
-jdbc.password=Whxz@2019
+jdbc.url=jdbc:mysql://rm-uf60e9vbmanleydq4.mysql.rds.aliyuncs.com:3306/iplat_hggp?useSSL=false&useUnicode=true&characterEncoding=utf-8
+#jdbc.url=jdbc:mysql://129.211.46.84:3306/iplat_hggp?useSSL=false&useUnicode=true&characterEncoding=utf-8
+jdbc.username=hggp
+#jdbc.username=root
+jdbc.password=hggp_Twhxz2024Aly
+#jdbc.password=Whxz@2019
 jdbc.maxActive=20
 jdbc.validationQuery=SELECT 1 FROM ${platSchema}.TEDFA00
 

src/main/resources/quartz.properties

@@ -22,12 +22,12 @@ org.quartz.jobStore.isClustered = true
 #\u6570\u636E\u5E93\u8FDE\u63A5\u914D\u7F6E\u4FE1\u606F
 org.quartz.jobStore.clusterCheckinInterval = 20000
 org.quartz.dataSource.appDS.driver = com.mysql.cj.jdbc.Driver
-#org.quartz.dataSource.appDS.URL = jdbc:mysql://rm-uf60e9vbmanleydq4.mysql.rds.aliyuncs.com:3306/iplat_hggp?useSSL=false&useUnicode=true&characterEncoding=utf-8
-org.quartz.dataSource.appDS.URL = jdbc:mysql://129.211.46.84:3306/iplat_hggp?useSSL=false&useUnicode=true&characterEncoding=utf-8
-#org.quartz.dataSource.appDS.user = hggp
-org.quartz.dataSource.appDS.user = root
-#org.quartz.dataSource.appDS.password = hggp_Twhxz2024Aly
-org.quartz.dataSource.appDS.password = Whxz@2019
+org.quartz.dataSource.appDS.URL = jdbc:mysql://rm-uf60e9vbmanleydq4.mysql.rds.aliyuncs.com:3306/iplat_hggp?useSSL=false&useUnicode=true&characterEncoding=utf-8
+#org.quartz.dataSource.appDS.URL = jdbc:mysql://129.211.46.84:3306/iplat_hggp?useSSL=false&useUnicode=true&characterEncoding=utf-8
+org.quartz.dataSource.appDS.user = hggp
+#org.quartz.dataSource.appDS.user = root
+org.quartz.dataSource.appDS.password = hggp_Twhxz2024Aly
+#org.quartz.dataSource.appDS.password = Whxz@2019
 org.quartz.dataSource.appDS.maxConnections = 30
 
 org.quartz.plugin.logging.class = com.baosight.xservices.ej.job.quartz.JobLoggingPluginWithPartition

src/main/webapp/HG/KC/HGKC008D.jsp

@@ -32,12 +32,10 @@
 			<EF:EFComboColumn ename="inventType" cname="存货类型" enable="false" width="100" align="center"
 			                  blockName="invent_type_block_id" textField="textField" valueField="valueField">
 			</EF:EFComboColumn>
-			<EF:EFColumn ename="productCode" cname="存货编码" enable="false" width="100" align="center"/>
-			<EF:EFColumn ename="productName" cname="存货名称" enable="false" width="100" align="center"/>
-<%--			<EF:EFColumn ename="productCode" cname="成品编码" enable="false" width="100" align="center"/>--%>
-<%--			<EF:EFColumn ename="productName" cname="成品名称" enable="false" width="100" align="center"/>--%>
-<%--			<EF:EFColumn ename="materialCode" cname="材料编码" enable="false" width="100" align="center"/>--%>
-<%--			<EF:EFColumn ename="materialtName" cname="材料名称" enable="false" width="100" align="center"/>--%>
+			<EF:EFColumn ename="productCode" cname="成品编码" enable="false" width="100" align="center"/>
+			<EF:EFColumn ename="productName" cname="成品名称" enable="false" width="100" align="center"/>
+			<EF:EFColumn ename="materialCode" cname="材料编码" enable="false" width="100" align="center"/>
+			<EF:EFColumn ename="materialtName" cname="材料名称" enable="false" width="100" align="center"/>
 			<EF:EFColumn ename="spec" cname="规格" enable="false" width="120" align="center"/>
 			<EF:EFColumn ename="applyQty" cname="申请数量" width="120" align="right" format="{0:N3}" required="true"/>
 			<EF:EFColumn ename="quantity" cname="数量" enable="false" width="120" align="right" format="{0:N3}"/>

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

@@ -46,8 +46,8 @@
                 <EF:EFGrid blockId="result" autoDraw="override" isFloat="true" checkMode="row">
                     <EF:EFColumn ename="id" cname="主键" hidden="true"/>
                     <EF:EFColumn ename="lv" cname="层级" hidden="true"/>
-                    <EF:EFColumn enable="false" ename="parentProdCode" hidden="true" cname="上级产品编号"/>
-                    <EF:EFColumn enable="false" ename="parentProdName" hidden="true" cname="上级产品名称"/>
+                    <EF:EFColumn enable="false" ename="parentProdCode" hidden="false" cname="上级产品编号"/>
+                    <EF:EFColumn enable="false" ename="parentProdName" hidden="false" cname="上级产品名称"/>
                     <EF:EFColumn enable="false" ename="productId" hidden="true" cname="产品id"/>
                     <EF:EFColumn enable="false" ename="productType" hidden="true" cname="产品类型"/>
                     <EF:EFColumn enable="false" ename="inventType" hidden="true" cname="库存类型"/>