From 5f4ff02960658a1ffca65a8d1eb5425faca6ecee Mon Sep 17 00:00:00 2001
From: liujiandao <274878379@qq.com>
Date: 星期一, 06 五月 2024 17:12:25 +0800
Subject: [PATCH] fix
---
controllers/operation.go | 54 ++++++++++++++++++++++++++++++++++++------------------
1 files changed, 36 insertions(+), 18 deletions(-)
diff --git a/controllers/operation.go b/controllers/operation.go
index 4ebdf5c..e334da1 100644
--- a/controllers/operation.go
+++ b/controllers/operation.go
@@ -2,7 +2,6 @@
import (
"context"
- "encoding/json"
"errors"
"fmt"
"github.com/gin-gonic/gin"
@@ -10,7 +9,6 @@
"github.com/shopspring/decimal"
"github.com/xuri/excelize/v2"
"gorm.io/gorm"
- "os"
"sort"
"strconv"
"strings"
@@ -20,7 +18,6 @@
"wms/extend/code"
"wms/extend/util"
"wms/models"
- "wms/opa"
"wms/pkg/logx"
"wms/pkg/mysqlx"
"wms/pkg/structx"
@@ -542,23 +539,23 @@
}
- if operation.BaseOperationType == constvar.BaseOperationTypeOutgoing {
+ if operation.BaseOperationType == constvar.BaseOperationTypeOutgoing || operation.BaseOperationType == constvar.BaseOperationTypeDisuse {
for k, v := range listDetails {
//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.Product.Amount.LessThan(v.Amount) {
- return errors.New(fmt.Sprintf("浜у搧锛�%v,搴撳瓨锛�%v,鍑哄簱锛�%v,鏁伴噺涓嶅锛屾棤娉曞畬鎴愬嚭搴撴搷浣�", v.Product.Name, v.Product.Amount.String(), v.Amount.String()))
- }
- }
+ //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.Product.Amount.LessThan(v.Amount) {
+ // return errors.New(fmt.Sprintf("浜у搧锛�%v,搴撳瓨锛�%v,鍑哄簱锛�%v,鏁伴噺涓嶅锛屾棤娉曞畬鎴愬嚭搴撴搷浣�", v.Product.Name, v.Product.Amount.String(), v.Amount.String()))
+ // }
+ //}
//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()))
@@ -614,6 +611,27 @@
}
}
}
+
+ if operation.BaseOperationType == constvar.BaseOperationTypeAdjust {
+ for _, v := range listDetails {
+ if locAmount, aok := mapLocAmount[strconv.Itoa(v.ToLocationID)+v.ProductId]; aok {
+ locAmount.Amount = 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: 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
+ }
+ }
+ }
+ }
return nil
})
if err != nil {
--
Gitblit v1.8.0