From 82c058c91daed212fd9b3807dca9ca80217ce738 Mon Sep 17 00:00:00 2001
From: wangpengfei <274878379@qq.com>
Date: 星期三, 30 八月 2023 20:25:01 +0800
Subject: [PATCH] fix
---
service/purchase/purchase.go | 140 ++++++++++++++++++++++++++++++++++++----------
1 files changed, 109 insertions(+), 31 deletions(-)
diff --git a/service/purchase/purchase.go b/service/purchase/purchase.go
index 58ae69d..2251d8e 100644
--- a/service/purchase/purchase.go
+++ b/service/purchase/purchase.go
@@ -2,12 +2,13 @@
import (
"context"
+ "errors"
+ "github.com/shopspring/decimal"
"github.com/spf13/cast"
"gorm.io/gorm"
"srm/global"
"srm/model/common/request"
"srm/model/purchase"
- purchaserequest "srm/model/purchase/request"
"srm/proto/qualityinspect"
"srm/service/test"
)
@@ -23,19 +24,44 @@
//@param: params *purchaserequest.AddPurchase
//@return: err error
-func (slf *PurchaseService) CreatePurchase(params purchaserequest.AddPurchase) (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 = global.GVA_DB.Create(¶ms.Purchase).Error
+ err = tx.Create(&record).Error
if err != nil {
return err
}
- for _, product := range params.ProductList {
- product.PurchaseId = cast.ToInt(params.Purchase.ID)
+ for _, product := range productList {
+ product.PurchaseId = cast.ToInt(record.ID)
}
- return global.GVA_DB.Create(params.ProductList).Error
+ 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
@@ -45,11 +71,11 @@
func (slf *PurchaseService) DeletePurchase(id uint) (err error) {
err = global.GVA_DB.Transaction(func(tx *gorm.DB) error {
- err = global.GVA_DB.Where("id = ?", id).Delete(&purchase.Purchase{}).Error
+ err = tx.Where("id = ?", id).Delete(&purchase.Purchase{}).Error
if err != nil {
return err
}
- return global.GVA_DB.Where("purchase_id = ?", id).Delete(&purchase.PurchaseProducts{}).Error
+ return tx.Where("purchase_id = ?", id).Delete(&purchase.PurchaseProducts{}).Error
})
return err
}
@@ -59,21 +85,25 @@
//@param: params *purchaserequest.AddPurchase
//@return: err error
-func (slf *PurchaseService) UpdatePurchase(params *purchaserequest.AddPurchase) (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 = global.GVA_DB.Updates(params.Purchase).Error
+ err = tx.Where("id = ?", params.ID).Updates(params).Error
if err != nil {
return err
}
- err = global.GVA_DB.Where("purchase_id = ?", params.Purchase.ID).Delete(&purchase.PurchaseProducts{}).Error
+ err = tx.Where("purchase_id = ?", params.ID).Delete(&purchase.PurchaseProducts{}).Error
if err != nil {
return err
}
- for _, product := range params.ProductList {
+ for _, product := range productList {
product.ID = 0
- product.PurchaseId = cast.ToInt(params.Purchase.ID)
+ product.PurchaseId = cast.ToInt(params.ID)
}
- return global.GVA_DB.Create(params.ProductList).Error
+ return tx.Create(productList).Error
})
return err
}
@@ -105,7 +135,7 @@
Or("Product.name like ?", "%"+info.Keyword+"%").
Or("supplier.name like ?", "%"+info.Keyword+"%")
}
- var purchaseList []purchase.Purchase
+ var purchaseList []*purchase.Purchase
err = db.Count(&total).Error
if err != nil {
return purchaseList, total, err
@@ -122,7 +152,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
}
@@ -147,16 +177,16 @@
targetStatus = purchase.OrderStatusCompleted
}
err = global.GVA_DB.Transaction(func(tx *gorm.DB) error {
- err = global.GVA_DB.Where("id = ?", id).Model(&purchase.Purchase{}).Updates(map[string]interface{}{"status": targetStatus}).Error
+ err = tx.Where("id = ?", id).Model(&purchase.Purchase{}).Updates(map[string]interface{}{"status": targetStatus}).Error
if err != nil {
return err
}
switch targetStatus {
- case purchase.OrderStatusConfirmed:
- return SendInspect(purchaseData)
case purchase.OrderStatusReceived:
+ return SendInspect(purchaseData)
case purchase.OrderStatusStored:
+ case purchase.OrderStatusCompleted:
}
return nil
})
@@ -174,7 +204,9 @@
}
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)]
@@ -182,21 +214,67 @@
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)
return err
}
+
+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("id not in ?", ids).Delete(&purchase.PurchaseType{}).Error
+ if err != nil {
+ return err
+ }
+ if len(newRecords) > 0 {
+ err = tx.Create(newRecords).Error
+ if err != nil {
+ return err
+ }
+ }
+
+ for _, item := range list {
+ if item.ID != 0 {
+ err = tx.Save(item).Error
+ if err != nil {
+ return err
+ }
+ }
+ }
+ return nil
+ })
+ return err
+}
+
+func (slf *PurchaseService) GetPurchaseTypeList() (list []*purchase.PurchaseType, err error) {
+ db := global.GVA_DB.Model(&purchase.PurchaseType{})
+ list = make([]*purchase.PurchaseType, 0)
+ err = db.Order("pin desc, sort desc, id asc").Find(&list).Error
+ return list, err
+}
--
Gitblit v1.8.0