From 73b6baf6af3d88cdcb0e2df7932a9bd96b0b85c5 Mon Sep 17 00:00:00 2001 From: zhangqian <zhangqian@123.com> Date: 星期一, 01 七月 2024 22:32:34 +0800 Subject: [PATCH] 月度统计出入库按类型汇总报表定时任务和手动跑任务接口 --- models/product_category.go | 36 +++++++++++++++++++++++++++--------- 1 files changed, 27 insertions(+), 9 deletions(-) diff --git a/models/product_category.go b/models/product_category.go index 8f37a40..af90da8 100644 --- a/models/product_category.go +++ b/models/product_category.go @@ -11,11 +11,11 @@ // ProductCategory 浜у搧鍒嗙被 ProductCategory struct { WmsModel - Id int `json:"id" gorm:"column:id;primary_key;AUTO_INCREMENT"` - Name string `json:"name" gorm:"index;type:varchar(255);not null;comment:浣嶇疆鍚嶇О"` //浣嶇疆鍚嶇О + Id int `json:"id" gorm:"column:id;primary_key;AUTO_INCREMENT"` + Name string `json:"name" gorm:"index;type:varchar(255);not null;comment:鍒嗙被鍚嶇О"` //鍒嗙被鍚嶇О ParentId int `json:"parentId" gorm:"type:int;comment:涓婄骇鍒嗙被id"` //涓婄骇id - CompanyId int `json:"companyId" gorm:"type:int;comment:鍏徃id"` //鍏徃id - Company Company `json:"company" gorm:"foreignKey:CompanyId"` //鍏徃 + RouteId int `json:"routeId" gorm:"type:int;comment:璺嚎id"` //璺嚎id + RouteName string `json:"routeName" gorm:"type:varchar(512);comment:璺嚎鍚嶇О"` //鍏徃 ForceRemovalStrategy constvar.ForceRemovalStrategy `json:"forceRemovalStrategy" gorm:"type:tinyint;comment:寮哄埗涓嬫灦绛栫暐"` //寮哄埗涓嬫灦绛栫暐 CostingMethod constvar.CostingMethod `json:"costingMethod" gorm:"type:tinyint;comment:鎴愭湰鏂规硶"` //鎴愭湰鏂规硶 InventoryValuation constvar.InventoryValuation `json:"inventoryValuation" gorm:"type:tinyint;comment:搴撳瓨璁′环"` //搴撳瓨璁′环 @@ -29,11 +29,12 @@ Keyword string Orm *gorm.DB Preload bool + Ids []int } ) func (slf *ProductCategory) TableName() string { - return "wms_ProductCategory" + return "wms_product_category" } func NewProductCategorySearch() *ProductCategorySearch { @@ -55,8 +56,8 @@ return slf } -func (slf *ProductCategorySearch) SetID(id uint) *ProductCategorySearch { - slf.ID = id +func (slf *ProductCategorySearch) SetID(id int) *ProductCategorySearch { + slf.Id = id return slf } @@ -74,12 +75,16 @@ slf.Preload = preload return slf } +func (slf *ProductCategorySearch) SetIds(ids []int) *ProductCategorySearch { + slf.Ids = ids + return slf +} func (slf *ProductCategorySearch) build() *gorm.DB { var db = slf.Orm.Model(&ProductCategory{}) - if slf.ID != 0 { - db = db.Where("id = ?", slf.ID) + if slf.Id != 0 { + db = db.Where("id = ?", slf.Id) } if slf.Order != "" { @@ -92,6 +97,9 @@ if slf.Name != "" { db = db.Where("name = ?", slf.Name) + } + if len(slf.Ids) > 0 { + db = db.Where("id in (?)", slf.Ids) } return db @@ -244,3 +252,13 @@ return records, nil } + +func (slf *ProductCategorySearch) Save(record *ProductCategory) error { + var db = slf.build() + + if err := db.Omit("CreatedAt").Save(record).Error; err != nil { + return fmt.Errorf("save err: %v, record: %+v", err, record) + } + + return nil +} -- Gitblit v1.8.0