Merge branch 'bugfix_3403' into debug

# Conflicts:
#	controller/contract/register.go

controller/contract/register.go

@@ -724,11 +724,11 @@ func (rg *RegisterController) Add(c *gin.Context) {
 			}
 		}
 		// 修改summary表，把旧合同id变成新的
-		err = fms.UpdateInvoicePaymentSummaryByRegisterId(ob.ContractRegisterId, dupRegisterIds)
-		if err != nil {
-			err = fmt.Errorf("获取开票到款列表失败, Err: %s", err.Error())
-			return
-		}
+		//err = fms.UpdateInvoicePaymentSummaryByRegisterId(ob.ContractRegisterId, dupRegisterIds)
+		//if err != nil {
+		//	err = fmt.Errorf("获取开票到款列表失败, Err: %s", err.Error())
+		//	return
+		//}
 
 		//先遍历一遍拿到开票销售信息
 		for _, ppItem := range nDupList {
@@ -853,6 +853,8 @@ func (rg *RegisterController) Add(c *gin.Context) {
 			resp.FailMsg("操作失败", "更新合同登记失败, Err:"+e.Error(), c)
 			return
 		}
+		// 开票到款汇总
+		go fmsService.SummaryInvoicePaymentByContractRegisterId(ob.ContractRegisterId)
 		// 操作日志
 		go func() {
 			logOB := new(fms.ContractRegisterLog)