From 0551df1d2a65876b2427df112e37625f128b67e4 Mon Sep 17 00:00:00 2001
From: jiangshuai <291802688@qq.com>
Date: 星期一, 23 十月 2023 11:59:34 +0800
Subject: [PATCH] 1.库存盘点列表增加基础作业类型
---
controllers/report_forms_controller.go | 45 +++++++++++++++++++++++++++++++++++----------
1 files changed, 35 insertions(+), 10 deletions(-)
diff --git a/controllers/report_forms_controller.go b/controllers/report_forms_controller.go
index d536b4a..f5c38c4 100644
--- a/controllers/report_forms_controller.go
+++ b/controllers/report_forms_controller.go
@@ -69,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 = ?", constvar.OperationStatus_Finish)
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.base_operation_type in (?)", []int{2, 4}).
+ Where("wms_operation.status = ?", constvar.OperationStatus_Finish)
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
@@ -94,7 +94,6 @@
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)
resp.ProductType = material.CategoryName
@@ -108,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)
}
@@ -132,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
@@ -142,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
@@ -186,21 +186,46 @@
if params.PageInfo.Check() {
search.SetPage(params.Page, params.PageSize)
}
- find, total, err := search.SetKeyword(params.KeyWord).FindByPage()
+ //鏌ヨ浣嶇疆
+ 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)
+ }
+
+ 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()
+ if err != nil {
+ util.ResponseFormat(c, code.RequestParamError, "鏌ヨ鏁伴噺澶辫触")
return
}
var result []response.LocationForms
for _, product := range find {
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.Amount = product.Product.Amount
resp.Unit = product.Product.Unit
- resp.Value = product.Product.Amount.Mul(product.Product.Cost)
+ resp.Value = resp.Amount.Mul(product.Product.Cost)
result = append(result, resp)
}
util.ResponseFormatList(c, code.Success, result, int(total))
--
Gitblit v1.8.0