From 7d4f02f6a8066018911d09bad42c5c540abaa66b Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期一, 11 三月 2024 15:18:29 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/aps/WMS
---
controllers/operation.go | 585 ++++++++++++++++++++++++++--------------------------------
1 files changed, 263 insertions(+), 322 deletions(-)
diff --git a/controllers/operation.go b/controllers/operation.go
index c1fd5c4..ae51152 100644
--- a/controllers/operation.go
+++ b/controllers/operation.go
@@ -6,6 +6,7 @@
"errors"
"fmt"
"github.com/gin-gonic/gin"
+ uuid "github.com/satori/go.uuid"
"github.com/shopspring/decimal"
"github.com/xuri/excelize/v2"
"gorm.io/gorm"
@@ -20,6 +21,7 @@
"wms/models"
"wms/opa"
"wms/pkg/logx"
+ "wms/pkg/mysqlx"
"wms/pkg/structx"
"wms/proto/client"
"wms/proto/init_client"
@@ -28,6 +30,7 @@
"wms/proto/purchase_wms"
"wms/proto/supplier"
"wms/request"
+ "wms/response"
"wms/service"
"wms/utils/http"
"wms/utils/upload"
@@ -58,6 +61,7 @@
util.ResponseFormat(c, code.RequestParamError, err.Error())
return
}
+
if err := slf.FormatLocation(¶ms); err != nil {
util.ResponseFormat(c, code.RequestParamError, err.Error())
return
@@ -75,8 +79,19 @@
}
params.Status = constvar.OperationStatus_Ready
- params.Number = strconv.FormatInt(time.Now().Unix(), 10)
+ //params.Number = strconv.FormatInt(time.Now().Unix(), 10)
params.BaseOperationType = operationType.BaseOperationType
+
+ var numberNum int64
+ if err := mysqlx.GetDB().Model(&models.Operation{}).Where("number=?", params.Number).Count(&numberNum).Error; err != nil {
+ util.ResponseFormat(c, code.RequestParamError, err.Error())
+ return
+ }
+ if numberNum > 0 {
+ util.ResponseFormat(c, code.RequestParamError, "鍗曞彿宸插瓨鍦�")
+ return
+ }
+
if err := models.NewOperationSearch().Create(¶ms); err != nil {
logx.Errorf("Operation create err: %v", err)
util.ResponseFormat(c, code.SaveFail, "娣诲姞澶辫触锛�"+err.Error())
@@ -108,32 +123,41 @@
return err
}
if operationType.BaseOperationType == constvar.BaseOperationTypeIncoming {
- if location, err := models.NewLocationSearch().SetType(int(constvar.LocationTypeVendor)).First(); err != nil {
+ location, err := models.NewLocationSearch().SetType(int(constvar.LocationTypeVendor)).First()
+ if err != nil {
return err
- } else {
- params.FromLocationID = location.Id
}
- if params.ToLocationID == 0 {
- return errors.New("璇烽�夋嫨鐩爣浣嶇疆")
+ for k, v := range params.Details {
+ params.Details[k].FromLocationID = location.Id
+ if v.ToLocationID == 0 {
+ params.Details[k].ToLocationID = params.LocationID
+ }
}
+
}
if operationType.BaseOperationType == constvar.BaseOperationTypeOutgoing {
- if location, err := models.NewLocationSearch().SetType(int(constvar.LocationTypeCustomer)).First(); err != nil {
+ location, err := models.NewLocationSearch().SetType(int(constvar.LocationTypeCustomer)).First()
+ if err != nil {
return err
- } else {
- params.ToLocationID = location.Id
}
- if params.FromLocationID == 0 {
- return errors.New("璇烽�夋嫨婧愪綅缃�")
+ for k, v := range params.Details {
+ params.Details[k].ToLocationID = location.Id
+ if v.FromLocationID == 0 {
+ return errors.New("璇烽�夋嫨鍑哄簱浣嶇疆")
+ }
}
+
}
if operationType.BaseOperationType == constvar.BaseOperationTypeInternal {
- if params.ToLocationID == 0 {
- return errors.New("璇烽�夋嫨鐩爣浣嶇疆")
+ for _, v := range params.Details {
+ if v.ToLocationID == 0 {
+ return errors.New("璇烽�夋嫨鐩爣浣嶇疆")
+ }
+ if v.FromLocationID == 0 {
+ return errors.New("璇烽�夋嫨婧愪綅缃�")
+ }
}
- if params.FromLocationID == 0 {
- return errors.New("璇烽�夋嫨婧愪綅缃�")
- }
+
}
return nil
}
@@ -143,12 +167,20 @@
return errors.New("璇峰～鍏ユ簮鍗曞彿")
}
+ if params.Number == "" {
+ return errors.New("璇峰～鍏ュ崟鍙�")
+ }
+
if params.OperationTypeId == 0 && int(params.BaseOperationType) == 0 {
return errors.New("鏈瘑鍒璁板綍绫诲瀷")
}
if params.OperationDate == "" {
return errors.New("璇烽�夋嫨瀹夋帓鏃ユ湡")
+ }
+
+ if params.LocationID == 0 {
+ return errors.New("璇烽�夋嫨婧愪綅缃�")
}
if len(params.Details) <= 0 {
@@ -362,8 +394,27 @@
util.ResponseFormat(c, code.RequestError, "璇ュ嚭鍏ュ簱淇℃伅鏃犳硶瀹屾垚")
return
}
- err = models.WithTransaction(func(tx *gorm.DB) error {
+ listDetails, err := models.NewOperationDetailsSearch().SetOperationId(operation.Id).SetPreload(true).FindAll()
+ if err != nil {
+ util.ResponseFormat(c, code.RequestError, err.Error())
+ return
+ }
+
+ var mapLocAmount map[string]*models.LocationProductAmount
+ locAmountList, err := models.NewLocationProductAmountSearch().Find()
+ if err != nil {
+ util.ResponseFormat(c, code.RequestError, err.Error())
+ return
+ }
+ if len(locAmountList) > 0 {
+ mapLocAmount = make(map[string]*models.LocationProductAmount)
+ for _, v := range locAmountList {
+ mapLocAmount[strconv.Itoa(v.LocationId)+v.ProductId] = v
+ }
+ }
+
+ 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
}
@@ -371,154 +422,119 @@
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("浜у搧绉嶇被寮傚父")
+ locationRoleList, err := models.NewLocationProductSearch().Find()
+ if err != nil {
+ return errors.New("鑾峰彇涓婃灦瑙勫垯淇℃伅澶辫触")
+ }
+ var mapLocationRoleProduct, mapLocationRoleCategory map[string]*models.LocationProduct
+ if len(locationRoleList) > 0 {
+ mapLocationRoleProduct = make(map[string]*models.LocationProduct)
+ mapLocationRoleCategory = make(map[string]*models.LocationProduct)
+ for _, v := range locationRoleList {
+ if v.RuleType == constvar.RuleType_Product {
+ mapLocationRoleProduct[strconv.Itoa(v.AreaId)+v.ProductId] = v
+ }
+ if v.RuleType == constvar.RuleType_ProductCategory {
+ mapLocationRoleCategory[strconv.Itoa(v.AreaId)+strconv.Itoa(v.ProductCategoryID)] = v
+ }
}
+ }
- listProdt[k].Amount = listProdt[k].Amount.Add(value)
- if err := tx.Save(listProdt[k]).Error; err != nil {
+ var details []*models.OperationDetails
+ for k, v := range listDetails {
+ listDetails[k].Product.Amount = listDetails[k].Product.Amount.Add(v.Amount)
+ if err := tx.Save(&listDetails[k].Product).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,
- },
- },
+ if roleProduct, ok := mapLocationRoleProduct[strconv.Itoa(operation.LocationID)+v.ProductId]; ok {
+ detail := &models.OperationDetails{
+ ProductId: v.ProductId,
+ Amount: v.Amount,
+ FromLocationID: roleProduct.AreaId,
+ ToLocationID: roleProduct.LocationId,
}
- operationInputs = append(operationInputs, operationTransfer)
+ details = append(details, detail)
- //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 locAmount, aok := mapLocAmount[strconv.Itoa(roleProduct.LocationId)+v.ProductId]; aok {
+ locAmount.Amount = locAmount.Amount.Add(v.Amount)
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) {
+ if err := models.NewLocationProductAmountSearch().Create(&models.LocationProductAmount{
+ LocationId: roleProduct.LocationId,
+ ProductCategoryID: v.Product.CategoryId,
+ ProductId: v.ProductId,
+ Amount: v.Amount,
+ CreateDate: time.Now().Format("2006-01-02 15:04:05"),
+ }); err != nil {
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
+ }
+ } else {
+ if roleCategory, cok := mapLocationRoleCategory[strconv.Itoa(operation.LocationID)+strconv.Itoa(v.Product.CategoryId)]; cok {
+ detail := &models.OperationDetails{
+ ProductId: v.ProductId,
+ Amount: v.Amount,
+ FromLocationID: roleCategory.AreaId,
+ ToLocationID: roleCategory.LocationId,
+ }
+ details = append(details, detail)
+
+ if locAmount, aok := mapLocAmount[strconv.Itoa(roleCategory.LocationId)+v.ProductId]; aok {
+ locAmount.Amount = locAmount.Amount.Add(v.Amount)
+ if res := models.NewLocationProductAmountSearch().Orm.Where("id=?", locAmount.ID).Save(locAmount); res.Error != nil {
+ return res.Error
+ }
+ } else {
+ if err := models.NewLocationProductAmountSearch().Create(&models.LocationProductAmount{
+ LocationId: roleCategory.LocationId,
+ ProductCategoryID: v.Product.CategoryId,
+ ProductId: v.ProductId,
+ Amount: v.Amount,
+ CreateDate: time.Now().Format("2006-01-02 15:04:05"),
+ }); err != nil {
+ return err
+ }
+ }
+ } else {
+ if locAmount, aok := mapLocAmount[strconv.Itoa(operation.LocationID)+v.ProductId]; aok {
+ locAmount.Amount = locAmount.Amount.Add(v.Amount)
+ if res := models.NewLocationProductAmountSearch().Orm.Where("id=?", locAmount.ID).Save(locAmount); res.Error != nil {
+ return res.Error
+ }
+ } else {
+ if err := models.NewLocationProductAmountSearch().Create(&models.LocationProductAmount{
+ LocationId: operation.LocationID,
+ ProductCategoryID: v.Product.CategoryId,
+ ProductId: v.ProductId,
+ Amount: v.Amount,
+ CreateDate: time.Now().Format("2006-01-02 15:04:05"),
+ }); err != nil {
+ return err
+ }
}
}
}
}
- if len(operationInputs) > 0 {
- if err := tx.Create(&operationInputs).Error; err != nil {
+ if len(details) > 0 {
+ if err := tx.Create(&models.Operation{
+ Number: operation.Number,
+ SourceNumber: operation.SourceNumber,
+ OperationTypeId: 0,
+ OperationTypeName: operation.OperationTypeName,
+ Status: constvar.OperationStatus_Finish,
+ OperationDate: operation.OperationDate,
+ ContacterID: operation.ContacterID,
+ ContacterName: operation.ContacterName,
+ CompanyID: operation.CompanyID,
+ CompanyName: operation.CompanyName,
+ Comment: operation.Comment,
+ BaseOperationType: constvar.BaseOperationTypeInternal,
+ Details: details,
+ }).Error; err != nil {
return err
}
}
@@ -529,11 +545,7 @@
}
if operation.BaseOperationType == constvar.BaseOperationTypeOutgoing {
- for k, v := range listProdt {
- value, ok := mapProdt[v.ID]
- if !ok {
- return errors.New("浜у搧绉嶇被寮傚父")
- }
+ for k, v := range listDetails {
//todo 婕旂ず娴嬭瘯鏁版嵁
data, err := os.ReadFile("conf/input.json")
if err != nil {
@@ -545,182 +557,65 @@
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()))
+ if v.Product.Amount.LessThan(v.Amount) {
+ return errors.New(fmt.Sprintf("浜у搧锛�%v,搴撳瓨锛�%v,鍑哄簱锛�%v,鏁伴噺涓嶅锛屾棤娉曞畬鎴愬嚭搴撴搷浣�", v.Product.Name, v.Product.Amount.String(), v.Amount.String()))
}
}
- listProdt[k].Amount = listProdt[k].Amount.Sub(value)
- if err := tx.Save(listProdt[k]).Error; err != nil {
+ //todo ================end===============================
+ if v.Product.Amount.LessThan(v.Amount) {
+ return errors.New(fmt.Sprintf("浜у搧锛�%v,搴撳瓨锛�%v,鍑哄簱锛�%v,鏁伴噺涓嶅锛屾棤娉曞畬鎴愬嚭搴撴搷浣�", v.Product.Name, v.Product.Amount.String(), v.Amount.String()))
+ }
+ listDetails[k].Product.Amount = listDetails[k].Product.Amount.Sub(v.Amount)
+ if err := tx.Save(&listDetails[k].Product).Error; err != nil {
return err
}
- locAmount, res := models.NewLocationProductAmountSearch().
- SetProductId(v.ID).
- SetLocationId(operation.FromLocationID).
- FirstRes()
- if res.Error != nil {
- if res.Error == gorm.ErrRecordNotFound {
- return errors.New("褰撳墠浠撳簱娌℃湁璇ヤ骇鍝�,璇峰厛鍏ュ簱")
+
+ if locAmount, aok := mapLocAmount[strconv.Itoa(v.FromLocationID)+v.ProductId]; aok {
+ if locAmount.Amount.LessThan(v.Amount) {
+ return errors.New(fmt.Sprintf("浜у搧锛�%v,搴撳瓨锛�%v,鍑哄簱锛�%v,鏁伴噺涓嶅锛屾棤娉曞畬鎴愬嚭搴撴搷浣�", v.Product.Name, locAmount.Amount.String(), v.Amount.String()))
}
- return res.Error
- }
- 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
+ locAmount.Amount = locAmount.Amount.Sub(v.Amount)
+ if err := models.NewLocationProductAmountSearch().SetID(locAmount.Id).Update(locAmount); err != nil {
+ return err
+ }
+ } else {
+ return errors.New("褰撳墠浠撳簱娌℃湁璇ヤ骇鍝�,璇峰厛鍏ュ簱")
}
}
if operation.Source != "" {
- go UpdateOutStatus(operation.Source, operation.Number, 4)
+ go UpdateOutStatus(operation.Source, operation.SourceNumber, 4)
}
}
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,
- },
- },
+ for _, v := range listDetails {
+ if fromLocAmount, aok := mapLocAmount[strconv.Itoa(v.FromLocationID)+v.ProductId]; aok {
+ if fromLocAmount.Amount.LessThan(v.Amount) {
+ return errors.New(fmt.Sprintf("浜у搧锛�%v,搴撳瓨锛�%v,鍑哄簱锛�%v,鏁伴噺涓嶅锛屾棤娉曞畬鎴愬嚭搴撴搷浣�", v.Product.Name, fromLocAmount.Amount.String(), v.Amount.String()))
}
- 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) {
+ fromLocAmount.Amount = fromLocAmount.Amount.Sub(v.Amount)
+ if err := models.NewLocationProductAmountSearch().SetID(fromLocAmount.Id).Update(fromLocAmount); err != nil {
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 errors.New("褰撳墠浠撳簱娌℃湁璇ヤ骇鍝�,璇峰厛鍏ュ簱")
+ }
+
+ if toLocAmount, aok := mapLocAmount[strconv.Itoa(v.ToLocationID)+v.ProductId]; aok {
+ toLocAmount.Amount = toLocAmount.Amount.Add(v.Amount)
+ if err := models.NewLocationProductAmountSearch().SetID(toLocAmount.Id).Update(toLocAmount); err != nil {
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
- }
+ } else {
+ if err := models.NewLocationProductAmountSearch().Create(&models.LocationProductAmount{
+ LocationId: v.ToLocationID,
+ ProductCategoryID: v.Product.CategoryId,
+ ProductId: v.ProductId,
+ Amount: v.Amount,
+ CreateDate: time.Now().Format("2006-01-02 15:04:05"),
+ }); err != nil {
+ return err
}
- }
- }
- if len(operationInputs) > 0 {
- if err := tx.Create(&operationInputs).Error; err != nil {
- return err
}
}
}
@@ -750,10 +645,10 @@
Amount: v.Amount,
Unit: v.Product.Unit,
Weight: operation.Weight,
- FromLocationId: operation.FromLocationID,
- FromLocation: operation.FromLocation.Name,
- ToLocationId: operation.ToLocationID,
- ToLocation: operation.ToLocation.Name,
+ FromLocationId: v.FromLocationID,
+ FromLocation: v.FromLocation.Name,
+ ToLocationId: v.ToLocationID,
+ ToLocation: v.ToLocation.Name,
}
histories = append(histories, history)
}
@@ -910,7 +805,7 @@
}
//鏇存柊aps鐗╂枡鐢宠鐘舵��
if operation.Source == "APS_APPLY_MATERIAL" {
- go UpdateOutStatus(operation.Source, operation.Number, 3)
+ go UpdateOutStatus(operation.Source, operation.SourceNumber, 3)
}
util.ResponseFormat(c, code.Success, "鎿嶄綔鎴愬姛")
}
@@ -965,11 +860,11 @@
}
func ExportInputSelfmade(category constvar.FileTemplateCategory, operation *models.Operation) (string, error) {
- template, err := models.NewFileTemplateAttachmentSearch().SetPreload(true).SetCategory(category).First()
+ template, err := models.NewFileTemplateAttachmentSearch().SetCategory(category).First()
if err != nil {
return "", errors.New("鑾峰彇妯＄増璁板綍澶辫触:" + err.Error())
}
- readerCloser, err := http.HttpGetWithReadCloser(template.Attachment.FileUrl)
+ readerCloser, err := http.HttpGetWithReadCloser(template.FileUrl)
if err != nil {
return "", errors.New("鑾峰彇妯＄増澶辫触:" + err.Error())
}
@@ -979,6 +874,7 @@
return "", errors.New("璇诲彇excel妯＄増澶辫触锛�" + err.Error())
}
readerCloser.Close()
+ defer f.Close()
style, _ := f.NewStyle(&excelize.Style{
Border: []excelize.Border{
@@ -1011,7 +907,7 @@
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", "H"+strconv.Itoa(rowIndex), v.ToLocation.Name)
f.SetCellValue("Sheet1", "I"+strconv.Itoa(rowIndex), operation.Comment)
rowIndex++
totalAmount = totalAmount.Add(v.Amount)
@@ -1034,7 +930,7 @@
return "", err
}
- fileUrl, err := upload.UploadFileToSeaWeed(string(constvar.FileType_File), "xlsx", buf.Bytes())
+ fileUrl, err := upload.UploadFileToSeaWeed(string(constvar.FileType_File), uuid.NewV4().String()+".xlsx", buf.Bytes())
if err != nil {
logx.Errorf("file upload err: %v", err)
return "", err
@@ -1044,12 +940,12 @@
}
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()
+ repositoryLevels := strings.Split(operation.Location.JointName, "/")
+ template, err := models.NewFileTemplateAttachmentSearch().SetCategory(category).First()
if err != nil {
return "", errors.New("鑾峰彇妯＄増璁板綍澶辫触:" + err.Error())
}
- readerCloser, err := http.HttpGetWithReadCloser(template.Attachment.FileUrl)
+ readerCloser, err := http.HttpGetWithReadCloser(template.FileUrl)
if err != nil {
return "", errors.New("鑾峰彇妯＄増澶辫触:" + err.Error())
}
@@ -1059,6 +955,7 @@
return "", errors.New("璇诲彇excel妯＄増澶辫触锛�" + err.Error())
}
readerCloser.Close()
+ defer f.Close()
style, _ := f.NewStyle(&excelize.Style{
Border: []excelize.Border{
@@ -1110,7 +1007,7 @@
return "", err
}
- fileUrl, err := upload.UploadFileToSeaWeed(string(constvar.FileType_File), "xlsx", buf.Bytes())
+ fileUrl, err := upload.UploadFileToSeaWeed(string(constvar.FileType_File), uuid.NewV4().String()+".xlsx", buf.Bytes())
if err != nil {
logx.Errorf("file upload err: %v", err)
return "", err
@@ -1155,3 +1052,47 @@
}
util.ResponseFormat(c, code.Success, resp.List)
}
+
+// ListByCondition
+// @Tags 鍏ュ簱/鍑哄簱
+// @Summary 鍑哄叆搴撴槑缁�
+// @Produce application/json
+// @Param object body request.OperationCondition true "鍙傛暟"
+// @Success 200 {object} util.Response "鎴愬姛"
+// @Router /api-wms/v1/operation/listByCondition [post]
+func (slf OperationController) ListByCondition(c *gin.Context) {
+ var params request.OperationCondition
+ 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
+ }
+
+ db := mysqlx.GetDB().Table("wms_operation").
+ Select("wms_operation.id as operation_id,wms_operation.number,wms_operation.base_operation_type,material.id AS product_id,material.`name` AS product_name,wms_operation_details.amount,material.unit,wms_operation_details.from_location_id,from_location.`name` AS from_location,wms_operation_details.to_location_id,to_location.`name` AS to_location,wms_operation.operation_date as date,wms_operation.`status`").
+ InnerJoins("inner join wms_operation_details ON wms_operation_details.operation_id = wms_operation.id").
+ InnerJoins("INNER JOIN material ON material.id = wms_operation_details.product_id").
+ InnerJoins("INNER JOIN wms_location AS from_location ON from_location.id = wms_operation_details.from_location_id").
+ InnerJoins("INNER JOIN wms_location AS to_location ON to_location.id = wms_operation_details.to_location_id")
+ if params.Condition != "" {
+ db = db.Where("wms_operation.number like ? or wms_operation.source_number like ? or from_location.`name` like ? or to_location.`name` like ? or material.`name` like ? ", "%"+params.Condition+"%", "%"+params.Condition+"%", "%"+params.Condition+"%", "%"+params.Condition+"%", "%"+params.Condition+"%")
+ }
+ var (
+ records = make([]*response.InventoryHistory, 0)
+ total int64
+ )
+
+ if err := db.Count(&total).Error; err != nil {
+ util.ResponseFormat(c, code.RequestError, "鏌ユ壘澶辫触:"+err.Error())
+ return
+ }
+
+ if err := db.Offset((params.Page - 1) * params.PageSize).Limit(params.PageSize).Order("wms_operation.created_at desc").Find(&records).Error; err != nil {
+ util.ResponseFormat(c, code.RequestError, "鏌ユ壘澶辫触:"+err.Error())
+ return
+ }
+ util.ResponseFormatListWithPage(c, code.Success, records, int(total), params.Page, params.PageSize)
+}
--
Gitblit v1.8.0