后:重新入库

src/dashoo.cn/backend/api/business/invoiceinfo/invoiceinfo.go

@@ -29,3 +29,31 @@ type OilInvoiceInfo struct {
 	ModifiedUserId int       `xorm:"INT(11)"`
 	ModifiedBy     string    `xorm:"VARCHAR(50)"`
 }
+
+type Del_OilInvoiceInfo struct {
+	Id             int       `xorm:"not null pk autoincr INT(10)"`
+	SrcIds         string    `xorm:"VARCHAR(255)"`
+	SupplierId     int       `xorm:"comment('Supplier') INT(11)"`
+	CommercialNo   string    `xorm:"comment('社会统一信用代码') VARCHAR(20)"`
+	SupplierName   string    `xorm:"VARCHAR(100)"`
+	Address        string    `xorm:"comment('注册地址') VARCHAR(255)"`
+	DepositBank    string    `xorm:"comment('开户行') VARCHAR(255)"`
+	BankAccount    string    `xorm:"comment('银行账号') VARCHAR(255)"`
+	Email          string    `xorm:"comment('邮箱') VARCHAR(255)"`
+	Amount         float64   `xorm:"DECIMAL(10,2)"`
+	IsInvoice      string    `xorm:"default '0' comment('是否已开发票 0 否 1 是') VARCHAR(5)"`
+	InvoiceOn      time.Time `xorm:"comment('开票时间') DATETIME"`
+	BankSerialNum  string    `xorm:"VARCHAR(50)"`
+	Remark         string    `xorm:"VARCHAR(255)"`
+	Url            string    `xorm:"comment('诺诺网发票pdf') VARCHAR(255)"`
+	NuNuSerialNum  string	 `xorm:"comment('诺诺网发票流水号') VARCHAR(50)"`
+	WorkflowId     string    `xorm:"VARCHAR(50)"`
+	CreateUserId   int       `xorm:"INT(11)"`
+	CreateOn       time.Time `xorm:"DATETIME"`
+	CreateBy       string    `xorm:"VARCHAR(50)"`
+	ModifiedOn     time.Time `xorm:"DATETIME"`
+	ModifiedUserId int       `xorm:"INT(11)"`
+	ModifiedBy     string    `xorm:"VARCHAR(50)"`
+	DeleteDate     time.Time `xorm:"DATETIME"`
+
+}

src/dashoo.cn/backend/api/controllers/oilsupplier/suppliercert.go

@@ -2,6 +2,7 @@ package oilsupplier
 
 import (
 	"dashoo.cn/backend/api/business/codecsequence"
+	"dashoo.cn/backend/api/business/invoiceinfo"
 	msg2 "dashoo.cn/backend/api/business/msg"
 	"dashoo.cn/backend/api/business/oilsupplier/annualaudit"
 	"dashoo.cn/backend/api/business/oilsupplier/infochange"
@@ -1740,37 +1741,37 @@ func (this *OilSupplierCertController) ReInput() {
 				return
 			}
 
-			// 交费信息
-			//var delpay []paymentinfo.Del_OilPaymentInfo
-			//wherepay := "SupplierCertId=" + strconv.Itoa(model[0].Id)
-			//var sqlpay string
-			//sqlpay = "select * from " + OilPaymentInfoName + " where " + wherepay
-			//utils.DBE.SQL(sqlpay).Find(&delpay)
-			//
-			//err = svc.DeleteEntityBytbl(OilPaymentInfoName, wherepay)
-			//if err != nil {
-			//	session.Rollback()
-			//	errinfo.Message = "提交失败！" + utils.AlertProcess(err.Error())
-			//	errinfo.Code = -1
-			//	this.Data["json"] = &errinfo
-			//	this.ServeJSON()
-			//	return
-			//}
-			//
-			//for idx, _ := range delpay {
-			//	delpay[idx].DeleteDate = time.Now()
-			//}
-			//
-			//_, err = svc.InsertEntityBytbl(DelOilPaymentInfoName, &delpay)
-			//
-			//if err != nil {
-			//	session.Rollback()
-			//	errinfo.Message = "提交失败！" + utils.AlertProcess(err.Error())
-			//	errinfo.Code = -1
-			//	this.Data["json"] = &errinfo
-			//	this.ServeJSON()
-			//	return
-			//}
+			//交费信息
+			var delpay []paymentinfo.Del_OilPaymentInfo
+			wherepay := "SupplierCertId=" + strconv.Itoa(model[0].Id)
+			var sqlpay string
+			sqlpay = "select * from " + OilPaymentInfoName + " where " + wherepay
+			utils.DBE.SQL(sqlpay).Find(&delpay)
+
+			err = svc.DeleteEntityBytbl(OilPaymentInfoName, wherepay)
+			if err != nil {
+				session.Rollback()
+				errinfo.Message = "提交失败！" + utils.AlertProcess(err.Error())
+				errinfo.Code = -1
+				this.Data["json"] = &errinfo
+				this.ServeJSON()
+				return
+			}
+
+			for idx,_ := range delpay {
+				delpay[idx].DeleteDate = time.Now()
+			}
+
+			_, err = svc.InsertEntityBytbl(DelOilPaymentInfoName, &delpay)
+
+			if err != nil {
+				session.Rollback()
+				errinfo.Message = "提交失败！" + utils.AlertProcess(err.Error())
+				errinfo.Code = -1
+				this.Data["json"] = &errinfo
+				this.ServeJSON()
+				return
+			}
 
 			// 删除增项记录
 			var modelapp []suppliercertappend.Del_OilSupplierCertAppend
@@ -1905,7 +1906,38 @@ func (this *OilSupplierCertController) ReInput() {
 			return
 		}
 
-		// 删除注册信息
+		//删除发票信息
+		var invoice []invoiceinfo.Del_OilInvoiceInfo
+		where = "SupplierId=" + id
+		sql = "select * from OilInvoiceInfo where " + where
+		utils.DBE.SQL(sql).Find(&invoice)
+
+		err = svc.DeleteEntityBytbl("OilInvoiceInfo", where)
+		if err != nil {
+			session.Rollback()
+			errinfo.Message = "提交失败！" + utils.AlertProcess(err.Error())
+			errinfo.Code = -1
+			this.Data["json"] = &errinfo
+			this.ServeJSON()
+			return
+		}
+
+		for idx, app := range invoice {
+			invoice[idx].DeleteDate = time.Now()
+			needWorkflowId = append(needWorkflowId, app.WorkflowId)
+		}
+		_, err = svc.InsertEntityBytbl("Del_OilInvoiceInfo", &invoice)
+
+		if err != nil {
+			session.Rollback()
+			errinfo.Message = "提交失败！" + utils.AlertProcess(err.Error())
+			errinfo.Code = -1
+			this.Data["json"] = &errinfo
+			this.ServeJSON()
+			return
+		}
+
+		// 删除注册信息,用户信息
 		var corporateInfo register.Del_OilCorporateInfo
 		where = "CommercialNo = '" + modelsupp.CommercialNo + "'"
 		sql = "select * from " + OilCorporateInfoName + " where " + where
@@ -1921,26 +1953,8 @@ func (this *OilSupplierCertController) ReInput() {
 				this.ServeJSON()
 				return
 			}
-			corporateInfo.DeleteDate = time.Now()
-			_, err = svc.InsertEntityBytbl(DelOilCorporateInfoName, &corporateInfo)
-
-			if err != nil {
-				session.Rollback()
-				errinfo.Message = "提交失败！" + utils.AlertProcess(err.Error())
-				errinfo.Code = -1
-				this.Data["json"] = &errinfo
-				this.ServeJSON()
-				return
-			}
-		}
-
-		// 删除用户信息
-		var user register.Del_Base_User
-		where = "Id = " + strconv.Itoa(corporateInfo.UserId)
-		sql = "select * from " + BaseUserName + " where " + where
-		utils.DBE.SQL(sql).Get(&user)
-
-		if corporateInfo.Id > 0 {
+			// 删除用户信息
+			where = "Id = " + strconv.Itoa(corporateInfo.UserId)
 			err = svc.DeleteEntityBytbl(BaseUserName, where)
 			if err != nil {
 				session.Rollback()
@@ -1950,17 +1964,7 @@ func (this *OilSupplierCertController) ReInput() {
 				this.ServeJSON()
 				return
 			}
-			user.DeleteDate = time.Now()
-			_, err = svc.InsertEntityBytbl(DelBaseNameName, &user)
 
-			if err != nil {
-				session.Rollback()
-				errinfo.Message = "提交失败！" + utils.AlertProcess(err.Error())
-				errinfo.Code = -1
-				this.Data["json"] = &errinfo
-				this.ServeJSON()
-				return
-			}
 		}
 
 		// 删除企业资质