From 122c79a4b3f16ef9f5c3e92c2ca1812f49b41ccb Mon Sep 17 00:00:00 2001
From: liujiandao <274878379@qq.com>
Date: 星期三, 10 四月 2024 11:53:07 +0800
Subject: [PATCH] 出入库添加重量查询
---
controllers/operation.go | 5 ++++-
controllers/report_forms_controller.go | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/controllers/operation.go b/controllers/operation.go
index c585774..63cfdad 100644
--- a/controllers/operation.go
+++ b/controllers/operation.go
@@ -1103,7 +1103,10 @@
}
db := mysqlx.GetDB().Table("wms_operation").
- Select("wms_operation.id as operation_id,wms_operation.number,wms_operation.base_operation_type,material.id AS product_id,material.`name` AS product_name,wms_operation_details.amount,material.unit,wms_operation_details.from_location_id,from_location.`name` AS from_location,wms_operation_details.to_location_id,to_location.`name` AS to_location,wms_operation.operation_date as date,wms_operation.`status`").
+ Select("wms_operation.id as operation_id,wms_operation.number,wms_operation.base_operation_type,material.id AS product_id," +
+ "material.`name` AS product_name,wms_operation_details.amount,material.unit,wms_operation_details.from_location_id," +
+ "from_location.`name` AS from_location,wms_operation_details.to_location_id,to_location.`name` AS to_location," +
+ "wms_operation.operation_date as date,wms_operation.`status`,material.weight").
InnerJoins("inner join wms_operation_details ON wms_operation_details.operation_id = wms_operation.id").
InnerJoins("INNER JOIN material ON material.id = wms_operation_details.product_id").
InnerJoins("INNER JOIN wms_location AS from_location ON from_location.id = wms_operation_details.from_location_id").
diff --git a/controllers/report_forms_controller.go b/controllers/report_forms_controller.go
index ced1c45..4f3bc71 100644
--- a/controllers/report_forms_controller.go
+++ b/controllers/report_forms_controller.go
@@ -266,7 +266,7 @@
detailsSearch.Orm = detailsSearch.Orm.Model(&models.MoveHistory{}).
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, operation_type_name").Order("id desc")
+ "unit, operator as contacted_name, base_operation_type, weight, product_id, from_location, to_location, operation_type_name, weight").Order("id desc")
if len(ids) > 0 {
detailsSearch.Orm = detailsSearch.Orm.Where("id in ?", ids)
}
--
Gitblit v1.8.0