From 313617ceb05dd5194d2091c717a25cbf33ef39b9 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期五, 24 十一月 2023 14:39:25 +0800
Subject: [PATCH] 新增history加入索引
---
controllers/operation.go | 366 ++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 356 insertions(+), 10 deletions(-)
diff --git a/controllers/operation.go b/controllers/operation.go
index a541b4d..c0b34f4 100644
--- a/controllers/operation.go
+++ b/controllers/operation.go
@@ -1,17 +1,20 @@
package controllers
import (
+ "context"
"encoding/json"
"errors"
"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"
"os"
"sort"
"strconv"
+ "strings"
"time"
"wms/conf"
"wms/constvar"
@@ -21,8 +24,14 @@
"wms/opa"
"wms/pkg/logx"
"wms/pkg/structx"
+ "wms/proto/client"
"wms/proto/product_inventory"
+ "wms/proto/purchase_wms"
+ "wms/proto/supplier"
"wms/request"
+ "wms/service"
+ "wms/utils/http"
+ "wms/utils/upload"
)
type OperationController struct {
@@ -332,7 +341,10 @@
}
if err := models.WithTransaction(func(tx *gorm.DB) error {
- if err := models.NewOperationSearch().SetOrm(tx).SetID(id).Update(&models.Operation{Status: constvar.OperationStatus_Finish}); err != nil {
+ if err := models.NewOperationSearch().SetOrm(tx).SetID(id).Update(&models.Operation{Status: constvar.OperationStatus_Finish, AuditDate: time.Now().Format("2006-01-02 15:04:05")}); err != nil {
+ return err
+ }
+ if err := AddMoveHistory([]*models.Operation{operation}, tx); err != nil {
return err
}
@@ -399,7 +411,6 @@
// return err
//}
- //TODO:鍑哄叆搴撶殑finish鍜屾姤搴熺殑finish閮借澧炲姞瀵筶ocation_product_amount琛ㄦ暟閲忕殑鏇存柊,鍥犱负姝よ〃鏈塒roductCategory瀛楁锛屾墍浠peration_details琛ㄤ腑瑕佸鍔燩roductCategoryId瀛楁
locAmount, err := models.NewLocationProductAmountSearch().
SetProductId(v.ID).
SetLocationId(locationRule.LocationId).
@@ -411,6 +422,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
}
@@ -448,7 +460,6 @@
// return err
//}
- //TODO:鍑哄叆搴撶殑finish鍜屾姤搴熺殑finish閮借澧炲姞瀵筶ocation_product_amount琛ㄦ暟閲忕殑鏇存柊,鍥犱负姝よ〃鏈塒roductCategory瀛楁锛屾墍浠peration_details琛ㄤ腑瑕佸鍔燩roductCategoryId瀛楁
locAmount, err := models.NewLocationProductAmountSearch().
SetProductId(v.ID).
SetLocationId(locationRule.LocationId).
@@ -460,11 +471,11 @@
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
}
} else {
- //TODO:鍑哄叆搴撶殑finish鍜屾姤搴熺殑finish閮借澧炲姞瀵筶ocation_product_amount琛ㄦ暟閲忕殑鏇存柊,鍥犱负姝よ〃鏈塒roductCategory瀛楁锛屾墍浠peration_details琛ㄤ腑瑕佸鍔燩roductCategoryId瀛楁
locAmount, err := models.NewLocationProductAmountSearch().
SetProductId(v.ID).
SetLocationId(operation.ToLocationID).
@@ -476,6 +487,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 +498,9 @@
if err := tx.Create(&operationInputs).Error; err != nil {
return err
}
+ }
+ if operation.SourceNumber != "" {
+ go UpdatePurchaseStatus(operation.SourceNumber)
}
}
@@ -529,6 +544,9 @@
if err := models.NewLocationProductAmountSearch().SetID(locAmount.Id).Update(locAmount); err != nil {
return err
}
+ }
+ if operation.SourceNumber != "" {
+ go UpdateSalesDetailStatus(operation.SourceNumber)
}
}
@@ -603,6 +621,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 +670,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 +703,55 @@
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
+func AddMoveHistory(operationList []*models.Operation, db *gorm.DB) error {
+ var histories []*models.MoveHistory
+ for _, operation := range operationList {
+ for _, v := range operation.Details {
+ history := &models.MoveHistory{
+ Number: operation.Number,
+ BaseOperationType: operation.BaseOperationType,
+ OperationTypeId: operation.OperationTypeId,
+ OperationTypeName: operation.OperationTypeName,
+ OperationId: operation.Id,
+ ProductId: v.ProductId,
+ ProductName: v.Product.Name,
+ Amount: v.Amount,
+ Unit: v.Product.Unit,
+ Weight: operation.Weight,
+ FromLocationId: operation.FromLocationID,
+ FromLocation: operation.FromLocation.Name,
+ ToLocationId: operation.ToLocationID,
+ ToLocation: operation.ToLocation.Name,
+ }
+ histories = append(histories, history)
+ }
+ }
+ if err := db.Model(&models.MoveHistory{}).Create(&histories).Error; err != nil {
+ return err
+ }
+ for _, history := range histories {
+ service.AddNewHistoryReportRecord(history.Id)
+ }
+ return nil
+}
+
+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 +762,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 +831,280 @@
}
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
+ operation.AuditDate = time.Now().Format("2006-01-02 15:04:05")
+ if err := models.NewOperationSearch().SetID(operation.Id).Save(operation); err != nil {
+ util.ResponseFormat(c, code.SaveFail, err.Error())
+ return
+ }
+ util.ResponseFormat(c, code.Success, "鎿嶄綔鎴愬姛")
+}
+
+// outputOperation
+//
+// @Tags 鍏ュ簱/鍑哄簱
+// @Summary 鎵撳嵃
+// @Produce application/json
+// @Param id path int true "id"
+// @Success 200 {object} util.Response "鎴愬姛"
+// @Router /api-wms/v1/operation/outputOperation/{id} [put]
+func (slf OperationController) OutputOperation(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 len(operation.Details) == 0 {
+ util.ResponseFormat(c, code.RequestParamError, "娌℃湁鐩稿叧浜у搧鏄庣粏鐨勪俊鎭�")
+ return
+ }
+
+ var fileUrl string
+ if operation.BaseOperationType == constvar.BaseOperationTypeIncoming {
+ fileUrl, err = ExportInputSelfmade(constvar.FileTemplateCategory_Selfmade, operation)
+ if err != nil {
+ util.ResponseFormat(c, code.RequestParamError, err.Error())
+ return
+ }
+ } else if operation.BaseOperationType == constvar.BaseOperationTypeOutgoing {
+ fileUrl, err = ExportOutputOperation(constvar.FileTemplateCategory_Output, operation)
+ if err != nil {
+ util.ResponseFormat(c, code.RequestParamError, err.Error())
+ return
+ }
+ } else {
+ util.ResponseFormat(c, code.RequestParamError, "璇ヨ褰曚笉鏀寔鎵撳嵃")
+ return
+ }
+
+ util.ResponseFormat(c, code.Success, fileUrl)
+}
+
+func ExportInputSelfmade(category constvar.FileTemplateCategory, operation *models.Operation) (string, error) {
+ template, err := models.NewFileTemplateAttachmentSearch().SetPreload(true).SetCategory(category).First()
+ if err != nil {
+ return "", errors.New("鑾峰彇妯＄増璁板綍澶辫触:" + err.Error())
+ }
+ readerCloser, err := http.HttpGetWithReadCloser(template.Attachment.FileUrl)
+ if err != nil {
+ return "", errors.New("鑾峰彇妯＄増澶辫触:" + err.Error())
+ }
+
+ f, err := excelize.OpenReader(readerCloser)
+ if err != nil {
+ return "", errors.New("璇诲彇excel妯＄増澶辫触锛�" + err.Error())
+ }
+ 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 {
+ return "", err
+ }
+ 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 {
+ return "", err
+ }
+
+ fileUrl, err := upload.UploadFileToSeaWeed(string(constvar.FileType_File), "xlsx", buf.Bytes())
+ if err != nil {
+ logx.Errorf("file upload err: %v", err)
+ return "", err
+ }
+
+ return fileUrl, nil
+}
+
+func ExportOutputOperation(category constvar.FileTemplateCategory, operation *models.Operation) (string, error) {
+ repositoryLevels := strings.Split(operation.FromLocation.JointName, "/")
+ template, err := models.NewFileTemplateAttachmentSearch().SetPreload(true).SetCategory(category).First()
+ if err != nil {
+ return "", errors.New("鑾峰彇妯＄増璁板綍澶辫触:" + err.Error())
+ }
+ readerCloser, err := http.HttpGetWithReadCloser(template.Attachment.FileUrl)
+ if err != nil {
+ return "", errors.New("鑾峰彇妯＄増澶辫触:" + err.Error())
+ }
+
+ f, err := excelize.OpenReader(readerCloser)
+ if err != nil {
+ return "", errors.New("璇诲彇excel妯＄増澶辫触锛�" + err.Error())
+ }
+ readerCloser.Close()
+
+ style, _ := f.NewStyle(&excelize.Style{
+ Border: []excelize.Border{
+ {Type: "left", Color: "#000000", Style: 1},
+ {Type: "top", Color: "#000000", Style: 1},
+ {Type: "bottom", Color: "#000000", Style: 1},
+ {Type: "right", Color: "#000000", Style: 1},
+ },
+ Alignment: &excelize.Alignment{
+ Horizontal: "center",
+ Vertical: "center",
+ },
+ })
+
+ f.SetCellValue("Sheet1", "C2", repositoryLevels[0])
+ f.SetCellValue("Sheet1", "H2", operation.WaybillNumber)
+ f.SetCellValue("Sheet1", "K2", operation.AuditDate)
+ f.SetCellValue("Sheet1", "H3", operation.SourceNumber)
+ f.SetCellValue("Sheet1", "K3", operation.Number)
+ f.SetCellValue("Sheet1", "C4", operation.CompanyName)
+ f.SetCellValue("Sheet1", "I4", operation.ReceiverAddr)
+ f.SetCellValue("Sheet1", "C5", operation.ReceiverName)
+ f.SetCellValue("Sheet1", "H5", operation.ReceiverPhone)
+
+ rowIndex := 8
+ totalAmount := decimal.NewFromInt(0)
+ totalWeight := decimal.NewFromInt(0)
+
+ addRows := len(operation.Details) - 1
+ if addRows > 0 {
+ f.InsertRows("Sheet1", 9, addRows)
+ f.SetCellStyle("Sheet1", "A9", "K"+strconv.Itoa(rowIndex+addRows), style)
+ }
+
+ for k, v := range operation.Details {
+ productTotalWeight := v.Amount.Mul(v.Product.Weight).Div(decimal.NewFromInt(1000))
+ f.SetCellValue("Sheet1", "A"+strconv.Itoa(rowIndex), k+1)
+ f.SetCellValue("Sheet1", "B"+strconv.Itoa(rowIndex), v.Product.Name)
+ f.SetCellValue("Sheet1", "H"+strconv.Itoa(rowIndex), v.Amount)
+ f.SetCellValue("Sheet1", "I"+strconv.Itoa(rowIndex), v.Product.Weight)
+ f.SetCellValue("Sheet1", "J"+strconv.Itoa(rowIndex), productTotalWeight)
+ rowIndex++
+ totalAmount = totalAmount.Add(v.Amount)
+ totalWeight = totalWeight.Add(productTotalWeight)
+ }
+
+ buf, err := f.WriteToBuffer()
+ if err != nil {
+ return "", err
+ }
+
+ fileUrl, err := upload.UploadFileToSeaWeed(string(constvar.FileType_File), "xlsx", buf.Bytes())
+ if err != nil {
+ logx.Errorf("file upload err: %v", err)
+ return "", err
+ }
+
+ return fileUrl, nil
+
+}
+
+// GetSupplierList
+// @Tags 鍏ュ簱/鍑哄簱
+// @Summary 鑾峰彇鐗╂祦鍏徃鍒楄〃
+// @Produce application/json
+//
+// @Success 200 {object} util.Response "鎴愬姛"
+//
+// @Router /api-wms/v1/operation/getSupplierList [get]
+func (slf OperationController) GetSupplierList(c *gin.Context) {
+ cli := supplier.NewSupplierServiceClient(supplier.SupplierConn)
+ resp, err := cli.GetSupplierList(c, &supplier.SupplierListRequest{Status: 1})
+ if err != nil {
+ util.ResponseFormat(c, code.RequestParamError, "grpc璋冪敤澶辫触:"+err.Error())
+ return
+ }
+ util.ResponseFormat(c, code.Success, resp.List)
+}
+
+// GetClientList
+// @Tags 鍏ュ簱/鍑哄簱
+// @Summary 鑾峰彇鐗╂祦鍏徃鍒楄〃
+// @Produce application/json
+//
+// @Success 200 {object} util.Response "鎴愬姛"
+//
+// @Router /api-wms/v1/operation/getClientList [get]
+func (slf OperationController) GetClientList(c *gin.Context) {
+ cli := client.NewClientServiceClient(client.ClientConn)
+ resp, err := cli.GetClientList(c, &client.ClientListRequest{})
+ if err != nil {
+ util.ResponseFormat(c, code.RequestParamError, "grpc璋冪敤澶辫触:"+err.Error())
+ return
+ }
+ util.ResponseFormat(c, code.Success, resp.List)
+}
--
Gitblit v1.8.0