From 9d0d545bdd6f1448c19c24d2159a4f1752131d31 Mon Sep 17 00:00:00 2001
From: jiangshuai <291802688@qq.com>
Date: 星期二, 14 十一月 2023 11:48:04 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/aps/WMS
---
controllers/report_forms_controller.go | 23 +++++++++++++----------
1 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/controllers/report_forms_controller.go b/controllers/report_forms_controller.go
index c137692..d7bccab 100644
--- a/controllers/report_forms_controller.go
+++ b/controllers/report_forms_controller.go
@@ -166,7 +166,7 @@
if params.PageInfo.Check() {
detailsSearch.SetPage(params.Page, params.PageSize)
}
- details, total, err := detailsSearch.SetProductId(params.ProduceId).Find()
+ details, total, err := detailsSearch.SetPreload(true).SetProductId(params.ProduceId).Find()
if err != nil {
util.ResponseFormat(c, code.RequestParamError, "鏌ヨ鎿嶄綔璇︽儏澶辫触")
return
@@ -218,16 +218,19 @@
util.ResponseFormat(c, code.RequestParamError, "鍙傛暟瑙ｆ瀽澶辫触锛屾暟鎹被鍨嬮敊璇�")
return
}
-
- //鏌ヨ浣嶇疆
- 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)
+ if params.LocationId != 0 {
+ ids = append(ids, params.LocationId)
+ } else {
+ //鏌ヨ浣嶇疆
+ locations, err := models.NewLocationSearch().SetJointName(params.WareHouseCode).FindAll()
+ if err != nil {
+ util.ResponseFormat(c, code.RequestParamError, "鏌ヨ浣嶇疆澶辫触")
+ return
+ }
+ for _, location := range locations {
+ ids = append(ids, location.Id)
+ }
}
amounts, total, err := models.NewLocationProductAmountSearch().SetPage(params.Page, params.PageSize).SetPreload(true).SetKeyword(params.KeyWord).SetProductId(params.ProductId).SetLocationIds(ids).FindByPage()
--
Gitblit v1.8.0