From 279b381d288cf6d1358408684d308d50ef3dd7a5 Mon Sep 17 00:00:00 2001 From: Fixiaobai <fixiaobai@163.com> Date: 星期五, 03 十一月 2023 09:10:54 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- mes-basic/src/main/java/com/chinaztt/mes/basic/service/PartService.java | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/mes-basic/src/main/java/com/chinaztt/mes/basic/service/PartService.java b/mes-basic/src/main/java/com/chinaztt/mes/basic/service/PartService.java index 877deca..67abf0c 100644 --- a/mes-basic/src/main/java/com/chinaztt/mes/basic/service/PartService.java +++ b/mes-basic/src/main/java/com/chinaztt/mes/basic/service/PartService.java @@ -24,9 +24,10 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.chinaztt.mes.basic.entity.Part; import com.chinaztt.mes.basic.excel.PartData; +import com.chinaztt.mes.basic.vo.PartVo; import com.chinaztt.ztt.common.core.util.R; +import org.springframework.web.multipart.MultipartFile; -import java.util.Date; import java.util.List; /** @@ -131,5 +132,14 @@ void syncPart(); - void syncNewIfs(Date date); + Long syncNewIfs(String date); + + void asyncUploadExcel(MultipartFile file); + + /** + * 瑙﹀彂闆朵欢 + * @param partVo + * @return + */ + String triggerAdd(PartVo partVo); } -- Gitblit v1.9.3