fix

controller/contract/register.go

@@ -483,7 +483,7 @@ func (rg *RegisterController) Add(c *gin.Context) {
 			}
 		}
 		ppOB := new(fms.ContractPreRegister)
-		item, e := ppOB.FetchByRegisterId(req.ContractRegisterId)
+		items, e := ppOB.FetchByRegisterId(req.ContractRegisterId)
 		if e != nil {
 			if e == utils.ErrNoRow {
 				resp.Fail("预登记记录不存在或已被删除", c)
@@ -492,10 +492,12 @@ func (rg *RegisterController) Add(c *gin.Context) {
 			resp.FailMsg("获取预登记失败", "Err:"+e.Error(), c)
 			return
 		}
-		e = item.Delete()
-		if e != nil {
-			resp.FailMsg("删除预登记失败", "Err:"+e.Error(), c)
-			return
+		for _, item := range items {
+			e = item.Delete()
+			if e != nil {
+				resp.FailMsg("删除预登记失败", "Err:"+e.Error(), c)
+				return
+			}
 		}
 
 		//更新合同套餐等内容

models/fms/contract_pre_payment.go

@@ -187,6 +187,7 @@ type PreRegisterDelReq struct {
 }
 
 type PreRegisterSaveReqItem struct {
+	PreRegisterId    int     `json:"pre_register_id" description:"预登记ID"`
 	InvoiceId        int     `json:"contract_invoice_id" description:"开票ID"`
 	Amount           float64 `json:"amount" binding:"required" description:"到款金额"`
 	CurrencyUnit     string  `json:"currency_unit" binding:"required" description:"货币单位"`

models/fms/contract_pre_register.go

@@ -130,8 +130,8 @@ func (c *ContractPreRegister) Fetch(id int) (item *ContractPreRegister, err erro
 	return
 }
 
-func (c *ContractPreRegister) FetchByRegisterId(id int) (item *ContractPreRegister, err error) {
-	err = global.DEFAULT_MYSQL.Model(c).Where(" contract_register_id = ?", id).First(&item).Error
+func (c *ContractPreRegister) FetchByRegisterId(id int) (items []*ContractPreRegister, err error) {
+	err = global.DEFAULT_MYSQL.Model(c).Where(" contract_register_id = ?", id).Find(&items).Error
 	return
 }
 

models/fms/contract_register.go

@@ -701,6 +701,16 @@ func UpdateContractRegisterPre(item *ContractRegister, updateCols []string, serv
 		//}
 	}
 
+	//更新另一类型的invoice表数据
+	invoiceItem := ContractInvoice{
+		ContractRegisterId: item.ContractRegisterId,
+		StartDate: item.StartDate,
+		EndDate: item.EndDate,
+		CurrencyUnit: item.CurrencyUnit,
+	}
+	tx.Model(&invoiceItem).Select([]string{"StartDate","EndDate","CurrencyUnit"}).Where("ContractRegisterId",item.ContractRegisterId).Updates(invoiceItem)
+
+
 	// 开票到款操作类型: 0-无; 1-更新; 2-新增;
 	if invoiceHandleType == 2 {
 		for _, v := range invoiceList {