From c278d736f5f9c0ab4a64540aa1a6b89984b0cd2c Mon Sep 17 00:00:00 2001
From: jiangshuai <291802688@qq.com>
Date: 星期四, 19 十月 2023 15:52:37 +0800
Subject: [PATCH] 1.wms业务调整及bug修改
---
controllers/operation.go | 70 +++++++++++++++++++++++++++++------
1 files changed, 58 insertions(+), 12 deletions(-)
diff --git a/controllers/operation.go b/controllers/operation.go
index fa8137d..151792e 100644
--- a/controllers/operation.go
+++ b/controllers/operation.go
@@ -176,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 {
@@ -358,10 +355,18 @@
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
- //}
+ 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=?", v.ID, operation.ToLocationID).
+ First(&locAmount).Error; err != nil {
+ return err
+ }
+ locAmount.Amount = locAmount.Amount.Add(value)
+ if err := models.NewLocationProductAmountSearch().SetID(locAmount.Id).Update(&locAmount); err != nil {
+ return err
+ }
}
}
@@ -378,8 +383,52 @@
if err := tx.Save(listProdt[k]).Error; err != nil {
return err
}
+ 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=?", v.ID, operation.ToLocationID).First(&locAmount).Error; err != 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 operationType.BaseOperationType == constvar.BaseOperationTypeInternal {
+ for k, v := range listProdt {
+ if value, ok := mapProdt[v.ID]; !ok {
+ return errors.New("浜у搧绉嶇被寮傚父")
+ } else {
+ 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 fromAmount, toAmount 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=?", v.ID, operation.FromLocationID).Find(&fromAmount).Error; err != nil {
+ return err
+ }
+ if fromAmount.Amount.LessThan(value) {
+ return errors.New(fmt.Sprintf("浜у搧锛�%v,搴撳瓨锛�%v,璋冩嫧锛�%v,鏁伴噺涓嶅锛屾棤娉曞畬鎴愯皟鎷ㄦ搷浣�", v.Name, v.Amount.String(), value.String()))
+ }
+ fromAmount.Amount = fromAmount.Amount.Sub(value)
+ if err := models.NewLocationProductAmountSearch().SetID(fromAmount.Id).Update(&fromAmount); err != nil {
+ return err
+ }
+
+ 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=?", v.ID, operation.ToLocationID).Find(&toAmount).Error; err != nil {
+ return err
+ }
+ toAmount.Amount = toAmount.Amount.Add(value)
+ if err := models.NewLocationProductAmountSearch().SetID(toAmount.Id).Update(&toAmount); err != nil {
+ return err
+ }
+ }
+ }
+
}
}
@@ -412,10 +461,7 @@
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 {
--
Gitblit v1.8.0