From b9a62531fb93aba42d13e62fd1b03d8dba112fa6 Mon Sep 17 00:00:00 2001 From: liujiandao <274878379@qq.com> Date: 星期一, 23 十月 2023 12:04:31 +0800 Subject: [PATCH] 位置修改 --- controllers/report_forms_controller.go | 90 +++++++++++++++++++++++++++++++-------------- 1 files changed, 62 insertions(+), 28 deletions(-) diff --git a/controllers/report_forms_controller.go b/controllers/report_forms_controller.go index d9ea817..79ee050 100644 --- a/controllers/report_forms_controller.go +++ b/controllers/report_forms_controller.go @@ -1,6 +1,7 @@ package controllers import ( + "fmt" "github.com/gin-gonic/gin" "wms/constvar" "wms/extend/code" @@ -28,20 +29,31 @@ } //鏌ヨ浜у搧 search := models.NewMaterialSearch() - if params.PageInfo.Check() { - search.SetPage(params.Page, params.PageSize) + search.Orm = search.Orm.Model(&models.Material{}). + Select(`material.id, material.name, material.cost, material.amount, material.unit, wms_product_category.name as category_name `). + Joins("left join wms_product_category on material.category_id = wms_product_category.id") + if len(params.CategoryIds) > 0 { + search.Orm.Where("material.category_id in (?)", params.CategoryIds) } - materials, total, err := search.SetCategoryIds(params.CategoryIds).Find() - if err != nil { - util.ResponseFormat(c, code.RequestParamError, "鏌ヨ浜у搧绫诲瀷澶辫触") + if params.KeyWord != "" { + search.Orm.Where("material.name like ?", "%"+params.KeyWord+"%").Or("wms_product_category.name like ?", "%"+params.KeyWord+"%") + } + var ( + materials = make([]*models.Material, 0) + total int64 + ) + if err := search.Orm.Count(&total).Error; err != nil { + util.ResponseFormat(c, code.RequestParamError, "鏌ヨtotal澶辫触") return } - //鏌ヨ浜у搧绫诲瀷 - categories, err := models.NewProductCategorySearch().SetIds(params.CategoryIds).FindNotTotal() - if err != nil { - util.ResponseFormat(c, code.RequestParamError, "鏌ヨ浜у搧绫诲瀷澶辫触") + if params.Page*params.PageSize > 0 { + search.Orm = search.Orm.Offset((params.Page - 1) * params.PageSize).Limit(params.PageSize) + } + if err := search.Orm.Find(&materials).Error; err != nil { + util.ResponseFormat(c, code.RequestParamError, fmt.Errorf("鏌ヨ浜у搧澶辫触: %v", err)) return } + //鏌ヨ鍑哄叆搴撴暟閲� locations, err := models.NewLocationSearch().SetJointName(params.WarehouseCode).FindNotTotal() if err != nil { @@ -57,13 +69,13 @@ dbIn := models.NewOperationDetailsSearch().Orm.Model(&models.OperationDetails{}). Joins("left join wms_operation ON wms_operation_details.operation_id=wms_operation.id"). Where("wms_operation.base_operation_type=?", constvar.BaseOperationTypeIncoming). - Where("wms_operation.status=?", constvar.OperationStatus_Ready) + Where("wms_operation.status = ?", constvar.OperationStatus_Finish) dbOut := models.NewOperationDetailsSearch().Orm.Model(&models.OperationDetails{}). Joins("left join wms_operation ON wms_operation_details.operation_id=wms_operation.id"). - Where("wms_operation.base_operation_type=?", constvar.BaseOperationTypeOutgoing). - Where("wms_operation.status=?", constvar.OperationStatus_Ready) + Where("wms_operation.base_operation_type in (?)", []int{2, 4}). + Where("wms_operation.status = ?", constvar.OperationStatus_Finish) if len(locationIds) > 0 { - dbIn.Where("wms_operation.from_location_id in (?)", locationIds) + dbIn.Where("wms_operation.to_location_id in (?)", locationIds) dbOut.Where("wms_operation.from_location_id in (?)", locationIds) } err = dbIn.Find(&inHouse).Error @@ -82,15 +94,9 @@ resp.ProduceId = material.ID resp.ProductName = material.Name resp.Cost = material.Cost - resp.Amount = material.Amount resp.Unit = material.Unit resp.Value = material.Amount.Mul(material.Cost) - for _, category := range categories { - if material.CategoryId == int(category.ID) { - resp.ProductType = category.Name - break - } - } + resp.ProductType = material.CategoryName for _, details := range inHouse { if material.ID == details.ProductId { resp.In = resp.In.Add(details.Amount) @@ -101,6 +107,7 @@ resp.Out = resp.Out.Add(details.Amount) } } + resp.Amount = resp.In.Sub(resp.Out) resp.AvailableNumber = resp.Amount result = append(result, resp) } @@ -125,7 +132,7 @@ if params.PageInfo.Check() { detailsSearch.SetPage(params.Page, params.PageSize) } - details, total, err := detailsSearch.SetProductId(params.ProduceId).Find() + details, err := detailsSearch.SetProductId(params.ProduceId).FindNotTotal() if err != nil { util.ResponseFormat(c, code.RequestParamError, "鏌ヨ鎿嶄綔璇︽儏澶辫触") return @@ -134,8 +141,9 @@ for _, detail := range details { operationIds = append(operationIds, detail.OperationID) } - //鑾峰彇鎿嶄綔璁板綍 - operations, err := models.NewOperationSearch().SetIds(operationIds).SetStatus(constvar.OperationStatus_Finish).FindNotTotal() + //鑾峰彇宸插畬鎴愮殑鎿嶄綔璁板綍 + operations, total, err := models.NewOperationSearch().SetIds(operationIds).SetBaseOperationType(params.BaseOperationType). + SetStatus(constvar.OperationStatus_Finish).Find() if err != nil { util.ResponseFormat(c, code.RequestParamError, "鏌ヨ鎿嶄綔璁板綍澶辫触") return @@ -145,11 +153,12 @@ var resp response.InventoryHistory resp.Amount = detail.Amount resp.Unit = params.Unit + resp.ProductName = params.ProductName for _, operation := range operations { if detail.OperationID == operation.Id { resp.Number = operation.Number resp.Date = operation.UpdateTime - resp.BaseOperationType = operation.BaseOperationType + resp.Status = "瀹屾垚" resp.ContactedName = operation.ContacterName resp.FromLocation = operation.FromLocation.Name resp.ToLocation = operation.ToLocation.Name @@ -165,7 +174,7 @@ // @Tags 鎶ヨ〃 // @Summary 鑾峰彇浣嶇疆鎶ヨ〃 // @Produce application/json -// @Param object body request.PageInfo true "鏌ヨ鍙傛暟" +// @Param object body request.GetLocationForms true "鏌ヨ鍙傛暟" // @Success 200 {object} util.ResponseList{data=[]response.LocationForms} "鎴愬姛" // @Router /api-wms/v1/forms/getLocationForms [post] func (slf ReportFormsController) GetLocationForms(c *gin.Context) { @@ -178,21 +187,46 @@ if params.PageInfo.Check() { search.SetPage(params.Page, params.PageSize) } - find, total, err := search.SetKeyword(params.KeyWord).FindByPage() + //鏌ヨ浣嶇疆 + locations, err := models.NewLocationSearch().SetJointName(params.WareHouseCode).FindAll() + if err != nil { + util.ResponseFormat(c, code.RequestParamError, "鏌ヨ浣嶇疆澶辫触") + return + } + ids := make([]int, 0) + for _, location := range locations { + ids = append(ids, location.Id) + } + + find, total, err := search.SetKeyword(params.KeyWord).SetProductId(params.ProductId).SetLocationIds(ids).FindByPage() if err != nil { util.ResponseFormat(c, code.RequestParamError, "鏌ヨ涓婃灦瑙勫垯澶辫触") + return + } + ruleIds := make([]int, 0) + for _, product := range find { + ruleIds = append(ruleIds, product.Id) + } + amounts, err := models.NewLocationProductAmountSearch().SetLocationProductIds(ruleIds).Find() + if err != nil { + util.ResponseFormat(c, code.RequestParamError, "鏌ヨ鏁伴噺澶辫触") return } var result []response.LocationForms for _, product := range find { var resp response.LocationForms + for _, amount := range amounts { + if product.Id == amount.LocationProductId { + resp.Amount = amount.Amount + break + } + } resp.LocationName = product.Location.Name resp.ProduceId = product.Product.ID resp.ProductName = product.Product.Name resp.ProductTypeName = product.ProductCategory.Name - resp.Amount = product.Product.Amount resp.Unit = product.Product.Unit - resp.Value = product.Product.Amount.Mul(product.Product.Cost) + resp.Value = resp.Amount.Mul(product.Product.Cost) result = append(result, resp) } util.ResponseFormatList(c, code.Success, result, int(total)) -- Gitblit v1.8.0