From deecdeec560af558b5a3e745b1540332959009ec Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期二, 25 六月 2024 11:27:04 +0800
Subject: [PATCH] fix
---
service/operation.go | 133 +++++++++++++++++++-------------------------
1 files changed, 58 insertions(+), 75 deletions(-)
diff --git a/service/operation.go b/service/operation.go
index 7ec90ce..8b5bd2e 100644
--- a/service/operation.go
+++ b/service/operation.go
@@ -291,26 +291,26 @@
Cost: v.Cost,
SalePrice: v.SalePrice,
})
- if len(outputDetails) > 0 {
- opTypeId, err := GetTargetOperationTypeIdByOperation(originOperation, constvar.BaseOperationTypeOutgoing)
- if err != nil {
- return err
- }
- operation := &models.Operation{
- OperationTypeId: opTypeId,
- Number: strconv.FormatInt(time.Now().Unix(), 10),
- Status: constvar.OperationStatus_Ready,
- OperationDate: time.Now().Format("2006-01-02 15:04:05"),
- Comment: "搴撳瓨璋冩嫧鍑哄簱",
- BaseOperationType: constvar.BaseOperationTypeOutgoing,
- Details: outputDetails,
- LocationID: outputDetails[0].FromLocationID,
- OperationTypeName: "搴撳瓨璋冩嫧鍑哄簱",
- IsInternalOutput: true,
- }
- if err := models.NewOperationSearch().SetOrm(tx).Create(operation); err != nil {
- return err
- }
+ }
+ if len(outputDetails) > 0 {
+ opTypeId, err := GetTargetOperationTypeIdByOperation(originOperation, constvar.BaseOperationTypeOutgoing)
+ if err != nil {
+ return err
+ }
+ operation := &models.Operation{
+ OperationTypeId: opTypeId,
+ Number: strconv.FormatInt(time.Now().Unix(), 10),
+ Status: constvar.OperationStatus_Ready,
+ OperationDate: time.Now().Format("2006-01-02 15:04:05"),
+ Comment: "搴撳瓨璋冩嫧鍑哄簱",
+ BaseOperationType: constvar.BaseOperationTypeOutgoing,
+ Details: outputDetails,
+ LocationID: outputDetails[0].FromLocationID,
+ OperationTypeName: "搴撳瓨璋冩嫧鍑哄簱",
+ IsInternalOutput: true,
+ }
+ if err := models.NewOperationSearch().SetOrm(tx).Create(operation); err != nil {
+ return err
}
}
return nil
@@ -365,62 +365,45 @@
Remark: v.Remark,
})
}
- //if locAmount, aok := mapLocAmount[strconv.Itoa(v.ToLocationID)+v.ProductId]; aok {
- // locAmount.Amount = v.Amount
- // if err := models.NewLocationProductAmountSearch().SetOrm(tx).SetID(locAmount.Id).Save(locAmount); err != nil {
- // return err
- // }
- //} else {
- // if err := models.NewLocationProductAmountSearch().SetOrm(tx).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(inputDetails) > 0 {
- opTypeId, err := GetTargetOperationTypeIdByOperation(originOperation, constvar.BaseOperationTypeIncoming)
- if err != nil {
- return err
- }
- operation := &models.Operation{
- OperationTypeId: opTypeId,
- Number: strconv.FormatInt(time.Now().Unix(), 10),
- Status: constvar.OperationStatus_Ready,
- OperationDate: time.Now().Format("2006-01-02 15:04:05"),
- Comment: "搴撳瓨璋冩暣鍏ュ簱",
- BaseOperationType: constvar.BaseOperationTypeIncoming,
- Details: inputDetails,
- LocationID: inputDetails[0].FromLocationID,
- OperationTypeName: "搴撳瓨璋冩暣鍏ュ簱",
- }
- if err := models.NewOperationSearch().SetOrm(tx).Create(operation); err != nil {
- return err
- }
+ }
+ if len(inputDetails) > 0 {
+ opTypeId, err := GetTargetOperationTypeIdByOperation(originOperation, constvar.BaseOperationTypeIncoming)
+ if err != nil {
+ return err
}
- if len(outputDetails) > 0 {
- opTypeId, err := GetTargetOperationTypeIdByOperation(originOperation, constvar.BaseOperationTypeOutgoing)
- if err != nil {
- return err
- }
- operation := &models.Operation{
- OperationTypeId: opTypeId,
- Number: strconv.FormatInt(time.Now().Unix(), 10),
- Status: constvar.OperationStatus_Ready,
- OperationDate: time.Now().Format("2006-01-02 15:04:05"),
- Comment: "搴撳瓨璋冩暣鍑哄簱",
- BaseOperationType: constvar.BaseOperationTypeOutgoing,
- Details: outputDetails,
- LocationID: outputDetails[0].FromLocationID,
- OperationTypeName: "搴撳瓨璋冩暣鍑哄簱",
- }
- if err := models.NewOperationSearch().SetOrm(tx).Create(operation); err != nil {
- return err
- }
+ operation := &models.Operation{
+ OperationTypeId: opTypeId,
+ Number: strconv.FormatInt(time.Now().Unix(), 10),
+ Status: constvar.OperationStatus_Ready,
+ OperationDate: time.Now().Format("2006-01-02 15:04:05"),
+ Comment: "搴撳瓨璋冩暣鍏ュ簱",
+ BaseOperationType: constvar.BaseOperationTypeIncoming,
+ Details: inputDetails,
+ LocationID: inputDetails[0].FromLocationID,
+ OperationTypeName: "搴撳瓨璋冩暣鍏ュ簱",
+ }
+ if err := models.NewOperationSearch().SetOrm(tx).Create(operation); err != nil {
+ return err
+ }
+ }
+ if len(outputDetails) > 0 {
+ opTypeId, err := GetTargetOperationTypeIdByOperation(originOperation, constvar.BaseOperationTypeOutgoing)
+ if err != nil {
+ return err
+ }
+ operation := &models.Operation{
+ OperationTypeId: opTypeId,
+ Number: strconv.FormatInt(time.Now().Unix(), 10),
+ Status: constvar.OperationStatus_Ready,
+ OperationDate: time.Now().Format("2006-01-02 15:04:05"),
+ Comment: "搴撳瓨璋冩暣鍑哄簱",
+ BaseOperationType: constvar.BaseOperationTypeOutgoing,
+ Details: outputDetails,
+ LocationID: outputDetails[0].FromLocationID,
+ OperationTypeName: "搴撳瓨璋冩暣鍑哄簱",
+ }
+ if err := models.NewOperationSearch().SetOrm(tx).Create(operation); err != nil {
+ return err
}
}
return nil
--
Gitblit v1.8.0