From c7e82fd1d76b9fb25497d5aba4372bbfe13a8468 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期四, 28 三月 2024 20:00:21 +0800
Subject: [PATCH] 采购入库增加来源

---
 proto/purchase_wms/server.go |   20 ++++++++++++--------
 1 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/proto/purchase_wms/server.go b/proto/purchase_wms/server.go
index f7339e7..f419f3c 100644
--- a/proto/purchase_wms/server.go
+++ b/proto/purchase_wms/server.go
@@ -20,8 +20,12 @@
 	if req.Number == "" {
 		return nil, errors.New("閲囪喘缂栧彿涓嶈兘涓虹┖")
 	}
-	err := global.GVA_DB.Model(&purchase.Purchase{}).Where("number = ?", req.Number).
-		Updates(map[string]interface{}{"status": purchase.OrderStatusStored}).Error
+	m := make(map[string]interface{})
+	m["status"] = purchase.OrderStatusStored
+	if req.Status > 0 {
+		m["status"] = req.Status
+	}
+	err := global.GVA_DB.Model(&purchase.Purchase{}).Where("number = ?", req.Number).Updates(m).Error
 	return new(UpdatePurchaseStatusResponse), err
 }
 
@@ -164,14 +168,14 @@
 		}
 		for _, pp := range pps {
 			if int(p.ID) == pp.PurchaseId {
-				info.ProductId = pp.Product.Number
-				info.ProductName = pp.Product.Name
-				info.Specs = pp.Product.Specifications
-				info.Unit = pp.Product.Unit
-				break
+				ni := info
+				ni.ProductId = pp.Product.Number
+				ni.ProductName = pp.Product.Name
+				ni.Specs = pp.Product.Specifications
+				ni.Unit = pp.Product.Unit
+				infos = append(infos, &ni)
 			}
 		}
-		infos = append(infos, &info)
 	}
 	resp := new(GetPurchaseInfoResponse)
 	resp.Infos = infos

--
Gitblit v1.8.0