From 359f2f3fd0da6d69474cce87353beb54bfdbf90c Mon Sep 17 00:00:00 2001
From: lishihai <dslsh@dscom>
Date: 星期四, 20 六月 2024 14:24:52 +0800
Subject: [PATCH] 概述->新建或编辑（出库/入库）信息，编辑的时候显示保存的成本单价和销售单价
---
controllers/operation.go | 788 +++++++++++++++++++++++++------------------------------
1 files changed, 362 insertions(+), 426 deletions(-)
diff --git a/controllers/operation.go b/controllers/operation.go
index 2a0b25e..98f633a 100644
--- a/controllers/operation.go
+++ b/controllers/operation.go
@@ -2,23 +2,22 @@
import (
"context"
- "encoding/json"
"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"
- "os"
"sort"
"strconv"
"strings"
"time"
+ "wms/conf"
"wms/constvar"
"wms/extend/code"
"wms/extend/util"
+ "wms/middleware"
"wms/models"
- "wms/opa"
"wms/pkg/logx"
"wms/pkg/mysqlx"
"wms/pkg/structx"
@@ -48,6 +47,7 @@
func (slf OperationController) Add(c *gin.Context) {
var reqParams request.AddOperation
var params models.Operation
+
if err := c.BindJSON(&reqParams); err != nil {
util.ResponseFormat(c, code.RequestParamError, "鍙傛暟瑙ｆ瀽澶辫触锛屾暟鎹被鍨嬮敊璇�")
return
@@ -60,6 +60,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,11 +76,41 @@
util.ResponseFormat(c, code.RequestParamError, err.Error())
return
}
-
+ userInfo := middleware.GetUserInfo(c)
+ params.CreatedBy = userInfo.Username
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
- if err := models.NewOperationSearch().Create(¶ms); err != nil {
+
+ 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
+ }
+ err = models.WithTransaction(func(db *gorm.DB) error {
+ if err := models.NewOperationSearch().Create(¶ms); err != nil {
+ return err
+ }
+ od := params.Details
+ for _, v := range od {
+ //material, err := models.NewMaterialSearch().SetID(v.ProductId).First()
+ //if err != nil {return err}
+ material := new(models.Material)
+ material.ID = v.ProductId
+ material.Cost = v.Cost
+ material.SalePrice = v.SalePrice
+ if err := models.NewMaterialSearch().SetOrm(db).Update(material); err != nil {
+ return err
+ }
+ }
+ return nil
+ })
+
+ if err != nil {
logx.Errorf("Operation create err: %v", err)
util.ResponseFormat(c, code.SaveFail, "娣诲姞澶辫触锛�"+err.Error())
return
@@ -110,39 +141,51 @@
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("璇烽�夋嫨鐩爣浣嶇疆")
- }
- if params.FromLocationID == 0 {
- return errors.New("璇烽�夋嫨婧愪綅缃�")
+ for _, v := range params.Details {
+ if v.ToLocationID == 0 {
+ return errors.New("璇烽�夋嫨鐩爣浣嶇疆")
+ }
+ if v.FromLocationID == 0 {
+ return errors.New("璇烽�夋嫨婧愪綅缃�")
+ }
}
}
return nil
}
func (slf OperationController) CheckParams(params models.Operation) error {
- if params.SourceNumber == "" {
+ /*if params.SourceNumber == "" {
return errors.New("璇峰～鍏ユ簮鍗曞彿")
+ }*/
+
+ if params.Number == "" {
+ return errors.New("璇峰～鍏ュ崟鍙�")
}
if params.OperationTypeId == 0 && int(params.BaseOperationType) == 0 {
@@ -151,6 +194,10 @@
if params.OperationDate == "" {
return errors.New("璇烽�夋嫨瀹夋帓鏃ユ湡")
+ }
+
+ if params.LocationID == 0 {
+ return errors.New("璇烽�夋嫨婧愪綅缃�")
}
if len(params.Details) <= 0 {
@@ -222,10 +269,29 @@
if int(params.Status) != 0 {
search.SetStatus(params.Status)
}
+ materials, err := models.NewMaterialSearch().FindNotTotal()
+ if err != nil {
+ util.ResponseFormat(c, code.RequestError, "鏌ユ壘澶辫触:"+err.Error())
+ return
+ }
+ costMap := make(map[string]decimal.Decimal)
+ salePriceMap := make(map[string]decimal.Decimal)
+ for _, material := range materials {
+ costMap[material.ID] = material.Cost
+ salePriceMap[material.ID] = material.SalePrice
+ }
list, total, err := search.SetOperationTypeId(params.OperationTypeId).SetPreload(true).SetOrder("created_at desc").Find()
if err != nil {
util.ResponseFormat(c, code.RequestError, "鏌ユ壘澶辫触:"+err.Error())
return
+ }
+ for _, v := range list {
+ for _, v1 := range v.Details {
+ //v1.SalePrice = decimal.NewFromFloat(1.2345)
+ //v1.Cost = decimal.NewFromFloat(9.678)
+ v1.SalePrice = v1.Cost
+ v1.Cost = v1.SalePrice
+ }
}
util.ResponseFormatListWithPage(c, code.Success, list, int(total), params.Page, params.PageSize)
@@ -286,6 +352,18 @@
if err := models.NewOperationSearch().SetOrm(tx).SetID(params.Id).Save(¶ms); err != nil {
return err
}
+ od := params.Details
+ for _, v := range od {
+ //material, err := models.NewMaterialSearch().SetID(v.ProductId).First()
+ //if err != nil {return err}
+ material := new(models.Material)
+ material.ID = v.ProductId
+ material.Cost = v.Cost
+ material.SalePrice = v.SalePrice
+ if err := models.NewMaterialSearch().SetOrm(tx).Update(material); err != nil {
+ return err
+ }
+ }
return nil
}); err != nil {
util.ResponseFormat(c, code.RequestParamError, "淇敼澶辫触锛�"+err.Error())
@@ -315,11 +393,16 @@
}
operation, err := models.NewOperationSearch().SetID(id).First()
if err != nil {
- util.ResponseFormat(c, code.RequestParamError, "鏈壘鍒扮浉鍏冲嚭鍏ュ簱淇℃伅:"+err.Error())
+ util.ResponseFormat(c, code.RequestParamError, "鏈壘鍒扮浉鍏冲嚭鍏ュ簱鍗曟嵁:"+err.Error())
+ return
+ }
+ userInfo := middleware.GetUserInfo(c)
+ if operation.CreatedBy != userInfo.Username {
+ util.ResponseFormat(c, code.RequestError, "鍒汉鐨勫嚭鍏ュ簱鍗曟嵁鏃犳硶杩涜鍒犻櫎")
return
}
if operation.Status != constvar.OperationStatus_Ready {
- util.ResponseFormat(c, code.RequestError, "璇ュ叆搴撲俊鎭棤娉曡繘琛屽垹闄�")
+ util.ResponseFormat(c, code.RequestError, "璇ュ嚭鍏ュ簱鍗曟嵁鏃犳硶杩涜鍒犻櫎")
return
}
if err := models.WithTransaction(func(tx *gorm.DB) error {
@@ -364,366 +447,58 @@
util.ResponseFormat(c, code.RequestError, "璇ュ嚭鍏ュ簱淇℃伅鏃犳硶瀹屾垚")
return
}
+
+ 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
+ }
+ }
+ userInfo := middleware.GetUserInfo(c)
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 {
+ if err := models.NewOperationSearch().SetOrm(tx).SetID(id).Update(&models.Operation{
+ Status: constvar.OperationStatus_Finish,
+ CheckedBy: userInfo.Username,
+ AuditDate: time.Now().Format("2006-01-02 15:04:05")}); err != nil {
return err
}
- if err := AddMoveHistory([]*models.Operation{operation}, tx); err != nil {
- 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 {
+ if err := service.AddMoveHistory([]*models.Operation{operation}, tx); 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("浜у搧绉嶇被寮傚父")
- }
-
- listProdt[k].Amount = listProdt[k].Amount.Add(value)
- if err := tx.Save(listProdt[k]).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,
- },
- },
- }
- 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 {
- 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 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)
- locAmount.ProductCategoryID = v.CategoryId
- if res := models.NewLocationProductAmountSearch().Orm.Where("id=?", locAmount.ID).Save(locAmount); res.Error != nil {
- return res.Error
- }
- }
- }
+ if err := service.FinishOperationInput(c, tx, operation, listDetails, mapLocAmount); err != nil {
+ return err
}
- if len(operationInputs) > 0 {
- if err := tx.Create(&operationInputs).Error; err != nil {
- return err
- }
- }
- if operation.Source != "" {
- go UpdatePurchaseStatus(operation.Source, operation.SourceNumber)
- }
-
}
- if operation.BaseOperationType == constvar.BaseOperationTypeOutgoing {
- for k, v := range listProdt {
- value, ok := mapProdt[v.ID]
- if !ok {
- return errors.New("浜у搧绉嶇被寮傚父")
- }
- //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.Amount.LessThan(value) {
- return errors.New(fmt.Sprintf("浜у搧锛�%v,搴撳瓨锛�%v,鍑哄簱锛�%v,鏁伴噺涓嶅锛屾棤娉曞畬鎴愬嚭搴撴搷浣�", v.Name, v.Amount.String(), value.String()))
- }
- }
- listProdt[k].Amount = listProdt[k].Amount.Sub(value)
- if err := tx.Save(listProdt[k]).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("褰撳墠浠撳簱娌℃湁璇ヤ骇鍝�,璇峰厛鍏ュ簱")
- }
- 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
- }
- }
- if operation.Source != "" {
- go UpdateOutStatus(operation.Source, operation.Number, 4)
+ if operation.BaseOperationType == constvar.BaseOperationTypeOutgoing || operation.BaseOperationType == constvar.BaseOperationTypeDisuse {
+ if err := service.FinishOperationOutput(tx, listDetails, mapLocAmount); err != nil {
+ return err
}
}
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,
- },
- },
- }
- 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 {
- 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 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
- }
- }
- }
+ if err := service.FinishOperationInternal(tx, listDetails); err != nil {
+ return err
}
- if len(operationInputs) > 0 {
- if err := tx.Create(&operationInputs).Error; err != nil {
- return err
- }
+ }
+
+ if operation.BaseOperationType == constvar.BaseOperationTypeAdjust {
+ if err := service.FinishOperationAdjust(tx, listDetails, mapLocAmount); err != nil {
+ return err
}
}
return nil
@@ -733,41 +508,19 @@
return
}
- util.ResponseFormat(c, code.Success, "鎿嶄綔鎴愬姛")
-}
-
-func AddMoveHistory(operationList []*models.Operation, db *gorm.DB) error {
- var histories []*models.MoveHistory
- operationMap := make(map[int]*models.Operation, len(operationList))
- for _, operation := range operationList {
- for _, v := range operation.Details {
- history := &models.MoveHistory{
- Number: operation.Number,
- BaseOperationType: operation.BaseOperationType,
- OperationTypeId: operation.OperationTypeId,
- OperationTypeName: operation.OperationTypeName,
- OperationId: operation.Id,
- ProductId: v.ProductId,
- ProductName: v.Product.Name,
- Amount: v.Amount,
- Unit: v.Product.Unit,
- Weight: operation.Weight,
- FromLocationId: operation.FromLocationID,
- FromLocation: operation.FromLocation.Name,
- ToLocationId: operation.ToLocationID,
- ToLocation: operation.ToLocation.Name,
- }
- histories = append(histories, history)
+ //淇敼鍏朵粬绯荤粺璁㈠崟鐘舵��
+ if operation.BaseOperationType == constvar.BaseOperationTypeIncoming {
+ if operation.Source != "" {
+ go UpdatePurchaseStatus(operation.Source, operation.SourceNumber)
+ go UpdateOutsourceOrder(operation.Source, operation.SourceNumber, operation.Id, listDetails)
}
- operationMap[operation.Id] = operation
+ } else if operation.BaseOperationType == constvar.BaseOperationTypeOutgoing {
+ if operation.Source != "" {
+ go UpdateOutStatus(operation.Source, operation.SourceNumber, 4)
+ }
}
- if err := db.Model(&models.MoveHistory{}).Create(&histories).Error; err != nil {
- return err
- }
- for _, history := range histories {
- service.AddNewHistoryReportRecord(history, operationMap[history.OperationId])
- }
- return nil
+
+ util.ResponseFormat(c, code.Success, "鎿嶄綔鎴愬姛")
}
//var (
@@ -823,10 +576,36 @@
func UpdatePurchaseStatus(source, number string) {
if source == "SRM_PURCHASE" {
+ count, err := models.NewOperationSearch().SetSourceNumber(number).SetStatus(constvar.OperationStatus_Ready).Count()
+ if err != nil || count > 0 {
+ return
+ }
cl := purchase_wms.NewPurchaseServiceClient(init_client.SrmConn)
- _, err := cl.UpdatePurchaseStatus(context.Background(), &purchase_wms.UpdatePurchaseStatusRequest{Number: number})
+ _, err = cl.UpdatePurchaseStatus(context.Background(), &purchase_wms.UpdatePurchaseStatusRequest{Number: number})
if err != nil {
logx.Errorf("grpc dial UpdatePurchaseStatus service error: %v", err)
+ }
+ }
+}
+
+func UpdateOutsourceOrder(source, number string, operationId int, details []*models.OperationDetails) {
+ if source == "APS_OUTSOURCING_RECEIVE" {
+ products := make([]*inventory_order.OperationProduct, 0)
+ for _, detail := range details {
+ if operationId == detail.OperationID {
+ var op inventory_order.OperationProduct
+ op.ProductNumber = detail.ProductId
+ op.Amount = detail.Amount.IntPart()
+ products = append(products, &op)
+ }
+ }
+ cl := inventory_order.NewInventoryOrderServiceClient(init_client.ApsConn)
+ _, err := cl.UpdateOutsourceOrder(context.Background(), &inventory_order.UpdateOutsourceOrderRequest{
+ OutsourceNumber: number,
+ Products: products,
+ })
+ if err != nil {
+ logx.Errorf("grpc dial UpdateOutsourceOrder service error: %v", err)
}
}
}
@@ -912,7 +691,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, "鎿嶄綔鎴愬姛")
}
@@ -946,32 +725,157 @@
}
var fileUrl string
+ companyName := conf.WebConf.CompanyName
+ if companyName == "" {
+ util.ResponseFormat(c, code.RequestParamError, "缂哄皯宸ュ巶鍚嶇О閰嶇疆")
+ return
+ }
if operation.BaseOperationType == constvar.BaseOperationTypeIncoming {
- fileUrl, err = ExportInputSelfmade(constvar.FileTemplateCategory_Selfmade, operation)
- if err != nil {
- util.ResponseFormat(c, code.RequestParamError, err.Error())
- return
+ if companyName == "jialian" {
+ fileUrl, err = JialianOperation(constvar.FileTemplateCategory_JialianInput, operation)
+ if err != nil {
+ util.ResponseFormat(c, code.RequestParamError, err.Error())
+ return
+ }
+ } else if companyName == "geruimi" {
+ fileUrl, err = ExportInputSelfmade(constvar.FileTemplateCategory_Selfmade, operation)
+ if err != nil {
+ util.ResponseFormat(c, code.RequestParamError, err.Error())
+ return
+ }
}
} else if operation.BaseOperationType == constvar.BaseOperationTypeOutgoing {
- fileUrl, err = ExportOutputOperation(constvar.FileTemplateCategory_Output, operation)
- if err != nil {
- util.ResponseFormat(c, code.RequestParamError, err.Error())
- return
+ if companyName == "jialian" {
+ fileUrl, err = JialianOperation(constvar.FileTemplateCategory_JialianOutput, operation)
+ if err != nil {
+ util.ResponseFormat(c, code.RequestParamError, err.Error())
+ return
+ }
+ } else if companyName == "geruimi" {
+ fileUrl, err = ExportInputSelfmade(constvar.FileTemplateCategory_Output, operation)
+ if err != nil {
+ util.ResponseFormat(c, code.RequestParamError, err.Error())
+ return
+ }
}
} else {
util.ResponseFormat(c, code.RequestParamError, "璇ヨ褰曚笉鏀寔鎵撳嵃")
return
}
- util.ResponseFormat(c, code.Success, fileUrl)
+ m := make(map[string]string)
+ m["url"] = fileUrl
+ m["name"] = companyName
+ util.ResponseFormat(c, code.Success, m)
}
-func ExportInputSelfmade(category constvar.FileTemplateCategory, operation *models.Operation) (string, error) {
- template, err := models.NewFileTemplateAttachmentSearch().SetPreload(true).SetCategory(category).First()
+func JialianOperation(category constvar.FileTemplateCategory, operation *models.Operation) (string, error) {
+ 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())
+ }
+
+ f, err := excelize.OpenReader(readerCloser)
+ if err != nil {
+ return "", errors.New("璇诲彇excel妯＄増澶辫触锛�" + err.Error())
+ }
+ readerCloser.Close()
+ defer f.Close()
+
+ f.SetCellValue("Sheet1", "H2", operation.OperationDate)
+ f.SetCellValue("Sheet1", "O2", operation.Number)
+
+ rowIndex := 5
+ totalAmount := decimal.NewFromInt(0)
+ totalPrice := decimal.NewFromInt(0)
+ for i, v := range operation.Details {
+ //璁剧疆琛ㄥ崟鏈�澶�9鏉℃暟鎹�
+ if i > 8 {
+ break
+ }
+ f.SetCellValue("Sheet1", "A"+strconv.Itoa(rowIndex), v.Product.Name)
+ f.SetCellValue("Sheet1", "B"+strconv.Itoa(rowIndex), v.Product.Type)
+ f.SetCellValue("Sheet1", "C"+strconv.Itoa(rowIndex), v.Product.Unit)
+ f.SetCellValue("Sheet1", "D"+strconv.Itoa(rowIndex), v.Amount.String())
+ f.SetCellValue("Sheet1", "E"+strconv.Itoa(rowIndex), v.Product.SalePrice.String())
+ if !v.Product.SalePrice.IsZero() {
+ ap := v.Amount.Mul(v.Product.SalePrice)
+ totalPrice = totalPrice.Add(ap)
+ price := ap.String()
+ split := strings.Split(price, ".")
+ if len(split) == 2 {
+ for n, a := range split[1] {
+ f.SetCellValue("Sheet1", string('M'+n)+strconv.Itoa(rowIndex), string(a))
+ }
+ }
+ s := split[0]
+ n := 0
+ for j := len(s) - 1; j >= 0; j-- {
+ if n == 6 {
+ f.SetCellValue("Sheet1", string('L'-n)+strconv.Itoa(rowIndex), s[:j])
+ break
+ }
+ f.SetCellValue("Sheet1", string('L'-n)+strconv.Itoa(rowIndex), string(s[j]))
+ n++
+ }
+ }
+
+ rowIndex++
+ totalAmount = totalAmount.Add(v.Amount)
+ }
+ //鍚堣
+ if !totalPrice.IsZero() {
+ price := totalPrice.String()
+ split := strings.Split(price, ".")
+ if len(split) == 2 {
+ for n, a := range split[1] {
+ f.SetCellValue("Sheet1", string('M'+n)+"14", string(a))
+ }
+ } else {
+ f.SetCellValue("Sheet1", "M14", "0")
+ f.SetCellValue("Sheet1", "N14", "0")
+ }
+ s := split[0]
+ n := 0
+ for j := len(s) - 1; j >= 0; j-- {
+ if n == 6 {
+ f.SetCellValue("Sheet1", string('L'-n)+"14", s[:j])
+ break
+ }
+ f.SetCellValue("Sheet1", string('L'-n)+"14", string(s[j]))
+ n++
+ }
+ }
+ f.SetCellValue("Sheet1", "D14", totalAmount)
+
+ f.SetCellValue("Sheet1", "B15", operation.Manager)
+ f.SetCellValue("Sheet1", "D15", operation.Accountant)
+ f.SetCellValue("Sheet1", "F15", operation.Custodian)
+
+ buf, err := f.WriteToBuffer()
+ if err != nil {
+ return "", err
+ }
+
+ 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
+ }
+
+ return fileUrl, nil
+}
+
+func ExportInputSelfmade(category constvar.FileTemplateCategory, operation *models.Operation) (string, error) {
+ template, err := models.NewFileTemplateAttachmentSearch().SetCategory(category).First()
+ if err != nil {
+ return "", errors.New("鑾峰彇妯＄増璁板綍澶辫触:" + err.Error())
+ }
+ readerCloser, err := http.HttpGetWithReadCloser(template.FileUrl)
if err != nil {
return "", errors.New("鑾峰彇妯＄増澶辫触:" + err.Error())
}
@@ -1014,7 +918,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)
@@ -1037,7 +941,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
@@ -1047,12 +951,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())
}
@@ -1114,7 +1018,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
@@ -1178,9 +1082,23 @@
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.from_location_id,from_location.`name` AS from_location,wms_operation.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.from_location_id").InnerJoins("INNER JOIN wms_location AS to_location ON to_location.id = wms_operation.to_location_id")
+ 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`,material.weight,wms_operation.operation_type_name").
+ 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 ?", "%"+params.Condition+"%", "%"+params.Condition+"%", "%"+params.Condition+"%", "%"+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+"%")
+ }
+ if params.WarehouseId != 0 {
+ db = db.Where("warehouse_id = ?", params.WarehouseId)
+ }
+ if params.LocationId != 0 {
+ db = db.Where("location_id = ?", params.LocationId)
}
var (
records = make([]*response.InventoryHistory, 0)
@@ -1192,9 +1110,27 @@
return
}
- if err := db.Offset((params.Page - 1) * params.PageSize).Limit(params.PageSize).Find(&records).Error; err != nil {
+ 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)
}
+
+// GetPersonnelList
+// @Tags 鍏ュ簱/鍑哄簱
+// @Summary 鑾峰彇浜哄憳鍒楄〃
+// @Produce application/json
+// @Param object body request.OperationCondition true "鍙傛暟"
+// @Success 200 {object} util.ResponseList{data=[]inventory_order.WorkerInfo} "鎴愬姛"
+// @Router /api-wms/v1/operation/getPersonnelList [get]
+func (slf OperationController) GetPersonnelList(c *gin.Context) {
+ cli := inventory_order.NewInventoryOrderServiceClient(init_client.ApsConn)
+ list, err := cli.GetWorkerList(context.Background(), &inventory_order.GetWorkerListRequest{})
+ if err != nil {
+ util.ResponseFormat(c, code.RequestParamError, "鍐呴儴閿欒")
+ logx.Error("grpc璋冪敤澶辫触, GetPersonnelList err : " + err.Error())
+ return
+ }
+ util.ResponseFormat(c, code.Success, list.List)
+}
--
Gitblit v1.8.0