From ea25d0bb100a95d043b420e5c32f86300bf19df4 Mon Sep 17 00:00:00 2001
From: jiangshuai <291802688@qq.com>
Date: 星期六, 21 十月 2023 17:43:50 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/aps/WMS
---
controllers/report_forms_controller.go | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/controllers/report_forms_controller.go b/controllers/report_forms_controller.go
index b3a8e53..f5c38c4 100644
--- a/controllers/report_forms_controller.go
+++ b/controllers/report_forms_controller.go
@@ -69,11 +69,11 @@
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 in (?)", []int{3, 4})
+ 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 in (?)", []int{3, 4})
+ 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.to_location_id in (?)", locationIds)
dbOut.Where("wms_operation.from_location_id in (?)", locationIds)
--
Gitblit v1.8.0