下料清单详情

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

@@ -112,7 +112,7 @@
 		A.FILE_PATH1	as "filePath1",  <!-- 文件地址1 -->
 		A.INVENT_RECORD_ID	as "inventRecordId", <!-- 存货档案ID -->
 		CONCAT(
-		format((ifnull( A.ACTUAL_COMPLETION_NUM , 0 ) / ifnull(A.TOTAL_WT, 0 ) * 100),2)
+		format((ifnull( A.ACTUAL_COMPLETION_TOTAL_WT , 0 ) / ifnull(A.TOTAL_WT, 0 ) * 100),2)
 		,'%') AS "cutSchedule",
 		B.PRDT_NAME AS "prdtName",
 		B.PART_NAME AS "partName"
@@ -233,7 +233,7 @@
 		SELECT
 		<include refid="column2"/>
 		FROM ${hpjxSchema}.T_HPSC006 A LEFT JOIN ${hpjxSchema}.T_HPSC005 B ON A.PROJ_CODE=B.PROJ_CODE
-		AND A.PRODUCTION_ORDER_NO=B.PROD_ORDER_NO
+		AND A.PRODUCTION_ORDER_NO=B.PROD_ORDER_NO WHERE 1=1
 		<include refid="condition" />
 		<include refid="order" />
 	</select>

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

@@ -39,6 +39,7 @@
 			<EF:EFColumn ename="factoryName" cname="厂区名称" enable="false" width="100" align="center"/>
 			<EF:EFColumn ename="prdtName" cname="部件名称" enable="false" width="100" align="center"/>
 			<EF:EFColumn ename="partName" cname="零件名称" enable="false" width="100" align="center"/>
+			<EF:EFColumn ename="inventName" cname="材料名称" enable="false" width="100" align="center"/>
 			<EF:EFColumn ename="orgName" cname="生产组名称" enable="false" width="100" align="center"/>
 			<EF:EFColumn ename="planCompletionDate" cname="计划完成日期" enable="false" width="120" align="center"/>
 			<EF:EFColumn enable="false" ename="cutSchedule" cname="下料进度" format="{0:N2}" width="80" readonly="true" align="center"/>

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

@@ -21,6 +21,10 @@
 		</div>
 		<div class="row">
 			<EF:EFInput ename="detail-0-material" cname="材质" colWidth="4" readonly="true"/>
+			<EF:EFInput ename="detail-0-totalWt" cname="总量" colWidth="4" readonly="true"/>
+			<EF:EFInput ename="detail-0-actualCompletionTotalWt" cname="完成重量" colWidth="4" readonly="true"/>
+		</div>
+		<div class="row">
 			<EF:EFInput ename="detail-0-cutSchedule" cname="下料进度" format="{0:N2}" colWidth="4" readonly="true"/>
 			<EF:EFSelect ename="detail-0-status" cname="状态" colWidth="4" readonly="true">
 				<EF:EFOption label="计划中" value="0"/>