From b13834f8c0b4a0fe9928cb07a721e6ec7df86ae1 Mon Sep 17 00:00:00 2001
From: jiangshuai <291802688@qq.com>
Date: 星期三, 15 十一月 2023 17:01:51 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/aps/WMS
---
controllers/report_forms_controller.go | 123 ++++++++++++++++++++++++----------------
1 files changed, 73 insertions(+), 50 deletions(-)
diff --git a/controllers/report_forms_controller.go b/controllers/report_forms_controller.go
index 79ee050..d7bccab 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))
@@ -132,7 +166,7 @@
if params.PageInfo.Check() {
detailsSearch.SetPage(params.Page, params.PageSize)
}
- details, err := detailsSearch.SetProductId(params.ProduceId).FindNotTotal()
+ details, total, err := detailsSearch.SetPreload(true).SetProductId(params.ProduceId).Find()
if err != nil {
util.ResponseFormat(c, code.RequestParamError, "鏌ヨ鎿嶄綔璇︽儏澶辫触")
return
@@ -142,8 +176,8 @@
operationIds = append(operationIds, detail.OperationID)
}
//鑾峰彇宸插畬鎴愮殑鎿嶄綔璁板綍
- operations, total, err := models.NewOperationSearch().SetIds(operationIds).SetBaseOperationType(params.BaseOperationType).
- SetStatus(constvar.OperationStatus_Finish).Find()
+ operations, err := models.NewOperationSearch().SetIds(operationIds).SetBaseOperationType(params.BaseOperationType).
+ SetStatus(constvar.OperationStatus_Finish).FindNotTotal()
if err != nil {
util.ResponseFormat(c, code.RequestParamError, "鏌ヨ鎿嶄綔璁板綍澶辫触")
return
@@ -152,8 +186,8 @@
for _, detail := range details {
var resp response.InventoryHistory
resp.Amount = detail.Amount
- resp.Unit = params.Unit
- resp.ProductName = params.ProductName
+ resp.Unit = detail.Product.Unit
+ resp.ProductName = detail.Product.Name
for _, operation := range operations {
if detail.OperationID == operation.Id {
resp.Number = operation.Number
@@ -162,6 +196,7 @@
resp.ContactedName = operation.ContacterName
resp.FromLocation = operation.FromLocation.Name
resp.ToLocation = operation.ToLocation.Name
+ resp.BaseOperationType = operation.BaseOperationType
result = append(result, resp)
break
}
@@ -183,51 +218,39 @@
util.ResponseFormat(c, code.RequestParamError, "鍙傛暟瑙ｆ瀽澶辫触锛屾暟鎹被鍨嬮敊璇�")
return
}
- search := models.NewLocationProductSearch()
- if params.PageInfo.Check() {
- search.SetPage(params.Page, params.PageSize)
- }
- //鏌ヨ浣嶇疆
- 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)
+ }
}
- find, total, err := search.SetKeyword(params.KeyWord).SetProductId(params.ProductId).SetLocationIds(ids).FindByPage()
- if err != nil {
- util.ResponseFormat(c, code.RequestParamError, "鏌ヨ涓婃灦瑙勫垯澶辫触")
- return
- }
- ruleIds := make([]int, 0)
- for _, product := range find {
- ruleIds = append(ruleIds, product.Id)
- }
- amounts, err := models.NewLocationProductAmountSearch().SetLocationProductIds(ruleIds).Find()
+ 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 result []response.LocationForms
- for _, product := range find {
+ for _, amount := range amounts {
var resp response.LocationForms
- for _, amount := range amounts {
- if product.Id == amount.LocationProductId {
- resp.Amount = amount.Amount
- break
- }
- }
- resp.LocationName = product.Location.Name
- resp.ProduceId = product.Product.ID
- resp.ProductName = product.Product.Name
- resp.ProductTypeName = product.ProductCategory.Name
- resp.Unit = product.Product.Unit
- resp.Value = resp.Amount.Mul(product.Product.Cost)
+ resp.Amount = amount.Amount
+ resp.LocationName = amount.Location.Name
+ resp.ProduceId = amount.Product.ID
+ resp.ProductName = amount.Product.Name
+ resp.ProductTypeName = amount.ProductCategory.Name
+ resp.Unit = amount.Product.Unit
+ resp.Value = resp.Amount.Mul(amount.Product.Cost)
result = append(result, resp)
}
+
util.ResponseFormatList(c, code.Success, result, int(total))
}
--
Gitblit v1.8.0