From d85105fd3f9713633e70583ad28de8e65319607f Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期五, 24 十一月 2023 17:03:40 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/aps/WMS
---
controllers/report_forms_controller.go | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/controllers/report_forms_controller.go b/controllers/report_forms_controller.go
index 7c57613..25bb3f3 100644
--- a/controllers/report_forms_controller.go
+++ b/controllers/report_forms_controller.go
@@ -265,7 +265,7 @@
}
detailsSearch.Orm = detailsSearch.Orm.Model(&models.MoveHistory{}).
- Select("number, updated_at as date, product_name as product_name, from_location_id," +
+ Select("number, updated_at as date, product_name as product_name, from_location_id, operation_id," +
"to_location_id, amount, unit, operator as contacted_name, base_operation_type, weight, product_id, from_location, to_location").Order("id desc")
if len(ids) > 0 {
detailsSearch.Orm = detailsSearch.Orm.Where("id in ?", ids)
--
Gitblit v1.8.0