From 155f70979af20ca520a55b89c6ec8cd46c43f8a5 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期三, 31 七月 2024 15:47:33 +0800
Subject: [PATCH] 产品流水表增加多单位存储

---
 controllers/location_product_amount.go |   72 ++++++++++++++++++++++++++++++++++-
 1 files changed, 69 insertions(+), 3 deletions(-)

diff --git a/controllers/location_product_amount.go b/controllers/location_product_amount.go
index 87ff91b..c717ed0 100644
--- a/controllers/location_product_amount.go
+++ b/controllers/location_product_amount.go
@@ -4,6 +4,7 @@
 	"errors"
 	"fmt"
 	"github.com/gin-gonic/gin"
+	"github.com/mitchellh/mapstructure"
 	"github.com/shopspring/decimal"
 	"gorm.io/gorm"
 	"strconv"
@@ -143,10 +144,71 @@
 	util.ResponseFormatListWithPage(c, code.Success, records, int(total), params.Page, params.PageSize)
 }
 
+// LocationProductList
+// @Tags      搴撳瓨鐩樼偣
+// @Summary   鑾峰彇浣嶇疆瀵瑰簲浜у搧鍒楄〃
+// @Produce   application/json
+// @Param		 object  body  request.GetLocationProductList true  "鏌ヨ鍙傛暟"
+// @Param     Authorization	header string true "token"
+// @Success   200 {object} util.ResponseList(data=[]*response.LocationProductAmount)	"鎴愬姛"
+// @Router    /api-wms/v1/locationProductAmount/locationProductList [post]
+func (slf LocationProductAmountController) LocationProductList(c *gin.Context) {
+	var params request.GetLocationProductList
+	if err := c.BindJSON(&params); err != nil {
+		util.ResponseFormat(c, code.RequestParamError, "鍙傛暟瑙ｆ瀽澶辫触锛屾暟鎹被鍨嬮敊璇�:"+err.Error())
+		return
+	}
+	if !params.Check() {
+		util.ResponseFormat(c, code.RequestParamError, "鍙傛暟寮傚父")
+		return
+	}
+	productIds := make([]string, 0)
+	locationIds := make([]int, 0)
+	if params.Keyword != "" {
+		materials, _ := models.NewMaterialSearch().SetKeyword(params.Keyword).FindNotTotal()
+		for _, material := range materials {
+			productIds = append(productIds, material.ID)
+		}
+		locations, _ := models.NewLocationSearch().SetKeyword(params.Keyword).FindNotTotal()
+		for _, location := range locations {
+			locationIds = append(locationIds, location.Id)
+		}
+	}
+
+	search := models.NewLocationProductAmountSearch()
+	records, total, err := search.
+		SetLocationIds(locationIds).SetWarehouseId(params.WarehouseId).SetProductIds(productIds).SetLocationId(params.LocationId).
+		SetPage(params.Page, params.PageSize).
+		SetOrder("id desc").
+		SetPreload(true).
+		SetCategoryIds(params.CategoryIds).
+		FindByPage()
+	if err != nil {
+		util.ResponseFormat(c, code.InternalError, "鏌ヨ澶辫触")
+		return
+	}
+
+	dataList := make([]*response.LocationProductAmount, 0, len(records))
+
+	for _, v := range records {
+		data := new(response.LocationProductAmount)
+		mapstructure.Decode(v.Product, &data)
+		data.ID = v.ProductId
+		data.LocationId = v.LocationId
+		data.Location = v.Location
+		data.Amount = v.Amount
+		data.ProductId = v.ProductId
+		dataList = append(dataList, data)
+	}
+
+	util.ResponseFormatList(c, code.Success, dataList, int(total))
+}
+
 // Add
 // @Tags      搴撳瓨鐩樼偣
 // @Summary   娣诲姞搴撳瓨鐩樼偣淇℃伅
 // @Produce   application/json
+// @Param     Authorization	header string true "token"
 // @Param     object  body  request.UpdateLocationProductAmount true  "鍏ュ簱/鍑哄簱淇℃伅"
 // @Success   200 {object} util.Response "鎴愬姛"
 // @Router    /api-wms/v1/locationProductAmount/add [post]
@@ -202,6 +264,7 @@
 			ProductId:         reqParams.ProductId,
 			Amount:            decimal.NewFromInt(0),
 			CreateDate:        time.Now().Format("2006-01-02 15:04:05"),
+			WarehouseId:       location.WarehouseId,
 		}
 	}
 
@@ -271,6 +334,7 @@
 // @Tags      搴撳瓨鐩樼偣
 // @Summary   淇敼搴撳瓨鐩樼偣淇℃伅
 // @Produce   application/json
+// @Param     Authorization	header string true "token"
 // @Param     object  body  request.UpdateLocationProductAmount true  "鍏ュ簱/鍑哄簱淇℃伅"
 // @Success   200 {object} util.Response "鎴愬姛"
 // @Router    /api-wms/v1/locationProductAmount/update [post]
@@ -308,13 +372,15 @@
 }
 
 // Finish
+// deprecated
 //
-//	@Tags		搴撳瓨鐩樼偣
+//	@Tags	搴撳瓨鐩樼偣
 //	@Summary	搴旂敤銆侀獙璇�
 //	@Produce	application/json
-//	@Param		object  body  request.FinishLocationProductAmount true  "鍏ュ弬"
+//	@Param	Authorization	header string true "token"
+//	@Param	object  body  request.FinishLocationProductAmount true  "鍏ュ弬"
 //	@Success	200	{object}	util.Response	"鎴愬姛"
-//	@Router		/api-wms/v1/locationProductAmount/finish [post]
+//	@Router	/api-wms/v1/locationProductAmount/finish [post]
 func (slf LocationProductAmountController) Finish(c *gin.Context) {
 	var reqParams request.FinishLocationProductAmount
 	if err := c.BindJSON(&reqParams); err != nil {

--
Gitblit v1.8.0