From 8d2e27d818b1e77e146d90e0d26c93d542b681e0 Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期四, 08 五月 2025 15:28:57 +0800 Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop --- rsf-server/src/main/java/com/vincent/rsf/server/manager/service/MatnrService.java | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/MatnrService.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/MatnrService.java index 5982014..09f3c06 100644 --- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/MatnrService.java +++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/MatnrService.java @@ -1,10 +1,10 @@ package com.vincent.rsf.server.manager.service; -import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; import com.vincent.rsf.framework.common.R; import com.vincent.rsf.server.common.domain.BaseParam; import com.vincent.rsf.server.common.domain.PageParam; +import com.vincent.rsf.server.manager.controller.params.MatnrToGroupParams; import com.vincent.rsf.server.manager.entity.Matnr; import org.springframework.web.multipart.MultipartFile; @@ -14,5 +14,15 @@ R importExcels(MultipartFile file) throws Exception; - IPage<Map<String, Object>> getMatnrPage(PageParam<Matnr, BaseParam> pageParam); + R saveMatnrs(Map<String, Object> matnr); + + PageParam<Matnr, BaseParam> getMatnrPage(PageParam<Matnr, BaseParam> pageParam, Map<String, Object> map); + + Matnr selectMatnrById(Long id); + + boolean bindMatnrs(MatnrToGroupParams params); + + boolean batchUpdate(MatnrToGroupParams params); + + PageParam<Matnr, BaseParam> getPages(Map<String, Object> map); } -- Gitblit v1.9.1