From 16e06252079d36be7686a3d006c8b73565973c68 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期一, 18 十二月 2023 21:04:08 +0800
Subject: [PATCH] 全文搜索支持时间查询
---
controllers/operation.go | 1132 +++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 754 insertions(+), 378 deletions(-)
diff --git a/controllers/operation.go b/controllers/operation.go
index 5d29310..e75abc4 100644
--- a/controllers/operation.go
+++ b/controllers/operation.go
@@ -1,23 +1,37 @@
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"
"wms/extend/code"
"wms/extend/util"
"wms/models"
+ "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 {
@@ -156,6 +170,30 @@
}
return nil
+}
+
+// GetOperationInfo
+// @Tags 鍏ュ簱/鍑哄簱
+// @Summary 鍏ュ簱/鍑哄簱鍒楄〃
+// @Produce application/json
+//
+// @Param id path string true "id"
+//
+// @Success 200 {object} util.Response "鎴愬姛"
+// @Router /api-wms/v1/operation/getOperationInfo/{id} [get]
+func (slf OperationController) GetOperationInfo(c *gin.Context) {
+ number := c.Param("id")
+ if number == "" {
+ util.ResponseFormat(c, code.RequestParamError, "鍙傛暟瑙ｆ瀽澶辫触锛屽弬鏁颁笉鑳戒负绌�")
+ return
+ }
+ id, _ := strconv.Atoi(number)
+ operation, err := models.NewOperationSearch().SetID(id).SetPreload(true).First()
+ if err != nil {
+ util.ResponseFormat(c, code.RequestParamError, err.Error())
+ return
+ }
+ util.ResponseFormat(c, code.Success, operation)
}
// List
@@ -307,389 +345,439 @@
// @Success 200 {object} util.Response "鎴愬姛"
// @Router /api-wms/v1/operation/finish/{id} [put]
func (slf OperationController) Finish(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
- //}
- //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 {
- // return err
- // }
- //
- // var listProdtId []string
- // var listProdt []*models.Material
- // mapProdt := make(map[string]decimal.Decimal)
- // listDetails, err := models.NewOperationDetailsSearch().SetOperationId(operation.Id).FindAll()
- // if err != nil {
- // return err
- // }
- // for _, v := range listDetails {
- // listProdtId = append(listProdtId, v.ProductId)
- // mapProdt[v.ProductId] = v.Amount
- // }
- //
- // if err := models.NewMaterialSearch().Orm.Where("id IN ?", listProdtId).Find(&listProdt).Error; err != nil {
- // return err
- // }
- //
- // if operation.BaseOperationType == constvar.BaseOperationTypeIncoming {
- // var operationInputs []*models.Operation
- // for k, v := range listProdt {
- // value, ok := mapProdt[v.ID]
- // if !ok {
- // return errors.New("浜у搧绉嶇被寮傚父")
- // }
- //
- // listProdt[k].Amount = listProdt[k].Amount.Add(value)
- // if err := tx.Save(listProdt[k]).Error; err != nil {
- // return err
- // }
- //
- // locationRule, err := models.NewLocationProductSearch().SetProductId(v.ID).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
- // //}
- //
- // //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)
- // 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
- // //}
- //
- // //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)
- // 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)
- // 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
- // }
- // }
- //
- // }
- //
- // if operation.BaseOperationType == constvar.BaseOperationTypeOutgoing {
- // for k, v := range listProdt {
- // value, ok := mapProdt[v.ID]
- // if !ok {
- // return errors.New("浜у搧绉嶇被寮傚父")
- // }
- // //todo 婕旂ず娴嬭瘯鏁版嵁
- // data, err := os.ReadFile("conf/input.json")
- // if err != nil {
- // return errors.New("鏂囦欢璇诲彇澶辫触")
- // }
- // m := make(map[string]interface{})
- // err = json.Unmarshal(data, &m)
- // if err != nil {
- // return errors.New("鏍煎紡杞崲澶辫触")
- // }
- // if opa.OpaCheck(c, m, "operation") {
- // if v.Amount.LessThan(value) {
- // return errors.New(fmt.Sprintf("浜у搧锛�%v,搴撳瓨锛�%v,鍑哄簱锛�%v,鏁伴噺涓嶅锛屾棤娉曞畬鎴愬嚭搴撴搷浣�", v.Name, v.Amount.String(), value.String()))
- // }
- // }
- // listProdt[k].Amount = listProdt[k].Amount.Sub(value)
- // if err := tx.Save(listProdt[k]).Error; err != nil {
- // return err
- // }
- // locAmount, res := models.NewLocationProductAmountSearch().
- // SetProductId(v.ID).
- // SetLocationId(operation.ToLocationID).
- // FirstRes()
- // if res.Error != nil {
- // return err
- // }
- // if locAmount.Amount.LessThan(value) {
- // return errors.New(fmt.Sprintf("浜у搧锛�%v,搴撳瓨锛�%v,鍑哄簱锛�%v,鏁伴噺涓嶅锛屾棤娉曞畬鎴愬嚭搴撴搷浣�", v.Name, v.Amount.String(), value.String()))
- // }
- // locAmount.Amount = locAmount.Amount.Sub(value)
- // if err := models.NewLocationProductAmountSearch().SetID(locAmount.Id).Update(locAmount); err != nil {
- // return err
- // }
- // }
- // }
- //
- // if operation.BaseOperationType == constvar.BaseOperationTypeInternal {
- // var operationInputs []*models.Operation
- // for _, v := range listProdt {
- // value, ok := mapProdt[v.ID]
- // if !ok {
- // return errors.New("浜у搧绉嶇被寮傚父")
- // }
- // //listProdt[k].Amount = listProdt[k].Amount.Add(value)
- // //if err := tx.Save(listProdt[k]).Error; err != nil {
- // // return err
- // //}
- // fromLocAmount, res := models.NewLocationProductAmountSearch().
- // SetProductId(v.ID).
- // SetLocationId(operation.FromLocationID).
- // FirstRes()
- // if res.Error != nil {
- // return err
- // }
- // if fromLocAmount.Amount.LessThan(value) {
- // return errors.New(fmt.Sprintf("浜у搧锛�%v,搴撳瓨锛�%v,璋冩嫧锛�%v,鏁伴噺涓嶅锛屾棤娉曞畬鎴愯皟鎷ㄦ搷浣�", v.Name, v.Amount.String(), value.String()))
- // }
- // fromLocAmount.Amount = fromLocAmount.Amount.Sub(value)
- // if err := models.NewLocationProductAmountSearch().SetID(fromLocAmount.Id).Update(fromLocAmount); err != nil {
- // return err
- // }
- //
- // locationRule, err := models.NewLocationProductSearch().SetProductId(v.ID).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)
- // 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)
- // 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
- // }
- // }
- // }
- // return nil
- //}); err != nil {
- // util.ResponseFormat(c, code.RequestError, err.Error())
- // return
- //}
- //if operation.SourceNumber != "" {
- // go UpdateSalesDetailStatus(c, operation.SourceNumber)
- //}
- UpdateSalesDetailStatus(c, c.Param("id"))
+ 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
+ }
+ if err := models.WithTransaction(func(tx *gorm.DB) error {
+
+ 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
+ }
+
+ var listProdtId []string
+ var listProdt []*models.Material
+ mapProdt := make(map[string]decimal.Decimal)
+ listDetails, err := models.NewOperationDetailsSearch().SetOperationId(operation.Id).FindAll()
+ if err != nil {
+ return err
+ }
+ for _, v := range listDetails {
+ listProdtId = append(listProdtId, v.ProductId)
+ mapProdt[v.ProductId] = v.Amount
+ }
+
+ if err := models.NewMaterialSearch().Orm.Where("id IN ?", listProdtId).Find(&listProdt).Error; err != nil {
+ return err
+ }
+
+ if operation.BaseOperationType == constvar.BaseOperationTypeIncoming {
+ var operationInputs []*models.Operation
+ for k, v := range listProdt {
+ value, ok := mapProdt[v.ID]
+ if !ok {
+ return errors.New("浜у搧绉嶇被寮傚父")
+ }
+
+ listProdt[k].Amount = listProdt[k].Amount.Add(value)
+ if err := tx.Save(listProdt[k]).Error; err != nil {
+ return err
+ }
+
+ locationRule, err := models.NewLocationProductSearch().SetProductId(v.ID).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 {
+ 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)
+ locAmount.ProductCategoryID = v.CategoryId
+ 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
+ }
+ }
+ if operation.SourceNumber != "" {
+ go UpdatePurchaseStatus(operation.SourceNumber)
+ }
+
+ }
+
+ if operation.BaseOperationType == constvar.BaseOperationTypeOutgoing {
+ for k, v := range listProdt {
+ value, ok := mapProdt[v.ID]
+ if !ok {
+ return errors.New("浜у搧绉嶇被寮傚父")
+ }
+ //todo 婕旂ず娴嬭瘯鏁版嵁
+ data, err := os.ReadFile("conf/input.json")
+ if err != nil {
+ return errors.New("鏂囦欢璇诲彇澶辫触")
+ }
+ m := make(map[string]interface{})
+ err = json.Unmarshal(data, &m)
+ if err != nil {
+ return errors.New("鏍煎紡杞崲澶辫触")
+ }
+ if opa.OpaCheck(c, m, "operation") {
+ if v.Amount.LessThan(value) {
+ return errors.New(fmt.Sprintf("浜у搧锛�%v,搴撳瓨锛�%v,鍑哄簱锛�%v,鏁伴噺涓嶅锛屾棤娉曞畬鎴愬嚭搴撴搷浣�", v.Name, v.Amount.String(), value.String()))
+ }
+ }
+ listProdt[k].Amount = listProdt[k].Amount.Sub(value)
+ if err := tx.Save(listProdt[k]).Error; err != nil {
+ return err
+ }
+ locAmount, res := models.NewLocationProductAmountSearch().
+ SetProductId(v.ID).
+ SetLocationId(operation.ToLocationID).
+ FirstRes()
+ if res.Error != nil {
+ return err
+ }
+ if locAmount.Amount.LessThan(value) {
+ return errors.New(fmt.Sprintf("浜у搧锛�%v,搴撳瓨锛�%v,鍑哄簱锛�%v,鏁伴噺涓嶅锛屾棤娉曞畬鎴愬嚭搴撴搷浣�", v.Name, v.Amount.String(), value.String()))
+ }
+ locAmount.Amount = locAmount.Amount.Sub(value)
+ if err := models.NewLocationProductAmountSearch().SetID(locAmount.Id).Update(locAmount); err != nil {
+ 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 {
+ return errors.New("浜у搧绉嶇被寮傚父")
+ }
+ //listProdt[k].Amount = listProdt[k].Amount.Add(value)
+ //if err := tx.Save(listProdt[k]).Error; err != nil {
+ // return err
+ //}
+ fromLocAmount, res := models.NewLocationProductAmountSearch().
+ SetProductId(v.ID).
+ SetLocationId(operation.FromLocationID).
+ FirstRes()
+ if res.Error != nil {
+ return err
+ }
+ if fromLocAmount.Amount.LessThan(value) {
+ return errors.New(fmt.Sprintf("浜у搧锛�%v,搴撳瓨锛�%v,璋冩嫧锛�%v,鏁伴噺涓嶅锛屾棤娉曞畬鎴愯皟鎷ㄦ搷浣�", v.Name, v.Amount.String(), value.String()))
+ }
+ fromLocAmount.Amount = fromLocAmount.Amount.Sub(value)
+ if err := models.NewLocationProductAmountSearch().SetID(fromLocAmount.Id).Update(fromLocAmount); err != nil {
+ return err
+ }
+
+ locationRule, err := models.NewLocationProductSearch().SetProductId(v.ID).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 {
+ 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
+ }
+ }
+ }
+ return nil
+ }); err != nil {
+ util.ResponseFormat(c, code.RequestError, err.Error())
+ return
+ }
+
util.ResponseFormat(c, code.Success, "鎿嶄綔鎴愬姛")
}
-var ProductInventoryServiceConn *grpc.ClientConn
+func AddMoveHistory(operationList []*models.Operation, db *gorm.DB) error {
+ var histories []*models.MoveHistory
+ operationMap := make(map[int]*models.Operation, len(operationList))
+ 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)
+ }
+ operationMap[operation.Id] = operation
+ }
+ if err := db.Model(&models.MoveHistory{}).Create(&histories).Error; err != nil {
+ return err
+ }
+ for _, history := range histories {
+ service.AddNewHistoryReportRecord(history, operationMap[history.OperationId])
+ }
+ 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
@@ -700,16 +788,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)
}
}
@@ -758,3 +857,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