From 8cb1da78fd4d237b278ed4d512c6c4f04b663cfc Mon Sep 17 00:00:00 2001 From: liujiandao <274878379@qq.com> Date: 星期一, 22 四月 2024 11:34:47 +0800 Subject: [PATCH] 库存调整修改 --- controllers/location_product_amount.go | 33 +++++++++++++++++++++++++++++---- 1 files changed, 29 insertions(+), 4 deletions(-) diff --git a/controllers/location_product_amount.go b/controllers/location_product_amount.go index 50e03f8..97a6f8e 100644 --- a/controllers/location_product_amount.go +++ b/controllers/location_product_amount.go @@ -25,11 +25,11 @@ // @Tags 搴撳瓨鐩樼偣 // @Summary 搴撳瓨鐩樼偣鍒楄〃 // @Produce application/json -// @Param object body request.PageInfo true "鏌ヨ鍙傛暟" +// @Param object body request.GetList true "鏌ヨ鍙傛暟" // @Success 200 {object} util.Response "鎴愬姛" // @Router /api-wms/v1/locationProductAmount/list [post] func (slf LocationProductAmountController) List(c *gin.Context) { - var params request.PageInfo + var params request.GetList if err := c.BindJSON(¶ms); err != nil { util.ResponseFormat(c, code.RequestParamError, "鍙傛暟瑙f瀽澶辫触锛屾暟鎹被鍨嬮敊璇�:"+err.Error()) return @@ -37,6 +37,18 @@ 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() @@ -55,6 +67,13 @@ records = make([]*models.LocationProductAmountWithOperation, 0) total int64 ) + if len(productIds) > 0 { + search.Orm = search.Orm.Where("wms_location_product_amount.product_id in (?)", productIds) + + } + if len(locationIds) > 0 { + search.Orm = search.Orm.Where("wms_location_product_amount.location_id in (?)", locationIds) + } if err := search.Orm.Count(&total).Error; err != nil { util.ResponseFormat(c, code.RequestError, fmt.Errorf("find count err: %v", err)) @@ -68,9 +87,14 @@ util.ResponseFormat(c, code.RequestError, fmt.Errorf("find count err: %v", err)) return } - var operation models.Operation + for k, v := range records { - if res := mysqlx.GetDB().Table("wms_operation").Preload("Details").InnerJoins("inner join wms_operation_details on wms_operation_details.operation_id=wms_operation.id").Where("wms_operation.base_operation_type=? and wms_operation.status=? and wms_operation_details.to_location_id=? and wms_operation_details.product_id=?", constvar.BaseOperationTypeAdjust, constvar.OperationStatus_Ready, v.LocationId, v.ProductId).First(&operation); res.Error != nil { + var operation models.Operation + db := mysqlx.GetDB() + if res := db.Table("wms_operation").Preload("Details").InnerJoins("inner join wms_operation_details "+ + "on wms_operation_details.operation_id=wms_operation.id").Where("wms_operation.base_operation_type=? and "+ + "wms_operation.status=? and wms_operation_details.to_location_id=? and wms_operation_details.product_id=?", constvar.BaseOperationTypeAdjust, + constvar.OperationStatus_Ready, v.LocationId, v.ProductId).First(&operation); res.Error != nil { if errors.Is(res.Error, gorm.ErrRecordNotFound) { records[k].Status = constvar.OperationStatus_Finish records[k].BaseOperationType = constvar.BaseOperationTypeAdjust @@ -108,6 +132,7 @@ if err := AddLocationProductAmount(reqParams); err != nil { util.ResponseFormat(c, code.RequestError, err) + return } util.ResponseFormat(c, code.Success, "娣诲姞鎴愬姛") -- Gitblit v1.8.0