From 84efc2b9cc81fadfffe35c6e3a07dd735ef46a98 Mon Sep 17 00:00:00 2001
From: jiangshuai <291802688@qq.com>
Date: 星期四, 28 九月 2023 11:25:11 +0800
Subject: [PATCH] 1.修改库存盘点列表bug
---
controllers/location_product_amount.go | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/controllers/location_product_amount.go b/controllers/location_product_amount.go
index 0e909f3..053979e 100644
--- a/controllers/location_product_amount.go
+++ b/controllers/location_product_amount.go
@@ -42,6 +42,7 @@
search.Orm = search.Orm.
Table("wms_location_product_amount").
Select(`
+ wms_location_product_amount.id as location_product_amount_id,
wms_location.id as location_id,
wms_location.name as location_name,
material.id as product_id,
@@ -52,12 +53,10 @@
wms_operation_details.amount as adjust_amount,
wms_operation.id as operation_id`).
InnerJoins("inner join wms_location_product on wms_location_product.id=wms_location_product_amount.location_product_id").
+ InnerJoins("inner join material on material.id=wms_location_product.product_id").
InnerJoins("inner join wms_location on wms_location.id=wms_location_product.location_id").
- InnerJoins("inner join wms_operation_details on wms_operation_details.product_id=wms_location_product.product_id").
- InnerJoins("inner join material on material.id=wms_operation_details.product_id").
- InnerJoins("inner join wms_operation on wms_operation.id=wms_operation_details.operation_id").
- Where("wms_operation.base_operation_type=?", constvar.BaseOperationTypeAdjust)
-
+ Joins("left join wms_operation_details on wms_operation_details.product_id=wms_location_product.product_id").
+ Joins("left join wms_operation on wms_operation.id=wms_operation_details.operation_id and wms_operation.base_operation_type=? and wms_operation.status=?", constvar.BaseOperationTypeAdjust, constvar.OperationStatus_Ready)
var (
records = make([]*models.LocationProductAmountWithOperation, 0)
total int64
@@ -76,7 +75,9 @@
return
}
for k, v := range records {
- records[k].DifferenceAmount = v.Amount.Sub(v.AdjustAmount)
+ if v.OperationId != 0 {
+ records[k].DifferenceAmount = v.Amount.Add(v.AdjustAmount)
+ }
}
util.ResponseFormatListWithPage(c, code.Success, records, int(total), params.Page, params.PageSize)
}
--
Gitblit v1.8.0