From e170c5fe4273a9635f27290028a5231500c3ace6 Mon Sep 17 00:00:00 2001
From: liujiandao <274878379@qq.com>
Date: 星期四, 14 十二月 2023 15:53:43 +0800
Subject: [PATCH] 出入库明细添加业务类型
---
response/report_forms_response.go | 1 +
controllers/report_forms_controller.go | 4 ++--
docs/swagger.yaml | 6 ++++++
docs/docs.go | 10 ++++++++++
docs/swagger.json | 8 ++++++++
5 files changed, 27 insertions(+), 2 deletions(-)
diff --git a/controllers/report_forms_controller.go b/controllers/report_forms_controller.go
index 9575819..b6c8866 100644
--- a/controllers/report_forms_controller.go
+++ b/controllers/report_forms_controller.go
@@ -265,8 +265,8 @@
}
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").Order("id desc")
+ 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")
if len(ids) > 0 {
detailsSearch.Orm = detailsSearch.Orm.Where("id in ?", ids)
}
diff --git a/docs/docs.go b/docs/docs.go
index 1ec49df..d8fa175 100644
--- a/docs/docs.go
+++ b/docs/docs.go
@@ -3708,6 +3708,10 @@
"fromLocationId": {
"type": "integer"
},
+ "number": {
+ "description": "Unit string ` + "`" + `json:\"unit\"` + "`" + `",
+ "type": "string"
+ },
"productId": {
"type": "string"
},
@@ -4708,6 +4712,10 @@
"operationId": {
"type": "integer"
},
+ "operationTypeName": {
+ "description": "浣滀笟绫诲瀷鍚嶇О",
+ "type": "string"
+ },
"productId": {
"type": "string"
},
@@ -4834,6 +4842,8 @@
Description: "",
InfoInstanceName: "swagger",
SwaggerTemplate: docTemplate,
+ LeftDelim: "{{",
+ RightDelim: "}}",
}
func init() {
diff --git a/docs/swagger.json b/docs/swagger.json
index 8022c96..81e39d3 100644
--- a/docs/swagger.json
+++ b/docs/swagger.json
@@ -3696,6 +3696,10 @@
"fromLocationId": {
"type": "integer"
},
+ "number": {
+ "description": "Unit string `json:\"unit\"`",
+ "type": "string"
+ },
"productId": {
"type": "string"
},
@@ -4696,6 +4700,10 @@
"operationId": {
"type": "integer"
},
+ "operationTypeName": {
+ "description": "浣滀笟绫诲瀷鍚嶇О",
+ "type": "string"
+ },
"productId": {
"type": "string"
},
diff --git a/docs/swagger.yaml b/docs/swagger.yaml
index 2f29308..aee079f 100644
--- a/docs/swagger.yaml
+++ b/docs/swagger.yaml
@@ -845,6 +845,9 @@
type: number
fromLocationId:
type: integer
+ number:
+ description: Unit string `json:"unit"`
+ type: string
productId:
type: string
sourceNumber:
@@ -1534,6 +1537,9 @@
type: string
operationId:
type: integer
+ operationTypeName:
+ description: 浣滀笟绫诲瀷鍚嶇О
+ type: string
productId:
type: string
productName:
diff --git a/response/report_forms_response.go b/response/report_forms_response.go
index 6585587..0c2962d 100644
--- a/response/report_forms_response.go
+++ b/response/report_forms_response.go
@@ -34,6 +34,7 @@
FromLocationId int `json:"fromLocationId"`
ToLocationId int `json:"toLocationId"`
OperationId int `json:"operationId"`
+ OperationTypeName string `json:"operationTypeName"` //浣滀笟绫诲瀷鍚嶇О
}
type LocationForms struct {
--
Gitblit v1.8.0