From 845f1b6da081aae73325e558356f9ab8a851462e Mon Sep 17 00:00:00 2001
From: liujiandao <274878379@qq.com>
Date: 星期五, 10 十一月 2023 15:05:12 +0800
Subject: [PATCH] 确认出库修改crm销售明细状态
---
controllers/operation.go | 600 ++++++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 507 insertions(+), 93 deletions(-)
diff --git a/controllers/operation.go b/controllers/operation.go
index 97f68b3..5d29310 100644
--- a/controllers/operation.go
+++ b/controllers/operation.go
@@ -2,17 +2,21 @@
import (
"errors"
- "fmt"
"github.com/gin-gonic/gin"
- "github.com/shopspring/decimal"
+ "google.golang.org/grpc"
+ "google.golang.org/grpc/credentials/insecure"
"gorm.io/gorm"
+ "sort"
"strconv"
+ "time"
+ "wms/conf"
"wms/constvar"
"wms/extend/code"
"wms/extend/util"
"wms/models"
"wms/pkg/logx"
"wms/pkg/structx"
+ "wms/proto/product_inventory"
"wms/request"
)
@@ -46,13 +50,43 @@
return
}
+ if CheckDetailsRepeat(params.Details) {
+ util.ResponseFormat(c, code.RequestParamError, "鏄庣粏涓笉鑳藉瓨鍦ㄩ噸澶嶇殑浜у搧")
+ return
+ }
+
+ operationType, err := models.NewOperationTypeSearch().SetID(uint(params.OperationTypeId)).First()
+ if err != nil {
+ util.ResponseFormat(c, code.RequestParamError, err.Error())
+ return
+ }
+
params.Status = constvar.OperationStatus_Ready
+ params.Number = strconv.FormatInt(time.Now().Unix(), 10)
+ params.BaseOperationType = operationType.BaseOperationType
if err := models.NewOperationSearch().Create(¶ms); err != nil {
logx.Errorf("Operation create err: %v", err)
util.ResponseFormat(c, code.SaveFail, "娣诲姞澶辫触锛�"+err.Error())
return
}
util.ResponseFormat(c, code.Success, "娣诲姞鎴愬姛")
+}
+
+func CheckDetailsRepeat(details []*models.OperationDetails) bool {
+ var detailIDs []string
+ var tempID string
+ for _, v := range details {
+ detailIDs = append(detailIDs, v.ProductId)
+ }
+ sort.Strings(detailIDs)
+ for _, v := range detailIDs {
+ if v != tempID {
+ tempID = v
+ } else {
+ return true
+ }
+ }
+ return false
}
func (slf OperationController) FormatLocation(params *models.Operation) error {
@@ -96,8 +130,8 @@
return errors.New("璇峰～鍏ユ簮鍗曞彿")
}
- if params.OperationTypeId == 0 {
- return errors.New("operationTypeId涓�0")
+ if params.OperationTypeId == 0 && int(params.BaseOperationType) == 0 {
+ return errors.New("鏈瘑鍒璁板綍绫诲瀷")
}
if params.OperationDate == "" {
@@ -113,9 +147,9 @@
if v.ProductId == "" {
return errors.New("productID涓虹┖")
}
- if v.ProductName == "" {
- return errors.New("浜у搧鍚嶇О寮傚父")
- }
+ //if v.ProductName == "" {
+ // return errors.New("浜у搧鍚嶇О寮傚父")
+ //}
if v.Amount.IsNegative() {
return errors.New("浜у搧鏁伴噺鍑洪敊")
}
@@ -128,13 +162,12 @@
// @Tags 鍏ュ簱/鍑哄簱
// @Summary 鍏ュ簱/鍑哄簱鍒楄〃
// @Produce application/json
-// @Accept json
-// @Param object query request.OperationList true "鍙傛暟"
-// @Success 200 {object} util.Response "鎴愬姛"
-// @Router /api-wms/v1/operation/operation [get]
+// @Param object body request.OperationList true "鏌ヨ鍙傛暟"
+// @Success 200 {object} util.Response "鎴愬姛"
+// @Router /api-wms/v1/operation/list [post]
func (slf OperationController) List(c *gin.Context) {
var params request.OperationList
- if err := c.ShouldBindQuery(¶ms); err != nil {
+ if err := c.BindJSON(¶ms); err != nil {
util.ResponseFormat(c, code.RequestParamError, "鍙傛暟瑙ｆ瀽澶辫触锛屾暟鎹被鍨嬮敊璇�:"+err.Error())
return
}
@@ -144,14 +177,19 @@
}
search := models.NewOperationSearch()
search.SetPage(params.Page, params.PageSize)
+ if params.Number != "" {
+ search.SetKeyword(params.Number)
+ }
+ if int(params.Status) != 0 {
+ search.SetStatus(params.Status)
+ }
list, total, err := search.SetOperationTypeId(params.OperationTypeId).SetPreload(true).SetOrder("created_at desc").Find()
if err != nil {
util.ResponseFormat(c, code.RequestError, "鏌ユ壘澶辫触:"+err.Error())
return
}
- util.ResponseFormatList(c, code.Success, list, int(total))
-
+ util.ResponseFormatListWithPage(c, code.Success, list, int(total), params.Page, params.PageSize)
}
func (slf OperationController) CheckListParams(params *request.OperationList) error {
@@ -190,6 +228,10 @@
util.ResponseFormat(c, code.RequestParamError, err.Error())
return
}
+ if CheckDetailsRepeat(params.Details) {
+ util.ResponseFormat(c, code.RequestParamError, "鏄庣粏涓笉鑳藉瓨鍦ㄩ噸澶嶇殑浜у搧")
+ return
+ }
if err := slf.FormatLocation(¶ms); err != nil {
util.ResponseFormat(c, code.RequestParamError, err.Error())
return
@@ -214,7 +256,7 @@
util.ResponseFormat(c, code.Success, "淇敼鎴愬姛")
}
-// DeleteDevice
+// Delete
//
// @Tags 鍏ュ簱/鍑哄簱
// @Summary 鍒犻櫎鍏ュ簱/鍑哄簱淇℃伅
@@ -256,7 +298,7 @@
util.ResponseFormat(c, code.Success, "鍒犻櫎鎴愬姛")
}
-// DeleteDevice
+// Finish
//
// @Tags 鍏ュ簱/鍑哄簱
// @Summary 鏇存敼璁板綍鐘舵��
@@ -265,82 +307,454 @@
// @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().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
- }
- operationType, err := models.NewOperationTypeSearch().SetID(uint(operation.OperationTypeId)).First()
- if err != nil {
- util.ResponseFormat(c, code.RequestError, err.Error())
- 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
- }
- if operationType.BaseOperationType != constvar.BaseOperationTypeInternal {
- 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 operationType.BaseOperationType == constvar.BaseOperationTypeIncoming {
- for k, v := range listProdt {
- if value, ok := mapProdt[v.ID]; !ok {
- return errors.New("浜у搧绉嶇被寮傚父")
- } else {
- listProdt[k].Amount.Add(value)
- if err := tx.Save(listProdt[k]).Error; err != nil {
- return err
- }
- }
- }
- }
- if operationType.BaseOperationType == constvar.BaseOperationTypeOutgoing {
- for k, v := range listProdt {
- if value, ok := mapProdt[v.ID]; !ok {
- return errors.New("浜у搧绉嶇被寮傚父")
- } else {
- if v.Amount.LessThan(value) {
- return errors.New(fmt.Sprintf("浜у搧锛�%v,搴撳瓨锛�%v,鍑哄簱锛�%v,鏁伴噺涓嶅锛屾棤娉曞畬鎴愬嚭搴撴搷浣�", v.Name, v.Amount.String(), value.String()))
- }
- listProdt[k].Amount.Sub(value)
- if err := tx.Save(listProdt[k]).Error; err != nil {
- return err
- }
- }
- }
- }
-
- }
- return nil
- }); err != nil {
- util.ResponseFormat(c, code.RequestError, err.Error())
- return
- }
+ //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"))
util.ResponseFormat(c, code.Success, "鎿嶄綔鎴愬姛")
}
+
+var ProductInventoryServiceConn *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
+ }
+}
+
+func CloseProductInventoryServiceConn() {
+ if ProductInventoryServiceConn != nil {
+ ProductInventoryServiceConn.Close()
+ }
+}
+
+func UpdateSalesDetailStatus(ctx *gin.Context, number string) {
+ client := product_inventory.NewProductInventoryServiceClient(ProductInventoryServiceConn)
+ _, err := client.UpdateSalesDetailStatus(ctx, &product_inventory.UpdateSalesDetailStatusRequest{
+ Number: number,
+ SalesDetailStatus: "宸插嚭搴�",
+ })
+ if err != nil {
+ logx.Errorf("grpc dial UpdateSalesDetailStatus service error: %v", err)
+ }
+}
+
+// ListTransfer
+// @Tags 鍏ュ簱/鍑哄簱
+// @Summary 搴撳瓨璋冩嫧鍒楄〃
+// @Produce application/json
+// @Param object body request.OperationAllList true "鍙傛暟"
+// @Success 200 {object} util.Response "鎴愬姛"
+// @Router /api-wms/v1/operation/listTransfer [post]
+func (slf OperationController) ListTransfer(c *gin.Context) {
+ var params request.OperationAllList
+ if err := c.BindJSON(¶ms); err != nil {
+ util.ResponseFormat(c, code.RequestParamError, "鍙傛暟瑙ｆ瀽澶辫触锛屾暟鎹被鍨嬮敊璇�:"+err.Error())
+ return
+ }
+ if !params.PageInfo.Check() {
+ util.ResponseFormat(c, code.RequestParamError, "鏁版嵁鍒嗛〉淇℃伅閿欒")
+ return
+ }
+ search := models.NewOperationSearch()
+ search.SetPage(params.Page, params.PageSize)
+ search.SetPage(params.Page, params.PageSize)
+ if params.Number != "" {
+ search.SetKeyword(params.Number)
+ }
+ list, total, err := search.SetPreload(true).SetBaseOperationType(constvar.BaseOperationTypeInternal).SetOrder("created_at desc").Find()
+ if err != nil {
+ util.ResponseFormat(c, code.RequestError, "鏌ユ壘澶辫触:"+err.Error())
+ return
+ }
+ 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)
+}
--
Gitblit v1.8.0