From 3bdc6225a61aaf20583642ea5a1319109c22072e Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期二, 21 十一月 2023 11:15:28 +0800
Subject: [PATCH] mysql配置和各grpc地址从环境变量取
---
service/purchase/purchase.go | 71 ++++++++++++++++++-----------------
1 files changed, 37 insertions(+), 34 deletions(-)
diff --git a/service/purchase/purchase.go b/service/purchase/purchase.go
index d07291e..4ed07b9 100644
--- a/service/purchase/purchase.go
+++ b/service/purchase/purchase.go
@@ -7,8 +7,8 @@
"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"
)
@@ -123,34 +123,37 @@
//@param: info request.PageInfo
//@return: list interface{}, total int64, err error
-func (slf *PurchaseService) GetPurchaseList(info request.PageInfo) (list interface{}, total int64, err error) {
+func (slf *PurchaseService) GetPurchaseList(info purchaserequest.PurchaseSearch) (list interface{}, total int64, err error) {
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 srm_supplier_material on srm_supplier_material.supplier_id = srm_purchase.id").
+ Joins("left join srm_supplier on srm_supplier.Id = srm_purchase.supplier_id").
+ Where("srm_purchase.name like ?", "%"+info.Keyword+"%").
+ Or("srm_supplier_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
}
}
+ if info.SupplierId != 0 {
+ db = db.Where("supplier_id = ?", info.SupplierId)
+ }
err = db.Count(&total).Error
if err != nil {
return purchaseList, total, err
}
if len(ids) != 0 {
db = global.GVA_DB.Model(&purchase.Purchase{})
- err = db.Where("id in (?)", ids).Find(&purchaseList).Error
+ err = db.Where("id in (?)", ids).Preload("Supplier").Order("updated_at desc").Find(&purchaseList).Error
} else {
- err = db.Limit(limit).Offset(offset).Find(&purchaseList).Error
+ err = db.Limit(limit).Offset(offset).Preload("Supplier").Order("updated_at desc").Find(&purchaseList).Error
}
return purchaseList, total, err
@@ -173,33 +176,33 @@
//@param: id uint
//@return: err error
-func (slf *PurchaseService) Submit(id uint) (err error) {
+func (slf *PurchaseService) Submit(id int, status purchase.OrderStatus) (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
- }
+ //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 = tx.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": status}).Error
if err != nil {
return err
}
- switch targetStatus {
- case purchase.OrderStatusReceived:
- return SendInspect(purchaseData)
- case purchase.OrderStatusStored:
- case purchase.OrderStatusCompleted:
- }
+ //switch targetStatus {
+ //case purchase.OrderStatusReceived:
+ // return SendInspect(purchaseData)
+ //case purchase.OrderStatusStored:
+ //case purchase.OrderStatusCompleted:
+ //}
return nil
})
return err
@@ -212,7 +215,7 @@
}
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)
@@ -221,7 +224,7 @@
}
inspectOrders := make([]*qualityinspect.QualityInspect, 0, len(productList))
for _, productItem := range productList {
- product := productMap[uint(productItem.ProductId)]
+ product := productMap[productItem.ID]
if product == nil {
continue
}
@@ -273,7 +276,7 @@
for _, item := range list {
if item.ID != 0 {
- err = tx.Save(item).Error
+ err = tx.Where("id = ?", item.ID).Updates(item).Error
if err != nil {
return err
}
--
Gitblit v1.8.0