2024-09-10 采购发票录入发票总金额，系统自动核销采购收货明细，按照相同供应商、从最早日期往后自动核销

src/main/java/com/baosight/hggp/hg/cg/domain/HGCG003B.java

@@ -163,7 +163,7 @@ public class HGCG003B extends DaoEPBase {
 	private Integer isInvoicing = 0;	/* 是否开票 0否 1是*/
 	private String projCode = " ";		/* 项目编码*/
 	private String projName = " ";		/* 项目名称*/
-	private Integer calculationMethod;	/* 计算方式 0-数量乘单价 1-重量乘单价*/
+	private Integer calculationMethod = 0;	/* 计算方式 0-数量乘单价 1-重量乘单价*/
 	private BigDecimal cancelAmount = new BigDecimal("0");		/* 核销金额*/
 	private BigDecimal unCancelAmount = new BigDecimal("0");		/* 未核销金额*/
 	

src/main/java/com/baosight/hggp/hg/cw/service/ServiceHGCW012.java

@@ -178,13 +178,17 @@ public class ServiceHGCW012 extends ServiceBase {
                 hgcg003B.setIsInvoicing(HGConstant.CgIsInvoicing.S_0);
                 flag = false;
             }
+            //跟新采购收票状态
+            if (ObjectUtils.isEmpty(hgcg003B.getCalculationMethod())){
+                hgcg003B.setCalculationMethod(0);
+            }
+            DaoUtils.update(HGCG003B.UPDATE, hgcg003B);
 
             hgcw013.setTaxPoints(hgcw012.getTaxPoints());
             hgcw013.setThisSettlementTax(String.valueOf(thisSettlementTax)); //税额
             hgcw013.setThisSettlementAmount(String.valueOf(thisSettlementAmount)); //不含税金额
             DaoUtils.insert(HGCW013.INSERT, hgcw013);
-            //跟新采购收票状态
-            DaoUtils.update(HGCG003B.UPDATE, hgcg003B);
+
             if (!flag){
                 break;
             }