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 | 443 ++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 407 insertions(+), 36 deletions(-)
diff --git a/controllers/operation.go b/controllers/operation.go
index 5e3a174..b673452 100644
--- a/controllers/operation.go
+++ b/controllers/operation.go
@@ -1,16 +1,21 @@
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"
"time"
+ "wms/conf"
"wms/constvar"
"wms/extend/code"
"wms/extend/util"
@@ -18,7 +23,11 @@
"wms/opa"
"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 {
@@ -74,7 +83,7 @@
}
func CheckDetailsRepeat(details []*models.OperationDetails) bool {
- detailIDs := []string{}
+ var detailIDs []string
var tempID string
for _, v := range details {
detailIDs = append(detailIDs, v.ProductId)
@@ -257,7 +266,7 @@
util.ResponseFormat(c, code.Success, "淇敼鎴愬姛")
}
-// DeleteDevice
+// Delete
//
// @Tags 鍏ュ簱/鍑哄簱
// @Summary 鍒犻櫎鍏ュ簱/鍑哄簱淇℃伅
@@ -299,7 +308,7 @@
util.ResponseFormat(c, code.Success, "鍒犻櫎鎴愬姛")
}
-// DeleteDevice
+// Finish
//
// @Tags 鍏ュ簱/鍑哄簱
// @Summary 鏇存敼璁板綍鐘舵��
@@ -349,7 +358,7 @@
}
if operation.BaseOperationType == constvar.BaseOperationTypeIncoming {
- operationInputs := []*models.Operation{}
+ var operationInputs []*models.Operation
for k, v := range listProdt {
value, ok := mapProdt[v.ID]
if !ok {
@@ -365,11 +374,12 @@
if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
return err
}
+
if err == nil {
operationTransfer := &models.Operation{
Number: operation.Number,
SourceNumber: operation.SourceNumber,
- OperationTypeId: operation.OperationTypeId,
+ OperationTypeId: 0,
OperationTypeName: operation.OperationTypeName,
Status: constvar.OperationStatus_Finish,
FromLocationID: locationRule.AreaId,
@@ -380,22 +390,12 @@
CompanyID: operation.CompanyID,
CompanyName: operation.CompanyName,
Comment: operation.Comment,
- BaseOperationType: operation.BaseOperationType,
+ BaseOperationType: constvar.BaseOperationTypeInternal,
Details: []*models.OperationDetails{
- &models.OperationDetails{
+ {
ProductId: v.ID,
Amount: value,
},
- },
- }
- operationTransfer.Id = 0
- operationTransfer.FromLocationID = locationRule.AreaId
- operationTransfer.ToLocationID = locationRule.LocationId
- operationTransfer.Status = constvar.OperationStatus_Finish
- operationTransfer.Details = []*models.OperationDetails{
- &models.OperationDetails{
- ProductId: v.ID,
- Amount: value,
},
}
operationInputs = append(operationInputs, operationTransfer)
@@ -416,24 +416,77 @@
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).
- First()
+ locationRule, err = models.NewLocationProductSearch().SetProductCategoryId(v.CategoryId).SetAreaId(operation.ToLocationID).First()
if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
return err
}
- locAmount.LocationId = operation.ToLocationID
- locAmount.ProductId = v.ID
- locAmount.CreateDate = time.Now().Format("2006-01-02 15:04:05")
- locAmount.Amount = locAmount.Amount.Add(value)
- if res := models.NewLocationProductAmountSearch().Orm.Where("id=?", locAmount.ID).Save(locAmount); res.Error != nil {
- return res.Error
+ if err == nil {
+ operationTransfer := &models.Operation{
+ Number: operation.Number,
+ SourceNumber: operation.SourceNumber,
+ OperationTypeId: 0,
+ OperationTypeName: operation.OperationTypeName,
+ Status: constvar.OperationStatus_Finish,
+ FromLocationID: locationRule.AreaId,
+ ToLocationID: locationRule.LocationId,
+ OperationDate: operation.OperationDate,
+ ContacterID: operation.ContacterID,
+ ContacterName: operation.ContacterName,
+ CompanyID: operation.CompanyID,
+ CompanyName: operation.CompanyName,
+ Comment: operation.Comment,
+ BaseOperationType: constvar.BaseOperationTypeInternal,
+ Details: []*models.OperationDetails{
+ {
+ ProductId: v.ID,
+ Amount: value,
+ },
+ },
+ }
+ operationInputs = append(operationInputs, operationTransfer)
+
+ //if err := tx.Create(&operationTransfer).Error; err != nil {
+ // return err
+ //}
+
+ //TODO:鍑哄叆搴撶殑finish鍜屾姤搴熺殑finish閮借澧炲姞瀵筶ocation_product_amount琛ㄦ暟閲忕殑鏇存柊,鍥犱负姝よ〃鏈塒roductCategory瀛楁锛屾墍浠peration_details琛ㄤ腑瑕佸鍔燩roductCategoryId瀛楁
+ locAmount, err := models.NewLocationProductAmountSearch().
+ SetProductId(v.ID).
+ SetLocationId(locationRule.LocationId).
+ First()
+ if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
+ return err
+ }
+ locAmount.LocationId = locationRule.LocationId
+ 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).
+ First()
+ if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
+ return err
+ }
+ locAmount.LocationId = operation.ToLocationID
+ 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
+ }
}
}
}
@@ -441,6 +494,9 @@
if err := tx.Create(&operationInputs).Error; err != nil {
return err
}
+ }
+ if operation.SourceNumber != "" {
+ go UpdatePurchaseStatus(operation.SourceNumber)
}
}
@@ -485,8 +541,13 @@
return err
}
}
+ if operation.SourceNumber != "" {
+ go UpdateSalesDetailStatus(operation.SourceNumber)
+ }
}
+
if operation.BaseOperationType == constvar.BaseOperationTypeInternal {
+ var operationInputs []*models.Operation
for _, v := range listProdt {
value, ok := mapProdt[v.ID]
if !ok {
@@ -511,15 +572,124 @@
return err
}
- toLocAmount, res := models.NewLocationProductAmountSearch().
- SetProductId(v.ID).
- SetLocationId(operation.ToLocationID).
- FirstRes()
- if res.Error != nil {
+ locationRule, err := models.NewLocationProductSearch().SetProductId(v.ID).SetAreaId(operation.ToLocationID).First()
+ if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
return err
}
- toLocAmount.Amount = toLocAmount.Amount.Add(value)
- if err := models.NewLocationProductAmountSearch().SetID(toLocAmount.Id).Update(toLocAmount); err != nil {
+
+ if err == nil {
+ operationTransfer := &models.Operation{
+ Number: operation.Number,
+ SourceNumber: operation.SourceNumber,
+ OperationTypeId: 0,
+ OperationTypeName: operation.OperationTypeName,
+ Status: constvar.OperationStatus_Finish,
+ FromLocationID: locationRule.AreaId,
+ ToLocationID: locationRule.LocationId,
+ OperationDate: operation.OperationDate,
+ ContacterID: operation.ContacterID,
+ ContacterName: operation.ContacterName,
+ CompanyID: operation.CompanyID,
+ CompanyName: operation.CompanyName,
+ Comment: operation.Comment,
+ BaseOperationType: constvar.BaseOperationTypeInternal,
+ Details: []*models.OperationDetails{
+ {
+ ProductId: v.ID,
+ Amount: value,
+ },
+ },
+ }
+ operationInputs = append(operationInputs, operationTransfer)
+
+ //if err := tx.Create(&operationTransfer).Error; err != nil {
+ // return err
+ //}
+
+ locAmount, err := models.NewLocationProductAmountSearch().
+ SetProductId(v.ID).
+ SetLocationId(locationRule.LocationId).
+ First()
+ if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
+ return err
+ }
+ locAmount.LocationId = locationRule.LocationId
+ 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 {
+ locationRule, err = models.NewLocationProductSearch().SetProductCategoryId(v.CategoryId).SetAreaId(operation.ToLocationID).First()
+ if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
+ return err
+ }
+ if err == nil {
+ operationTransfer := &models.Operation{
+ Number: operation.Number,
+ SourceNumber: operation.SourceNumber,
+ OperationTypeId: 0,
+ OperationTypeName: operation.OperationTypeName,
+ Status: constvar.OperationStatus_Finish,
+ FromLocationID: locationRule.AreaId,
+ ToLocationID: locationRule.LocationId,
+ OperationDate: operation.OperationDate,
+ ContacterID: operation.ContacterID,
+ ContacterName: operation.ContacterName,
+ CompanyID: operation.CompanyID,
+ CompanyName: operation.CompanyName,
+ Comment: operation.Comment,
+ BaseOperationType: constvar.BaseOperationTypeInternal,
+ Details: []*models.OperationDetails{
+ {
+ ProductId: v.ID,
+ Amount: value,
+ },
+ },
+ }
+ operationInputs = append(operationInputs, operationTransfer)
+
+ //if err := tx.Create(&operationTransfer).Error; err != nil {
+ // return err
+ //}
+
+ locAmount, err := models.NewLocationProductAmountSearch().
+ SetProductId(v.ID).
+ SetLocationId(locationRule.LocationId).
+ First()
+ if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
+ return err
+ }
+ locAmount.LocationId = locationRule.LocationId
+ 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 {
+ locAmount, err := models.NewLocationProductAmountSearch().
+ SetProductId(v.ID).
+ SetLocationId(operation.ToLocationID).
+ First()
+ if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
+ return err
+ }
+ locAmount.LocationId = operation.ToLocationID
+ locAmount.ProductId = v.ID
+ locAmount.CreateDate = time.Now().Format("2006-01-02 15:04:05")
+ locAmount.Amount = locAmount.Amount.Add(value)
+ if res := models.NewLocationProductAmountSearch().Orm.Where("id=?", locAmount.ID).Save(locAmount); res.Error != nil {
+ return res.Error
+ }
+ }
+ }
+ }
+ if len(operationInputs) > 0 {
+ if err := tx.Create(&operationInputs).Error; err != nil {
return err
}
}
@@ -529,10 +699,58 @@
util.ResponseFormat(c, code.RequestError, err.Error())
return
}
+
util.ResponseFormat(c, code.Success, "鎿嶄綔鎴愬姛")
}
-// listTransfer
+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
+ }
+}
+
+func CloseProductInventoryServiceConn() {
+ if ProductInventoryServiceConn != nil {
+ ProductInventoryServiceConn.Close()
+ }
+ if PurchaseServiceConn != nil {
+ PurchaseServiceConn.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)
+ }
+}
+
+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)
+ }
+}
+
+// ListTransfer
// @Tags 鍏ュ簱/鍑哄簱
// @Summary 搴撳瓨璋冩嫧鍒楄〃
// @Produce application/json
@@ -562,3 +780,156 @@
}
util.ResponseFormatListWithPage(c, code.Success, list, int(total), params.Page, params.PageSize)
}
+
+// GetLogisticCompanyList
+// @Tags 鍏ュ簱/鍑哄簱
+// @Summary 鑾峰彇鐗╂祦鍏徃鍒楄〃
+// @Produce application/json
+// @Success 200 {object} util.ResponseList{data=[]models.LogisticCompany} "鎴愬姛"
+// @Router /api-wms/v1/operation/getLogisticCompanyList [get]
+func (slf OperationController) GetLogisticCompanyList(c *gin.Context) {
+ companies, err := models.NewLogisticCompanySearch().FindNotTotal()
+ if err != nil {
+ util.ResponseFormat(c, code.RequestError, "鏌ユ壘澶辫触:"+err.Error())
+ return
+ }
+ 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