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

# Conflicts:
#	src/main/webapp/HP/KC/HPKC003A.jsp

src/main/java/com/baosight/hpjx/hp/kc/service/ServiceHPKC003A.java

@@ -137,6 +137,7 @@ public class ServiceHPKC003A extends ServiceEPBase {
 				newKc003.setProdNo(SequenceGenerator.getNextSequence(HPConstant.SequenceId.HPKC003_PROD_NO));
 				newKc003.setDocumentDate(DateUtils.shortDate());
 				newKc003.setWhCode(whCode);
+				newKc003.setRemark(MapUtils.getString(row, "remark1"));
 				newKc003.setWhName(HPPZTools.HpPz007.getByCode(whCode).getWhName());
 				newKc003.setAmount(applyNum);
 				newKc003.setWeight(applyNum.multiply(dbSc005b.getUnitWt()));

src/main/webapp/HP/KC/HPKC003.jsp

@@ -24,15 +24,15 @@
 	    <div class="row">
 		    <EF:EFInput cname="部件名称" ename="prdtName" blockId="inqu_status" row="0" colWidth="3"/>
 		    <EF:EFInput cname="零件名称" ename="partName" blockId="inqu_status" row="0" colWidth="3"/>
-		    <EF:EFInput cname="生产订单号" ename="prodOrderNo" blockId="inqu_status" row="0" colWidth="3"/>
-		    <EF:EFInput cname="生产任务号" ename="prodTaskNo" blockId="inqu_status" row="0" colWidth="3"/>
-	    </div>
-	    <div class="row">
 			<EF:EFDateSpan startCname="创建日期(从)" endCname="至" blockId="inqu_status"
 						   startName="createdDateFrom" endName="createdDateTo" row="0" role="date"
 						   format="yyyy-MM-dd" ratio="3:3" satrtRatio="4:8" endRatio="4:8" readonly="true">
 			</EF:EFDateSpan>
 	    </div>
+	    <div class="row">
+				<%--		    <EF:EFInput cname="生产订单号" ename="prodOrderNo" blockId="inqu_status" row="0" colWidth="3"/>
+                <EF:EFInput cname="生产任务号" ename="prodTaskNo" blockId="inqu_status" row="0" colWidth="3"/>--%>
+	    </div>
     </EF:EFRegion>
 
 	<EF:EFRegion id="result" title="明细信息">
@@ -54,8 +54,8 @@
 			<EF:EFColumn ename="remark" cname="备注" enable="false" width="150"/>
 			<EF:EFColumn ename="prdtCode" cname="部件编码" enable="false" width="120" align="center" hidden="true"/>
 			<EF:EFColumn ename="partCode" cname="零件编码" enable="false" width="120" align="center" hidden="true"/>
-			<EF:EFColumn ename="prodTaskNo" cname="生产任务号" enable="false" width="150" align="center"/>
-			<EF:EFColumn ename="prodOrderNo" cname="生产订单号" enable="false" width="140" align="center"/>
+<%--			<EF:EFColumn ename="prodTaskNo" cname="生产任务号" enable="false" width="150" align="center"/>
+			<EF:EFColumn ename="prodOrderNo" cname="生产订单号" enable="false" width="140" align="center"/>--%>
 		</EF:EFGrid>
 	</EF:EFRegion>
 

src/main/webapp/HP/KC/HPKC003A.jsp

@@ -35,8 +35,8 @@
 			                  columnTemplate="#=textField#" itemTemplate="#=textField#" required="true">
 			</EF:EFComboColumn>
 			<EF:EFColumn ename="applyNum" cname="入库数量" width="120" align="right" format="{0:N0}" required="true"/>
-			<EF:EFColumn ename="completeNum" cname="已入库数量" enable="false" width="120" align="right" format="{0:N0}"
-			             hidden="true"/>
+			<EF:EFColumn ename="remark1" cname="入库说明"  width="150"/>
+			<EF:EFColumn ename="completeNum" cname="已入库数量" enable="false" width="120" align="right" format="{0:N0}" hidden="true"/>
 			<EF:EFColumn ename="unCompleteNum" cname="待入库数量" enable="false" width="120" align="right" format="{0:N0}"/>
 			<EF:EFColumn ename="num" cname="任务数量" enable="false" width="120" align="right" format="{0:N0}"/>
 			<EF:EFColumn ename="totalWt" cname="任务重量" enable="false" width="120" align="right" format="{0:N3}"/>