From f0d048fa2cba4f52066e14d1d31e4f7a2c7a9530 Mon Sep 17 00:00:00 2001 From: hdy <1105738590@qq.com> Date: 星期三, 12 三月 2025 09:05:57 +0800 Subject: [PATCH] 新增导入功能 --- billion-admin/pom.xml | 7 ++ billion-main/src/main/java/com/billion/main/bs/controller/BsBomChildInfoController.java | 16 +++++ billion-main/src/main/java/com/billion/main/bs/service/IBsBomChildInfoService.java | 1 billion-ui/src/views/main/bs/bomChildInfo/index.vue | 85 +++++++++++++++++++++++++++ billion-main/src/main/java/com/billion/main/bs/service/impl/BsBomChildInfoServiceImpl.java | 46 +++++++++++++++ pom.xml | 1 6 files changed, 154 insertions(+), 2 deletions(-) diff --git a/billion-admin/pom.xml b/billion-admin/pom.xml index 6f5d4a7..70dfbb9 100644 --- a/billion-admin/pom.xml +++ b/billion-admin/pom.xml @@ -68,6 +68,12 @@ </dependency> <dependency> + <groupId>com.alibaba</groupId> + <artifactId>easyexcel</artifactId> + <version>3.3.3</version> + </dependency> + + <dependency> <groupId>com.billion</groupId> <artifactId>billion-main</artifactId> </dependency> @@ -78,6 +84,7 @@ </dependencies> + <build> <plugins> <plugin> diff --git a/billion-main/src/main/java/com/billion/main/bs/controller/BsBomChildInfoController.java b/billion-main/src/main/java/com/billion/main/bs/controller/BsBomChildInfoController.java index c7470bd..c24c956 100644 --- a/billion-main/src/main/java/com/billion/main/bs/controller/BsBomChildInfoController.java +++ b/billion-main/src/main/java/com/billion/main/bs/controller/BsBomChildInfoController.java @@ -11,6 +11,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletResponse; import java.util.List; @@ -28,6 +29,21 @@ @Autowired private IBsBomChildInfoService bsBomChildInfoService; + @PostMapping("/importTemplate") + public void importTemplate(HttpServletResponse response) + { + ExcelUtil<BsBomChildInfo> util = new ExcelUtil<BsBomChildInfo>(BsBomChildInfo.class); + util.importTemplateExcel(response, "bom瀛愯〃鏁版嵁"); + } + @PreAuthorize("@ss.hasPermi('bs:bomChildInfo:import')") + @PostMapping("/importData") + public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception + { + ExcelUtil<BsBomChildInfo> util = new ExcelUtil<BsBomChildInfo>(BsBomChildInfo.class); + List<BsBomChildInfo> bomChildList = util.importExcel(file.getInputStream()); + String message = bsBomChildInfoService.importBomChild(bomChildList, updateSupport, "1"); + return success(message); + } /** * 鏌ヨ鍩虹BOM瀛愪俊鎭垪琛� */ diff --git a/billion-main/src/main/java/com/billion/main/bs/service/IBsBomChildInfoService.java b/billion-main/src/main/java/com/billion/main/bs/service/IBsBomChildInfoService.java index 60d277d..a214a65 100644 --- a/billion-main/src/main/java/com/billion/main/bs/service/IBsBomChildInfoService.java +++ b/billion-main/src/main/java/com/billion/main/bs/service/IBsBomChildInfoService.java @@ -61,4 +61,5 @@ */ public int deleteBsBomChildInfoById(Long id); void insertBatch(List<BsBomChildInfo> confList); + public String importBomChild(List<BsBomChildInfo> bomChildList, Boolean isUpdateSupport, String operName); } diff --git a/billion-main/src/main/java/com/billion/main/bs/service/impl/BsBomChildInfoServiceImpl.java b/billion-main/src/main/java/com/billion/main/bs/service/impl/BsBomChildInfoServiceImpl.java index 9a1e5b6..5ee4b40 100644 --- a/billion-main/src/main/java/com/billion/main/bs/service/impl/BsBomChildInfoServiceImpl.java +++ b/billion-main/src/main/java/com/billion/main/bs/service/impl/BsBomChildInfoServiceImpl.java @@ -1,12 +1,16 @@ package com.billion.main.bs.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.billion.common.exception.ServiceException; +import com.billion.common.utils.StringUtils; +import com.billion.common.utils.bean.BeanValidators; import com.billion.main.bs.domain.BsBomChildInfo; import com.billion.main.bs.mapper.BsBomChildInfoMapper; import com.billion.main.bs.service.IBsBomChildInfoService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import javax.validation.Validator; import java.util.List; /** @@ -19,6 +23,48 @@ public class BsBomChildInfoServiceImpl extends ServiceImpl<BsBomChildInfoMapper, BsBomChildInfo> implements IBsBomChildInfoService { @Autowired + protected Validator validator; + + @Autowired + private IBsBomChildInfoService bsBomChildInfoService; + + @Override + public String importBomChild(List<BsBomChildInfo> bomChildList, Boolean isUpdateSupport, String operName) + { + if (StringUtils.isNull(bomChildList) || bomChildList.size() == 0) + { + throw new ServiceException("瀵煎叆鏁版嵁涓嶈兘涓虹┖锛�"); + } + StringBuilder successMsg = new StringBuilder(); + for (BsBomChildInfo list : bomChildList) + { + try + { + BeanValidators.validateWithException(validator, list); + BsBomChildInfo bsBomChildInfo = new BsBomChildInfo(); + bsBomChildInfo.setProductCode(list.getProductCode()); + bsBomChildInfo.setProductName(list.getProductName()); + bsBomChildInfo.setLocationCode(list.getLocationCode()); + bsBomChildInfo.setLocationName(list.getLocationName()); + bsBomChildInfo.setMaterialCode(list.getMaterialCode()); + bsBomChildInfo.setMaterialName(list.getMaterialName()); + bsBomChildInfo.setCostQty(list.getCostQty()); + bsBomChildInfo.setBomCode(list.getBomCode()); + bsBomChildInfoService.insertBsBomChildInfo(bsBomChildInfo); + successMsg.append( " 鏇存柊鎴愬姛"); + } + catch (Exception e) + { + String msg = " 瀵煎叆澶辫触"; + log.error(msg, e); + } + } + return successMsg.toString(); + } + + + + @Autowired private BsBomChildInfoMapper bsBomChildInfoMapper; /** diff --git a/billion-ui/src/views/main/bs/bomChildInfo/index.vue b/billion-ui/src/views/main/bs/bomChildInfo/index.vue index 141e2b2..1b1a53e 100644 --- a/billion-ui/src/views/main/bs/bomChildInfo/index.vue +++ b/billion-ui/src/views/main/bs/bomChildInfo/index.vue @@ -81,6 +81,16 @@ </el-col> <el-col :span="1.5"> <el-button + type="info" + plain + icon="el-icon-upload2" + size="mini" + @click="handleImport" + v-hasPermi="['system:user:import']" + >瀵煎叆</el-button> + </el-col> + <el-col :span="1.5"> + <el-button type="warning" plain icon="el-icon-download" @@ -186,6 +196,38 @@ <el-button @click="cancel">鍙� 娑�</el-button> </div> </el-dialog> + + <!-- 鐢ㄦ埛瀵煎叆瀵硅瘽妗� --> + <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body> + <el-upload + ref="upload" + :limit="1" + accept=".xlsx, .xls" + :headers="upload.headers" + :action="upload.url + '?updateSupport=' + upload.updateSupport" + :disabled="upload.isUploading" + :on-progress="handleFileUploadProgress" + :on-success="handleFileSuccess" + :auto-upload="false" + drag + > + <i class="el-icon-upload"></i> + <div class="el-upload__text">灏嗘枃浠舵嫋鍒版澶勶紝鎴�<em>鐐瑰嚮涓婁紶</em></div> + <div class="el-upload__tip text-center" slot="tip"> + <div class="el-upload__tip" slot="tip"> + <el-checkbox v-model="upload.updateSupport" /> 鏄惁鏇存柊宸茬粡瀛樺湪鐨勬暟鎹� + </div> + <span>浠呭厑璁稿鍏ls銆亁lsx鏍煎紡鏂囦欢銆�</span> + <el-link type="primary" :underline="false" style="font-size:12px;vertical-align: baseline;" @click="importTemplate">涓嬭浇妯℃澘</el-link> + </div> + </el-upload> + <div slot="footer" class="dialog-footer"> + <el-button type="primary" @click="submitFileForm">纭� 瀹�</el-button> + <el-button @click="upload.open = false">鍙� 娑�</el-button> + </div> + </el-dialog> + + </div> </template> @@ -193,6 +235,7 @@ import { listBomChildInfo, getBomChildInfo, delBomChildInfo, addBomChildInfo, updateBomChildInfo } from "@/api/main/bs/bomChildInfo"; import { listBomInfo } from "@/api/main/bs/bomInfo"; import ItemSelect from "@/components/itemSelect/single.vue"; +import {getToken} from "@/utils/auth"; export default { name: "BomChildInfo", @@ -240,7 +283,19 @@ productCode: "", productName: "" }, - + // 鐢ㄦ埛瀵煎叆鍙傛暟 + upload: { + open: false, + title: "", + // 鏄惁绂佺敤涓婁紶 + isUploading: false, + // 鏄惁鏇存柊宸茬粡瀛樺湪鐨勭敤鎴锋暟鎹� + updateSupport: 0, + // 璁剧疆涓婁紶鐨勮姹傚ご閮� + headers: { Authorization: "Bearer " + getToken() }, + // 涓婁紶鐨勫湴鍧� + url: process.env.VUE_APP_BASE_API + "/bs/bomChildInfo/importData" + }, // 琛ㄥ崟鍙傛暟 form: {}, // 琛ㄥ崟鏍¢獙 @@ -388,7 +443,33 @@ this.download('bs/bomChildInfo/export', { ...this.queryParams }, `bomChildInfo_${new Date().getTime()}.xlsx`) - } + }, + /** 瀵煎叆鎸夐挳鎿嶄綔 */ + handleImport() { + this.upload.title = "鏁版嵁瀵煎叆"; + this.upload.open = true; + }, + // 鏂囦欢涓婁紶涓鐞� + handleFileUploadProgress(event, file, fileList) { + this.upload.isUploading = true; + }, + // 鏂囦欢涓婁紶鎴愬姛澶勭悊 + handleFileSuccess(response, file, fileList) { + this.upload.open = false; + this.upload.isUploading = false; + this.$refs.upload.clearFiles(); + this.$alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response.msg + "</div>", "瀵煎叆缁撴灉", { dangerouslyUseHTMLString: true }); + this.getList(); + }, + // 鎻愪氦涓婁紶鏂囦欢 + submitFileForm() { + this.$refs.upload.submit(); + }, + /** 涓嬭浇妯℃澘鎿嶄綔 */ + importTemplate() { + this.download('bs/bomChildInfo/importTemplate', { + }, `bom_child_${new Date().getTime()}.xlsx`) + }, } }; </script> diff --git a/pom.xml b/pom.xml index a6265f6..a905b2b 100644 --- a/pom.xml +++ b/pom.xml @@ -285,4 +285,5 @@ </pluginRepository> </pluginRepositories> + </project> \ No newline at end of file -- Gitblit v1.9.3