feat:完善项目

This commit is contained in:
henry
2021-11-15 17:32:23 +08:00
parent f5e2063685
commit 78128277ff
27 changed files with 717 additions and 105 deletions

View File

@ -11,8 +11,9 @@ type Manage struct{}
type (
// manageEquipmentForm 装备参数信息
manageEquipmentForm struct {
Code string `json:"code" form:"code" binding:"required"`
Title string `json:"title" form:"title" binding:"required"`
ParentID string `json:"parent_id" form:"parent_id"`
Code string `json:"code" form:"code" binding:"required"`
Title string `json:"title" form:"title" binding:"required"`
ImageForm
Config string `json:"config" form:"config"`
Remark string `json:"remark" form:"remark"`
@ -23,8 +24,12 @@ type (
Code string `json:"code" form:"code" binding:"required"`
Title string `json:"title" form:"title" binding:"required"`
ImageForm
Remark string `json:"remark" form:"remark"`
Unit int `json:"unit" form:"Unit" binding:"required"`
Price float64 `json:"price" form:"price" binding:"required"`
Remark string `json:"remark" form:"remark"`
Unit int `json:"unit" form:"unit" binding:"required"`
MaterialID string `json:"material_id" form:"material_id"`
SupplierID string `json:"supplier_id" form:"supplier_id"`
Stock float64 `json:"stock" form:"stock"`
}
// manageNoticeForm 公告参数信息
manageNoticeForm struct {
@ -33,11 +38,26 @@ type (
}
)
func (this *manageEquipmentForm) ParentInfo() uint64 {
obj := &IDStringForm{ID: this.ParentID}
return obj.Convert()
}
func (this *manageMaterialForm) ManufacturerInfo() uint64 {
obj := &IDStringForm{ID: this.ManufacturerID}
return obj.Convert()
}
func (this *manageMaterialForm) MaterialInfo() uint64 {
obj := &IDStringForm{ID: this.MaterialID}
return obj.Convert()
}
func (this *manageMaterialForm) SupplierInfo() uint64 {
obj := &IDStringForm{ID: this.SupplierID}
return obj.Convert()
}
/**
* @apiDefine Manage 数据管理
*/
@ -207,6 +227,7 @@ func (*Manage) EquipmentDetail(c *gin.Context) {
*
* @apiHeader {string} x-token token
*
* @apiParam {String} parent_id 装备父集ID
* @apiParam {String} code 器材编码
* @apiParam {String} title 器材名称
* @apiParam {String} image 器材图片
@ -232,8 +253,8 @@ func (*Manage) EquipmentAdd(c *gin.Context) {
return
}
err := manage.NewEquipment()(getSession()(c).(*service.Session)).Form(&manage.EquipmentParams{
Code: form.Code, Title: form.Title, Image: form.FilterImageURL(), Config: form.Config,
Remark: form.Remark,
ParentID: form.ParentInfo(), Code: form.Code, Title: form.Title, Image: form.FilterImageURL(),
Config: form.Config, Remark: form.Remark,
})
APIResponse(err)(c)
}
@ -247,6 +268,7 @@ func (*Manage) EquipmentAdd(c *gin.Context) {
* @apiHeader {string} x-token token
*
* @apiParam {String} id ID
* @apiParam {String} parent_id 装备父集ID
* @apiParam {String} code 器材编码
* @apiParam {String} title 器材名称
* @apiParam {String} image 器材图片
@ -274,7 +296,7 @@ func (*Manage) EquipmentEdit(c *gin.Context) {
return
}
err := manage.NewEquipment()(getSession()(c).(*service.Session)).Form(&manage.EquipmentParams{
ID: form.Convert(), Code: form.Code, Title: form.Title, Image: form.FilterImageURL(), Config: form.Config,
ID: form.Convert(), ParentID: form.ParentInfo(), Code: form.Code, Title: form.Title, Image: form.FilterImageURL(), Config: form.Config,
Remark: form.Remark,
})
APIResponse(err)(c)
@ -432,10 +454,14 @@ func (*Manage) MaterialSelect(c *gin.Context) {
*
* @apiParam {String} manufacturer_id 制造商ID
* @apiParam {String} code 器材编码
* @apiParam {float} price 价格
* @apiParam {String} title 器材名称
* @apiParam {String} image 器材图片
* @apiParam {Number} unit 单位
* @apiParam {String} remark 备注
* @apiParam {String} material_id 器材ID
* @apiParam {String} supplier_id 供应商ID
* @apiParam {String} [stock=0] 库存
*
* @apiSuccess (200) {Object} data 数据信息
* @apiSuccess (200) {Number} code 成功响应状态码!
@ -458,7 +484,8 @@ func (*Manage) MaterialAdd(c *gin.Context) {
}
err := manage.NewMaterial()(getSession()(c).(*service.Session)).Form(&manage.MaterialParams{
ManufacturerID: form.ManufacturerInfo(), Code: form.Code, Title: form.Title, Image: form.FilterImageURL(),
Remark: form.Remark, Unit: form.Unit,
Price: form.Price, Remark: form.Remark, Unit: form.Unit, MaterialID: form.MaterialInfo(),
SupplierID: form.SupplierInfo(), Stock: form.Stock,
})
APIResponse(err)(c)
}
@ -474,6 +501,7 @@ func (*Manage) MaterialAdd(c *gin.Context) {
* @apiParam {String} id ID
* @apiParam {String} manufacturer_id 制造商ID
* @apiParam {String} code 器材编码
* @apiParam {float} price 价格
* @apiParam {String} title 器材名称
* @apiParam {String} image 器材图片
* @apiParam {Number} unit 单位
@ -502,7 +530,7 @@ func (*Manage) MaterialEdit(c *gin.Context) {
}
err := manage.NewMaterial()(getSession()(c).(*service.Session)).Form(&manage.MaterialParams{
ID: form.Convert(), ManufacturerID: form.ManufacturerInfo(), Code: form.Code, Title: form.Title,
Image: form.FilterImageURL(), Remark: form.Remark, Unit: form.Unit,
Price: form.Price, Image: form.FilterImageURL(), Remark: form.Remark, Unit: form.Unit,
})
APIResponse(err)(c)
}