From e5c9327d1b659cd6bf9c3adc3ae81146630511a0 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期二, 29 八月 2023 14:51:21 +0800
Subject: [PATCH] Merge branch 'purchase'
---
service/purchase/purchase.go | 128 +++++++++++++++++++++++++++++++++++-------
1 files changed, 106 insertions(+), 22 deletions(-)
diff --git a/service/purchase/purchase.go b/service/purchase/purchase.go
index 6267575..0df0c5c 100644
--- a/service/purchase/purchase.go
+++ b/service/purchase/purchase.go
@@ -1,12 +1,14 @@
package purchase
import (
+ "context"
"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"
)
type PurchaseService struct{}
@@ -20,16 +22,16 @@
//@param: params *purchaserequest.AddPurchase
//@return: err error
-func (exa *PurchaseService) CreatePurchase(params purchaserequest.AddPurchase) (err error) {
+func (slf *PurchaseService) CreatePurchase(params *purchase.Purchase, productList []*purchase.PurchaseProducts) (err error) {
err = global.GVA_DB.Transaction(func(tx *gorm.DB) error {
- err = global.GVA_DB.Create(¶ms.Purchase).Error
+ err = tx.Create(¶ms).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(params.ID)
}
- return global.GVA_DB.Create(params.ProductList).Error
+ return tx.Create(productList).Error
})
return err
@@ -40,13 +42,13 @@
//@param: id uint
//@return: err error
-func (exa *PurchaseService) DeletePurchase(id uint) (err error) {
+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
}
@@ -56,21 +58,21 @@
//@param: params *purchaserequest.AddPurchase
//@return: err error
-func (exa *PurchaseService) UpdatePurchase(params *purchaserequest.AddPurchase) (err error) {
+func (slf *PurchaseService) UpdatePurchase(params *purchase.Purchase, productList []*purchase.PurchaseProducts) (err error) {
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
}
@@ -80,8 +82,8 @@
//@param: id uint
//@return: purchase model.Purchase, err error
-func (exa *PurchaseService) GetPurchase(id uint) (purchase purchase.Purchase, err error) {
- err = global.GVA_DB.Where("id = ?", id).First(&purchase).Error
+func (slf *PurchaseService) GetPurchase(id uint) (purchase purchase.Purchase, err error) {
+ err = global.GVA_DB.Where("id = ?", id).Preload("Supplier").First(&purchase).Error
return
}
@@ -90,7 +92,7 @@
//@param: info request.PageInfo
//@return: list interface{}, total int64, err error
-func (exa *PurchaseService) GetPurchaseList(info request.PageInfo) (list interface{}, total int64, err error) {
+func (slf *PurchaseService) GetPurchaseList(info request.PageInfo) (list interface{}, total int64, err error) {
limit := info.PageSize
offset := info.PageSize * (info.Page - 1)
db := global.GVA_DB.Model(&purchase.Purchase{})
@@ -116,7 +118,7 @@
//@param: purchaseId int
//@return: list interface{}, err error
-func (exa *PurchaseService) GetPurchaseProductList(purchaseId uint) (list []*purchase.PurchaseProducts, err error) {
+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
@@ -128,13 +130,95 @@
//@param: id uint
//@return: err error
-func (exa *PurchaseService) Submit(id uint) (err error) {
+func (slf *PurchaseService) Submit(id uint) (err error) {
+
+ purchaseData, err := slf.GetPurchase(id)
+ if err != nil {
+ return err
+ }
+ var targetStatus purchase.OrderStatus
+ switch purchaseData.Status {
+ case purchase.OrderStatusConfirmed:
+ targetStatus = purchase.OrderStatusReceived
+ case purchase.OrderStatusReceived:
+ targetStatus = purchase.OrderStatusStored
+ case purchase.OrderStatusStored:
+ 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": 1}).Error
+ err = tx.Where("id = ?", id).Model(&purchase.Purchase{}).Updates(map[string]interface{}{"status": targetStatus}).Error
if err != nil {
return err
}
- return global.GVA_DB.Where("purchase_id = ?", id).Delete(&purchase.PurchaseProducts{}).Error
+
+ switch targetStatus {
+ case purchase.OrderStatusReceived:
+ return SendInspect(purchaseData)
+ case purchase.OrderStatusStored:
+ case purchase.OrderStatusCompleted:
+ }
+ return nil
})
return err
}
+
+func SendInspect(record purchase.Purchase) error {
+ productList, err := NewPurchaseService().GetPurchaseProductList(record.ID)
+ if err != nil {
+ return err
+ }
+ productIds := make([]uint, 0, len(productList))
+ for _, product := range productList {
+ productIds = append(productIds, uint(product.ProductId))
+ }
+ 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)]
+ 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(),
+ }
+ inspectOrders = append(inspectOrders, inspectOrder)
+ }
+ 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) {
+ err = global.GVA_DB.Transaction(func(tx *gorm.DB) error {
+ err = tx.Where("1 = ?", 1).Delete(&purchase.PurchaseType{}).Error
+ if err != nil {
+ return err
+ }
+ for _, item := range list {
+ item.ID = 0
+ }
+ return tx.Create(list).Error
+ })
+ 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