From 07ecf8f047049c92193018d8f0e683bf3a49791e Mon Sep 17 00:00:00 2001
From: liujiandao <274878379@qq.com>
Date: 星期三, 18 十月 2023 16:28:06 +0800
Subject: [PATCH] 报表模块修改

---
 controllers/report_forms_controller.go |   39 +++++++++++++++++++++++----------------
 1 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/controllers/report_forms_controller.go b/controllers/report_forms_controller.go
index db62c73..d536b4a 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 {
@@ -85,12 +97,7 @@
 		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)
@@ -166,7 +173,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) {

--
Gitblit v1.8.0