From dec7039530a66297fd3800fec4742824c3a9a2c1 Mon Sep 17 00:00:00 2001
From: liujiandao <274878379@qq.com>
Date: 星期一, 22 一月 2024 10:08:44 +0800
Subject: [PATCH] 产品查询修改
---
models/material.go | 29 ++++++++++++++++++++---------
1 files changed, 20 insertions(+), 9 deletions(-)
diff --git a/models/material.go b/models/material.go
index fd2e51b..a73db2c 100644
--- a/models/material.go
+++ b/models/material.go
@@ -71,7 +71,18 @@
OutStorageExplain string `gorm:"type:varchar(512);comment:鍑哄簱璇存槑" json:"outStorageExplain"` //鍑哄簱璇存槑
InternalTransferExplain string `gorm:"type:varchar(512);comment:鍐呴儴璋冩嫧璇存槑" json:"internalTransferExplain"` //鍐呴儴璋冩嫧璇存槑
AttachmentList []*Attachment `json:"attachmentList" gorm:"many2many:material_attachment"`
- AttachmentIDs []uint `json:"attachmentIDs" gorm:"-"`
+ IsStorage int `gorm:"type:tinyint(1);default:1;comment:鏄惁瀛樺簱(1鏄�2鍚�)" json:"isStorage"` //鏃犲簱瀛樼殑鍦╳ms浠ュ強srm涓渶瑕佽繃婊ゆ帀
+ IsVirtual int `json:"isVirtual" gorm:"type:tinyint(1);default:2;comment:鏄惁铏氭嫙鐗╂枡(1鏄�2鍚�)"` //铏氭嫙鐗╂枡鍦∕RP璁＄畻鏃惰烦杩囪灞傜骇鐩存帴棰嗙敤涓嬬骇鐗╂枡锛岃櫄鎷熺墿鏂欎笉鐢熸垚宸ュ崟
+ ReorderRuleNum int64 `json:"reorderRuleNum"`
+
+ //浠ヤ笅涓轰笉瀛樺簱鐨勫瓧娈�
+ AttachmentIDs []uint `json:"attachmentIDs" gorm:"-"`
+ PredictionAmount decimal.Decimal `json:"predictionAmount" gorm:"-"`
+ InputAmount decimal.Decimal `json:"inputAmount" gorm:"-"`
+ OutputAmount decimal.Decimal `json:"outputAmount" gorm:"-"`
+ MinInventoryRule decimal.Decimal `json:"minInventoryRule" gorm:"-"` //鏈�灏忓簱瀛�
+ MaxInventoryRule decimal.Decimal `json:"maxInventoryRule" gorm:"-"` //鏈�澶у簱瀛�
+
}
MaterialSearch struct {
@@ -99,7 +110,7 @@
}
func NewMaterialSearch() *MaterialSearch {
- return &MaterialSearch{Orm: mysqlx.GetDB()}
+ return &MaterialSearch{Orm: mysqlx.GetDB().Where("is_storage = ", 1)} //鍙煡璇㈡湁搴撳瓨鐨�
}
func (slf *MaterialSearch) SetOrm(tx *gorm.DB) *MaterialSearch {
@@ -122,10 +133,10 @@
return slf
}
-func (slf *MaterialSearch) SetIsSale(isSale bool) *MaterialSearch {
- slf.IsSale = isSale
- return slf
-}
+//func (slf *MaterialSearch) SetIsSale(isSale bool) *MaterialSearch {
+// slf.IsSale = isSale
+// return slf
+//}
func (slf *MaterialSearch) SetIDs(ids []string) *MaterialSearch {
slf.Ids = ids
@@ -238,9 +249,9 @@
if len(slf.Ids) > 0 {
db = db.Where("id in ?", slf.Ids)
}
- if slf.IsSale {
- db = db.Where("is_sale = ?", 1)
- }
+ //if slf.IsSale {
+ // db = db.Where("is_sale = ?", 1)
+ //}
if slf.CategoryId > 0 {
db = db.Where("category_id = ?", slf.CategoryId)
}
--
Gitblit v1.8.0