feat:完善项目

This commit is contained in:
henry
2021-11-10 16:07:09 +08:00
parent 863edee71c
commit 5ffb79b4fa
10 changed files with 170 additions and 43 deletions

View File

@ -15,6 +15,12 @@ type Equipment struct{ *service.Session }
type EquipmentHandle func(session *service.Session) *Equipment
type (
// EquipmentBasic 装备基本信息
EquipmentBasic struct {
basic.CommonIDString
Code string `json:"code"`
Title string `json:"title"`
}
// EquipmentInfo 装备信息
EquipmentInfo struct {
basic.CommonIDString
@ -57,12 +63,6 @@ func (c *Equipment) tree(iModel model2.IModel, src []*model2.ManageEquipment, pa
for _, v := range src {
if v.ParentID == parentID {
//parentID := "0"
//
//if v.ParentID > 0 {
// iModel.SetID(v.ParentID)
// parentID = iModel.GetEncodeID()
//}
out = append(out, &EquipmentInfo{
CommonIDString: basic.CommonIDString{ID: v.GetEncodeID()},
Code: v.Code,
@ -93,10 +93,6 @@ func (c *Equipment) List(parentID uint64, title string, page, pageSize int) (*ba
Where: model2.NewWhereLike("title", title),
})
}
//if err := model2.ScanFields(mManageEquipment.ManageEquipment, &out, []string{"id", "code", "title", "image", "created_at"},
// where...); err != nil {
// return nil, err
//}
var count int64
if err := model2.PagesFields(mManageEquipment.ManageEquipment, &out, []string{"id", "code", "title", "image", "created_at"},
@ -109,6 +105,27 @@ func (c *Equipment) List(parentID uint64, title string, page, pageSize int) (*ba
}, nil
}
// Select 筛选信息
func (c *Equipment) Select() ([]*EquipmentBasic, error) {
mManageEquipment := model.NewManageEquipment()
out := make([]*model2.ManageEquipment, 0)
if err := model2.ScanFields(mManageEquipment.ManageEquipment, &out, []string{"id", "code", "title"}); err != nil {
return nil, err
}
list := make([]*EquipmentBasic, 0)
for _, v := range out {
list = append(list, &EquipmentBasic{
CommonIDString: basic.CommonIDString{ID: v.GetEncodeID()},
Code: v.Code,
Title: v.Title,
})
}
return list, nil
}
// Detail 详细信息
func (c *Equipment) Detail(id uint64) (*EquipmentDetail, error) {
mManageEquipment := model.NewManageEquipment()

View File

@ -15,6 +15,11 @@ type Material struct{ *service.Session }
type MaterialHandle func(session *service.Session) *Material
type (
// MaterialBasic 基本信息
MaterialBasic struct {
basic.CommonIDString
*model.ManageMaterialBasic
}
// MaterialInfo 基本信息
MaterialInfo struct {
basic.CommonIDString
@ -74,6 +79,28 @@ func (c *Material) List(manufacturerID, supplierID uint64, code, title string, p
return &basic.PageDataResponse{Data: list, Count: count}, nil
}
// Select 信息筛选
func (c *Material) Select() ([]*MaterialBasic, error) {
mManageMaterial := model.NewManageMaterial()
out, err := mManageMaterial.Basic()
if err != nil {
return nil, err
}
list := make([]*MaterialBasic, 0)
for _, v := range out {
mManageMaterial.ID = v.ID
list = append(list, &MaterialBasic{
CommonIDString: basic.CommonIDString{ID: mManageMaterial.GetEncodeID()},
ManageMaterialBasic: v,
})
}
return list, nil
}
// Form 数据操作
func (c *Material) Form(params *MaterialParams) error {
mManageMaterial := model.NewManageMaterial()
@ -100,7 +127,6 @@ func (c *Material) Form(params *MaterialParams) error {
mManageMaterial.Code = params.Code
mManageMaterial.Title = params.Title
mManageMaterial.Unit = model2.ManageMaterialUnit(params.Unit)
mManageMaterial.Position = params.Position
mManageMaterial.Remark = params.Remark
if mManageMaterial.ID > 0 {