From a0125ef3d6ce35be7b6dc4919c4192dba4a7329a Mon Sep 17 00:00:00 2001
From: jiangshuai <291802688@qq.com>
Date: 星期四, 16 十一月 2023 14:33:51 +0800
Subject: [PATCH] 报废数量bug
---
controllers/operation.go | 77 +++++++++++++++++++++++++++++++++++---
1 files changed, 71 insertions(+), 6 deletions(-)
diff --git a/controllers/operation.go b/controllers/operation.go
index a541b4d..1e56fd1 100644
--- a/controllers/operation.go
+++ b/controllers/operation.go
@@ -1,6 +1,7 @@
package controllers
import (
+ "context"
"encoding/json"
"errors"
"fmt"
@@ -22,6 +23,7 @@
"wms/pkg/logx"
"wms/pkg/structx"
"wms/proto/product_inventory"
+ "wms/proto/purchase_wms"
"wms/request"
)
@@ -411,6 +413,7 @@
locAmount.ProductId = v.ID
locAmount.CreateDate = time.Now().Format("2006-01-02 15:04:05")
locAmount.Amount = locAmount.Amount.Add(value)
+ locAmount.ProductCategoryID = v.CategoryId
if res := models.NewLocationProductAmountSearch().Orm.Where("id=?", locAmount.ID).Save(locAmount); res.Error != nil {
return res.Error
}
@@ -460,6 +463,7 @@
locAmount.ProductId = v.ID
locAmount.CreateDate = time.Now().Format("2006-01-02 15:04:05")
locAmount.Amount = locAmount.Amount.Add(value)
+ locAmount.ProductCategoryID = v.CategoryId
if res := models.NewLocationProductAmountSearch().Orm.Where("id=?", locAmount.ID).Save(locAmount); res.Error != nil {
return res.Error
}
@@ -476,6 +480,7 @@
locAmount.ProductId = v.ID
locAmount.CreateDate = time.Now().Format("2006-01-02 15:04:05")
locAmount.Amount = locAmount.Amount.Add(value)
+ locAmount.ProductCategoryID = v.CategoryId
if res := models.NewLocationProductAmountSearch().Orm.Where("id=?", locAmount.ID).Save(locAmount); res.Error != nil {
return res.Error
}
@@ -486,6 +491,9 @@
if err := tx.Create(&operationInputs).Error; err != nil {
return err
}
+ }
+ if operation.SourceNumber != "" {
+ go UpdatePurchaseStatus(operation.SourceNumber)
}
}
@@ -529,6 +537,9 @@
if err := models.NewLocationProductAmountSearch().SetID(locAmount.Id).Update(locAmount); err != nil {
return err
}
+ }
+ if operation.SourceNumber != "" {
+ go UpdateSalesDetailStatus(operation.SourceNumber)
}
}
@@ -603,6 +614,7 @@
locAmount.ProductId = v.ID
locAmount.CreateDate = time.Now().Format("2006-01-02 15:04:05")
locAmount.Amount = locAmount.Amount.Add(value)
+ locAmount.ProductCategoryID = v.CategoryId
if res := models.NewLocationProductAmountSearch().Orm.Where("id=?", locAmount.ID).Save(locAmount); res.Error != nil {
return res.Error
}
@@ -651,6 +663,7 @@
locAmount.ProductId = v.ID
locAmount.CreateDate = time.Now().Format("2006-01-02 15:04:05")
locAmount.Amount = locAmount.Amount.Add(value)
+ locAmount.ProductCategoryID = v.CategoryId
if res := models.NewLocationProductAmountSearch().Orm.Where("id=?", locAmount.ID).Save(locAmount); res.Error != nil {
return res.Error
}
@@ -683,17 +696,23 @@
util.ResponseFormat(c, code.RequestError, err.Error())
return
}
- if operation.SourceNumber != "" {
- go UpdateSalesDetailStatus(c, operation.SourceNumber)
- }
+
util.ResponseFormat(c, code.Success, "鎿嶄綔鎴愬姛")
}
-var ProductInventoryServiceConn *grpc.ClientConn
+var (
+ ProductInventoryServiceConn *grpc.ClientConn
+ PurchaseServiceConn *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
+ }
+ PurchaseServiceConn, err = grpc.Dial(conf.GrpcServerConf.SrmAddr, grpc.WithTransportCredentials(insecure.NewCredentials()))
if err != nil {
logx.Errorf("grpc dial product service error: %v", err.Error())
return
@@ -704,16 +723,27 @@
if ProductInventoryServiceConn != nil {
ProductInventoryServiceConn.Close()
}
+ if PurchaseServiceConn != nil {
+ PurchaseServiceConn.Close()
+ }
}
-func UpdateSalesDetailStatus(ctx *gin.Context, number string) {
+func UpdateSalesDetailStatus(number string) {
client := product_inventory.NewProductInventoryServiceClient(ProductInventoryServiceConn)
- _, err := client.UpdateSalesDetailStatus(ctx, &product_inventory.UpdateSalesDetailStatusRequest{
+ _, err := client.UpdateSalesDetailStatus(context.Background(), &product_inventory.UpdateSalesDetailStatusRequest{
Number: number,
SalesDetailStatus: "宸插嚭搴�",
})
if err != nil {
logx.Errorf("grpc dial UpdateSalesDetailStatus service error: %v", err)
+ }
+}
+
+func UpdatePurchaseStatus(number string) {
+ client := purchase_wms.NewPurchaseServiceClient(PurchaseServiceConn)
+ _, err := client.UpdatePurchaseStatus(context.Background(), &purchase_wms.UpdatePurchaseStatusRequest{Number: number})
+ if err != nil {
+ logx.Errorf("grpc dial UpdatePurchaseStatus service error: %v", err)
}
}
@@ -762,3 +792,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