diff --git a/business/jxstore/cms/sku.go b/business/jxstore/cms/sku.go index 74a1c7cdb..066e4303c 100644 --- a/business/jxstore/cms/sku.go +++ b/business/jxstore/cms/sku.go @@ -1740,18 +1740,18 @@ func buildCreateUpcSkuByExcelErr(v *model.SkuName, errMsg string) (createUpcSkuB return createUpcSkuByExcelErr } -func CreateUpcSkuByExcel(ctx *jxcontext.Context, files []*multipart.FileHeader) (err error) { +func CreateUpcSkuByExcel(ctx *jxcontext.Context, files []*multipart.FileHeader) (hint string, err error) { if len(files) == 0 { - return errors.New("没有文件上传!") + return "", errors.New("没有文件上传!") } fileHeader := files[0] file, err := fileHeader.Open() - err = CreateUpcSkuByExcelBin(ctx, file) + hint, err = CreateUpcSkuByExcelBin(ctx, file) file.Close() - return err + return hint, err } -func CreateUpcSkuByExcelBin(ctx *jxcontext.Context, reader io.Reader) (err error) { +func CreateUpcSkuByExcelBin(ctx *jxcontext.Context, reader io.Reader) (hint string, err error) { var ( db = dao.GetDB() skuParams []*model.SkuName @@ -1955,8 +1955,8 @@ func CreateUpcSkuByExcelBin(ctx *jxcontext.Context, reader io.Reader) (err error } taskSeq := tasksch.NewSeqTask2("根据excel创建标品-序列任务", ctx, true, taskSeqFunc, 3) tasksch.HandleTask(taskSeq, nil, true).Run() - _, err = taskSeq.GetResult(0) - return err + hint = taskSeq.GetID() + return hint, err } func writeToExcel(excelTitle []string, dataList interface{}, task *tasksch.SeqTask) (err error) { diff --git a/controllers/cms_sku.go b/controllers/cms_sku.go index 4f5f15bb4..04dea3c64 100644 --- a/controllers/cms_sku.go +++ b/controllers/cms_sku.go @@ -460,7 +460,7 @@ func (c *SkuController) CreateUpcSkuByExcel() { c.callCreateUpcSkuByExcel(func(params *tSkuCreateUpcSkuByExcelParams) (retVal interface{}, errCode string, err error) { r := c.Ctx.Request files := r.MultipartForm.File["userfiles"] - err = cms.CreateUpcSkuByExcel(params.Ctx, files) + retVal, err = cms.CreateUpcSkuByExcel(params.Ctx, files) return retVal, "", err }) }