From ed81fc8d860adb66676d4990e4ce0ff56cff79a6 Mon Sep 17 00:00:00 2001
From: jiangshuai <291802688@qq.com>
Date: 星期三, 22 十一月 2023 19:48:16 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/aps/WMS
---
controllers/report_forms_controller.go | 166 +++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 119 insertions(+), 47 deletions(-)
diff --git a/controllers/report_forms_controller.go b/controllers/report_forms_controller.go
index ca58506..2489b45 100644
--- a/controllers/report_forms_controller.go
+++ b/controllers/report_forms_controller.go
@@ -10,6 +10,7 @@
"wms/models"
"wms/request"
"wms/response"
+ "wms/service"
)
type ReportFormsController struct {
@@ -156,64 +157,125 @@
// @Success 200 {object} util.ResponseList{data=[]response.InventoryHistory} "鎴愬姛"
// @Router /api-wms/v1/forms/getHistory [post]
func (slf ReportFormsController) GetHistory(c *gin.Context) {
+ slf.GetHistoryNew(c)
+ return
+ //var params request.GetInventoryHistory
+ //if err := c.BindJSON(¶ms); err != nil {
+ // util.ResponseFormat(c, code.RequestParamError, "鍙傛暟瑙ｆ瀽澶辫触锛屾暟鎹被鍨嬮敊璇�")
+ // return
+ //}
+ ////鑾峰彇鎿嶄綔璇︽儏
+ //detailsSearch := models.NewOperationDetailsSearch()
+ //var (
+ // result []*response.InventoryHistory
+ // total int64
+ // ids []int
+ // err error
+ //)
+ //if params.KeyWord != "" {
+ // ids, err = service.SearchHistoryReport(params.KeyWord, params.BaseOperationType)
+ //
+ // if err != nil {
+ // util.ResponseFormat(c, code.InternalError, err.Error())
+ // return
+ // }
+ // if len(ids) == 0 {
+ // util.ResponseFormatList(c, code.Success, result, 0)
+ // }
+ //}
+ //
+ //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 len(ids) > 0 {
+ // detailsSearch.Orm = detailsSearch.Orm.Where("wms_operation_details.id in ?", ids)
+ //}
+ //if params.ProduceId != "" {
+ // detailsSearch.Orm = detailsSearch.Orm.Where("wms_operation_details.product_id = ?", params.ProduceId)
+ //}
+ //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, "鏌ヨtotal澶辫触")
+ // return
+ //}
+ //if params.Page*params.PageSize > 0 {
+ // detailsSearch.Orm = detailsSearch.Orm.Offset((params.Page - 1) * params.PageSize).Limit(params.PageSize)
+ //}
+ //
+ //err = detailsSearch.Orm.Find(&result).Error
+ //if err != nil {
+ // util.ResponseFormat(c, code.RequestParamError, fmt.Errorf("鏌ヨ鎿嶄綔鏄庣粏澶辫触: %v", err))
+ // return
+ //}
+ //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
+ // }
+ // }
+ //}
+ //util.ResponseFormatList(c, code.Success, result, int(total))
+}
+
+func (slf ReportFormsController) GetHistoryNew(c *gin.Context) {
var params request.GetInventoryHistory
if err := c.BindJSON(¶ms); err != nil {
util.ResponseFormat(c, code.RequestParamError, "鍙傛暟瑙ｆ瀽澶辫触锛屾暟鎹被鍨嬮敊璇�")
return
}
//鑾峰彇鎿嶄綔璇︽儏
- detailsSearch := models.NewOperationDetailsSearch()
+ detailsSearch := models.NewMoveHistorySearch()
var (
result []*response.InventoryHistory
- total int64
+ total uint64
+ ids []int
+ err error
)
- 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)
+ if params.KeyWord != "" {
+ ids, total, err = service.SearchHistoryReport(params.KeyWord, params.BaseOperationType, params.Page, params.PageSize)
+ if err != nil {
+ util.ResponseFormat(c, code.InternalError, err.Error())
+ return
+ }
+ if len(ids) == 0 {
+ util.ResponseFormatList(c, code.Success, result, 0)
+ }
+ }
+
+ detailsSearch.Orm = detailsSearch.Orm.Model(&models.MoveHistory{}).
+ Select("number, updated_at as date, product_name as product_name, from_location_id," +
+ "to_location_id, amount, unit, operator as contacted_name, base_operation_type, weight, product_id, from_location, to_location").Order("id desc")
+ if len(ids) > 0 {
+ detailsSearch.Orm = detailsSearch.Orm.Where("id in ?", ids)
}
if params.BaseOperationType != 0 {
- detailsSearch.Orm = detailsSearch.Orm.Where("wms_operation.base_operation_type = ?", params.BaseOperationType)
+ detailsSearch.Orm = detailsSearch.Orm.Where("base_operation_type = ?", params.BaseOperationType)
}
-
- err := detailsSearch.Orm.Count(&total).Error
- if err != nil {
- util.ResponseFormat(c, code.RequestParamError, "鏌ヨtotal澶辫触")
- return
- }
- if params.Page*params.PageSize > 0 {
- detailsSearch.Orm = detailsSearch.Orm.Offset((params.Page - 1) * params.PageSize).Limit(params.PageSize)
- }
-
err = detailsSearch.Orm.Find(&result).Error
if err != nil {
util.ResponseFormat(c, code.RequestParamError, fmt.Errorf("鏌ヨ鎿嶄綔鏄庣粏澶辫触: %v", err))
return
- }
- 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
- }
- }
}
util.ResponseFormatList(c, code.Success, result, int(total))
}
@@ -245,11 +307,21 @@
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()
- if err != nil {
- util.ResponseFormat(c, code.RequestParamError, "鏌ヨ鏁伴噺澶辫触")
- return
+ var (
+ amounts []*models.LocationProductAmount
+ total uint64
+ totalInt64 int64
+ err error
+ )
+ if params.KeyWord != "" {
+ amounts, total, err = service.SearchLocationReport(params.KeyWord, params.Page, params.PageSize)
+ } else {
+ amounts, totalInt64, 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
+ }
+ total = uint64(totalInt64)
}
var result []response.LocationForms
--
Gitblit v1.8.0