fix

controller/contract/register.go

@@ -502,7 +502,10 @@ func (rg *RegisterController) Add(c *gin.Context) {
 				return
 			}
 			opData = string(opDataByte)
-			opType := fms.ContractRegisterOpTypePreInvoice
+			opType := fms.ContractRegisterOpTypePrePay
+			if ppItem.InvoiceType == 3 {
+				opType = fms.ContractRegisterOpTypePreInvoice
+			}
 			newAmount := decimal.NewFromFloat(0).Round(2)
 			a := decimal.NewFromFloat(v.Amount).Round(2)
 			newAmount = newAmount.Add(a)
@@ -579,7 +582,10 @@ func (rg *RegisterController) Add(c *gin.Context) {
 					return
 				}
 				opData = string(opDataByte)
-				opType := fms.ContractRegisterOpTypePreInvoice
+				opType := fms.ContractRegisterOpTypePrePay
+				if ppItem.InvoiceType == 3 {
+					opType = fms.ContractRegisterOpTypePreInvoice
+				}
 				newAmount := decimal.NewFromFloat(0).Round(2)
 				a := decimal.NewFromFloat(v.Amount).Round(2)
 				newAmount = newAmount.Add(a)
@@ -741,7 +747,10 @@ func (rg *RegisterController) Add(c *gin.Context) {
 					return
 				}
 				opData = string(opDataByte)
-				opType := fms.ContractRegisterOpTypePreInvoice
+				opType := fms.ContractRegisterOpTypePrePay
+				if ppItem.InvoiceType == 3 {
+					opType = fms.ContractRegisterOpTypePreInvoice
+				}
 				newAmount := decimal.NewFromFloat(0).Round(2)
 				a := decimal.NewFromFloat(v.Amount).Round(2)
 				newAmount = newAmount.Add(a)
@@ -3542,7 +3551,10 @@ func (rg *RegisterController) Import(c *gin.Context) {
 							return
 						}
 						//opData = string(opDataByte)
-						opType := fms.ContractRegisterOpTypePreInvoice
+						opType := fms.ContractRegisterOpTypePrePay
+						if ppItem.InvoiceType == 3 {
+							opType = fms.ContractRegisterOpTypePreInvoice
+						}
 						newAmount := decimal.NewFromFloat(0).Round(2)
 						a := decimal.NewFromFloat(v.Amount).Round(2)
 						newAmount = newAmount.Add(a)

models/fms/constants.go

@@ -25,8 +25,9 @@ const (
 	ContractRegisterOpTypeStatus     = 4 // 修改合同状态
 	ContractRegisterOpTypeDel        = 5 // 删除合同登记
 	ContractRegisterOpTypeEdit       = 6 // 合规编辑
-	ContractRegisterOpTypePreInvoice = 7 // 开票预登记
-	ContractRegisterOpTypePrePay     = 8 // 到款预登记
+	ContractRegisterOpTypePrePay     = 7 // 到款预登记
+	ContractRegisterOpTypePreInvoice = 8 // 开票预登记
+
 
 	// 合同登记开票类型
 	ContractInvoiceTypeMake    = 1 // 开票登记