From 4885cc79aae34a011602807a41051e36e4b54e4f Mon Sep 17 00:00:00 2001
From: liujiandao <274878379@qq.com>
Date: 星期一, 27 十一月 2023 16:50:32 +0800
Subject: [PATCH] grpc创建采购单修改

---
 api/v1/purchase/purchase.go |   55 +++++++++++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 47 insertions(+), 8 deletions(-)

diff --git a/api/v1/purchase/purchase.go b/api/v1/purchase/purchase.go
index 0a5c918..edec24e 100644
--- a/api/v1/purchase/purchase.go
+++ b/api/v1/purchase/purchase.go
@@ -1,15 +1,16 @@
 package purchase
 
 import (
+	"context"
 	"fmt"
 	"github.com/gin-gonic/gin"
 	"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"
+	"srm/proto/purchase_wms"
 	"strconv"
 	"strings"
 	"time"
@@ -55,6 +56,7 @@
 	purchaseRecord.Creator = "admin"
 	purchaseRecord.Number = fmt.Sprintf("CG%v", time.Now().Unix())
 	purchaseRecord.Principal = "admin"
+	purchaseRecord.OrderType = "閲囪喘璁㈠崟"
 
 	if !purchaseRecord.WholeDiscountType.IsValid(purchaseRecord.TotalPrice, purchaseRecord.WholeDiscount) {
 		response.FailWithMessage("鏁村崟鎶樻墸鏁板�间笉姝ｇ‘", c)
@@ -193,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)
@@ -230,14 +232,51 @@
 // @Produce   application/json
 // @Param		id	path		int	true	"閲囪喘鍗旾D"
 // @Success   200   {object}  response.Response{msg=string}  "鎻愪氦閲囪喘鍗�"
-// @Router    /purchase/submit/{id} [post]
+// @Router    /purchase/submit [post]
 func (e *PurchaseApi) Submit(c *gin.Context) {
-	id, _ := strconv.Atoi(c.Param("id"))
-	if id == 0 {
-		response.FailWithMessage("鍙傛暟缂哄け", c)
+	var params purchaserequest.SubmitPurchase
+	err := c.ShouldBindJSON(&params)
+	if err != nil {
+		global.GVA_LOG.Error("Submit failed", zap.Error(err))
+		response.FailWithMessage(err.Error(), c)
 		return
 	}
-	err := service.NewPurchaseService().Submit(uint(id))
+	warehouse := ""
+	if params.Status == purchase.OrderStatusReceived {
+		data, err := service.NewPurchaseService().GetPurchase(uint(params.Id))
+		if err != nil {
+			global.GVA_LOG.Error("鑾峰彇澶辫触!", zap.Error(err))
+			response.FailWithMessage("鑾峰彇澶辫触", c)
+			return
+		}
+		productList, err := service.NewPurchaseService().GetPurchaseProductList(uint(params.Id))
+		if err != nil {
+			global.GVA_LOG.Error("鑾峰彇澶辫触!", zap.Error(err))
+			response.FailWithMessage("鑾峰彇澶辫触", c)
+			return
+		}
+		product := make([]*purchase_wms.PurchaseProduct, 0)
+		for _, products := range productList {
+			var p purchase_wms.PurchaseProduct
+			p.Id = products.Product.Number
+			p.Amount = products.Amount.IntPart()
+			product = append(product, &p)
+		}
+		client := purchase_wms.NewPurchaseServiceClient(purchase_wms.PurchaseConn)
+		resp, err := client.PurchaseToWms(context.Background(), &purchase_wms.PurchaseToWmsRequest{
+			Number:       data.Number,
+			SupplierName: data.Supplier.Name,
+			Product:      product,
+		})
+		if err != nil {
+			global.GVA_LOG.Error("grpc璋冪敤澶辫触!", zap.Error(err))
+			response.FailWithMessage("grpc璋冪敤澶辫触", c)
+			return
+		}
+		warehouse = resp.Warehouse
+	}
+
+	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