From 4d61fe8d8755ff2166ce7ac6adaa16c5f917fd33 Mon Sep 17 00:00:00 2001
From: liujiandao <274878379@qq.com>
Date: 星期三, 18 十月 2023 16:28:40 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/aps/WMS
---
controllers/operation.go | 65 ++++++++++++++++++++++++--------
1 files changed, 49 insertions(+), 16 deletions(-)
diff --git a/controllers/operation.go b/controllers/operation.go
index 8eca517..3e1e36f 100644
--- a/controllers/operation.go
+++ b/controllers/operation.go
@@ -6,7 +6,9 @@
"github.com/gin-gonic/gin"
"github.com/shopspring/decimal"
"gorm.io/gorm"
+ "sort"
"strconv"
+ "time"
"wms/constvar"
"wms/extend/code"
"wms/extend/util"
@@ -46,13 +48,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 {
+ 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 {
@@ -113,9 +145,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("浜у搧鏁伴噺鍑洪敊")
}
@@ -144,10 +176,7 @@
search := models.NewOperationSearch()
search.SetPage(params.Page, params.PageSize)
if params.Number != "" {
- search.SetNumber(params.Number)
- }
- if params.SourceNumber != "" {
- search.SetSourceNumber(params.SourceNumber)
+ search.SetKeyword(params.Number)
}
list, total, err := search.SetOperationTypeId(params.OperationTypeId).SetPreload(true).SetOrder("created_at desc").Find()
if err != nil {
@@ -156,7 +185,6 @@
}
util.ResponseFormatListWithPage(c, code.Success, list, int(total), params.Page, params.PageSize)
-
}
func (slf OperationController) CheckListParams(params *request.OperationList) error {
@@ -193,6 +221,10 @@
}
if err := slf.CheckParams(params); err != nil {
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 {
@@ -318,12 +350,18 @@
if value, ok := mapProdt[v.ID]; !ok {
return errors.New("浜у搧绉嶇被寮傚父")
} else {
- listProdt[k].Amount.Add(value)
+ listProdt[k].Amount = listProdt[k].Amount.Add(value)
if err := tx.Save(listProdt[k]).Error; err != nil {
return err
}
+ //TODO:鍑哄叆搴撶殑finish鍜屾姤搴熺殑finish閮借澧炲姞瀵筶ocation_product_amount琛ㄦ暟閲忕殑鏇存柊,鍥犱负姝よ〃鏈塒roductCategory瀛楁锛屾墍浠peration_details琛ㄤ腑瑕佸鍔燩roductCategoryId瀛楁
+ //var locAmount models.LocationProductAmount
+ //if err := models.NewLocationProductAmountSearch().Orm.Table("wms_location_produt_amount").Joins("inner join wms_location_product on wms_location_produt.id=wms_location_produt_amount.location_product_id").Where("wms_location_produt.product_id=? and wms_location_produt.location_id=?",operation.ToLocationID,v.ID).First(&locAmount).Error;err!=nil {
+ // return err
+ //}
}
}
+
}
if operationType.BaseOperationType == constvar.BaseOperationTypeOutgoing {
for k, v := range listProdt {
@@ -333,7 +371,7 @@
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)
+ listProdt[k].Amount = listProdt[k].Amount.Sub(value)
if err := tx.Save(listProdt[k]).Error; err != nil {
return err
}
@@ -371,17 +409,12 @@
search.SetPage(params.Page, params.PageSize)
search.SetPage(params.Page, params.PageSize)
if params.Number != "" {
- search.SetNumber(params.Number)
- }
- if params.SourceNumber != "" {
- search.SetSourceNumber(params.SourceNumber)
+ search.SetKeyword(params.Number)
}
list, total, err := search.SetPreload(true).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)
-
}
--
Gitblit v1.8.0