From a1a9aed81231a1685e3a615b07712bd94b1c98e4 Mon Sep 17 00:00:00 2001
From: lishihai <dslsh@dscom>
Date: 星期四, 04 七月 2024 10:01:47 +0800
Subject: [PATCH] 导入物料/产品->忽略AttributeValue动态属性已经存在的值

---
 controllers/attribute.go |   23 +++++++++++------------
 1 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/controllers/attribute.go b/controllers/attribute.go
index 926a09f..6949c1f 100644
--- a/controllers/attribute.go
+++ b/controllers/attribute.go
@@ -24,7 +24,7 @@
 // @Param     Authorization	header string true "token"
 // @Success   200 {object} util.Response "鎴愬姛"
 // @Router    /api-wms/v1/attribute/attribute [post]
-func (slf *AttributeController) Add(c *gin.Context) {
+func (slf AttributeController) Add(c *gin.Context) {
 	var reqParams request.AddAttribute
 	var params models.Attribute
 	if err := c.BindJSON(&reqParams); err != nil {
@@ -142,21 +142,20 @@
 	util.ResponseFormat(c, code.UpdateSuccess, "鍒犻櫎鎴愬姛")
 }
 
-// List
-// @Tags      灞炴��
-// @Summary   鏌ヨ灞炴�у垪琛�
+// ListAttribute
+// @Tags      灞炴�у�煎拰瀵硅薄
+// @Summary   娣诲姞灞炴�у�煎拰瀵硅薄
 // @Produce   application/json
-// @Param     object  query    request.GetAttributeList true  "鏌ヨ鍙傛暟"
-// @Param     Authorization	header string true "token"
-// @Success   200   {object}  util.ResponseList{data=[]models.Attribute}  "鎴愬姛"
+// @Param     object  body  request.AttributeList true  "灞炴�у�煎拰瀵硅薄淇℃伅"
+// @Success   200 {object} util.Response "鎴愬姛"
 // @Router    /api-wms/v1/attribute/attribute [get]
-func (slf AttributeController) List(c *gin.Context) {
-	var params request.GetAttributeList
-	if err := c.ShouldBindQuery(&params); err != nil {
+func (slf AttributeController) ListAttribute(c *gin.Context) {
+	var params request.AttributeList
+	if err := c.ShouldBind(&params); err != nil {
 		util.ResponseFormat(c, code.RequestParamError, err.Error())
 		return
 	}
-	list, count, err := models.NewAttributeSearch().SetPage(params.Page, params.PageSize).SetOrder("id desc").Find()
+	list, count, err := models.NewAttributeSearch().SetEntityType(params.EntityType).SetPage(params.Page, params.PageSize).SetOrder("id desc").Find()
 	if err != nil {
 		util.ResponseFormat(c, code.RequestParamError, "鏌ヨ澶辫触")
 		return
@@ -192,7 +191,7 @@
 // object  body  request.OperationList true  "鏌ヨ鍙傛暟"
 // @Success   200 {object} util.Response "鎴愬姛"
 // @Router    /api-wms/v1/attribute/primary/{id}  [get]
-func (slf *AttributeValueController) PrimaryAttribute(c *gin.Context) {
+func (slf AttributeController) PrimaryAttribute(c *gin.Context) {
 	id, _ := strconv.ParseUint(c.Param("id"), 10, 64)
 	if id == 0 {
 		util.ResponseFormat(c, code.RequestParamError, "鏃犳晥id")

--
Gitblit v1.8.0