From f6bf0ee81b080a2bad55aa5bf261c68ab3d555f8 Mon Sep 17 00:00:00 2001
From: jiangshuai <291802688@qq.com>
Date: 星期二, 19 十二月 2023 18:57:43 +0800
Subject: [PATCH] 新增共用id结构体
---
service/purchase/purchase.go | 23 ++++++++++++++++-------
1 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/service/purchase/purchase.go b/service/purchase/purchase.go
index ab378ab..fb3db12 100644
--- a/service/purchase/purchase.go
+++ b/service/purchase/purchase.go
@@ -140,20 +140,18 @@
if err != nil {
return purchaseList, total, err
}
- }
-
- if info.SupplierId != 0 {
+ } else if info.SupplierId != 0 {
db = db.Where("supplier_id = ?", info.SupplierId)
}
err = db.Count(&total).Error
- if err != nil {
+ if err != nil || total == 0 {
return purchaseList, total, err
}
if len(ids) != 0 {
db = global.GVA_DB.Model(&purchase.Purchase{})
err = db.Where("id in (?)", ids).Preload("Supplier").Order("updated_at desc").Find(&purchaseList).Error
} else {
- db = global.GVA_DB.Model(&purchase.Purchase{})
+ //db = global.GVA_DB.Model(&purchase.Purchase{})
err = db.Limit(limit).Offset(offset).Preload("Supplier").Order("updated_at desc").Find(&purchaseList).Error
}
@@ -177,7 +175,7 @@
//@param: id uint
//@return: err error
-func (slf *PurchaseService) Submit(id int, status purchase.OrderStatus) (err error) {
+func (slf *PurchaseService) Submit(id int, status purchase.OrderStatus, warehouse string) (err error) {
//purchaseData, err := slf.GetPurchase(id)
//if err != nil {
@@ -193,7 +191,12 @@
// 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": status}).Error
+ m := make(map[string]interface{})
+ m["status"] = status
+ if warehouse != "" {
+ m["warehouse"] = warehouse
+ }
+ err = tx.Where("id = ?", id).Model(&purchase.Purchase{}).Updates(m).Error
if err != nil {
return err
}
@@ -294,3 +297,9 @@
err = db.Order("pin desc, sort desc, id asc").Find(&list).Error
return list, err
}
+
+func (slf *PurchaseService) MaxAutoIncr() (int, error) {
+ var total int64
+ err := global.GVA_DB.Model(&purchase.Purchase{}).Count(&total).Error
+ return int(total), err
+}
--
Gitblit v1.8.0