2024-07-26 采购开票选择采购收货逻辑调整

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

@@ -172,8 +172,7 @@
 				AMOUNT	as "amount",  <!-- 金额（不含税金额） -->
 				INVENT_TYPE_DETAIL	as "inventTypeDetail",  <!-- 存货类型大类 -->
 				PRIMARY_ID	as "primaryId", <!-- 主表id -->
-				CONTRACT_DETAIL_ID	as "contractDetailId" <!-- 合同明细id -->
-				PRIMARY_ID	as "primaryId", <!-- 主表id -->
+				CONTRACT_DETAIL_ID	as "contractDetailId", <!-- 合同明细id -->
 		IS_INVOICING as "isInvoicing"
 		FROM ${hggpSchema}.HGCG003A WHERE 1=1
         <include refid="condition" />
@@ -230,11 +229,14 @@
 		AMOUNT,  <!-- 金额（不含税金额） -->
 		INVENT_TYPE_DETAIL,  <!-- 存货类型大类 -->
 		PRIMARY_ID,  <!-- 主表id -->
-										CONTRACT_DETAIL_ID  <!-- 合同明细id -->
-										PRIMARY_ID,  <!-- 主表id -->
+		CONTRACT_DETAIL_ID,  <!-- 合同明细id -->
 		IS_INVOICING
 		)
-	    VALUES (#id#, #accountCode#, #depCode#, #createdBy#, #createdName#, #createdTime#, #updatedBy#, #updatedName#, #updatedTime#, #deleteFlag#, #companyCode#, #companyName#, #receiveDate#, #receiveNo#, #planNo#, #contractNo#, #inventType#, #inventCode#, #inventName#, #specId#, #spec#, #material#, #unit#, #length#, #width#, #thick#, #receiveQty#, #deliverQty#, #depositQty#, #receiveUnitWeight#, #receiveWeight#, #status#, #price#, #amount#, #inventTypeDetail#, #primaryId#, #contractDetailId#)
+		VALUES (#id#, #accountCode#, #depCode#, #createdBy#, #createdName#, #createdTime#, #updatedBy#, #updatedName#,
+		#updatedTime#, #deleteFlag#, #companyCode#, #companyName#, #receiveDate#, #receiveNo#, #planNo#, #contractNo#,
+		#inventType#, #inventCode#, #inventName#, #specId#, #spec#, #material#, #unit#, #length#, #width#, #thick#,
+		#receiveQty#, #deliverQty#, #depositQty#, #receiveUnitWeight#, #receiveWeight#, #status#, #price#, #amount#,
+		#inventTypeDetail#, #primaryId#, #contractDetailId#,#isInvoicing#)
 	</insert>
 
 	<delete id="delete">