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

# Conflicts:
#	src/main/webapp/HP/SC/HPSC007.jsp

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

@@ -42,8 +42,8 @@
 		<EF:EFInput ename="productionOrderNo"  type="hidden"/>
 		<EF:EFGrid blockId="result" autoDraw="override" checkMode="row">
 			<EF:EFColumn ename="id" cname="主键" hidden="true"/>
+			<EF:EFColumn ename="actualCompletionDate" required='true' cname="完成日期" dateFormat="yyyy-MM-dd" parseFormats="['yyyyMMdd']" />
 			<EF:EFColumn ename="hpsc006Id" cname="生产下料ID" hidden="true"/>
-			<EF:EFColumn ename="actualCompletionDate"  cname="完成日期" editType="date" dateFormat="yyyy/MM/dd" />
 			<EF:EFPopupColumn ename="userId" cname="完成人"  popupType="ServiceGrid"
 							  popupTitle="人员信息" serviceName="HPXSUser" methodName="queryComboBox" resultId="user_block_id"
 							  columnEnames="textField,valueField"
@@ -52,7 +52,6 @@
 							  backFillFieldIds="userName,userId"
 							  valueField="valueField" textField="valueField"/>
 			<EF:EFColumn ename="userName" cname="完成名称" hidden="true"/>
-			<EF:EFColumn ename="actualCompletionDate" cname="完成日期" enable="false" hidden="true"/>
 			<EF:EFColumn ename="actualCompletionNum" cname="完成数量" format="{0:N3}" />
 			<EF:EFColumn ename="actualCompletionTotalWt" cname="完成重量" enable="false" format="{0:N3}"/>
 		</EF:EFGrid>