From dc73bb0a098f9c176ea4b6e920a5e70d9a618833 Mon Sep 17 00:00:00 2001
From: liujiandao <274878379@qq.com>
Date: 星期一, 27 十一月 2023 16:52:39 +0800
Subject: [PATCH] aps插入出库操作

---
 controllers/report_forms_controller.go |  180 ++++++++++++++++++++++++++++++++++++++++-------------------
 1 files changed, 121 insertions(+), 59 deletions(-)

diff --git a/controllers/report_forms_controller.go b/controllers/report_forms_controller.go
index 334b227..25bb3f3 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,77 +157,128 @@
 // @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(&params); 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(&params); 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)
+			return
+		}
+	}
+
+	detailsSearch.Orm = detailsSearch.Orm.Model(&models.MoveHistory{}).
+		Select("number, updated_at as date, product_name as product_name, from_location_id, operation_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))
-}
-
-// GetOutOrInOperationList
-// @Tags      鎶ヨ〃
-// @Summary   鑾峰彇鍑哄叆搴撴搷浣滄槑缁�
-// @Produce   application/json
-// @Param     object  body  request.GetLocationForms true  "鏌ヨ鍙傛暟"
-// @Success   200 {object} util.ResponseList{data=[]response.LocationForms}	"鎴愬姛"
-// @Router    /api-wms/v1/forms/getOutOrInOperationList [post]
-func (slf ReportFormsController) GetOutOrInOperationList(c *gin.Context) {
-
 }
 
 // GetLocationForms
@@ -247,7 +299,7 @@
 		ids = append(ids, params.LocationId)
 	} else {
 		//鏌ヨ浣嶇疆
-		locations, err := models.NewLocationSearch().SetJointName(params.WareHouseCode).FindAll()
+		locations, err := models.NewLocationSearch().SetJointName(params.WareHouseCode).SetType(3).FindAll()
 		if err != nil {
 			util.ResponseFormat(c, code.RequestParamError, "鏌ヨ浣嶇疆澶辫触")
 			return
@@ -256,11 +308,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