From 426ca2366cc521d88b7483f0cefd811f996e8a22 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期一, 20 十一月 2023 14:53:50 +0800
Subject: [PATCH] merge
---
controllers/operation.go | 178 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 174 insertions(+), 4 deletions(-)
diff --git a/controllers/operation.go b/controllers/operation.go
index 08031a9..b673452 100644
--- a/controllers/operation.go
+++ b/controllers/operation.go
@@ -7,6 +7,7 @@
"fmt"
"github.com/gin-gonic/gin"
"github.com/shopspring/decimal"
+ "github.com/xuri/excelize/v2"
"google.golang.org/grpc"
"google.golang.org/grpc/credentials/insecure"
"gorm.io/gorm"
@@ -23,7 +24,10 @@
"wms/pkg/logx"
"wms/pkg/structx"
"wms/proto/product_inventory"
+ "wms/proto/purchase_wms"
"wms/request"
+ "wms/utils/http"
+ "wms/utils/upload"
)
type OperationController struct {
@@ -412,6 +416,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
}
@@ -461,6 +466,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
}
@@ -477,6 +483,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
}
@@ -487,6 +494,9 @@
if err := tx.Create(&operationInputs).Error; err != nil {
return err
}
+ }
+ if operation.SourceNumber != "" {
+ go UpdatePurchaseStatus(operation.SourceNumber)
}
}
@@ -530,6 +540,9 @@
if err := models.NewLocationProductAmountSearch().SetID(locAmount.Id).Update(locAmount); err != nil {
return err
}
+ }
+ if operation.SourceNumber != "" {
+ go UpdateSalesDetailStatus(operation.SourceNumber)
}
}
@@ -604,6 +617,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
}
@@ -652,6 +666,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
}
@@ -684,17 +699,23 @@
util.ResponseFormat(c, code.RequestError, err.Error())
return
}
- if operation.SourceNumber != "" {
- go UpdateSalesDetailStatus(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,6 +725,9 @@
func CloseProductInventoryServiceConn() {
if ProductInventoryServiceConn != nil {
ProductInventoryServiceConn.Close()
+ }
+ if PurchaseServiceConn != nil {
+ PurchaseServiceConn.Close()
}
}
@@ -715,6 +739,14 @@
})
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)
}
}
@@ -763,3 +795,141 @@
}
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, "鎿嶄綔鎴愬姛")
+}
+
+// inputSelfmade
+//
+// @Tags 鍏ュ簱/鍑哄簱
+// @Summary 鎵撳嵃-鑷埗-鍏ュ簱
+// @Produce application/json
+// @Param id path int true "id"
+// @Success 200 {object} util.Response "鎴愬姛"
+// @Router /api-wms/v1/operation/inputSelfmade/{id} [put]
+func (slf OperationController) InputSelfmade(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
+ }
+
+ readerCloser, err := http.HttpGetWithReadCloser(conf.FileTemplateConf.InputSelfmadeAddr)
+ if err != nil {
+ util.ResponseFormat(c, code.RequestParamError, "鑾峰彇妯＄増澶辫触:"+err.Error())
+ return
+ }
+
+ f, err := excelize.OpenReader(readerCloser)
+ if err != nil {
+ util.ResponseFormat(c, code.RequestParamError, "璇诲彇excel妯＄増澶辫触锛�"+err.Error())
+ return
+ }
+ readerCloser.Close()
+
+ style, _ := f.NewStyle(&excelize.Style{
+ Border: []excelize.Border{
+ {Type: "left", Color: "#000000", Style: 2},
+ {Type: "top", Color: "#000000", Style: 2},
+ {Type: "bottom", Color: "#000000", Style: 2},
+ {Type: "right", Color: "#000000", Style: 2},
+ },
+ Alignment: &excelize.Alignment{
+ Horizontal: "center",
+ Vertical: "center",
+ },
+ })
+ styleLeft, _ := f.NewStyle(&excelize.Style{
+ Alignment: &excelize.Alignment{
+ Horizontal: "left",
+ Vertical: "center",
+ },
+ })
+
+ f.SetCellValue("Sheet1", "B3", operation.CompanyName)
+ f.SetCellValue("Sheet1", "E3", operation.OperationDate)
+ f.SetCellValue("Sheet1", "H3", operation.Number)
+
+ rowIndex := 5
+ totalAmount := decimal.NewFromInt(0)
+ for _, v := range operation.Details {
+ f.SetCellValue("Sheet1", "A"+strconv.Itoa(rowIndex), v.ProductId)
+ f.SetCellValue("Sheet1", "B"+strconv.Itoa(rowIndex), v.Product.Name)
+ f.SetCellValue("Sheet1", "C"+strconv.Itoa(rowIndex), v.Product.Specs)
+ f.SetCellValue("Sheet1", "D"+strconv.Itoa(rowIndex), v.Product.Unit)
+ f.SetCellValue("Sheet1", "E"+strconv.Itoa(rowIndex), v.Amount.String())
+ f.SetCellValue("Sheet1", "H"+strconv.Itoa(rowIndex), operation.ToLocation.Name)
+ f.SetCellValue("Sheet1", "I"+strconv.Itoa(rowIndex), operation.Comment)
+ rowIndex++
+ totalAmount = totalAmount.Add(v.Amount)
+ }
+ if err := f.MergeCell("Sheet1", "A"+strconv.Itoa(rowIndex), "C"+strconv.Itoa(rowIndex)); err != nil {
+ util.ResponseFormat(c, code.RequestParamError, err.Error())
+ return
+ }
+ f.SetCellValue("Sheet1", "A"+strconv.Itoa(rowIndex), "鍚堣")
+ f.SetCellValue("Sheet1", "E"+strconv.Itoa(rowIndex), totalAmount.String())
+ f.SetCellStyle("Sheet1", "A4", "I"+strconv.Itoa(rowIndex), style)
+ rowIndex++
+
+ f.SetCellValue("Sheet1", "A"+strconv.Itoa(rowIndex), "瀹℃牳锛�")
+ f.SetCellValue("Sheet1", "D"+strconv.Itoa(rowIndex), "妫�楠岋細")
+ f.SetCellValue("Sheet1", "G"+strconv.Itoa(rowIndex), "淇濈锛�")
+ f.SetCellStyle("Sheet1", "A"+strconv.Itoa(rowIndex), "G"+strconv.Itoa(rowIndex), styleLeft)
+
+ buf, err := f.WriteToBuffer()
+ if err != nil {
+ util.ResponseFormat(c, code.RequestParamError, err.Error())
+ return
+ }
+
+ fileUrl, err := upload.UploadFileToSeaWeed(string(constvar.FileType_File), "xlsx", buf.Bytes())
+ if err != nil {
+ logx.Errorf("file upload err: %v", err)
+ util.ResponseFormat(c, code.RequestParamError, err.Error())
+ return
+ }
+
+ util.ResponseFormat(c, code.Success, fileUrl)
+}
--
Gitblit v1.8.0