From 68692d29cb1964428146257bf875cd45dec9d0b7 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期三, 27 十二月 2023 17:35:47 +0800
Subject: [PATCH] 物料表增加虚拟件类型
---
api/v1/purchase/purchase.go | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/api/v1/purchase/purchase.go b/api/v1/purchase/purchase.go
index c037be0..edec24e 100644
--- a/api/v1/purchase/purchase.go
+++ b/api/v1/purchase/purchase.go
@@ -7,7 +7,6 @@
"go.uber.org/zap"
"gorm.io/gorm"
"srm/global"
- "srm/model/common/request"
"srm/model/common/response"
"srm/model/purchase"
purchaserequest "srm/model/purchase/request"
@@ -196,11 +195,11 @@
// @Security ApiKeyAuth
// @accept application/json
// @Produce application/json
-// @Param data query request.PageInfo true "椤电爜, 姣忛〉澶у皬"
+// @Param data query purchaserequest.PurchaseSearch true "鍙傛暟"
// @Success 200 {object} response.Response{data=response.PageResult,msg=string} "鍒嗛〉鑾峰彇閲囪喘鍗曞垪琛�,杩斿洖鍖呮嫭鍒楄〃,鎬绘暟,椤电爜,姣忛〉鏁伴噺"
// @Router /purchase/purchaseList [get]
func (e *PurchaseApi) GetPurchaseList(c *gin.Context) {
- var pageInfo request.PageInfo
+ var pageInfo purchaserequest.PurchaseSearch
err := c.ShouldBindQuery(&pageInfo)
if err != nil {
response.FailWithMessage(err.Error(), c)
@@ -242,6 +241,7 @@
response.FailWithMessage(err.Error(), c)
return
}
+ warehouse := ""
if params.Status == purchase.OrderStatusReceived {
data, err := service.NewPurchaseService().GetPurchase(uint(params.Id))
if err != nil {
@@ -263,7 +263,7 @@
product = append(product, &p)
}
client := purchase_wms.NewPurchaseServiceClient(purchase_wms.PurchaseConn)
- _, err = client.PurchaseToWms(context.Background(), &purchase_wms.PurchaseToWmsRequest{
+ resp, err := client.PurchaseToWms(context.Background(), &purchase_wms.PurchaseToWmsRequest{
Number: data.Number,
SupplierName: data.Supplier.Name,
Product: product,
@@ -273,9 +273,10 @@
response.FailWithMessage("grpc璋冪敤澶辫触", c)
return
}
+ warehouse = resp.Warehouse
}
- err = service.NewPurchaseService().Submit(params.Id, params.Status)
+ err = service.NewPurchaseService().Submit(params.Id, params.Status, warehouse)
if err != nil {
global.GVA_LOG.Error("鏇存柊澶辫触!", zap.Error(err))
response.FailWithMessage("鏇存柊澶辫触", c)
--
Gitblit v1.8.0