Merge branch 'master' of git.oa00.com:supply-chain/service

jd/brand.go

@@ -9,6 +9,7 @@ import (
 type brand struct {
 }
 type ArgsBrandList struct {
+	Name string
 	Page bean.Page
 }
 
@@ -39,3 +40,13 @@ func (b *brand) Edit(ctx context.Context, args ArgsBrandEdit) error {
 	reply := 0
 	return client.GetClient(b).Call(ctx, "Edit", args, &reply)
 }
+
+type ArgsImport struct {
+	Name          string // 品牌名称
+	SupplyBrandId uint   // 匹配的品牌Id
+}
+
+func (b *brand) Import(ctx context.Context, args []ArgsImport) error {
+	reply := 0
+	return client.GetClient(b).Call(ctx, "Import", args, &reply)
+}

jd/category.go

@@ -9,7 +9,8 @@ import (
 type category struct {
 }
 type ArgsCategoryList struct {
-	Page bean.Page
+	ThirdCategoryId uint
+	Page            bean.Page
 }
 
 type CategoryItem struct {

jd/sku.go

@@ -148,7 +148,7 @@ type AdoptItem struct {
 }
 
 // Adopt @Title 入库
-func (s *sku) Adopt(ctx context.Context, skuIds []uint) (err error) {
+func (s *sku) Adopt(ctx context.Context, skuIds []uint) (reply []AdoptItem, err error) {
-	reply := 0
+	err = client.GetClient(s).Call(ctx, "Adopt", skuIds, &reply)
-	return client.GetClient(s).Call(ctx, "Adopt", skuIds, &reply)
+	return
 }