From f80c6068d5e2ae5b9101125497b4de88726e1d9e Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期日, 07 四月 2024 21:44:58 +0800
Subject: [PATCH] 发货接口增加仓库ID
---
service/invoice.go | 151 +++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 136 insertions(+), 15 deletions(-)
diff --git a/service/invoice.go b/service/invoice.go
index 59301a9..339674a 100644
--- a/service/invoice.go
+++ b/service/invoice.go
@@ -17,27 +17,53 @@
func (InvoiceService) AddInvoice(invoice *model.Invoice) int {
- if invoice.SourceType == constvar.InvoiceSourceTypeServiceContract {
+ if invoice.SourceType == constvar.InvoiceSourceTypeServiceContract { //鏇存柊鏈嶅姟鍚堝悓宸插紑绁ㄩ噾棰�
serviceContract, err := model.NewServiceContractSearch().SetId(invoice.SourceId).SetPreload(true).First()
if err != nil {
return ecode.DBErr
}
- var amountInvoiced decimal.Decimal
+ var amountInvoiced, amountNotInvoiced decimal.Decimal
rightProducts := NewProductsService().PickRightProducts(invoice.Products, serviceContract.Products)
for _, product := range rightProducts {
amountInvoiced = serviceContract.AmountInvoiced.Add(product.Amount.Mul(product.Price))
+ amountNotInvoiced = serviceContract.AmountUnInvoiced.Sub(product.Amount.Mul(product.Price))
}
amountInvoiced = amountInvoiced.Round(2)
- if amountInvoiced.GreaterThan(serviceContract.AmountReceivable) {
- return ecode.SContractInvoiceProductPriceGreaterThanReceivableAmountErr
- }
+ amountNotInvoiced = amountNotInvoiced.Round(2)
err = model.WithTransaction(func(db *gorm.DB) error {
err = model.NewInvoiceSearch().Create(invoice)
if err != nil {
return err
}
return model.NewServiceContractSearch().SetId(invoice.SourceId).UpdateByMap(map[string]interface{}{
- "amount_invoiced": amountInvoiced,
+ "amount_invoiced": amountInvoiced,
+ "amount_not_invoiced": amountNotInvoiced,
+ })
+ })
+ if err != nil {
+ return ecode.DBErr
+ }
+ } else if invoice.SourceType == constvar.InvoiceSourceTypeSaleDetail { //鏇存柊閿�鍞槑缁嗗凡寮�绁ㄩ噾棰�
+ salesDetails, err := model.NewSalesDetailsSearch().SetId(invoice.SourceId).SetPreload(true).First()
+ if err != nil {
+ return ecode.DBErr
+ }
+ var amountInvoiced, amountNotInvoiced decimal.Decimal
+ rightProducts := NewProductsService().PickRightProducts(invoice.Products, salesDetails.Products)
+ for _, product := range rightProducts {
+ amountInvoiced = salesDetails.AmountInvoiced.Add(product.Amount.Mul(product.Price))
+ amountNotInvoiced = salesDetails.AmountUnInvoiced.Sub(product.Amount.Mul(product.Price))
+ }
+ amountInvoiced = amountInvoiced.Round(2)
+ amountNotInvoiced = amountNotInvoiced.Round(2)
+ err = model.WithTransaction(func(db *gorm.DB) error {
+ err = model.NewInvoiceSearch().Create(invoice)
+ if err != nil {
+ return err
+ }
+ return model.NewSalesDetailsSearch().SetId(invoice.SourceId).UpdateByMap(map[string]interface{}{
+ "amount_invoiced": amountInvoiced,
+ "amount_not_invoiced": amountNotInvoiced,
})
})
if err != nil {
@@ -49,15 +75,72 @@
}
func (InvoiceService) DeleteInvoice(id int) int {
- err := model.NewInvoiceSearch().SetId(id).Delete()
+ invoice, err := model.NewInvoiceSearch().SetId(id).First()
+ if err != nil {
+ return ecode.DBErr
+ }
+ if invoice.SourceType == constvar.InvoiceSourceTypeServiceContract { //鏇存柊鏈嶅姟鍚堝悓宸插紑绁ㄩ噾棰�
+ serviceContract, err := model.NewServiceContractSearch().SetId(invoice.SourceId).SetPreload(true).First()
+ if err != nil {
+ return ecode.DBErr
+ }
+ var amountInvoiced, amountNotInvoiced decimal.Decimal
+ rightProducts := NewProductsService().PickRightProducts(invoice.Products, serviceContract.Products)
+ for _, product := range rightProducts {
+ amountInvoiced = serviceContract.AmountInvoiced.Sub(product.Amount.Mul(product.Price))
+ amountNotInvoiced = serviceContract.AmountUnInvoiced.Add(product.Amount.Mul(product.Price))
+ }
+ amountInvoiced = amountInvoiced.Round(2)
+ amountNotInvoiced = amountNotInvoiced.Round(2)
+ err = model.WithTransaction(func(db *gorm.DB) error {
+ err := model.NewInvoiceSearch().SetId(id).Delete()
+ if err != nil {
+ return err
+ }
+ return model.NewServiceContractSearch().SetId(invoice.SourceId).UpdateByMap(map[string]interface{}{
+ "amount_invoiced": amountInvoiced,
+ "amount_not_invoiced": amountNotInvoiced,
+ })
+ })
+ if err != nil {
+ return ecode.DBErr
+ }
+ } else if invoice.SourceType == constvar.InvoiceSourceTypeServiceContract { //鏇存柊閿�鍞槑缁嗗凡寮�绁ㄩ噾棰�
+ salesDetails, err := model.NewSalesDetailsSearch().SetId(invoice.SourceId).SetPreload(true).First()
+ if err != nil {
+ return ecode.DBErr
+ }
+ var amountInvoiced, amountNotInvoiced decimal.Decimal
+ rightProducts := NewProductsService().PickRightProducts(invoice.Products, salesDetails.Products)
+ for _, product := range rightProducts {
+ amountInvoiced = salesDetails.AmountInvoiced.Sub(product.Amount.Mul(product.Price))
+ amountNotInvoiced = salesDetails.AmountUnInvoiced.Add(product.Amount.Mul(product.Price))
+ }
+ amountInvoiced = amountInvoiced.Round(2)
+ amountNotInvoiced = amountNotInvoiced.Round(2)
+ err = model.WithTransaction(func(db *gorm.DB) error {
+ err := model.NewInvoiceSearch().SetId(id).Delete()
+ if err != nil {
+ return err
+ }
+ return model.NewSalesDetailsSearch().SetId(invoice.SourceId).UpdateByMap(map[string]interface{}{
+ "amount_invoiced": amountInvoiced,
+ "amount_not_invoiced": amountNotInvoiced,
+ })
+ })
+ if err != nil {
+ return ecode.DBErr
+ }
+ }
+
if err != nil {
return ecode.DBErr
}
return ecode.OK
}
-func (InvoiceService) GetInvoiceList() ([]*model.Invoice, int64, int) {
- list, total, err := model.NewInvoiceSearch().Find()
+func (InvoiceService) GetInvoiceList(params request.GetInvoiceList) ([]*model.Invoice, int64, int) {
+ list, total, err := model.NewInvoiceSearch().SetSourceId(params.SourceId).SetSourceType(params.SourceType).SetPrincipalIds(params.PrincipalIds).Find()
if err != nil {
return nil, 0, ecode.DBErr
}
@@ -88,22 +171,22 @@
if err != nil {
return ecode.DBErr
}
- var amountInvoiced decimal.Decimal
+ var amountInvoiced, amountNotInvoiced decimal.Decimal
newProducts, removedProducts := NewProductsService().PickDiffProducts(invoice.Products, serviceContract.Products)
for _, product := range newProducts {
amountInvoiced = serviceContract.AmountInvoiced.Add(product.Amount.Mul(product.Price))
+ amountNotInvoiced = serviceContract.AmountUnInvoiced.Sub(product.Amount.Mul(product.Price))
}
removedProductIds := make([]uint, 0, len(removedProducts))
for _, product := range removedProducts {
amountInvoiced = serviceContract.AmountInvoiced.Sub(product.Amount.Mul(product.Price))
+ amountNotInvoiced = serviceContract.AmountUnInvoiced.Add(product.Amount.Mul(product.Price))
removedProductIds = append(removedProductIds, product.Id)
}
amountInvoiced = amountInvoiced.Round(2)
- if amountInvoiced.GreaterThan(serviceContract.AmountReceivable) {
- return ecode.SContractInvoiceProductPriceGreaterThanReceivableAmountErr
- }
+ amountNotInvoiced = amountNotInvoiced.Round(2)
err = model.WithTransaction(func(db *gorm.DB) error {
- err = model.NewInvoiceSearch().SetId(invoice.Id).Save(invoice)
+ err = model.NewInvoiceSearch().SetId(invoice.Id).Update(invoice)
if err != nil {
return err
}
@@ -114,7 +197,45 @@
}
}
return model.NewServiceContractSearch().SetId(invoice.SourceId).UpdateByMap(map[string]interface{}{
- "amount_invoiced": amountInvoiced,
+ "amount_invoiced": amountInvoiced,
+ "amount_not_invoiced": amountNotInvoiced,
+ })
+ })
+ if err != nil {
+ return ecode.DBErr
+ }
+ } else if invoice.SourceType == constvar.InvoiceSourceTypeServiceContract { //鏇存柊閿�鍞槑缁嗗凡寮�绁ㄩ噾棰�
+ salesDetails, err := model.NewSalesDetailsSearch().SetId(invoice.SourceId).SetPreload(true).First()
+ if err != nil {
+ return ecode.DBErr
+ }
+ var amountInvoiced, amountNotInvoiced decimal.Decimal
+ newProducts, removedProducts := NewProductsService().PickDiffProducts(invoice.Products, salesDetails.Products)
+ for _, product := range newProducts {
+ amountInvoiced = salesDetails.AmountInvoiced.Add(product.Amount.Mul(product.Price))
+ amountNotInvoiced = salesDetails.AmountUnInvoiced.Sub(product.Amount.Mul(product.Price))
+ }
+ removedProductIds := make([]uint, 0, len(removedProducts))
+ for _, product := range removedProducts {
+ amountInvoiced = salesDetails.AmountInvoiced.Sub(product.Amount.Mul(product.Price))
+ amountNotInvoiced = salesDetails.AmountUnInvoiced.Add(product.Amount.Mul(product.Price))
+ removedProductIds = append(removedProductIds, product.Id)
+ }
+ amountInvoiced = amountInvoiced.Round(2)
+ err = model.WithTransaction(func(db *gorm.DB) error {
+ err = model.NewInvoiceSearch().SetId(invoice.Id).Update(invoice)
+ if err != nil {
+ return err
+ }
+ if len(removedProductIds) > 0 {
+ err = model.NewInvoiceProductSearch().SetInvoiceId(invoice.Id).SetProductIds(removedProductIds).Delete()
+ if err != nil {
+ return err
+ }
+ }
+ return model.NewSalesDetailsSearch().SetId(invoice.SourceId).UpdateByMap(map[string]interface{}{
+ "amount_invoiced": amountInvoiced,
+ "amount_not_invoiced": amountNotInvoiced,
})
})
if err != nil {
--
Gitblit v1.8.0