From 201be38fd71ee487d887e686cf07773ec750a8de Mon Sep 17 00:00:00 2001
From: liujiandao <274878379@qq.com>
Date: 星期四, 26 十月 2023 17:56:50 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/aps/WMS
---
controllers/report_forms_controller.go | 48 +++++++++++++++++-------------------------------
1 files changed, 17 insertions(+), 31 deletions(-)
diff --git a/controllers/report_forms_controller.go b/controllers/report_forms_controller.go
index b3a8e53..88dc93a 100644
--- a/controllers/report_forms_controller.go
+++ b/controllers/report_forms_controller.go
@@ -69,11 +69,11 @@
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 in (?)", []int{3, 4})
+ 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 in (?)", []int{3, 4})
+ 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.to_location_id in (?)", locationIds)
dbOut.Where("wms_operation.from_location_id in (?)", locationIds)
@@ -142,7 +142,8 @@
operationIds = append(operationIds, detail.OperationID)
}
//鑾峰彇宸插畬鎴愮殑鎿嶄綔璁板綍
- operations, total, err := models.NewOperationSearch().SetIds(operationIds).SetStatus(constvar.OperationStatus_Finish).Find()
+ operations, total, err := models.NewOperationSearch().SetIds(operationIds).SetBaseOperationType(params.BaseOperationType).
+ SetStatus(constvar.OperationStatus_Finish).Find()
if err != nil {
util.ResponseFormat(c, code.RequestParamError, "鏌ヨ鎿嶄綔璁板綍澶辫触")
return
@@ -182,10 +183,7 @@
util.ResponseFormat(c, code.RequestParamError, "鍙傛暟瑙ｆ瀽澶辫触锛屾暟鎹被鍨嬮敊璇�")
return
}
- search := models.NewLocationProductSearch()
- if params.PageInfo.Check() {
- search.SetPage(params.Page, params.PageSize)
- }
+
//鏌ヨ浣嶇疆
locations, err := models.NewLocationSearch().SetJointName(params.WareHouseCode).FindAll()
if err != nil {
@@ -197,36 +195,24 @@
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()
+ amounts, total, err := models.NewLocationProductAmountSearch().SetPage(params.Page, params.PageSize).SetPreload(true).SetKeyword(params.KeyWord).SetProductId(params.ProductId).SetLocationIds(ids).FindByPage()
if err != nil {
util.ResponseFormat(c, code.RequestParamError, "鏌ヨ鏁伴噺澶辫触")
return
}
+
var result []response.LocationForms
- for _, product := range find {
+ for _, amount := range amounts {
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.Unit = product.Product.Unit
- resp.Value = resp.Amount.Mul(product.Product.Cost)
+ resp.Amount = amount.Amount
+ resp.LocationName = amount.Location.Name
+ resp.ProduceId = amount.Product.ID
+ resp.ProductName = amount.Product.Name
+ resp.ProductTypeName = amount.ProductCategory.Name
+ resp.Unit = amount.Product.Unit
+ resp.Value = resp.Amount.Mul(amount.Product.Cost)
result = append(result, resp)
}
+
util.ResponseFormatList(c, code.Success, result, int(total))
}
--
Gitblit v1.8.0