|
@@ -710,21 +710,12 @@ func (rg *RegisterController) Add(c *gin.Context) {
|
|
|
templateIdStr := strings.Join(ids, ",")
|
|
|
nDupList := make([]*fms.DupInvoice, 0)
|
|
|
|
|
|
-
|
|
|
- dupRegisterIds := make([]int, 0)
|
|
|
-
|
|
|
for _, dup := range dupList {
|
|
|
if templateIdStr == dup.TemplateIds {
|
|
|
nDupList = append(nDupList, dup)
|
|
|
- dupRegisterIds = append(dupRegisterIds, dup.ContractRegisterId)
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
+
|
|
|
|
|
|
|
|
|
for _, ppItem := range nDupList {
|
|
@@ -3610,21 +3601,12 @@ func (rg *RegisterController) Import(c *gin.Context) {
|
|
|
templateIdStr := strings.Join(ids, ",")
|
|
|
nDupList := make([]*fms.DupInvoice, 0)
|
|
|
|
|
|
-
|
|
|
- dupRegisterIds := make([]int, 0)
|
|
|
-
|
|
|
for _, dup := range dupList {
|
|
|
if templateIdStr == dup.TemplateIds {
|
|
|
nDupList = append(nDupList, dup)
|
|
|
- dupRegisterIds = append(dupRegisterIds, dup.ContractRegisterId)
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
- err = fms.UpdateInvoicePaymentSummaryByRegisterId(rowRegister.ContractRegisterId, dupRegisterIds)
|
|
|
- if err != nil {
|
|
|
- err = fmt.Errorf("获取开票到款列表失败, Err: %s", err.Error())
|
|
|
- return
|
|
|
- }
|
|
|
+
|
|
|
|
|
|
for _, ppItem := range dupList {
|
|
|
j := 0
|
|
@@ -3745,6 +3727,8 @@ func (rg *RegisterController) Import(c *gin.Context) {
|
|
|
go fmsService.CalculatePaymentServiceAmount(newId)
|
|
|
newIds = append(newIds, newId)
|
|
|
|
|
|
+
|
|
|
+ go fmsService.SummaryInvoicePaymentByContractRegisterId(rowRegister.ContractRegisterId)
|
|
|
}
|
|
|
}
|
|
|
}
|