From 41487709f1d0d92e1b6a86ecbab8811deb3b5ac8 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期三, 15 十一月 2023 17:44:22 +0800
Subject: [PATCH] 日志优化
---
service/purchase/purchase.go | 134 ++++++++++++++++++++++++++++++++++----------
1 files changed, 102 insertions(+), 32 deletions(-)
diff --git a/service/purchase/purchase.go b/service/purchase/purchase.go
index c829fc1..2a3a9cb 100644
--- a/service/purchase/purchase.go
+++ b/service/purchase/purchase.go
@@ -2,6 +2,8 @@
import (
"context"
+ "errors"
+ "github.com/shopspring/decimal"
"github.com/spf13/cast"
"gorm.io/gorm"
"srm/global"
@@ -22,19 +24,44 @@
//@param: params *purchaserequest.AddPurchase
//@return: err error
-func (slf *PurchaseService) CreatePurchase(params *purchase.Purchase, productList []*purchase.PurchaseProducts) (err error) {
+func (slf *PurchaseService) CreatePurchase(record *purchase.Purchase, productList []*purchase.PurchaseProducts) (err error) {
+ err = DealPrice(record, productList)
+ if err != nil {
+ return err
+ }
err = global.GVA_DB.Transaction(func(tx *gorm.DB) error {
- err = tx.Create(¶ms).Error
+ err = tx.Create(&record).Error
if err != nil {
return err
}
for _, product := range productList {
- product.PurchaseId = cast.ToInt(params.ID)
+ product.PurchaseId = cast.ToInt(record.ID)
}
return tx.Create(productList).Error
})
return err
+}
+
+func DealPrice(record *purchase.Purchase, productList []*purchase.PurchaseProducts) error {
+ var quantity decimal.Decimal
+ var totalPrice decimal.Decimal
+ var realTotalPrice decimal.Decimal
+ for _, product := range productList {
+ quantity = quantity.Add(product.Amount)
+ totalPrice = totalPrice.Add(product.Price.Mul(product.Amount))
+ }
+ record.Quantity = quantity
+ if !totalPrice.Equal(record.TotalPrice) {
+ return errors.New("浠风◣鎬昏璁＄畻閿欒")
+ }
+ realTotalPrice = record.CalcRealTotalPrice()
+ if !realTotalPrice.Equal(record.RealTotalPrice) {
+ return errors.New("鏈�缁堜环鏍艰绠楅敊璇�")
+ }
+ record.UnInvoiceAmount = record.RealTotalPrice
+ record.ShouldPayAmount = record.RealTotalPrice
+ return nil
}
//@function: DeletePurchase
@@ -59,6 +86,10 @@
//@return: err error
func (slf *PurchaseService) UpdatePurchase(params *purchase.Purchase, productList []*purchase.PurchaseProducts) (err error) {
+ err = DealPrice(params, productList)
+ if err != nil {
+ return err
+ }
err = global.GVA_DB.Transaction(func(tx *gorm.DB) error {
err = tx.Where("id = ?", params.ID).Updates(params).Error
if err != nil {
@@ -96,20 +127,32 @@
limit := info.PageSize
offset := info.PageSize * (info.Page - 1)
db := global.GVA_DB.Model(&purchase.Purchase{})
+ var ids []uint
+ var purchaseList = make([]*purchase.Purchase, 0)
if info.Keyword != "" {
- db.Distinct("purchases.id").Joins("left join purchase_products on purchase_products.purchase_id = purchases.id").
- Joins("left join Product on Product.Id = purchase_products.product_id").
- Joins("left join supplier on supplier.Id = purchases.supplier_id").
- Where("purchases.name like ?", "%"+info.Keyword+"%").
- Or("Product.name like ?", "%"+info.Keyword+"%").
- Or("supplier.name like ?", "%"+info.Keyword+"%")
+ db.Distinct("srm_purchase.id").Joins("left join srm_purchase_products on srm_purchase_products.purchase_id = srm_purchase.id").
+ Joins("left join material on material.id = srm_purchase_products.product_id").
+ Joins("left join srm_supplier on srm_supplier.Id = srm_purchase.supplier_id").
+ Where("srm_purchase.name like ?", "%"+info.Keyword+"%").
+ Or("material.name like ?", "%"+info.Keyword+"%").
+ Or("srm_supplier.name like ?", "%"+info.Keyword+"%")
+ err = db.Limit(limit).Offset(offset).Find(&ids).Error
+ if err != nil {
+ return purchaseList, total, err
+ }
}
- var purchaseList []purchase.Purchase
+
err = db.Count(&total).Error
if err != nil {
return purchaseList, total, err
}
- err = db.Limit(limit).Offset(offset).Find(&purchaseList).Error
+ if len(ids) != 0 {
+ db = global.GVA_DB.Model(&purchase.Purchase{})
+ err = db.Where("id in (?)", ids).Find(&purchaseList).Error
+ } else {
+ err = db.Limit(limit).Offset(offset).Find(&purchaseList).Error
+ }
+
return purchaseList, total, err
}
@@ -121,7 +164,7 @@
func (slf *PurchaseService) GetPurchaseProductList(purchaseId uint) (list []*purchase.PurchaseProducts, err error) {
db := global.GVA_DB.Model(&purchase.PurchaseProducts{})
list = make([]*purchase.PurchaseProducts, 0)
- err = db.Where("purchase_id = ?", purchaseId).Find(&list).Error
+ err = db.Where("purchase_id = ?", purchaseId).Preload("Product").Find(&list).Error
return list, err
}
@@ -152,10 +195,10 @@
}
switch targetStatus {
- case purchase.OrderStatusConfirmed:
- return SendInspect(purchaseData)
case purchase.OrderStatusReceived:
+ return SendInspect(purchaseData)
case purchase.OrderStatusStored:
+ case purchase.OrderStatusCompleted:
}
return nil
})
@@ -169,31 +212,37 @@
}
productIds := make([]uint, 0, len(productList))
for _, product := range productList {
- productIds = append(productIds, uint(product.ProductId))
+ productIds = append(productIds, product.ID)
}
productService := &test.ProductService{}
_, productMap, err := productService.GetProducts(productIds)
-
+ if err != nil {
+ return err
+ }
inspectOrders := make([]*qualityinspect.QualityInspect, 0, len(productList))
for _, productItem := range productList {
- product := productMap[uint(productItem.ProductId)]
+ product := productMap[productItem.ID]
if product == nil {
continue
}
inspectOrder := &qualityinspect.QualityInspect{
- InspectType: qualityinspect.InspectType_InspectTypePurchase,
- MaterialType: qualityinspect.MaterialType_MaterialTypeRaw,
- MaterialName: product.Name,
- MaterialId: product.Number,
- MaterialTp: product.ModelNumber,
- MaterialUnit: product.Unit,
- Supplier: record.Supplier.Name,
- WarehouseName: "閲囪喘鎬讳粨",
- ReportAmount: productItem.Amount.InexactFloat64(),
- InspectMethod: qualityinspect.InspectMethod_InspectMethodAll,
- InspectAmount: productItem.Amount.InexactFloat64(),
+ InspectType: qualityinspect.InspectType_InspectTypePurchase,
+ MaterialType: qualityinspect.MaterialType_MaterialTypeRaw,
+ MaterialName: product.Name,
+ MaterialId: product.Number,
+ MaterialTp: product.ModelNumber,
+ MaterialUnit: product.Unit,
+ Supplier: record.Supplier.Name,
+ WarehouseName: "閲囪喘鎬讳粨",
+ ReportAmount: productItem.Amount.InexactFloat64(),
+ InspectMethod: qualityinspect.InspectMethod_InspectMethodAll,
+ InspectAmount: productItem.Amount.InexactFloat64(),
+ PurchaseOrderId: record.Number,
}
inspectOrders = append(inspectOrders, inspectOrder)
+ }
+ if len(inspectOrders) == 0 {
+ return nil
}
inspectRequest := qualityinspect.SendPurchaseInspectRequest{List: inspectOrders}
_, err = qualityinspect.NewQualityInspectServiceClient(qualityinspect.Conn).SendPurchaseInspect(context.Background(), &inspectRequest)
@@ -201,15 +250,36 @@
}
func (slf *PurchaseService) SavePurchaseType(list []*purchase.PurchaseType) (err error) {
+ ids := make([]uint, 0)
+ newRecords := make([]*purchase.PurchaseType, 0)
+ for _, item := range list {
+ if item.ID != 0 {
+ ids = append(ids, item.ID)
+ } else {
+ newRecords = append(newRecords, item)
+ }
+ }
err = global.GVA_DB.Transaction(func(tx *gorm.DB) error {
- err = tx.Where("1 = ?", 1).Delete(&purchase.PurchaseType{}).Error
+ err = tx.Where("id not in ?", ids).Delete(&purchase.PurchaseType{}).Error
if err != nil {
return err
}
- for _, item := range list {
- item.ID = 0
+ if len(newRecords) > 0 {
+ err = tx.Create(newRecords).Error
+ if err != nil {
+ return err
+ }
}
- return tx.Create(list).Error
+
+ for _, item := range list {
+ if item.ID != 0 {
+ err = tx.Where("id = ?", item.ID).Updates(item).Error
+ if err != nil {
+ return err
+ }
+ }
+ }
+ return nil
})
return err
}
--
Gitblit v1.8.0