From a48026b8a0c952bb84065abaf164eb4763537066 Mon Sep 17 00:00:00 2001
From: jiangshuai <291802688@qq.com>
Date: 星期四, 16 十一月 2023 14:33:59 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/aps/WMS
---
controllers/report_forms_controller.go | 69 ++++++++++++++++++++--------------
1 files changed, 41 insertions(+), 28 deletions(-)
diff --git a/controllers/report_forms_controller.go b/controllers/report_forms_controller.go
index d7bccab..a15025a 100644
--- a/controllers/report_forms_controller.go
+++ b/controllers/report_forms_controller.go
@@ -163,42 +163,55 @@
}
//鑾峰彇鎿嶄綔璇︽儏
detailsSearch := models.NewOperationDetailsSearch()
- if params.PageInfo.Check() {
- detailsSearch.SetPage(params.Page, params.PageSize)
+ var (
+ result []*response.InventoryHistory
+ total int64
+ )
+ detailsSearch.Orm = detailsSearch.Orm.Model(&models.OperationDetails{}).
+ Select("wms_operation.number, wms_operation.updated_at as date, material.name as product_name, wms_operation.from_location_id,"+
+ "wms_operation.to_location_id, wms_operation_details.amount, material.unit, wms_operation.contacter_name as contacted_name,"+
+ "wms_operation.base_operation_type, material.weight, wms_operation_details.product_id").
+ Joins("left join wms_operation on wms_operation_details.operation_id = wms_operation.id").
+ Joins("left join material on wms_operation_details.product_id = material.id").
+ Where("wms_operation.status = ?", constvar.OperationStatus_Finish).Order("wms_operation.created_at desc")
+ if params.ProduceId != "" {
+ detailsSearch.Orm = detailsSearch.Orm.Where("wms_operation_details.product_id = ?", params.ProduceId)
}
- details, total, err := detailsSearch.SetPreload(true).SetProductId(params.ProduceId).Find()
+ if params.BaseOperationType != 0 {
+ detailsSearch.Orm = detailsSearch.Orm.Where("wms_operation.base_operation_type = ?", params.BaseOperationType)
+ }
+
+ err := detailsSearch.Orm.Count(&total).Error
if err != nil {
- util.ResponseFormat(c, code.RequestParamError, "鏌ヨ鎿嶄綔璇︽儏澶辫触")
+ util.ResponseFormat(c, code.RequestParamError, "鏌ヨtotal澶辫触")
return
}
- var operationIds []int
- for _, detail := range details {
- operationIds = append(operationIds, detail.OperationID)
+ if params.Page*params.PageSize > 0 {
+ detailsSearch.Orm = detailsSearch.Orm.Offset((params.Page - 1) * params.PageSize).Limit(params.PageSize)
}
- //鑾峰彇宸插畬鎴愮殑鎿嶄綔璁板綍
- operations, err := models.NewOperationSearch().SetIds(operationIds).SetBaseOperationType(params.BaseOperationType).
- SetStatus(constvar.OperationStatus_Finish).FindNotTotal()
+
+ err = detailsSearch.Orm.Find(&result).Error
if err != nil {
- util.ResponseFormat(c, code.RequestParamError, "鏌ヨ鎿嶄綔璁板綍澶辫触")
+ util.ResponseFormat(c, code.RequestParamError, fmt.Errorf("鏌ヨ鎿嶄綔鏄庣粏澶辫触: %v", err))
return
}
- var result []response.InventoryHistory
- for _, detail := range details {
- var resp response.InventoryHistory
- resp.Amount = detail.Amount
- resp.Unit = detail.Product.Unit
- resp.ProductName = detail.Product.Name
- for _, operation := range operations {
- if detail.OperationID == operation.Id {
- resp.Number = operation.Number
- resp.Date = operation.UpdateTime
- resp.Status = "瀹屾垚"
- resp.ContactedName = operation.ContacterName
- resp.FromLocation = operation.FromLocation.Name
- resp.ToLocation = operation.ToLocation.Name
- resp.BaseOperationType = operation.BaseOperationType
- result = append(result, resp)
- break
+ var locationIds []int
+ for _, history := range result {
+ locationIds = append(locationIds, history.FromLocationId, history.ToLocationId)
+ }
+ locations, err := models.NewLocationSearch().SetIds(locationIds).FindNotTotal()
+ if err != nil {
+ util.ResponseFormat(c, code.RequestParamError, fmt.Errorf("鏌ヨ浣嶇疆澶辫触: %v", err))
+ return
+ }
+ for _, history := range result {
+ history.Status = "瀹屾垚"
+ for _, location := range locations {
+ if history.ToLocationId == location.Id {
+ history.ToLocation = location.Name
+ }
+ if history.FromLocationId == location.Id {
+ history.FromLocation = location.Name
}
}
}
--
Gitblit v1.8.0