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

zhangqian

2023-12-18 ed3d45b189f102249eabd0cb5a0299bc66b0dea6

 controllers/reorder_rule_controller.go

@@ -3,19 +3,16 @@
import (
   "github.com/gin-gonic/gin"
   "github.com/shopspring/decimal"
   "google.golang.org/grpc"
   "google.golang.org/grpc/credentials/insecure"
   "gorm.io/gorm"
   "strconv"
   "strings"
   "time"
   "wms/conf"
   "wms/constvar"
   "wms/extend/code"
   "wms/extend/util"
   "wms/models"
   "wms/pkg/logx"
   "wms/pkg/timex"
   "wms/proto/init_client"
   "wms/proto/inventory_order"
   "wms/proto/purchase_wms"
   "wms/request"
@@ -260,22 +257,22 @@
   util.ResponseFormat(c, code.Success, "更新成功")
}

var InventoryOrderServiceConn *grpc.ClientConn

func InitInventoryOrderServiceConn() {
   var err error
   InventoryOrderServiceConn, err = grpc.Dial(conf.GrpcServerConf.ApsAddr, grpc.WithTransportCredentials(insecure.NewCredentials()))
   if err != nil {
      logx.Errorf("grpc dial product service error: %v", err.Error())
      return
   }
}

func CloseInventoryOrderServiceConn() {
   if InventoryOrderServiceConn != nil {
      InventoryOrderServiceConn.Close()
   }
}
//var InventoryOrderServiceConn *grpc.ClientConn
//
//func InitInventoryOrderServiceConn() {
//   var err error
//   InventoryOrderServiceConn, err = grpc.Dial(conf.GrpcServerConf.ApsAddr, grpc.WithTransportCredentials(insecure.NewCredentials()))
//   if err != nil {
//      logx.Errorf("grpc dial product service error: %v", err.Error())
//      return
//   }
//}
//
//func CloseInventoryOrderServiceConn() {
//   if InventoryOrderServiceConn != nil {
//      InventoryOrderServiceConn.Close()
//   }
//}

// OrderAgain
// @Tags      重订货规则
@@ -291,7 +288,7 @@
      return
   }
   if params.Route == "采购" {
      client := purchase_wms.NewPurchaseServiceClient(PurchaseServiceConn)
      client := purchase_wms.NewPurchaseServiceClient(init_client.SrmConn)
      resp, err := client.GetSupplierListByProductId(c, &purchase_wms.GetSupplierListByProductIdRequest{ProductId: params.ProductId})
      if err != nil {
         util.ResponseFormat(c, code.RequestParamError, "grpc调用失败")
@@ -300,7 +297,7 @@
      util.ResponseFormat(c, code.Success, resp.List)
      return
   }
   client := inventory_order.NewInventoryOrderServiceClient(InventoryOrderServiceConn)
   client := inventory_order.NewInventoryOrderServiceClient(init_client.ApsConn)
   order, err := client.CreateNewOrder(c, &inventory_order.CreateNewOrderRequest{
      OrderNumber: params.OrderNumber.IntPart(),
      Unit:        params.Unit,
@@ -368,7 +365,7 @@
// @Router    /api-wms/v1/reorderRule/submitOrder [post]
func (slf ReorderRuleController) SubmitOrder(c *gin.Context) {
   var params models.ReorderRule
   client := purchase_wms.NewPurchaseServiceClient(PurchaseServiceConn)
   client := purchase_wms.NewPurchaseServiceClient(init_client.SrmConn)
   resp, err := client.CreatePurchaseByWms(c, &purchase_wms.CreatePurchaseByWmsRequest{
      SupplierId: params.SupplierId,
      ProductId:  params.ProductId,