Merge branch 'bugfix_3403'

controller/contract/register.go

@@ -709,11 +709,14 @@ func (rg *RegisterController) Add(c *gin.Context) {
 		}
 		templateIdStr := strings.Join(ids, ",")
 		nDupList := make([]*fms.DupInvoice, 0)
+
 		for _, dup := range dupList {
 			if templateIdStr == dup.TemplateIds {
 				nDupList = append(nDupList, dup)
 			}
 		}
+
+
 		//先遍历一遍拿到开票销售信息
 		for _, ppItem := range nDupList {
 			j := 0
@@ -830,6 +833,8 @@ func (rg *RegisterController) Add(c *gin.Context) {
 				}
 			}
 		}
+		// 开票到款汇总
+		go fmsService.SummaryInvoicePaymentByContractRegisterId(ob.ContractRegisterId)
 		// 操作日志
 		go func() {
 			logOB := new(fms.ContractRegisterLog)
@@ -3595,11 +3600,13 @@ func (rg *RegisterController) Import(c *gin.Context) {
 				}
 				templateIdStr := strings.Join(ids, ",")
 				nDupList := make([]*fms.DupInvoice, 0)
+
 				for _, dup := range dupList {
 					if templateIdStr == dup.TemplateIds {
 						nDupList = append(nDupList, dup)
 					}
 				}
+
 				//先遍历一遍拿到开票销售信息
 				for _, ppItem := range dupList {
 					j := 0
@@ -3720,6 +3727,8 @@ func (rg *RegisterController) Import(c *gin.Context) {
 				go fmsService.CalculatePaymentServiceAmount(newId)
 				newIds = append(newIds, newId)
 
+				// 开票到款汇总
+				go fmsService.SummaryInvoicePaymentByContractRegisterId(rowRegister.ContractRegisterId)
 			}
 		}
 	}

models/fms/invoice_payment_summary.go

@@ -366,3 +366,11 @@ func GetInvoiceCensusList(condition string, pars []interface{}) (results []*Invo
 	}
 	return
 }
+
+// UpdateInvoicePaymentSummaryByRegisterId
+func UpdateInvoicePaymentSummaryByRegisterId(newId int, registerIds []int) (err error) {
+	sql := `UPDATE invoice_payment_summary SET register_id = ? WHERE register_id IN (?) `
+	err = global.DEFAULT_MYSQL.Exec(sql, newId, registerIds).Error
+	return
+}
+