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

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

@@ -106,6 +106,8 @@ public class ServiceHPKC002 extends ServiceBase {
 				newKc002.setReqNo(SequenceGenerator.getNextSequence(HPConstant.SequenceId.HPKC002_NUMBER));
 				newKc002.setAmount(dbKc002.getAmount().negate());
 				newKc002.setWeight(dbKc002.getWeight().negate());
+				newKc002.setProjCode(dbKc002.getProjCode());
+				newKc002.setHpsc006Id(dbKc002.getHpsc006Id());
 				newKc002.setOldReqNo(dbKc002.getReqNo());
 				newKc002.setDeleteFlag(CommonConstant.YesNo.YES_1);
 				DaoUtils.insert(HPKC002.INSERT, newKc002);

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

@@ -109,6 +109,8 @@ public class ServiceHPKC004 extends ServiceBase {
 				newKc004.setAmount(dbKc004.getAmount().negate());
 				newKc004.setWeight(dbKc004.getWeight().negate());
 				newKc004.setOldSaleNo(dbKc004.getSaleNo());
+				newKc004.setProjCode(dbKc004.getProjCode());
+				newKc004.setProjName(dbKc004.getProjName());
 				newKc004.setIsPrint(CommonConstant.YesNo.NO_0);
 				newKc004.setDeleteFlag(CommonConstant.YesNo.YES_1);
 				DaoUtils.insert(HPKC004.INSERT, newKc004);

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

@@ -68,7 +68,10 @@
 			                  blockName="invent_spec_block_id" textField="textField" valueField="valueField"
 			                  columnTemplate="#=textField#" itemTemplate="#=textField#">
 			</EF:EFComboColumn>
-			<EF:EFColumn ename="amount" cname="数量" enable="false" format="{0:N0}" maxLength="20" width="100"
+			<EF:EFColumn ename="length" cname="长(MM)" enable="false" width="20" align="right" format="{0:N3}"/>
+			<EF:EFColumn ename="width" cname="宽(MM)" enable="false" width="20" align="right" format="{0:N3}"/>
+			<EF:EFColumn ename="thick" cname="厚(MM)" enable="false" width="20" align="right" format="{0:N3}"/>
+			<EF:EFColumn ename="amount" cname="数量"  enable="false" format="{0:N0}" maxLength="20" width="100"
 			             align="right"/>
 			<EF:EFColumn ename="unitWeight" cname="单重" enable="false" format="{0:N3}" maxLength="20" width="100"
 			             align="right"/>

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

@@ -46,6 +46,9 @@
 			                  blockName="invent_spec_block_id" textField="textField" valueField="valueField"
 			                  columnTemplate="#=textField#" itemTemplate="#=textField#">
 			</EF:EFComboColumn>
+			<EF:EFColumn ename="length" cname="长(MM)" enable="false" width="20" align="right" format="{0:N3}"/>
+			<EF:EFColumn ename="width" cname="宽(MM)" enable="false" width="20" align="right" format="{0:N3}"/>
+			<EF:EFColumn ename="thick" cname="厚(MM)" enable="false" width="20" align="right" format="{0:N3}"/>
 			<EF:EFComboColumn ename="projCode" cname="项目名称" width="300" align="center" defaultValue="" required="true"
 							  filter="contains" >
 				<EF:EFOptions blockId="proj_record_block_id" valueField="valueField" textField="textField" />

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

@@ -45,6 +45,9 @@
 			                  blockName="invent_spec_block_id" textField="textField" valueField="valueField"
 			                  columnTemplate="#=textField#" itemTemplate="#=textField#">
 			</EF:EFComboColumn>
+			<EF:EFColumn ename="length" cname="长(MM)" enable="false" width="20" align="right" format="{0:N3}"/>
+			<EF:EFColumn ename="width" cname="宽(MM)" enable="false" width="20" align="right" format="{0:N3}"/>
+			<EF:EFColumn ename="thick" cname="厚(MM)" enable="false" width="20" align="right" format="{0:N3}"/>
 			<EF:EFComboColumn ename="projCode" cname="项目名称" width="300" align="center" defaultValue="" required="true"
 							  filter="contains" >
 				<EF:EFOptions blockId="proj_record_block_id" valueField="valueField" textField="textField" />