From 155f70979af20ca520a55b89c6ec8cd46c43f8a5 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期三, 31 七月 2024 15:47:33 +0800
Subject: [PATCH] 产品流水表增加多单位存储
---
controllers/product_controller.go | 89 +++++++++++++++++++++++++++-----------------
1 files changed, 55 insertions(+), 34 deletions(-)
diff --git a/controllers/product_controller.go b/controllers/product_controller.go
index 6807a60..fa48b5f 100644
--- a/controllers/product_controller.go
+++ b/controllers/product_controller.go
@@ -6,8 +6,8 @@
"github.com/gin-gonic/gin"
"github.com/shopspring/decimal"
"github.com/spf13/cast"
- "github.com/xuri/excelize/v2"
"gorm.io/gorm"
+ "io"
"net/url"
"strconv"
"time"
@@ -109,6 +109,7 @@
// @Summary 鑾峰彇浜у搧鍒楄〃
// @Produce application/json
// @Param object body request.GetProductList true "鏌ヨ鍙傛暟"
+// @Param Authorization header string true "token"
// @Success 200 {object} util.ResponseList{data=[]models.Material} "鎴愬姛"
// @Router /api-wms/v1/product/getProductList [post]
func (slf ProductController) GetProductList(c *gin.Context) {
@@ -121,7 +122,12 @@
if params.PageInfo.Check() {
search.SetPage(params.Page, params.PageSize)
}
- products, total, err := search.SetPreload(true).SetKeyword(params.KeyWord).SetCategoryId(params.CategoryId).SetOrder("created_at desc").Find()
+ products, total, err := search.SetPreload(true).
+ SetKeyword(params.KeyWord).
+ SetCategoryId(params.CategoryId).
+ SetCategoryIds(params.CategoryIds).
+ SetOrder("created_at desc").
+ Find()
if err != nil {
util.ResponseFormat(c, code.RequestParamError, "鏌ユ壘澶辫触")
return
@@ -136,32 +142,28 @@
util.ResponseFormat(c, code.RequestParamError, "浜у搧绫诲瀷鏌ユ壘澶辫触")
return
}
+ categoryMap := models.CategoryMap(categories)
for _, product := range products {
- for _, category := range categories {
- if product.CategoryId == int(category.ID) {
- product.CategoryName = category.Name
- }
+ if product.CategoryId != 0 && categoryMap[product.CategoryId] != nil {
+ product.CategoryName = categoryMap[product.CategoryId].Name
}
- var reorderAmount request.ProductStatisticsAmount
- if err := models.NewOperationSearch().Orm.
- Table("wms_operation_details").
+ var totalAmount decimal.Decimal
+ db := models.NewOperationSearch().Orm
+ if err := db.Table("wms_operation_details").
InnerJoins("INNER JOIN wms_operation on wms_operation_details.operation_id=wms_operation.id").
- Select("wms_operation_details.product_id,SUM(wms_operation_details.amount) as total_count").
+ Select("IFNULL(SUM(wms_operation_details.amount), 0) as total_count").
Where("wms_operation_details.product_id=? and wms_operation.`status`=? and wms_operation.base_operation_type in (?)", product.ID, constvar.OperationStatus_Ready, []constvar.BaseOperationType{constvar.BaseOperationTypeIncoming, constvar.BaseOperationTypeOutgoing, constvar.BaseOperationTypeDisuse}).
- Group("wms_operation_details.product_id").
- //Order("wms_operation_details.product_id").
- First(&reorderAmount).Error; err != nil {
+ Scan(&totalAmount).Error; err != nil {
if !errors.Is(err, gorm.ErrRecordNotFound) {
util.ResponseFormat(c, code.RequestParamError, "浜у搧鏁版嵁缁熻澶辫触")
return
- } else {
- reorderAmount.TotalAmount = decimal.NewFromInt(0)
}
}
- product.PredictionAmount = product.Amount.Add(reorderAmount.TotalAmount)
+ product.PredictionAmount = product.Amount.Add(totalAmount)
var statisticsList []*request.ProductStatistics
- if err := models.NewOperationSearch().Orm.Table("wms_operation").
+ db2 := models.NewOperationSearch().Orm
+ if err := db2.Table("wms_operation").
InnerJoins("INNER JOIN wms_operation_details on wms_operation_details.operation_id=wms_operation.id").
Select("SUM(wms_operation_details.amount) as total_amount,wms_operation.base_operation_type").
Where("wms_operation_details.product_id=? and wms_operation.`status`=? and wms_operation.base_operation_type in (?)", product.ID, constvar.OperationStatus_Finish, []constvar.BaseOperationType{constvar.BaseOperationTypeIncoming, constvar.BaseOperationTypeOutgoing, constvar.BaseOperationTypeDisuse}).
@@ -449,7 +451,16 @@
util.ResponseFormat(c, code.RequestParamError, "鏃犳晥id")
return
}
- err := models.NewMaterialSearch().SetID(id).Delete()
+ err := models.WithTransaction(func(tx *gorm.DB) error {
+ if err := models.NewMaterialSearch().SetOrm(tx).SetID(id).Delete(); err != nil {
+ return err
+ }
+ if err := models.NewAttributeValueSearch().SetOrm(tx).SetEntityID(id).Delete(); err != nil { //鍒犻櫎鐗╂枡瀵瑰簲鐨勫姩鎬佸睘鎬�
+ return err
+ }
+ return nil
+ })
+
if err != nil {
util.ResponseFormat(c, code.RequestParamError, "鍒犻櫎澶辫触")
return
@@ -792,6 +803,7 @@
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)
+ listDetails[k].Product.StockMoreUnitList = service.SubMoreUnit(listDetails[k].Product.StockMoreUnitList, v.MoreUnitList)
if err := tx.Save(&listDetails[k].Product).Error; err != nil {
return err
}
@@ -1017,6 +1029,16 @@
v.Sort = i + 1
}
+ //鏍￠獙閲嶅
+ m := make(map[string]struct{})
+ for _, v := range params {
+ if _, ok := m[v.Name]; ok {
+ util.ResponseFormat(c, code.RequestParamError, "鍗曚綅閲嶅锛�"+v.Name)
+ return
+ }
+ m[v.Name] = struct{}{}
+ }
+
err := models.WithTransaction(func(tx *gorm.DB) error {
err := models.NewUnitDictSearch().SetOrm(tx).Delete()
if err != nil {
@@ -1030,7 +1052,7 @@
return nil
})
if err != nil {
- util.ResponseFormat(c, code.RequestParamError, "鍒犻櫎澶辫触")
+ util.ResponseFormat(c, code.RequestParamError, "淇濆瓨澶辫触")
return
}
@@ -1077,7 +1099,7 @@
// @Success 200 {object} util.Response "鎴愬姛"
// @Router /api-wms/v1/product/downloadInputFormat [get]
func (slf ProductController) DownloadInputFormat(c *gin.Context) {
- template, err := models.NewFileTemplateAttachmentSearch().SetCategory(7).First() //鐗╂枡瀵煎叆妯℃澘
+ template, err := models.NewFileTemplateAttachmentSearch().SetCategory(constvar.FileWarehouseCategory_JialianInput3).First() //鐗╂枡瀵煎叆妯℃澘
if err != nil {
util.ResponseFormat(c, code.NoTemplateError, "鑾峰彇妯＄増璁板綍澶辫触:"+err.Error())
return
@@ -1087,20 +1109,19 @@
util.ResponseFormat(c, code.NoTemplateError, "鑾峰彇妯＄増璁板綍澶辫触:"+err.Error())
return
}
- f, err := excelize.OpenReader(readerCloser)
- if err != nil {
- util.ResponseFormat(c, code.NoTemplateError, "鑾峰彇妯＄増璁板綍澶辫触:"+err.Error())
- return
- }
- fileContentDisposition := "attachment;filename=\"" + url.QueryEscape("鐗╂枡瀵煎叆.xlsx") + "\""
- c.Writer.Header().Add("Content-Disposition", fileContentDisposition)
- c.Writer.Header().Add("Content-Type", "application/octet-stream")
- //c.Writer.Header().Add("Content-Type", "application/xlsx")
- if err = f.Write(c.Writer); err != nil {
- util.ResponseFormat(c, code.NoTemplateError, "鏁版嵁瀵煎嚭寮傚父:"+err.Error())
- return
- }
- readerCloser.Close()
+ fileContentDisposition := "attachment;filename=\"" + url.QueryEscape("鐗╂枡瀵煎叆.xlsx") + "\""
+ w := c.Writer
+ w.Header().Set("Content-Type", "application/octet-stream")
+ w.Header().Set("Content-Disposition", fileContentDisposition)
+ w.Header().Set("Content-Transfer-Encoding", "binary")
+ w.Header().Set("Cache-Control", "no-cache")
+ _, err = io.Copy(w, readerCloser)
+ if err != nil {
+ util.ResponseFormat(c, code.NoTemplateError, "涓嬭浇澶辫触:"+err.Error())
+ return
+ }
+ w.Flush()
+ _ = readerCloser.Close()
util.ResponseFormat(c, code.Success, "")
}
--
Gitblit v1.8.0