生产领料单增加选择产品清单功能,显示成品、材料

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/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="库存类型"/>