From 8e216cfa89d3bcd6f010376ecb4f2f0e90724ea0 Mon Sep 17 00:00:00 2001 From: jiangshuai <291802688@qq.com> Date: 星期一, 13 十一月 2023 14:38:12 +0800 Subject: [PATCH] 取消接口bug --- controllers/operation.go | 71 +++++++++++++++++++++++++++++++++++ 1 files changed, 71 insertions(+), 0 deletions(-) diff --git a/controllers/operation.go b/controllers/operation.go index ed353ff..72eaadd 100644 --- a/controllers/operation.go +++ b/controllers/operation.go @@ -1,16 +1,20 @@ package controllers import ( + "context" "encoding/json" "errors" "fmt" "github.com/gin-gonic/gin" "github.com/shopspring/decimal" + "google.golang.org/grpc" + "google.golang.org/grpc/credentials/insecure" "gorm.io/gorm" "os" "sort" "strconv" "time" + "wms/conf" "wms/constvar" "wms/extend/code" "wms/extend/util" @@ -18,6 +22,7 @@ "wms/opa" "wms/pkg/logx" "wms/pkg/structx" + "wms/proto/product_inventory" "wms/request" ) @@ -679,7 +684,38 @@ util.ResponseFormat(c, code.RequestError, err.Error()) return } + if operation.SourceNumber != "" { + go UpdateSalesDetailStatus(operation.SourceNumber) + } util.ResponseFormat(c, code.Success, "鎿嶄綔鎴愬姛") +} + +var ProductInventoryServiceConn *grpc.ClientConn + +func InitProductInventoryServiceConn() { + var err error + ProductInventoryServiceConn, err = grpc.Dial(conf.GrpcServerConf.CrmAddr, grpc.WithTransportCredentials(insecure.NewCredentials())) + if err != nil { + logx.Errorf("grpc dial product service error: %v", err.Error()) + return + } +} + +func CloseProductInventoryServiceConn() { + if ProductInventoryServiceConn != nil { + ProductInventoryServiceConn.Close() + } +} + +func UpdateSalesDetailStatus(number string) { + client := product_inventory.NewProductInventoryServiceClient(ProductInventoryServiceConn) + _, err := client.UpdateSalesDetailStatus(context.Background(), &product_inventory.UpdateSalesDetailStatusRequest{ + Number: number, + SalesDetailStatus: "宸插嚭搴�", + }) + if err != nil { + logx.Errorf("grpc dial UpdateSalesDetailStatus service error: %v", err) + } } // ListTransfer @@ -727,3 +763,38 @@ } util.ResponseFormat(c, code.Success, companies) } + +// Cancel +// +// @Tags 鍏ュ簱/鍑哄簱 +// @Summary 鍙栨秷 +// @Produce application/json +// @Param id path int true "id" +// @Success 200 {object} util.Response "鎴愬姛" +// @Router /api-wms/v1/operation/cancel/{id} [put] +func (slf OperationController) Cancel(c *gin.Context) { + id, err := strconv.Atoi(c.Param("id")) + if err != nil { + util.ResponseFormat(c, code.RequestParamError, "閿欒鐨刬d鍊�") + return + } + if id == 0 { + util.ResponseFormat(c, code.RequestParamError, "id涓�0") + return + } + operation, err := models.NewOperationSearch().SetPreload(true).SetID(id).First() + if err != nil { + util.ResponseFormat(c, code.RequestParamError, "鏈壘鍒扮浉鍏冲嚭鍏ュ簱淇℃伅:"+err.Error()) + return + } + if operation.Status != constvar.OperationStatus_Ready { + util.ResponseFormat(c, code.RequestError, "璇ュ嚭鍏ュ簱淇℃伅鏃犳硶鍙栨秷") + return + } + operation.Status = constvar.OperationStatus_Cancel + if err := models.NewOperationSearch().SetID(operation.Id).Save(operation); err != nil { + util.ResponseFormat(c, code.SaveFail, err.Error()) + return + } + util.ResponseFormat(c, code.Success, "鎿嶄綔鎴愬姛") +} -- Gitblit v1.8.0