From fda60dd56911c03330eb7330ebabd5d46e9d7622 Mon Sep 17 00:00:00 2001
From: jiangshuai <291802688@qq.com>
Date: 星期五, 15 十二月 2023 16:14:03 +0800
Subject: [PATCH] 库存盘点列表bug

---
 controllers/location_product_amount.go |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/controllers/location_product_amount.go b/controllers/location_product_amount.go
index b003c1b..36d7c28 100644
--- a/controllers/location_product_amount.go
+++ b/controllers/location_product_amount.go
@@ -12,6 +12,7 @@
 	"wms/extend/code"
 	"wms/extend/util"
 	"wms/models"
+	"wms/pkg/mysqlx"
 	"wms/request"
 	"wms/response"
 	"wms/service"
@@ -67,7 +68,7 @@
 	}
 	var operation models.Operation
 	for k, v := range records {
-		if res := models.NewOperationSearch().Orm.Preload("Details", "product_id=?", v.ProductId).Where("wms_operation.base_operation_type=? and wms_operation.status=? and wms_operation.to_location_id=?", constvar.BaseOperationTypeAdjust, constvar.OperationStatus_Ready, v.LocationId).First(&operation); res.Error != nil {
+		if res := mysqlx.GetDB().Table("wms_operation").InnerJoins("inner join wms_operation_details on wms_operation_details.operation_id=wms_operation.id").Where("wms_operation.base_operation_type=? and wms_operation.status=? and wms_operation.to_location_id=? and wms_operation_details.product_id=?", constvar.BaseOperationTypeAdjust, constvar.OperationStatus_Ready, v.LocationId, v.ProductId).First(&operation); res.Error != nil {
 			if errors.Is(res.Error, gorm.ErrRecordNotFound) {
 				records[k].Status = constvar.OperationStatus_Finish
 				records[k].BaseOperationType = constvar.BaseOperationTypeAdjust

--
Gitblit v1.8.0