From b9a62531fb93aba42d13e62fd1b03d8dba112fa6 Mon Sep 17 00:00:00 2001
From: liujiandao <274878379@qq.com>
Date: 星期一, 23 十月 2023 12:04:31 +0800
Subject: [PATCH] 位置修改
---
request/report_forms_request.go | 11 +++++++----
controllers/report_forms_controller.go | 3 ++-
models/operation.go | 10 ++++++++++
controllers/location.go | 2 +-
request/location.go | 3 ++-
5 files changed, 22 insertions(+), 7 deletions(-)
diff --git a/controllers/location.go b/controllers/location.go
index e545fb9..5bfec45 100644
--- a/controllers/location.go
+++ b/controllers/location.go
@@ -67,7 +67,7 @@
if params.PageInfo.Check() {
search.SetPage(params.Page, params.PageSize)
}
- list, total, err := search.SetKeyword(params.KeyWord).SetOrder("created_at desc").Find()
+ list, total, err := search.SetKeyword(params.KeyWord).SetJointName(params.JointName).SetOrder("created_at desc").Find()
if err != nil {
util.ResponseFormat(c, code.RequestParamError, "鏌ユ壘澶辫触")
return
diff --git a/controllers/report_forms_controller.go b/controllers/report_forms_controller.go
index f5c38c4..79ee050 100644
--- a/controllers/report_forms_controller.go
+++ b/controllers/report_forms_controller.go
@@ -142,7 +142,8 @@
operationIds = append(operationIds, detail.OperationID)
}
//鑾峰彇宸插畬鎴愮殑鎿嶄綔璁板綍
- operations, total, err := models.NewOperationSearch().SetIds(operationIds).SetStatus(constvar.OperationStatus_Finish).Find()
+ operations, total, err := models.NewOperationSearch().SetIds(operationIds).SetBaseOperationType(params.BaseOperationType).
+ SetStatus(constvar.OperationStatus_Finish).Find()
if err != nil {
util.ResponseFormat(c, code.RequestParamError, "鏌ヨ鎿嶄綔璁板綍澶辫触")
return
diff --git a/models/operation.go b/models/operation.go
index 5a126b3..faa78a2 100644
--- a/models/operation.go
+++ b/models/operation.go
@@ -107,8 +107,14 @@
slf.Ids = ids
return slf
}
+
func (slf *OperationSearch) SetStatus(status constvar.OperationStatus) *OperationSearch {
slf.Status = status
+ return slf
+}
+
+func (slf *OperationSearch) SetBaseOperationType(baseOperationType constvar.BaseOperationType) *OperationSearch {
+ slf.BaseOperationType = baseOperationType
return slf
}
@@ -154,6 +160,10 @@
db = db.Where("status = ?", slf.Status)
}
+ if slf.BaseOperationType != 0 {
+ db = db.Where("base_operation_type = ?", slf.BaseOperationType)
+ }
+
return db
}
diff --git a/request/location.go b/request/location.go
index ce3e2be..a762856 100644
--- a/request/location.go
+++ b/request/location.go
@@ -9,5 +9,6 @@
type GetLocationList struct {
PageInfo
- KeyWord string `json:"keyWord"`
+ KeyWord string `json:"keyWord"`
+ JointName string `json:"jointName"` //鎷兼帴鍚嶇О
}
diff --git a/request/report_forms_request.go b/request/report_forms_request.go
index 3d1a5ae..729a0e4 100644
--- a/request/report_forms_request.go
+++ b/request/report_forms_request.go
@@ -1,5 +1,7 @@
package request
+import "wms/constvar"
+
type GetInventoryForms struct {
PageInfo
CategoryIds []int `json:"categoryIds"` //浜у搧绫诲瀷id
@@ -9,10 +11,11 @@
type GetInventoryHistory struct {
PageInfo
- ProduceId string `json:"produceId"` //浜у搧id
- ProductName string `json:"productName"` //浜у搧鍚嶇О
- Unit string `json:"unit"` //鍗曚綅
- KeyWord string `json:"keyWord"` //鎼滅储鏉′欢
+ ProduceId string `json:"produceId"` //浜у搧id
+ ProductName string `json:"productName"` //浜у搧鍚嶇О
+ Unit string `json:"unit"` //鍗曚綅
+ KeyWord string `json:"keyWord"` //鎼滅储鏉′欢
+ BaseOperationType constvar.BaseOperationType `json:"baseOperationType"` //鍩虹浣滀笟绫诲瀷
}
type GetLocationForms struct {
--
Gitblit v1.8.0