From 318c49da20ec30c4f85ef35e479499e82a841b25 Mon Sep 17 00:00:00 2001
From: liujiandao <274878379@qq.com>
Date: 星期一, 11 三月 2024 14:18:13 +0800
Subject: [PATCH] swag提交
---
models/operation_type.go | 17 ++++++++++++++++-
1 files changed, 16 insertions(+), 1 deletions(-)
diff --git a/models/operation_type.go b/models/operation_type.go
index 26842f7..4857259 100644
--- a/models/operation_type.go
+++ b/models/operation_type.go
@@ -36,6 +36,7 @@
ReturnOperationType string `json:"returnOperationType" gorm:"-"` //閫�璐х被鍨嬪悕绉�
ReadyCount int `json:"readyCount" gorm:"-"` //灏辩华鏁伴噺
FinishCount int `json:"finishCount" gorm:"-"` //瀹屾垚鏁伴噺
+ CancelCount int `json:"cancelCount" gorm:"-"` //鍙栨秷鏁伴噺
}
OperationTypeSearch struct {
@@ -103,6 +104,11 @@
return slf
}
+func (slf *OperationTypeSearch) SetWarehouseId(warehouseId int) *OperationTypeSearch {
+ slf.WarehouseId = warehouseId
+ return slf
+}
+
func (slf *OperationTypeSearch) build() *gorm.DB {
var db = slf.Orm.Model(&OperationType{})
@@ -124,6 +130,14 @@
if slf.Preload {
db = db.Preload("Company").Preload("Warehouse").Preload("DefaultLocationSrc").Preload("DefaultLocationDest")
+ }
+
+ if slf.WarehouseId > 0 {
+ db = db.Where("warehouse_id = ?", slf.WarehouseId)
+ }
+
+ if int(slf.BaseOperationType) != 0 {
+ db = db.Where("base_operation_type = ?", slf.BaseOperationType)
}
return db
@@ -282,7 +296,8 @@
records = make([]*OperationTypeByStatus, 0)
db = slf.Orm
)
- db = db.Table("wms_job_type").Select("wms_job_type.id,wms_operation.status,count(wms_operation.id) as count").InnerJoins("inner join wms_operation on wms_operation.operation_type_id=wms_job_type.id").Group("wms_job_type.id,wms_operation.status")
+ db = db.Table("wms_job_type").Select("wms_job_type.id,wms_operation.status,count(wms_operation.id) as count").InnerJoins("inner join wms_operation on wms_operation.operation_type_id=wms_job_type.id").Where("wms_operation.deleted_at is null").
+ Group("wms_job_type.id,wms_operation.status")
if len(idList) > 0 {
db = db.Where("wms_job_type.id IN ?", idList)
}
--
Gitblit v1.8.0