From 216c9e49dafdb7a5bd025f6d6fa899a33befc38c Mon Sep 17 00:00:00 2001 From: liujiandao <274878379@qq.com> Date: 星期三, 17 四月 2024 10:33:01 +0800 Subject: [PATCH] 产品添加字段 --- controllers/location_product_amount.go | 37 +++++++++++++++++++++++++++++++++++-- 1 files changed, 35 insertions(+), 2 deletions(-) diff --git a/controllers/location_product_amount.go b/controllers/location_product_amount.go index 195d636..4b65a15 100644 --- a/controllers/location_product_amount.go +++ b/controllers/location_product_amount.go @@ -45,7 +45,9 @@ //wms_operation_details.amount as adjust_amount,wms_operation.id as operation_id,wms_operation.status search.Orm = search.Orm. Table("wms_location_product_amount"). - Select(`wms_location_product_amount.id as location_product_amount_id,wms_location.id as location_id,wms_location.name as location_name,material.id as product_id,material.name as product_name,wms_location_product_amount.amount,material.unit,wms_location_product_amount.create_date`). + Select(`wms_location_product_amount.id as location_product_amount_id,wms_location.id as location_id,wms_location.name as location_name, + material.id as product_id,material.name as product_name,wms_location_product_amount.amount,material.unit, + wms_location_product_amount.create_date,material.weight`). InnerJoins("inner join material on material.id=wms_location_product_amount.product_id"). InnerJoins("inner join wms_location on wms_location.id=wms_location_product_amount.location_id") @@ -165,6 +167,7 @@ Comment: "搴撳瓨鐩樼偣", BaseOperationType: constvar.BaseOperationTypeAdjust, Details: []*models.OperationDetails{detail}, + LocationID: location.Id, } if err := models.WithTransaction(func(tx *gorm.DB) error { @@ -251,7 +254,7 @@ util.ResponseFormat(c, code.Success, "淇敼鎴愬姛") } -// finish +// Finish // // @Tags 搴撳瓨鐩樼偣 // @Summary 搴旂敤銆侀獙璇� @@ -311,3 +314,33 @@ } util.ResponseFormat(c, code.Success, "鎿嶄綔鎴愬姛") } + +// GetLocationProductAmount +// +// @Tags 搴撳瓨鐩樼偣 +// @Summary 鑾峰彇浣嶇疆浜у搧淇℃伅 +// @Produce application/json +// @Param object body request.GetRuleList true "鍏ュ弬" +// @Success 200 {object} util.Response{data=models.LocationProductAmount} "鎴愬姛" +// @Router /api-wms/v1/locationProductAmount/getLocationProductAmount [post] +func (slf LocationProductAmountController) GetLocationProductAmount(c *gin.Context) { + var params request.GetRuleList + if err := c.BindJSON(¶ms); err != nil { + util.ResponseFormat(c, code.RequestParamError, "鍙傛暟瑙f瀽澶辫触锛屾暟鎹被鍨嬮敊璇�") + return + } + if params.LocationId == 0 || params.ProductId == "" { + util.ResponseFormat(c, code.Success, nil) + return + } + first, err := models.NewLocationProductAmountSearch().SetLocationId(params.LocationId).SetProductId(params.ProductId).First() + if err != nil { + if err == gorm.ErrRecordNotFound { + util.ResponseFormat(c, code.Success, nil) + return + } + util.ResponseFormat(c, code.RequestParamError, err.Error()) + return + } + util.ResponseFormat(c, code.Success, first) +} -- Gitblit v1.8.0