fix

controller/contract/register.go

@@ -385,7 +385,7 @@ func (rg *RegisterController) Add(c *gin.Context) {
 	// 新增合同及套餐
 	if req.Supplement == 1 {
 		//新增到款信息
-		if ob.HasPayment == 1 {
+		if ob.HasInvoice == 0 {
 			resp.Fail("合同存在代付不允许添加开票/到款登记", c)
 			return
 		}
@@ -652,7 +652,7 @@ func (rg *RegisterController) Edit(c *gin.Context) {
 		resp.Fail("合同编号已存在", c)
 		return
 	}
-	originHasPayment := item.HasPayment
+	originHasInvoice := item.HasInvoice
 
 	updateCols := []string{
 		"ProductIds", "ContractCode", "RelateContractCode", "CrmContractId", "ContractSource", "CompanyName",
@@ -707,8 +707,8 @@ func (rg *RegisterController) Edit(c *gin.Context) {
 	// 开票到款操作类型: 0-无; 1-更新; 2-删除;
 	logRemark := req.Remark
 	invoiceHandleType := 0
-	if originHasPayment == 0 && req.HasPayment == 1 {
-		// 若从无代付修改为有代付, 则删除无代付期间新增的所有开票到款登记
+	if originHasInvoice == 1 && req.HasInvoice == 0 {
+		// 若从需要开票改为无需开票, 则删除期间新增的所有开票到款登记
 		invoiceHandleType = 2
 	} else {
 		// 修改了货币单位后，同步更新汇率及开票到款的换算金额
@@ -1084,7 +1084,7 @@ func (rg *RegisterController) Invoice(c *gin.Context) {
 		return
 	}
 	// 合同存在代付不允许开票/到款登记
-	if item.HasPayment == 1 {
+	if item.HasInvoice == 0 {
 		resp.Fail("合同存在代付不允许添加开票/到款登记", c)
 		return
 	}

models/crm/contract_relation.go

@@ -53,7 +53,7 @@ func GetContractRelationListByPaymentOnBehalfContractId(contractId int) (list []
 	query := global.MYSQL["report"].
 		Table("contract AS a").
 		Select("a.contract_id, a.company_name, b.payment_on_behalf_contract_id").
-		Joins("JOIN contract_relation b ON a.contract_id = b.payment_on_behalf_contract_id").
+		Joins("JOIN contract_relation b ON a.contract_id = b.contract_id").
 		Where("a.status IN ('已签回','已审批') AND a.is_delete = 0 AND b.payment_on_behalf_contract_id = ?", contractId).
 		Order("a.contract_id ASC")
 	err = query.Find(&results).Error