From 55bd24a2d654052d4c4c8eb6e7bee244af81d446 Mon Sep 17 00:00:00 2001
From: jiangshuai <291802688@qq.com>
Date: 星期四, 19 十月 2023 15:53:22 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/aps/WMS
---
controllers/report_forms_controller.go | 51 +++++++++++++++++++++++++++++----------------------
1 files changed, 29 insertions(+), 22 deletions(-)
diff --git a/controllers/report_forms_controller.go b/controllers/report_forms_controller.go
index db62c73..85a48da 100644
--- a/controllers/report_forms_controller.go
+++ b/controllers/report_forms_controller.go
@@ -1,6 +1,7 @@
package controllers
import (
+ "fmt"
"github.com/gin-gonic/gin"
"wms/constvar"
"wms/extend/code"
@@ -28,20 +29,31 @@
}
//鏌ヨ浜у搧
search := models.NewMaterialSearch()
- if params.PageInfo.Check() {
- search.SetPage(params.Page, params.PageSize)
+ search.Orm = search.Orm.Model(&models.Material{}).
+ Select(`material.id, material.name, material.cost, material.amount, material.unit, wms_product_category.name as category_name `).
+ Joins("left join wms_product_category on material.category_id = wms_product_category.id")
+ if len(params.CategoryIds) > 0 {
+ search.Orm.Where("material.category_id in (?)", params.CategoryIds)
}
- materials, total, err := search.SetCategoryIds(params.CategoryIds).Find()
- if err != nil {
- util.ResponseFormat(c, code.RequestParamError, "鏌ヨ浜у搧绫诲瀷澶辫触")
+ if params.KeyWord != "" {
+ search.Orm.Where("material.name like ?", "%"+params.KeyWord+"%").Or("wms_product_category.name like ?", "%"+params.KeyWord+"%")
+ }
+ var (
+ materials = make([]*models.Material, 0)
+ total int64
+ )
+ if err := search.Orm.Count(&total).Error; err != nil {
+ util.ResponseFormat(c, code.RequestParamError, "鏌ヨtotal澶辫触")
return
}
- //鏌ヨ浜у搧绫诲瀷
- categories, err := models.NewProductCategorySearch().SetIds(params.CategoryIds).FindNotTotal()
- if err != nil {
- util.ResponseFormat(c, code.RequestParamError, "鏌ヨ浜у搧绫诲瀷澶辫触")
+ if params.Page*params.PageSize > 0 {
+ search.Orm = search.Orm.Offset((params.Page - 1) * params.PageSize).Limit(params.PageSize)
+ }
+ if err := search.Orm.Find(&materials).Error; err != nil {
+ util.ResponseFormat(c, code.RequestParamError, fmt.Errorf("鏌ヨ浜у搧澶辫触: %v", err))
return
}
+
//鏌ヨ鍑哄叆搴撴暟閲�
locations, err := models.NewLocationSearch().SetJointName(params.WarehouseCode).FindNotTotal()
if err != nil {
@@ -57,13 +69,13 @@
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=?", constvar.OperationStatus_Ready)
+ Where("wms_operation.status in (?)", []int{3, 4})
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=?", constvar.OperationStatus_Ready)
+ Where("wms_operation.status in (?)", []int{3, 4})
if len(locationIds) > 0 {
- dbIn.Where("wms_operation.from_location_id in (?)", locationIds)
+ dbIn.Where("wms_operation.to_location_id in (?)", locationIds)
dbOut.Where("wms_operation.from_location_id in (?)", locationIds)
}
err = dbIn.Find(&inHouse).Error
@@ -82,15 +94,9 @@
resp.ProduceId = material.ID
resp.ProductName = material.Name
resp.Cost = material.Cost
- resp.Amount = material.Amount
resp.Unit = material.Unit
resp.Value = material.Amount.Mul(material.Cost)
- for _, category := range categories {
- if material.CategoryId == int(category.ID) {
- resp.ProductType = category.Name
- break
- }
- }
+ resp.ProductType = material.CategoryName
for _, details := range inHouse {
if material.ID == details.ProductId {
resp.In = resp.In.Add(details.Amount)
@@ -101,6 +107,7 @@
resp.Out = resp.Out.Add(details.Amount)
}
}
+ resp.Amount = resp.In.Sub(resp.Out)
resp.AvailableNumber = resp.Amount
result = append(result, resp)
}
@@ -125,7 +132,7 @@
if params.PageInfo.Check() {
detailsSearch.SetPage(params.Page, params.PageSize)
}
- details, total, err := detailsSearch.SetProductId(params.ProduceId).Find()
+ details, err := detailsSearch.SetProductId(params.ProduceId).FindNotTotal()
if err != nil {
util.ResponseFormat(c, code.RequestParamError, "鏌ヨ鎿嶄綔璇︽儏澶辫触")
return
@@ -135,7 +142,7 @@
operationIds = append(operationIds, detail.OperationID)
}
//鑾峰彇宸插畬鎴愮殑鎿嶄綔璁板綍
- operations, err := models.NewOperationSearch().SetIds(operationIds).SetStatus(constvar.OperationStatus_Finish).FindNotTotal()
+ operations, total, err := models.NewOperationSearch().SetIds(operationIds).SetStatus(constvar.OperationStatus_Finish).Find()
if err != nil {
util.ResponseFormat(c, code.RequestParamError, "鏌ヨ鎿嶄綔璁板綍澶辫触")
return
@@ -166,7 +173,7 @@
// @Tags 鎶ヨ〃
// @Summary 鑾峰彇浣嶇疆鎶ヨ〃
// @Produce application/json
-// @Param object body request.PageInfo true "鏌ヨ鍙傛暟"
+// @Param object body request.GetLocationForms true "鏌ヨ鍙傛暟"
// @Success 200 {object} util.ResponseList{data=[]response.LocationForms} "鎴愬姛"
// @Router /api-wms/v1/forms/getLocationForms [post]
func (slf ReportFormsController) GetLocationForms(c *gin.Context) {
--
Gitblit v1.8.0