From 0fe9cf3173776fa4539a0719d45fc3fff3849f4c Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期一, 27 十一月 2023 14:35:18 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/aps/SRM
---
service/purchase/purchase.go | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/service/purchase/purchase.go b/service/purchase/purchase.go
index 7771ac8..7dabf2c 100644
--- a/service/purchase/purchase.go
+++ b/service/purchase/purchase.go
@@ -175,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 {
@@ -191,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
}
--
Gitblit v1.8.0