From 015c07410b59bafd606bd4f567a61355c4f15958 Mon Sep 17 00:00:00 2001
From: jiangshuai <291802688@qq.com>
Date: 星期五, 03 十一月 2023 11:37:20 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/aps/WMS
---
controllers/report_forms_controller.go | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/controllers/report_forms_controller.go b/controllers/report_forms_controller.go
index 88dc93a..7370006 100644
--- a/controllers/report_forms_controller.go
+++ b/controllers/report_forms_controller.go
@@ -132,7 +132,7 @@
if params.PageInfo.Check() {
detailsSearch.SetPage(params.Page, params.PageSize)
}
- details, err := detailsSearch.SetProductId(params.ProduceId).FindNotTotal()
+ details, total, err := detailsSearch.SetProductId(params.ProduceId).Find()
if err != nil {
util.ResponseFormat(c, code.RequestParamError, "鏌ヨ鎿嶄綔璇︽儏澶辫触")
return
@@ -142,8 +142,8 @@
operationIds = append(operationIds, detail.OperationID)
}
//鑾峰彇宸插畬鎴愮殑鎿嶄綔璁板綍
- operations, total, err := models.NewOperationSearch().SetIds(operationIds).SetBaseOperationType(params.BaseOperationType).
- SetStatus(constvar.OperationStatus_Finish).Find()
+ operations, err := models.NewOperationSearch().SetIds(operationIds).SetBaseOperationType(params.BaseOperationType).
+ SetStatus(constvar.OperationStatus_Finish).FindNotTotal()
if err != nil {
util.ResponseFormat(c, code.RequestParamError, "鏌ヨ鎿嶄綔璁板綍澶辫触")
return
@@ -152,8 +152,8 @@
for _, detail := range details {
var resp response.InventoryHistory
resp.Amount = detail.Amount
- resp.Unit = params.Unit
- resp.ProductName = params.ProductName
+ resp.Unit = detail.Product.Unit
+ resp.ProductName = detail.Product.Name
for _, operation := range operations {
if detail.OperationID == operation.Id {
resp.Number = operation.Number
@@ -162,6 +162,7 @@
resp.ContactedName = operation.ContacterName
resp.FromLocation = operation.FromLocation.Name
resp.ToLocation = operation.ToLocation.Name
+ resp.BaseOperationType = operation.BaseOperationType
result = append(result, resp)
break
}
--
Gitblit v1.8.0