ziwen hai 1 ano
pai
achega
9520acb0fe

+ 23 - 0
controller/contract/register.go

@@ -1475,6 +1475,29 @@ func (rg *RegisterController) Invoice(c *gin.Context) {
 					resp.FailMsg("操作失败", "更新到款登记失败, Err:"+e.Error(), c)
 					return
 				}
+				//修改对应到款的销售
+				summaryItem, err := fms.GetInvoicePaymentSummaryByRegisterIdAndInvoiceId(req.ContractRegisterId, req.AmountList[i].InvoiceId)
+				if err != nil {
+					resp.FailMsg("获取汇总数据失败", "修改到款销售时获取汇总数据失败, Err: "+err.Error(), c)
+					return
+				}
+
+				if summaryItem.PaymentId > 0 {
+					var paymentItem *fms.ContractInvoice
+					paymentItem.ContractInvoiceId = summaryItem.PaymentId
+					paymentItem.SellerId = sellerItem.SellerId
+					paymentItem.SellerName = sellerItem.SellerName
+					paymentItem.SellerGroupId = sellerItem.GroupId
+					paymentItem.SellerGroupName = sellerItem.GroupName
+					paymentItem.SellerTeamId = sellerItem.TeamId
+					paymentItem.SellerTeamName = sellerItem.TeamName
+					e = paymentItem.Update([]string{"SellerId", "SellerName", "SellerGroupId", "SellerGroupName", "SellerTeamId", "SellerTeamName"})
+					if e != nil {
+						resp.FailMsg("更新到款销售失败", "更新到款销售失败, Err: "+e.Error(), c)
+						return
+					}
+				}
+
 				noChangeInvoiceIds = append(noChangeInvoiceIds, req.AmountList[i].InvoiceId)
 				continue
 			}

+ 2 - 2
models/fms/contract_income_history.go

@@ -27,7 +27,7 @@ func (c *ContractIncomeHistory) TableName() string {
 	return "contract_income_history"
 }
 
-// GetInvoicePaymentSummaryByRegisterIdAndInvoiceId 根据合同登记ID和开票ID获取汇总数据
+// GetIncomeHistory
 func GetIncomeHistory(condition string, pars []interface{}) (results []*IncomeSummaryItem, err error) {
 	sql := `SELECT amount,seller_name,new_company AS contract_type,company_name,invoice_time AS invoice_date FROM contract_income_history WHERE  `
 	sql += condition
@@ -36,7 +36,7 @@ func GetIncomeHistory(condition string, pars []interface{}) (results []*IncomeSu
 	return
 }
 
-// GetInvoicePaymentSummaryByRegisterIdAndInvoiceId 根据合同登记ID和开票ID获取汇总数据
+// GetIncomeHistoryList
 func GetIncomeHistoryList() (results []*ContractIncomeHistory, err error) {
 	sql := `SELECT * FROM contract_income_history WHERE seller_id=0 `
 	err = global.DEFAULT_MYSQL.Raw(sql).Find(&results).Error

+ 2 - 2
models/fms/invoice_payment_summary.go

@@ -185,9 +185,9 @@ func GetContractSummaryInvoicePaymentAmount(condition string, pars []interface{}
 }
 
 // GetInvoicePaymentSummaryByRegisterIdAndInvoiceId 根据合同登记ID和开票ID获取汇总数据
-func GetInvoicePaymentSummaryByRegisterIdAndInvoiceId(registerId, invocieId int) (results []*ContractRegisterSummary, err error) {
+func GetInvoicePaymentSummaryByRegisterIdAndInvoiceId(registerId, invocieId int) (result *InvoicePaymentSummary, err error) {
 	sql := `SELECT * FROM invoice_payment_summary WHERE register_id = ? AND invoice_id= ? `
-	err = global.DEFAULT_MYSQL.Exec(sql, registerId, invocieId).Find(&results).Error
+	err = global.DEFAULT_MYSQL.Exec(sql, registerId, invocieId).First(&result).Error
 	return
 }