From 645e6cae2bdc4102c351c014bcc443b29fdd1dc1 Mon Sep 17 00:00:00 2001
From: liujiandao <274878379@qq.com>
Date: 星期四, 16 十一月 2023 13:47:36 +0800
Subject: [PATCH] 代码恢复
---
controllers/report_forms_controller.go | 144 ++++++++++++++++++++++++++++++++---------------
1 files changed, 97 insertions(+), 47 deletions(-)
diff --git a/controllers/report_forms_controller.go b/controllers/report_forms_controller.go
index 7370006..a15025a 100644
--- a/controllers/report_forms_controller.go
+++ b/controllers/report_forms_controller.go
@@ -3,6 +3,7 @@
import (
"fmt"
"github.com/gin-gonic/gin"
+ "github.com/shopspring/decimal"
"wms/constvar"
"wms/extend/code"
"wms/extend/util"
@@ -12,6 +13,13 @@
)
type ReportFormsController struct {
+}
+
+type Detail struct {
+ ProductId string `json:"productId"`
+ Amount decimal.Decimal `json:"amount"`
+ Status constvar.OperationStatus `json:"status"`
+ //ProductName string `json:"productName"`
}
// GetInventoryForms
@@ -54,7 +62,6 @@
return
}
- //鏌ヨ鍑哄叆搴撴暟閲�
locations, err := models.NewLocationSearch().SetJointName(params.WarehouseCode).FindNotTotal()
if err != nil {
util.ResponseFormat(c, code.RequestParamError, "鏌ヨ浠撳簱浣嶇疆澶辫触")
@@ -64,19 +71,37 @@
for _, location := range locations {
locationIds = append(locationIds, location.Id)
}
- var inHouse []models.OperationDetails
- var outHouse []models.OperationDetails
+ //鏌ヨ鍦ㄥ簱鏁伴噺
+ productIds := make([]string, 0)
+ for _, material := range materials {
+ productIds = append(productIds, material.ID)
+ }
+ productAmounts, err := models.NewLocationProductAmountSearch().SetProductIds(productIds).SetLocationIds(locationIds).Find()
+ if err != nil {
+ util.ResponseFormat(c, code.RequestParamError, "鏌ヨ鍦ㄥ簱鏁伴噺澶辫触")
+ return
+ }
+
+ //鏌ヨ鍑哄叆搴撳氨缁暟閲�
+ var inHouse []Detail
+ var outHouse []Detail
dbIn := models.NewOperationDetailsSearch().Orm.Model(&models.OperationDetails{}).
+ Select("wms_operation_details.product_id,wms_operation_details.amount,wms_operation.status as status").
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_Finish)
+ Where("wms_operation.base_operation_type in (?)", []constvar.BaseOperationType{constvar.BaseOperationTypeIncoming, constvar.BaseOperationTypeInternal}).
+ Where("wms_operation.status in (?)", []constvar.OperationStatus{constvar.OperationStatus_Finish})
dbOut := models.NewOperationDetailsSearch().Orm.Model(&models.OperationDetails{}).
+ Select("wms_operation_details.product_id,wms_operation_details.amount,wms_operation.status as status").
Joins("left join wms_operation ON wms_operation_details.operation_id=wms_operation.id").
- Where("wms_operation.base_operation_type in (?)", []int{2, 4}).
- Where("wms_operation.status = ?", constvar.OperationStatus_Finish)
+ Where("wms_operation.base_operation_type in (?)", []constvar.BaseOperationType{constvar.BaseOperationTypeOutgoing, constvar.BaseOperationTypeInternal, constvar.BaseOperationTypeDisuse}).
+ Where("wms_operation.status in (?)", []constvar.OperationStatus{constvar.OperationStatus_Ready, 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)
+ }
+ if len(productIds) > 0 {
+ dbIn.Where("wms_operation_details.product_id in (?)", productIds)
+ dbOut.Where("wms_operation_details.product_id in (?)", productIds)
}
err = dbIn.Find(&inHouse).Error
if err != nil {
@@ -97,18 +122,27 @@
resp.Unit = material.Unit
resp.Value = material.Amount.Mul(material.Cost)
resp.ProductType = material.CategoryName
+ for _, amount := range productAmounts {
+ if material.ID == amount.ProductId {
+ resp.Amount = resp.Amount.Add(amount.Amount)
+ }
+ }
for _, details := range inHouse {
if material.ID == details.ProductId {
resp.In = resp.In.Add(details.Amount)
}
}
+ available := decimal.NewFromInt(0)
for _, details := range outHouse {
if material.ID == details.ProductId {
- resp.Out = resp.Out.Add(details.Amount)
+ if details.Status == constvar.OperationStatus_Ready {
+ available = available.Add(details.Amount)
+ } else {
+ resp.Out = resp.Out.Add(details.Amount)
+ }
}
}
- resp.Amount = resp.In.Sub(resp.Out)
- resp.AvailableNumber = resp.Amount
+ resp.AvailableNumber = resp.Amount.Sub(available)
result = append(result, resp)
}
util.ResponseFormatList(c, code.Success, result, int(total))
@@ -129,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.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
}
}
}
@@ -184,16 +231,19 @@
util.ResponseFormat(c, code.RequestParamError, "鍙傛暟瑙ｆ瀽澶辫触锛屾暟鎹被鍨嬮敊璇�")
return
}
-
- //鏌ヨ浣嶇疆
- locations, err := models.NewLocationSearch().SetJointName(params.WareHouseCode).FindAll()
- if err != nil {
- util.ResponseFormat(c, code.RequestParamError, "鏌ヨ浣嶇疆澶辫触")
- return
- }
ids := make([]int, 0)
- for _, location := range locations {
- ids = append(ids, location.Id)
+ if params.LocationId != 0 {
+ ids = append(ids, params.LocationId)
+ } else {
+ //鏌ヨ浣嶇疆
+ locations, err := models.NewLocationSearch().SetJointName(params.WareHouseCode).FindAll()
+ if err != nil {
+ util.ResponseFormat(c, code.RequestParamError, "鏌ヨ浣嶇疆澶辫触")
+ return
+ }
+ for _, location := range locations {
+ 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()
--
Gitblit v1.8.0