From 1115ba492bd6afe4b9ae07284accbaa3ad4e1596 Mon Sep 17 00:00:00 2001
From: liujiandao <274878379@qq.com>
Date: 星期二, 16 四月 2024 11:35:41 +0800
Subject: [PATCH] 添加重量字段
---
service/input_history_search.go | 5 +++--
controllers/operation.go | 2 +-
models/location_product_amount.go | 1 +
controllers/location_product_amount.go | 4 +++-
4 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/controllers/location_product_amount.go b/controllers/location_product_amount.go
index b007d85..62558e7 100644
--- a/controllers/location_product_amount.go
+++ b/controllers/location_product_amount.go
@@ -45,7 +45,9 @@
//wms_operation_details.amount as adjust_amount,wms_operation.id as operation_id,wms_operation.status
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,material.name as product_name,wms_location_product_amount.amount,material.unit,wms_location_product_amount.create_date`).
+ 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,material.name as product_name,wms_location_product_amount.amount,material.unit,
+ wms_location_product_amount.create_date,material.weight`).
InnerJoins("inner join material on material.id=wms_location_product_amount.product_id").
InnerJoins("inner join wms_location on wms_location.id=wms_location_product_amount.location_id")
diff --git a/controllers/operation.go b/controllers/operation.go
index 216c091..406d78c 100644
--- a/controllers/operation.go
+++ b/controllers/operation.go
@@ -1106,7 +1106,7 @@
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").
+ "wms_operation.operation_date as date,wms_operation.`status`,material.weight,wms_operation.operation_type_name").
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/models/location_product_amount.go b/models/location_product_amount.go
index 0d27a70..c102c5b 100644
--- a/models/location_product_amount.go
+++ b/models/location_product_amount.go
@@ -54,6 +54,7 @@
OperationId int `json:"operationId" gorm:"column:operation_id"`
Status constvar.OperationStatus `json:"status" gorm:"status"`
BaseOperationType constvar.BaseOperationType `json:"baseOperationType" gorm:"base_operation_type"`
+ Weight decimal.Decimal `gorm:"type:decimal(20,3);comment:閲嶉噺" json:"weight"` //閲嶉噺
}
)
diff --git a/service/input_history_search.go b/service/input_history_search.go
index 68b61f9..c2d96bb 100644
--- a/service/input_history_search.go
+++ b/service/input_history_search.go
@@ -97,12 +97,13 @@
func SearchHistoryReport(keyword string, operationType constvar.BaseOperationType, page, pageSize int) (recordIds []int, total uint64, err error) {
var ids []string
from := (page - 1) * pageSize
- t, err := parseDateString(keyword)
+ t, err := time.ParseInLocation("20060102", keyword, time.Local)
+ //t, err := parseDateString(keyword)
m := make(map[string]interface{})
if operationType > 0 {
m["baseOperationType"] = operationType
}
- if err != nil && t.IsZero() {
+ if err != nil || t.IsZero() {
ids, total, err = blevex.ComplexSearch(HistoryReportIndexName, keyword, m, from, pageSize)
} else {
ids, total, err = blevex.TimeSearch(HistoryReportIndexName, t, m, from, pageSize)
--
Gitblit v1.8.0