Merge branch 'dev-sx' of http://git.pseer.com:8800/platform/hg-smart into dev

src/main/java/com/baosight/hggp/hg/cg/service/ServiceHGCG003A.java

@@ -204,11 +204,10 @@ public class ServiceHGCG003A extends ServiceBase {
 	 * 新增主信息
 	 *
 	 * @param fCg002Bs
-	 * @param cg002
+	 * @param dbCg002
 	 */
-	private HGCG003 insertMain(List<HGCG002B> fCg002Bs, HGCG002 cg002) {
-		HGCG002B firstCg002B = fCg002Bs.get(0);
-		HGCG003 newCg003 = BeanUtils.copy(firstCg002B, HGCG003.class);
+	private HGCG003 insertMain(List<HGCG002B> fCg002Bs, HGCG002 dbCg002) {
+		HGCG003 newCg003 = BeanUtils.copy(dbCg002, HGCG003.class);
 		newCg003.setReceiveDate(DateUtils.shortDate());
 		newCg003.setReceiveNo(SequenceGenerator.getNextSequence(HGConstant.SequenceId.CG_RECEIVE_NO));
 		// 计算收获总数量
@@ -246,6 +245,8 @@ public class ServiceHGCG003A extends ServiceBase {
 		HGCG003B cg003B = BeanUtils.copy(dbCg002b, HGCG003B.class);
 		cg003B.setReceiveDate(newCg003.getReceiveDate());   // 收货日期
 		cg003B.setReceiveNo(newCg003.getReceiveNo());   // 收货号
+		cg003B.setReceiveLineNo(SequenceGenerator.getNextSequence(HGConstant.SequenceId.CG_RECEIVE_LINE_NO,
+				new String[]{newCg003.getReceiveNo()}));
 		cg003B.setPlanNo(newCg003.getPlanNo()); // 计划号
 		cg003B.setContractNo(newCg003.getContractNo()); // 合同号
 		cg003B.setPrimaryId(newCg003.getId());

src/main/java/com/baosight/hggp/hg/cg/sql/HGCG003.xml

@@ -23,16 +23,6 @@
         SUP_NAME as "supName",  <!-- 供应商名称 -->
         PUR_USER_ID as "purUserId",  <!-- 采购员 -->
         PUR_USER_NAME as "purUserName",  <!-- 采购员名称 -->
-        INVENT_TYPE as "inventType",  <!-- 存货类型 -->
-        INVENT_CODE as "inventCode",  <!-- 存货编码 -->
-        INVENT_NAME as "inventName",  <!-- 存货名称 -->
-        SPEC_ID as "specId",  <!-- 规格ID -->
-        SPEC as "spec",  <!-- 规格 -->
-        MATERIAL as "material",  <!-- 材质 -->
-        UNIT as "unit",  <!-- 单位 -->
-        LENGTH as "length",  <!-- 长度 -->
-        WIDTH as "width",  <!-- 宽度 -->
-        THICK as "thick",  <!-- 厚度 -->
         RECEIVE_QTY as "receiveQty",  <!-- 收货数量 -->
         DELIVER_QTY as "deliverQty",  <!-- 退货数量 -->
         DEPOSIT_QTY as "depositQty",  <!-- 入库数量 -->
@@ -44,7 +34,6 @@
         TAX_INCLUDE_AMOUNT as "taxIncludeAmount",  <!-- 含税金额 -->
         TAX_AMOUNT as "taxAmount",  <!-- 税额 -->
         TAX_RATE as "taxRate",  <!-- 税率 -->
-        INVENT_TYPE_DETAIL as "inventTypeDetail",  <!-- 存货类型大类 -->
         IS_INVOICING as "isInvoicing",  <!-- 是否开票 -->
         SOURCE as "source",  <!-- 数据来源 根据采购数据来源小代码 目前0默认采购合同，1手动录入 -->
         PROJ_CODE as "projCode",  <!-- 项目编码 -->

src/main/webapp/HG/CG/HGCG003B.jsp

@@ -25,7 +25,10 @@
 	<EF:EFRegion id="result" title="明细信息">
 		<EF:EFGrid blockId="result" autoDraw="override" isFloat="true" checkMode="row">
 			<EF:EFColumn ename="id" cname="内码" hidden="true"/>
-			<EF:EFColumn ename="inventCode" required="true" cname="存货编号"/>
+			<EF:EFComboColumn ename="status" cname="状态" enable="false" width="80" align="center">
+				<EF:EFCodeOption codeName="hggp.hgcg.receiveStatus"/>
+			</EF:EFComboColumn>
+			<EF:EFColumn ename="inventCode" required="true" cname="存货编号" width="110" align="center"/>
 			<EF:EFColumn ename="inventName" cname="存货名称" width="120" align="center" enable="false" readonly="true"
 			             required="true"/>
 			<EF:EFComboColumn ename="inventType" cname="存货类型" width="120" align="center" required="false"
@@ -65,10 +68,10 @@
 			             sumType="page"/>
 			<EF:EFColumn ename="taxIncludeAmount" cname="含税金额" enable="false" width="120" align="right" format="{0:C3}"
 			             sumType="page"/>
-			<EF:EFComboColumn ename="status" cname="状态" enable="false" width="80" align="center">
-				<EF:EFCodeOption codeName="hggp.hgcg.receiveStatus"/>
-			</EF:EFComboColumn>
 			<EF:EFColumn ename="contractNo" cname="合同号" enable="false" width="120" align="center"/>
+			<EF:EFColumn ename="contractLineNo" cname="合同行号" enable="false" width="120" align="center"/>
+			<EF:EFColumn ename="receiveNo" cname="收货单号" enable="false" width="120" align="center"/>
+			<EF:EFColumn ename="receiveLineNo" cname="收货单行号" enable="false" width="120" align="center"/>
 			<EF:EFColumn ename="createdName" cname="创建人" enable="false" width="100" align="center"/>
 			<EF:EFColumn ename="createdTime" cname="创建时间" enable="false" width="140" align="center"
 			             editType="datetime" parseFormats="['yyyyMMddHHmmss']"/>
@@ -76,7 +79,6 @@
 			<EF:EFColumn ename="companyName" cname="公司名称" enable="false" width="130" align="center" hidden="true"/>
 			<EF:EFColumn ename="receiveDate" cname="收货日期" enable="false" width="100" align="center" editType="date"
 			             dateFormat="yyyy-MM-dd" parseFormats="['yyyyMMdd']" hidden="true"/>
-			<EF:EFColumn ename="receiveNo" cname="收货单号" enable="false" width="120" align="center" hidden="true"/>
 			<EF:EFColumn ename="primaryId" cname="主表id" enable="false" width="100" align="center" hidden="true"/>
 		</EF:EFGrid>
 	</EF:EFRegion>