From 73b6baf6af3d88cdcb0e2df7932a9bd96b0b85c5 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期一, 01 七月 2024 22:32:34 +0800
Subject: [PATCH] 月度统计出入库按类型汇总报表定时任务和手动跑任务接口
---
controllers/operation.go | 677 +++++++++++++++++++++++++++++++------------------------
1 files changed, 382 insertions(+), 295 deletions(-)
diff --git a/controllers/operation.go b/controllers/operation.go
index 7a6a2d0..d948560 100644
--- a/controllers/operation.go
+++ b/controllers/operation.go
@@ -9,6 +9,7 @@
"github.com/shopspring/decimal"
"github.com/xuri/excelize/v2"
"gorm.io/gorm"
+ "io/ioutil"
"sort"
"strconv"
"strings"
@@ -48,6 +49,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
@@ -61,26 +63,42 @@
return
}
- if err := slf.FormatLocation(¶ms); err != nil {
- util.ResponseFormat(c, code.RequestParamError, err.Error())
- return
- }
-
if CheckDetailsRepeat(params.Details) {
util.ResponseFormat(c, code.RequestParamError, "鏄庣粏涓笉鑳藉瓨鍦ㄩ噸澶嶇殑浜у搧")
return
}
- operationType, err := models.NewOperationTypeSearch().SetID(uint(params.OperationTypeId)).First()
- if err != nil {
- util.ResponseFormat(c, code.RequestParamError, err.Error())
- return
+ if params.BaseOperationType != constvar.BaseOperationTypeAdjust {
+ if err := slf.FormatLocation(¶ms); err != nil {
+ util.ResponseFormat(c, code.RequestParamError, err.Error())
+ return
+ }
+
+ var operationType *models.OperationType
+ var err error
+ if params.OperationTypeId == 0 {
+ operationType, err := models.NewOperationTypeSearch().
+ SetWarehouseId(params.WarehouseId).SetBaseOperationType(params.BaseOperationType).
+ First()
+ if err != nil || params.WarehouseId != operationType.WarehouseId {
+ util.ResponseFormat(c, code.RequestParamError, "鍙傛暟缂哄け")
+ return
+ }
+ } else {
+ operationType, err = models.NewOperationTypeSearch().SetID(uint(params.OperationTypeId)).First()
+ if err != nil {
+ util.ResponseFormat(c, code.RequestParamError, err.Error())
+ return
+ }
+ }
+ params.BaseOperationType = operationType.BaseOperationType
+ params.WarehouseId = operationType.WarehouseId
}
+
userInfo := middleware.GetUserInfo(c)
params.CreatedBy = userInfo.Username
params.Status = constvar.OperationStatus_Ready
//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 {
@@ -91,8 +109,26 @@
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 := models.NewOperationSearch().Create(¶ms); err != nil {
+ if err != nil {
logx.Errorf("Operation create err: %v", err)
util.ResponseFormat(c, code.SaveFail, "娣诲姞澶辫触锛�"+err.Error())
return
@@ -117,6 +153,7 @@
return false
}
+// FormatLocation 浣嶇疆妫�鏌�
func (slf OperationController) FormatLocation(params *models.Operation) error {
operationType, err := models.NewOperationTypeSearch().SetID(uint(params.OperationTypeId)).First()
if err != nil {
@@ -157,31 +194,36 @@
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 {
- return errors.New("鏈瘑鍒璁板綍绫诲瀷")
+ return errors.New("鏈瘑鍒璁板綍绫诲瀷1")
+ }
+
+ if params.BaseOperationType != 0 {
+ if params.WarehouseId == 0 {
+ return errors.New("鏈瘑鍒璁板綍绫诲瀷2")
+ }
}
if params.OperationDate == "" {
return errors.New("璇烽�夋嫨瀹夋帓鏃ユ湡")
}
- if params.LocationID == 0 {
- return errors.New("璇烽�夋嫨婧愪綅缃�")
- }
+ //if params.LocationID == 0 {
+ // return errors.New("璇烽�夋嫨婧愪綅缃�")
+ //}
if len(params.Details) <= 0 {
return errors.New("璇锋坊鍔犳槑缁嗕俊鎭�")
@@ -232,7 +274,7 @@
// @Summary 鍏ュ簱/鍑哄簱鍒楄〃
// @Produce application/json
// @Param object body request.OperationList true "鏌ヨ鍙傛暟"
-// @Success 200 {object} util.Response "鎴愬姛"
+// @Success 200 {object} util.ResponseList{data=[]models.Operation} "鎴愬姛"
// @Router /api-wms/v1/operation/list [post]
func (slf OperationController) List(c *gin.Context) {
var params request.OperationList
@@ -252,10 +294,31 @@
if int(params.Status) != 0 {
search.SetStatus(params.Status)
}
- list, total, err := search.SetOperationTypeId(params.OperationTypeId).SetPreload(true).SetOrder("created_at desc").Find()
+ 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).
+ SetBaseOperationType(params.BaseOperationType).
+ 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)
@@ -265,8 +328,8 @@
if !params.PageInfo.Check() {
return errors.New("鏁版嵁鍒嗛〉淇℃伅閿欒")
}
- if params.OperationTypeId == 0 {
- return errors.New("operationTypeId涓�0")
+ if params.OperationTypeId == 0 && params.BaseOperationType == 0 {
+ return errors.New("operationTypeId鍜宐aseOperationType涓嶈兘鍚屾椂涓�0")
}
return nil
}
@@ -301,9 +364,12 @@
util.ResponseFormat(c, code.RequestParamError, "鏄庣粏涓笉鑳藉瓨鍦ㄩ噸澶嶇殑浜у搧")
return
}
- if err := slf.FormatLocation(¶ms); err != nil {
- util.ResponseFormat(c, code.RequestParamError, err.Error())
- return
+
+ if params.BaseOperationType != constvar.BaseOperationTypeAdjust {
+ if err := slf.FormatLocation(¶ms); err != nil {
+ util.ResponseFormat(c, code.RequestParamError, err.Error())
+ return
+ }
}
if err := models.WithTransaction(func(tx *gorm.DB) error {
if err := models.NewOperationDetailsSearch().SetOrm(tx).SetOperationId(params.Id).Delete(); err != nil {
@@ -316,6 +382,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())
@@ -345,11 +423,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 {
@@ -414,231 +497,38 @@
}
}
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,
CheckedBy: userInfo.Username,
- CheckedAt: time.Now(),
AuditDate: time.Now().Format("2006-01-02 15:04:05")}); err != nil {
return err
}
- if err := AddMoveHistory([]*models.Operation{operation}, tx); err != nil {
+ if err := service.AddMoveHistory([]*models.Operation{operation}, tx); err != nil {
return err
}
if operation.BaseOperationType == constvar.BaseOperationTypeIncoming {
- locationRoleList, err := models.NewLocationProductSearch().Find()
- if err != nil {
- return errors.New("鑾峰彇涓婃灦瑙勫垯淇℃伅澶辫触")
+ if err := service.FinishOperationInput(c, tx, operation, listDetails, mapLocAmount); err != nil {
+ return err
}
- 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
- }
- }
- }
-
- 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
- }
-
- 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,
- }
- details = append(details, detail)
-
- 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 {
- 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
- }
- }
- } 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(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,
- CheckedAt: time.Now(),
- CheckedBy: userInfo.Username,
- }).Error; err != nil {
- return err
- }
- }
-
}
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()))
- // }
- //}
- //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
- }
-
- 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()))
- }
- 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 err := service.FinishOperationOutput(tx, listDetails, mapLocAmount, operation); err != nil {
+ return err
}
}
if operation.BaseOperationType == constvar.BaseOperationTypeInternal {
- 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()))
- }
- fromLocAmount.Amount = fromLocAmount.Amount.Sub(v.Amount)
- if err := models.NewLocationProductAmountSearch().SetID(fromLocAmount.Id).Update(fromLocAmount); err != nil {
- return err
- }
- } else {
- 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
- }
- } 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 err := service.FinishOperationInternal(tx, listDetails, operation); err != nil {
+ return err
}
}
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
- }
- }
+ if err := service.FinishOperationAdjust(tx, listDetails, mapLocAmount, operation); err != nil {
+ return err
}
}
return nil
@@ -661,40 +551,6 @@
}
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: v.FromLocationID,
- FromLocation: v.FromLocation.Name,
- ToLocationId: v.ToLocationID,
- ToLocation: v.ToLocation.Name,
- }
- histories = append(histories, history)
- }
- operationMap[operation.Id] = operation
- }
- 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
}
//var (
@@ -870,7 +726,7 @@
util.ResponseFormat(c, code.Success, "鎿嶄綔鎴愬姛")
}
-// outputOperation
+// OutputOperation
//
// @Tags 鍏ュ簱/鍑哄簱
// @Summary 鎵撳嵃
@@ -888,6 +744,7 @@
util.ResponseFormat(c, code.RequestParamError, "id涓�0")
return
}
+ // 鑾峰彇鎿嶄綔娑堟伅
operation, err := models.NewOperationSearch().SetPreload(true).SetID(id).First()
if err != nil {
util.ResponseFormat(c, code.RequestParamError, "鏈壘鍒扮浉鍏冲嚭鍏ュ簱淇℃伅:"+err.Error())
@@ -899,18 +756,47 @@
}
var fileUrl string
+ // 鑾峰彇鍏徃鍚嶇О
companyName := conf.WebConf.CompanyName
if companyName == "" {
util.ResponseFormat(c, code.RequestParamError, "缂哄皯宸ュ巶鍚嶇О閰嶇疆")
return
}
+ // BaseOperationTypeIncoming 鏀惰揣
if operation.BaseOperationType == constvar.BaseOperationTypeIncoming {
if companyName == "jialian" {
- fileUrl, err = JialianOperation(constvar.FileTemplateCategory_JialianInput, operation)
+ // 鍏ュ簱
+ oT, err := models.NewOperationTypeSearch().SetID(uint(operation.OperationTypeId)).First()
if err != nil {
util.ResponseFormat(c, code.RequestParamError, err.Error())
return
}
+ warehouse, err := models.NewWarehouseSearch().SetID(oT.WarehouseId).First()
+ if err != nil {
+ util.ResponseFormat(c, code.RequestParamError, err.Error())
+ return
+ }
+ if err != nil {
+ util.ResponseFormat(c, code.RequestParamError, err.Error())
+ return
+ }
+
+ if warehouse.FileTemplateCategoryIn == constvar.FileTemplateCategory_JialianInput1 {
+ fileUrl, err = JialianOperation2(warehouse.FileTemplateCategoryIn, operation)
+ if err != nil {
+ util.ResponseFormat(c, code.RequestParamError, err.Error())
+ return
+ }
+
+ } else if warehouse.FileTemplateCategoryIn == constvar.FileWarehouseCategory_JialianInput2 {
+ fileUrl, err = JialianOperation1(warehouse.FileTemplateCategoryIn, 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 {
@@ -918,12 +804,37 @@
return
}
}
- } else if operation.BaseOperationType == constvar.BaseOperationTypeOutgoing {
+ } else if operation.BaseOperationType == constvar.BaseOperationTypeOutgoing { // 浜よ揣
if companyName == "jialian" {
- fileUrl, err = JialianOperation(constvar.FileTemplateCategory_JialianOutput, operation)
+ oT, err := models.NewOperationTypeSearch().SetID(uint(operation.OperationTypeId)).First()
if err != nil {
util.ResponseFormat(c, code.RequestParamError, err.Error())
return
+ }
+ warehouse, err := models.NewWarehouseSearch().SetID(oT.WarehouseId).First()
+ if err != nil {
+ util.ResponseFormat(c, code.RequestParamError, err.Error())
+ return
+ }
+ if err != nil {
+ util.ResponseFormat(c, code.RequestParamError, err.Error())
+ return
+ }
+
+ if warehouse.FileTemplateCategoryOut == constvar.FileTemplateCategory_JialianOutput1 {
+ fileUrl, err = JialianOperation2(warehouse.FileTemplateCategoryOut, operation)
+ if err != nil {
+ util.ResponseFormat(c, code.RequestParamError, err.Error())
+ return
+ }
+
+ } else if warehouse.FileTemplateCategoryOut == constvar.FileWarehouseCategory_JialianOutput2 {
+ fileUrl, err = JialianOperation1(warehouse.FileTemplateCategoryOut, operation)
+ if err != nil {
+ util.ResponseFormat(c, code.RequestParamError, err.Error())
+ return
+ }
+
}
} else if companyName == "geruimi" {
fileUrl, err = ExportInputSelfmade(constvar.FileTemplateCategory_Output, operation)
@@ -943,39 +854,88 @@
util.ResponseFormat(c, code.Success, m)
}
-func JialianOperation(category constvar.FileTemplateCategory, operation *models.Operation) (string, error) {
+func JialianOperation1(category constvar.FileTemplateCategory, operation *models.Operation) (string, error) {
+ // 鑾峰彇妯℃澘璁板綍
template, err := models.NewFileTemplateAttachmentSearch().SetCategory(category).First()
if err != nil {
return "", errors.New("鑾峰彇妯＄増璁板綍澶辫触:" + err.Error())
}
+ fmt.Println(template)
+ // 鏍规嵁妯℃澘璺緞鑾峰彇妯℃澘娑堟伅
readerCloser, err := http.HttpGetWithReadCloser(template.FileUrl)
if err != nil {
return "", errors.New("鑾峰彇妯＄増澶辫触:" + err.Error())
}
+ // 璇诲彇妯℃澘鍐呭
f, err := excelize.OpenReader(readerCloser)
+ //fl, err := os.Open("E:\\瀹剁汉鍑哄叆搴撳崟.xlsx")
+ //f, err := excelize.OpenReader(fl)
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)
+ sheet := "Sheet1"
+ if category == constvar.FileWarehouseCategory_JialianInput2 {
+ sheet = "鍏ュ簱鍗�"
+ } else if category == constvar.FileWarehouseCategory_JialianOutput2 {
+ sheet = "鍑哄簱鍗�"
+ }
- rowIndex := 5
- totalAmount := decimal.NewFromInt(0)
- totalPrice := decimal.NewFromInt(0)
+ // 绗簩琛�
+ f.SetCellValue(sheet, "K2", operation.Number) // 鍗曞彿
+ // 绗笁琛�
+ f.SetCellValue(sheet, "D3", operation.CompanyName) // 鍏徃
+ f.SetCellValue(sheet, "G3", "") // 閮ㄩ棬
+
+ // 鏃堕棿
+ date := operation.OperationDate
+ f.SetCellValue(sheet, "I3", date[0:4]) // 骞�
+ f.SetCellValue(sheet, "L3", date[5:7]) // 鏈�
+ f.SetCellValue(sheet, "N3", date[8:10]) // 鏃�
+
+ var entityIDs []string
+ for _, v := range operation.Details {
+ entityIDs = append(entityIDs, v.ProductId)
+ }
+ attributeMap := make(map[string]uint)
+ attributeValueMap := make(map[string]string)
+ attributes, err := models.NewAttributeSearch().SetEntityType(1).FindNotTotal()
+ if err != nil {
+ return "", errors.New("鑾峰彇鍔ㄦ�佸睘鎬уけ璐ワ細" + err.Error())
+ }
+ for _, v := range attributes {
+ attributeMap[v.Name] = v.ID
+ }
+ attributeValues, err := models.NewAttributeValueSearch().SetEntityIDs(entityIDs).FindNotTotal()
+ if err != nil {
+ return "", errors.New("鑾峰彇鍔ㄦ�佸睘鎬у�煎け璐ワ細" + err.Error())
+ }
+ for _, v := range attributeValues {
+ attributeValueMap[fmt.Sprintf("%d%s", v.AttributeID, v.EntityID)] = v.Value
+ }
+
+ // 绗叚琛� 寰幆濉��
+ totalAmount := decimal.NewFromInt(0) // 鎬婚噾棰�
+ totalPrice := decimal.NewFromInt(0) // 鎬讳环
+ rowIndex := 6
for i, v := range operation.Details {
- //璁剧疆琛ㄥ崟鏈�澶�9鏉℃暟鎹�
- if i > 8 {
+ //璁剧疆琛ㄥ崟鏈�澶�6鏉℃暟鎹�
+ if i > 6 {
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())
+ f.SetCellValue(sheet, "B"+strconv.Itoa(rowIndex), v.Product.Name) // 浜у搧鍚嶇О
+ f.SetCellValue(sheet, "C"+strconv.Itoa(rowIndex), v.Product.Specs) //瑙勬牸
+ f.SetCellValue(sheet, "D"+strconv.Itoa(rowIndex), attributeValueMap[fmt.Sprintf("%d%s", attributeMap["棰滆壊"], v.ProductId)]) //棰滆壊
+ f.SetCellValue(sheet, "E"+strconv.Itoa(rowIndex), attributeValueMap[fmt.Sprintf("%d%s", attributeMap["闈㈡枡"], v.ProductId)]) //闈㈡枡
+ f.SetCellValue(sheet, "F"+strconv.Itoa(rowIndex), v.TotalGrossWeight.String()) //閲嶉噺
+ f.SetCellValue(sheet, "G"+strconv.Itoa(rowIndex), v.Amount.String()) //鏁伴噺
+ f.SetCellValue(sheet, "H"+strconv.Itoa(rowIndex), v.Product.SalePrice.String()) // 鍗曚环
+
+ // 閲戦
if !v.Product.SalePrice.IsZero() {
ap := v.Amount.Mul(v.Product.SalePrice)
totalPrice = totalPrice.Add(ap)
@@ -983,64 +943,185 @@
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))
+ f.SetCellValue(sheet, string('N'+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])
+ f.SetCellValue(sheet, string('M'-n)+strconv.Itoa(rowIndex), s[:j])
break
}
- f.SetCellValue("Sheet1", string('L'-n)+strconv.Itoa(rowIndex), string(s[j]))
+ f.SetCellValue(sheet, string('M'-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))
+ f.SetCellValue(sheet, string('M'+n)+"12", string(a))
}
} else {
- f.SetCellValue("Sheet1", "M14", "0")
- f.SetCellValue("Sheet1", "N14", "0")
+ f.SetCellValue(sheet, "N12", "0")
+ f.SetCellValue(sheet, "O12", "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])
+ f.SetCellValue(sheet, string('M'-n)+"12", s[:j])
break
}
- f.SetCellValue("Sheet1", string('L'-n)+"14", string(s[j]))
+ f.SetCellValue(sheet, string('M'-n)+"12", 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)
-
+ // 澶囨敞 绗�13琛�
+ f.SetCellValue(sheet, "B13", "澶囨敞锛�"+operation.Remark)
+ // 绗�14琛�
+ f.SetCellValue(sheet, "C14", operation.Manager) // 瀹℃牳
+ f.SetCellValue(sheet, "F14", operation.Accountant) // 淇濈
+ f.SetCellValue(sheet, "I14", 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())
+ ioutil.WriteFile("E:\\"+uuid.NewV4().String()+".xlsx", buf.Bytes(), 0644)
+ if err != nil {
+ //ioutil.WriteFile("E:\\"+uuid.NewV4().String()+".xlsx", buf.Bytes(), 0644)
+ logx.Errorf("file upload err: %v", err)
+ return "", err
+ }
+ return fileUrl, nil
+}
+
+func JialianOperation2(category constvar.FileTemplateCategory, operation *models.Operation) (string, error) {
+ // 鑾峰彇妯℃澘璁板綍
+ template, err := models.NewFileTemplateAttachmentSearch().SetCategory(category).First()
+ if err != nil {
+ return "", errors.New("鑾峰彇妯＄増璁板綍澶辫触:" + err.Error())
+ }
+ fmt.Println(template)
+ // 鏍规嵁妯℃澘璺緞鑾峰彇妯℃澘娑堟伅
+ 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()
+
+ sheet := "Sheet1"
+ f.SetCellValue(sheet, "A2", "鍗曚綅(閮ㄩ棬):"+operation.CompanyName) // 鍗曚綅閮ㄩ棬
+ f.SetCellValue(sheet, "J2", operation.OperationDate) // 鏃堕棿
+ f.SetCellValue(sheet, "Q2", operation.Number) // 缂栧彿
+
+ totalAmount := decimal.NewFromInt(0) // 鎬婚噾棰�
+ totalPrice := decimal.NewFromInt(0) // 鎬讳环
+ rowIndex := 5
+ for i, v := range operation.Details {
+ //璁剧疆琛ㄥ崟鏈�澶�9鏉℃暟鎹�
+ if i > 9 {
+ break
+ }
+ f.SetCellValue(sheet, "A"+strconv.Itoa(rowIndex), v.Product.Name) // 鍝佸悕
+ f.SetCellValue(sheet, "B"+strconv.Itoa(rowIndex), v.Product.Type) // 鍨嬪彿
+ f.SetCellValue(sheet, "C"+strconv.Itoa(rowIndex), v.Product.Unit) // 鍗曚綅
+ f.SetCellValue(sheet, "D"+strconv.Itoa(rowIndex), v.Amount.String()) // 鏁伴噺
+ unit := service.CreateMoreUnit(v.Amount, v.Product.MoreUnitList)
+ for _, v1 := range unit {
+ if !v1.Amount.IsZero() {
+ f.SetCellValue(sheet, "E"+strconv.Itoa(rowIndex), v1.Amount) // 杈呮暟閲�
+ f.SetCellValue(sheet, "F"+strconv.Itoa(rowIndex), v1.Unit) // 杈呭崟浣�
+ break
+ }
+ }
+ f.SetCellValue(sheet, "G"+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(sheet, string('O'+n)+strconv.Itoa(rowIndex), string(a))
+ }
+ }
+ s := split[0]
+ n := 0
+ for j := len(s) - 1; j >= 0; j-- {
+ if n == 6 {
+ f.SetCellValue(sheet, string('N'-n)+strconv.Itoa(rowIndex), s[:j])
+ break
+ }
+ f.SetCellValue(sheet, string('N'-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(sheet, string('N'+n)+"14", string(a))
+ }
+ } else {
+ f.SetCellValue(sheet, "O14", "0")
+ f.SetCellValue(sheet, "P14", "0")
+ }
+ s := split[0]
+ n := 0
+ for j := len(s) - 1; j >= 0; j-- {
+ if n == 6 {
+ f.SetCellValue(sheet, string('N'-n)+"14", s[:j])
+ break
+ }
+ f.SetCellValue(sheet, string('N'-n)+"14", string(s[j]))
+ n++
+ }
+ }
+
+ f.SetCellValue(sheet, "Q5", operation.Remark) // 澶囨敞
+
+ // 绗�14琛�
+ f.SetCellValue(sheet, "B15", operation.Manager) // 涓荤
+ f.SetCellValue(sheet, "D15", operation.Accountant) // 浼氳
+ f.SetCellValue(sheet, "H15", operation.Custodian) //淇濈鍛�
+ f.SetCellValue(sheet, "Q15", 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())
+ ioutil.WriteFile("E:\\"+uuid.NewV4().String()+".xlsx", buf.Bytes(), 0644)
if err != nil {
logx.Errorf("file upload err: %v", err)
return "", err
}
-
return fileUrl, nil
}
@@ -1268,6 +1349,12 @@
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+"%")
}
+ 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)
total int64
--
Gitblit v1.8.0