From f50a5ab504b4b02fa73fd8fd9d789c68c968efd3 Mon Sep 17 00:00:00 2001
From: jiangshuai <291802688@qq.com>
Date: 星期四, 09 十一月 2023 14:18:10 +0800
Subject: [PATCH] 附件信息，产品带附件
---
controllers/product_controller.go | 33 +++++
models/attachment.go | 8
models/material_attachment.go | 261 +++++++++++++++++++++++++++++++++++++++++++
models/material.go | 18 ++
4 files changed, 311 insertions(+), 9 deletions(-)
diff --git a/controllers/product_controller.go b/controllers/product_controller.go
index da77f6c..8178e2d 100644
--- a/controllers/product_controller.go
+++ b/controllers/product_controller.go
@@ -52,6 +52,19 @@
util.ResponseFormat(c, code.RequestParamError, "浜у搧淇℃伅淇濆瓨澶辫触")
return
}
+
+ materialAttachmentList := []*models.MaterialAttachment{}
+ for _, v := range params.AttachmentIDs {
+ ma := &models.MaterialAttachment{MaterialID: params.ID, AttachmentID: v}
+ materialAttachmentList = append(materialAttachmentList, ma)
+ }
+ if len(materialAttachmentList) > 0 {
+ if err := models.NewMaterialAttachmentSearch().CreateBatch(materialAttachmentList); err != nil {
+ util.ResponseFormat(c, code.SaveFail, "闄勪欢淇濆瓨澶辫触")
+ return
+ }
+ }
+
util.ResponseFormat(c, code.Success, "淇濆瓨鎴愬姛")
}
@@ -72,7 +85,7 @@
if params.PageInfo.Check() {
search.SetPage(params.Page, params.PageSize)
}
- products, total, err := search.SetKeyword(params.KeyWord).SetCategoryId(params.CategoryId).SetOrder("created_at desc").Find()
+ products, total, err := search.SetPreload(true).SetKeyword(params.KeyWord).SetCategoryId(params.CategoryId).SetOrder("created_at desc").Find()
if err != nil {
util.ResponseFormat(c, code.RequestParamError, "鏌ユ壘澶辫触")
return
@@ -110,7 +123,7 @@
util.ResponseFormat(c, code.RequestParamError, "鏃犳晥id")
return
}
- material, err := models.NewMaterialSearch().SetID(id).First()
+ material, err := models.NewMaterialSearch().SetID(id).SetPreload(true).First()
if err != nil {
util.ResponseFormat(c, code.RequestParamError, "鏌ユ壘澶辫触")
return
@@ -148,6 +161,22 @@
util.ResponseFormat(c, code.RequestParamError, "浜у搧淇℃伅鏇存柊澶辫触")
return
}
+
+ materialAttachmentList := []*models.MaterialAttachment{}
+ for _, v := range params.AttachmentIDs {
+ ma := &models.MaterialAttachment{MaterialID: params.ID, AttachmentID: v}
+ materialAttachmentList = append(materialAttachmentList, ma)
+ }
+ if err := models.NewMaterialAttachmentSearch().SetMaterialID(params.ID).Delete(); err != nil {
+ util.ResponseFormat(c, code.RequestParamError, "浜у搧闄勪欢娓呴櫎澶辫触")
+ return
+ }
+ if len(materialAttachmentList) > 0 {
+ if err := models.NewMaterialAttachmentSearch().CreateBatch(materialAttachmentList); err != nil {
+ util.ResponseFormat(c, code.RequestParamError, "浜у搧淇℃伅鏇存柊澶辫触")
+ return
+ }
+ }
util.ResponseFormat(c, code.Success, "鏇存柊鎴愬姛")
}
diff --git a/models/attachment.go b/models/attachment.go
index 24438cc..d3ff610 100644
--- a/models/attachment.go
+++ b/models/attachment.go
@@ -9,8 +9,8 @@
type (
Attachment struct {
- WmsModel
- Id int `json:"id" gorm:"column:id;primary_key;AUTO_INCREMENT"`
+ BaseModelInt
+ Id uint `json:"id" gorm:"column:id;primary_key;AUTO_INCREMENT"`
FileName string `json:"fileName" gorm:"type:varchar(127);comment:鏂囦欢鍚�"`
FileUrl string `json:"FileUrl" gorm:"type:varchar(255);comment:鏂囦欢鍦板潃"`
Ext string `json:"ext" gorm:"type:varchar(15);comment:鏂囦欢鍚庣紑鍚�"`
@@ -29,7 +29,7 @@
)
func (slf *Attachment) TableName() string {
- return "wms_attachment"
+ return "attachment"
}
func NewAttachmentSearch() *AttachmentSearch {
@@ -51,7 +51,7 @@
return slf
}
-func (slf *AttachmentSearch) SetID(ID int) *AttachmentSearch {
+func (slf *AttachmentSearch) SetID(ID uint) *AttachmentSearch {
slf.Id = ID
return slf
}
diff --git a/models/material.go b/models/material.go
index 0b46d57..5084258 100644
--- a/models/material.go
+++ b/models/material.go
@@ -67,9 +67,11 @@
//HSCode string `gorm:"type:varchar(255);comment:HS缂栫爜" json:"HSCode"` //HS缂栫爜
//OriginCountryId int `gorm:"type:int(11);comment:鍘熶骇鍦癷d" json:"originCountryId"` //鍘熶骇鍦癷d
//OriginCountryName string `gorm:"type:varchar(255);comment:鍘熶骇鍦板悕绉�" json:"originCountryName"` //鍘熶骇鍦板悕绉�
- InStorageExplain string `gorm:"type:varchar(512);comment:鍏ュ簱璇存槑" json:"inStorageExplain"` //鍏ュ簱璇存槑
- OutStorageExplain string `gorm:"type:varchar(512);comment:鍑哄簱璇存槑" json:"outStorageExplain"` //鍑哄簱璇存槑
- InternalTransferExplain string `gorm:"type:varchar(512);comment:鍐呴儴璋冩嫧璇存槑" json:"internalTransferExplain"` //鍐呴儴璋冩嫧璇存槑
+ InStorageExplain string `gorm:"type:varchar(512);comment:鍏ュ簱璇存槑" json:"inStorageExplain"` //鍏ュ簱璇存槑
+ 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:"-"`
}
MaterialSearch struct {
@@ -83,6 +85,7 @@
Ids []string
Orm *gorm.DB
CategoryIds []int
+ Preload bool
}
IdAndName struct {
@@ -174,6 +177,11 @@
// return slf
//}
+func (slf *MaterialSearch) SetPreload(preload bool) *MaterialSearch {
+ slf.Preload = preload
+ return slf
+}
+
func (slf *MaterialSearch) build() *gorm.DB {
var db = slf.Orm.Table(slf.TableName())
@@ -240,6 +248,10 @@
db = db.Where("category_id in ?", slf.CategoryIds)
}
+ if slf.Preload {
+ db = db.Preload("AttachmentList")
+ }
+
return db
}
diff --git a/models/material_attachment.go b/models/material_attachment.go
new file mode 100644
index 0000000..9e3f02b
--- /dev/null
+++ b/models/material_attachment.go
@@ -0,0 +1,261 @@
+package models
+
+import (
+ "fmt"
+ "gorm.io/gorm"
+ "wms/pkg/mysqlx"
+)
+
+type (
+ MaterialAttachment struct {
+ BaseModelInt
+ AttachmentID uint `json:"attachmentID" gorm:"comment:闄勪欢琛ㄥ閿�"`
+ MaterialID string `json:"materialID" gorm:"type:varchar(191);comment:鐗╂枡琛ㄥ妫�"`
+ }
+
+ MaterialAttachmentSearch struct {
+ MaterialAttachment
+ Order string
+ PageNum int
+ PageSize int
+ Keyword string
+ Orm *gorm.DB
+ Preload bool
+ }
+)
+
+func (slf *MaterialAttachment) TableName() string {
+ return "material_attachment"
+}
+
+func NewMaterialAttachmentSearch() *MaterialAttachmentSearch {
+ return &MaterialAttachmentSearch{Orm: mysqlx.GetDB()}
+}
+
+func (slf *MaterialAttachmentSearch) SetOrm(tx *gorm.DB) *MaterialAttachmentSearch {
+ slf.Orm = tx
+ return slf
+}
+
+func (slf *MaterialAttachmentSearch) SetPage(page, size int) *MaterialAttachmentSearch {
+ slf.PageNum, slf.PageSize = page, size
+ return slf
+}
+
+func (slf *MaterialAttachmentSearch) SetOrder(order string) *MaterialAttachmentSearch {
+ slf.Order = order
+ return slf
+}
+
+func (slf *MaterialAttachmentSearch) SetID(ID uint) *MaterialAttachmentSearch {
+ slf.ID = ID
+ return slf
+}
+
+func (slf *MaterialAttachmentSearch) SetKeyword(keyword string) *MaterialAttachmentSearch {
+ slf.Keyword = keyword
+ return slf
+}
+
+func (slf *MaterialAttachmentSearch) SetPreload(preload bool) *MaterialAttachmentSearch {
+ slf.Preload = preload
+ return slf
+}
+
+func (slf *MaterialAttachmentSearch) SetMaterialID(materialID string) *MaterialAttachmentSearch {
+ slf.MaterialID = materialID
+ return slf
+}
+
+func (slf *MaterialAttachmentSearch) build() *gorm.DB {
+ var db = slf.Orm.Model(&MaterialAttachment{})
+
+ if slf.ID != 0 {
+ db = db.Where("id = ?", slf.ID)
+ }
+ if slf.Order != "" {
+ db = db.Order(slf.Order)
+ }
+
+ if slf.Keyword != "" {
+ db = db.Where("name like ? ", fmt.Sprintf("%%%v%%", slf.Keyword))
+ }
+
+ if slf.MaterialID != "" {
+ db = db.Where("material_id=?", slf.MaterialID)
+ }
+
+ //if slf.Preload {
+ // db = db.Model(&Attachment{}).Preload("Details").Preload("Details.Product").Preload("FromLocation").Preload("ToLocation")
+ //}
+
+ return db
+}
+
+// Create 鍗曟潯鎻掑叆
+func (slf *MaterialAttachmentSearch) Create(record *MaterialAttachment) error {
+ var db = slf.build()
+
+ if err := db.Create(record).Error; err != nil {
+ return err
+ }
+
+ return nil
+}
+
+// CreateBatch 鎵归噺鎻掑叆
+func (slf *MaterialAttachmentSearch) CreateBatch(records []*MaterialAttachment) error {
+ var db = slf.build()
+
+ if err := db.Model(&MaterialAttachment{}).Create(&records).Error; err != nil {
+ return fmt.Errorf("create batch err: %v, records: %+v", err, records)
+ }
+
+ return nil
+}
+
+func (slf *MaterialAttachmentSearch) Save(record *MaterialAttachment) 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
+}
+
+func (slf *MaterialAttachmentSearch) Update(record *MaterialAttachment) error {
+ var db = slf.build()
+
+ if err := db.Omit("CreatedAt").Updates(record).Error; err != nil {
+ return fmt.Errorf("save err: %v, record: %+v", err, record)
+ }
+
+ return nil
+}
+
+func (slf *MaterialAttachmentSearch) UpdateByMap(upMap map[string]interface{}) error {
+ var (
+ db = slf.build()
+ )
+
+ if err := db.Updates(upMap).Error; err != nil {
+ return fmt.Errorf("update by map err: %v, upMap: %+v", err, upMap)
+ }
+
+ return nil
+}
+
+func (slf *MaterialAttachmentSearch) UpdateByQuery(query string, args []interface{}, upMap map[string]interface{}) error {
+ var (
+ db = slf.Orm.Table(slf.TableName()).Where(query, args...)
+ )
+
+ if err := db.Updates(upMap).Error; err != nil {
+ return fmt.Errorf("update by query err: %v, query: %s, args: %+v, upMap: %+v", err, query, args, upMap)
+ }
+
+ return nil
+}
+
+func (slf *MaterialAttachmentSearch) Delete() error {
+ var db = slf.build()
+ return db.Delete(&MaterialAttachment{}).Error
+}
+
+func (slf *MaterialAttachmentSearch) First() (*MaterialAttachment, error) {
+ var (
+ record = new(MaterialAttachment)
+ db = slf.build()
+ )
+
+ if err := db.First(record).Error; err != nil {
+ return record, err
+ }
+
+ return record, nil
+}
+
+func (slf *MaterialAttachmentSearch) Find() ([]*MaterialAttachment, int64, error) {
+ var (
+ records = make([]*MaterialAttachment, 0)
+ total int64
+ db = slf.build()
+ )
+
+ if err := db.Count(&total).Error; err != nil {
+ return records, total, fmt.Errorf("find count err: %v", err)
+ }
+ if slf.PageNum*slf.PageSize > 0 {
+ db = db.Offset((slf.PageNum - 1) * slf.PageSize).Limit(slf.PageSize)
+ }
+ if err := db.Order("created_at desc").Find(&records).Error; err != nil {
+ return records, total, fmt.Errorf("find records err: %v", err)
+ }
+
+ return records, total, nil
+}
+
+func (slf *MaterialAttachmentSearch) FindNotTotal() ([]*MaterialAttachment, error) {
+ var (
+ records = make([]*MaterialAttachment, 0)
+ db = slf.build()
+ )
+
+ if slf.PageNum*slf.PageSize > 0 {
+ db = db.Offset((slf.PageNum - 1) * slf.PageSize).Limit(slf.PageSize)
+ }
+ if err := db.Preload("FromLocation").Preload("ToLocation").Find(&records).Error; err != nil {
+ return records, fmt.Errorf("find records err: %v", err)
+ }
+
+ return records, nil
+}
+
+// FindByQuery 鎸囧畾鏉′欢鏌ヨ.
+func (slf *MaterialAttachmentSearch) FindByQuery(query string, args []interface{}) ([]*MaterialAttachment, int64, error) {
+ var (
+ records = make([]*MaterialAttachment, 0)
+ total int64
+ db = slf.Orm.Table(slf.TableName()).Where(query, args...)
+ )
+
+ if err := db.Count(&total).Error; err != nil {
+ return records, total, fmt.Errorf("find by query count err: %v", err)
+ }
+ if slf.PageNum*slf.PageSize > 0 {
+ db = db.Offset((slf.PageNum - 1) * slf.PageSize).Limit(slf.PageSize)
+ }
+ if err := db.Find(&records).Error; err != nil {
+ return records, total, fmt.Errorf("find by query records err: %v, query: %s, args: %+v", err, query, args)
+ }
+
+ return records, total, nil
+}
+
+// FindByQueryNotTotal 鎸囧畾鏉′欢鏌ヨ&涓嶆煡璇㈡�绘潯鏁�.
+func (slf *MaterialAttachmentSearch) FindByQueryNotTotal(query string, args []interface{}) ([]*MaterialAttachment, error) {
+ var (
+ records = make([]*MaterialAttachment, 0)
+ db = slf.Orm.Table(slf.TableName()).Where(query, args...)
+ )
+
+ if slf.PageNum*slf.PageSize > 0 {
+ db = db.Offset((slf.PageNum - 1) * slf.PageSize).Limit(slf.PageSize)
+ }
+ if err := db.Find(&records).Error; err != nil {
+ return records, fmt.Errorf("find by query records err: %v, query: %s, args: %+v", err, query, args)
+ }
+
+ return records, nil
+}
+
+func (slf *MaterialAttachmentSearch) CreateBatchWithResp(records []*MaterialAttachment) ([]*MaterialAttachment, error) {
+ var db = slf.build()
+
+ if err := db.Create(&records).Error; err != nil {
+ return nil, fmt.Errorf("create batch err: %v, records: %+v", err, records)
+ }
+
+ return records, nil
+}
--
Gitblit v1.8.0