Merge branch 'master' of http://192.168.5.5:10010/r/aps/SRM

jiangshuai

2024-02-06 02a2176f7c5733a4e4c4429c2028bbb86a967ce7

 api/v1/purchase/purchase.go

@@ -2,7 +2,6 @@

import (
   "context"
   "fmt"
   "github.com/gin-gonic/gin"
   "go.uber.org/zap"
   "gorm.io/gorm"
@@ -13,8 +12,6 @@
   "srm/proto/purchase_wms"
   "strconv"
   "strings"
   "time"

   //"srm/model/purchase"

   //"srm/model/purchase"
@@ -54,7 +51,6 @@
   purchaseRecord.Status = purchase.OrderStatusConfirmed
   purchaseRecord.HandledBy = "admin"
   purchaseRecord.Creator = "admin"
   purchaseRecord.Number = fmt.Sprintf("CG%v", time.Now().Unix())
   purchaseRecord.Principal = "admin"
   purchaseRecord.OrderType = "采购订单"

@@ -241,6 +237,7 @@
      response.FailWithMessage(err.Error(), c)
      return
   }
   warehouse := ""
   if params.Status == purchase.OrderStatusReceived {
      data, err := service.NewPurchaseService().GetPurchase(uint(params.Id))
      if err != nil {
@@ -262,19 +259,21 @@
         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,
         Source:       "SRM_PURCHASE",
      })
      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)
   err = service.NewPurchaseService().Submit(params.Id, params.Status, warehouse)
   if err != nil {
      global.GVA_LOG.Error("更新失败!", zap.Error(err))
      response.FailWithMessage("更新失败", c)