From 7b1b5cf618cdcbb45786bdeb168d9b000e174fb9 Mon Sep 17 00:00:00 2001 From: yf <770153798@qq.com> Date: Mon, 20 Jan 2025 00:26:12 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=20=20=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E7=A8=BF=E4=BB=B6=E5=AF=BC=E5=87=BA=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/oms/enums/ErrorCodeConstants.java | 1 + .../admin/saleorder/SaleOrderController.java | 7 ++ .../service/saleorder/SaleOrderService.java | 8 ++ .../saleorder/SaleOrderServiceImpl.java | 106 ++++++++++++++++++ .../src/api/oms/saleorder/index.ts | 8 ++ .../src/views/oms/saleorder/index.vue | 30 ++++- 6 files changed, 159 insertions(+), 1 deletion(-) diff --git a/hangtag-module-oms/hangtag-module-oms-api/src/main/java/cn/hangtag/module/oms/enums/ErrorCodeConstants.java b/hangtag-module-oms/hangtag-module-oms-api/src/main/java/cn/hangtag/module/oms/enums/ErrorCodeConstants.java index 0906d0d..b08a57e 100644 --- a/hangtag-module-oms/hangtag-module-oms-api/src/main/java/cn/hangtag/module/oms/enums/ErrorCodeConstants.java +++ b/hangtag-module-oms/hangtag-module-oms-api/src/main/java/cn/hangtag/module/oms/enums/ErrorCodeConstants.java @@ -26,5 +26,6 @@ public interface ErrorCodeConstants extends cn.hangtag.module.system.enums.Erro ErrorCode SALE_CONTRACT_NOT_EXISTS = new ErrorCode(5000, "OMS销售合约不存在"); ErrorCode PRODUCT_PRICE_NOT_EXISTS = new ErrorCode(600, "产品单价记录不存在"); ErrorCode CUSTOMER_EMAIL_EXISTS = new ErrorCode(600, "已存在重复的客户邮箱号"); + ErrorCode SALE_ORDER_NOT_FILE_EXPORT = new ErrorCode(7000, "订单中没有可导出的稿件"); } diff --git a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/saleorder/SaleOrderController.java b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/saleorder/SaleOrderController.java index 20c23ad..07686a0 100644 --- a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/saleorder/SaleOrderController.java +++ b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/saleorder/SaleOrderController.java @@ -208,4 +208,11 @@ public class SaleOrderController { saleOrderService.generatePdf(response,ids); } + @GetMapping("/exportDesignSourceFile") + @Operation(summary = "导出销售订单的稿件源文件") + @PermitAll + public void exportDesignSourceFile(@RequestParam("ids") List ids,HttpServletResponse response) throws IOException { + saleOrderService.exportDesignSourceFile(response,ids); + } + } \ No newline at end of file diff --git a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/saleorder/SaleOrderService.java b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/saleorder/SaleOrderService.java index d07db5e..bf161d3 100644 --- a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/saleorder/SaleOrderService.java +++ b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/saleorder/SaleOrderService.java @@ -145,4 +145,12 @@ public interface SaleOrderService { * @return {@link Long } */ Long queryLastOrderBrand(Long customerId); + + /** + * 导出销售订单 sku 设计源文件 + * + * @param response 响应 + * @param ids IDs + */ + void exportDesignSourceFile(HttpServletResponse response, List ids); } \ No newline at end of file diff --git a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/saleorder/SaleOrderServiceImpl.java b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/saleorder/SaleOrderServiceImpl.java index 96fd012..f62ea7c 100644 --- a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/saleorder/SaleOrderServiceImpl.java +++ b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/saleorder/SaleOrderServiceImpl.java @@ -35,6 +35,7 @@ import cn.hangtag.module.oms.dal.dataobject.saleorder.SaleOrderDO; import cn.hangtag.module.oms.dal.dataobject.saleorderentry.SaleOrderEntryDO; import cn.hangtag.module.oms.dal.dataobject.saleordersku.SaleOrderSkuDO; import cn.hangtag.module.oms.dal.mysql.customer.CustomerMapper; +import cn.hangtag.module.oms.dal.mysql.productinfo.ProductInfoMapper; import cn.hangtag.module.oms.dal.mysql.salecontract.SaleContractMapper; import cn.hangtag.module.oms.dal.mysql.saleorder.SaleOrderMapper; import cn.hangtag.module.oms.dal.mysql.saleorderentry.SaleOrderEntryMapper; @@ -71,6 +72,7 @@ import cn.hutool.json.JSONUtil; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.google.common.collect.Maps; +import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Value; @@ -129,6 +131,9 @@ public class SaleOrderServiceImpl implements SaleOrderService { private CustomerMapper customerMapper; @Resource private UserBrandMapper userBrandMapper; + + @Resource + private ProductInfoMapper productInfoMapper; @Resource private ProductPriceService productPriceService; @@ -1174,6 +1179,107 @@ public class SaleOrderServiceImpl implements SaleOrderService { return null; } + @SneakyThrows + @Override + public void exportDesignSourceFile(HttpServletResponse response, List ids) { + // 获取 分录 + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.in(SaleOrderEntryDO::getParentId, ids); + queryWrapper.eq(SaleOrderEntryDO::getDeleted, false); + List entryDOS = saleOrderEntryMapper.selectList(queryWrapper); + if(FuncUtil.isEmpty(entryDOS)){ + throw exception(ErrorCodeConstants.SALE_ORDER_NOT_FILE_EXPORT); + } + List id = new ArrayList<>(); + Map codeMap = new HashMap<>(); + for (SaleOrderEntryDO entryDO : entryDOS) { + Long materialId = entryDO.getMaterialId(); + ProductInfoDO infoDO = productInfoMapper.selectById(materialId); + if(FuncUtil.isNotEmpty(infoDO)){ + String templateType = infoDO.getTemplateType(); + if("1".equals(templateType)){ + // 有模板物料 + id.add(entryDO.getId()); + String code = infoDO.getCode(); + codeMap.put(entryDO.getId(), code); + } + } + } + if(FuncUtil.isEmpty(id)){ + throw exception(ErrorCodeConstants.SALE_ORDER_NOT_FILE_EXPORT); + } + // 获取 sku + LambdaQueryWrapper skuWrapper = new LambdaQueryWrapper<>(); + skuWrapper.in(SaleOrderSkuDO::getEntryId, id); + skuWrapper.eq(SaleOrderSkuDO::getDeleted, false); + List skuDOS = skuOrderSkuMapper.selectList(skuWrapper); + if(FuncUtil.isEmpty(skuDOS)){ + throw exception(ErrorCodeConstants.SALE_ORDER_NOT_FILE_EXPORT); + } + String pathUrl = System.getProperty("user.dir") + "/dsf"; + File file1 = new File(pathUrl); + if (!file1.exists()) { + file1.mkdirs(); + } + List files = new ArrayList<>(); + List delFiles = new ArrayList<>(); + for (SaleOrderSkuDO skuDO : skuDOS) { + String sourceFile = skuDO.getSourceFile(); + if(FuncUtil.isNotEmpty(sourceFile)){ + // 生成文件 + Long entryId = skuDO.getEntryId(); + String s = codeMap.get(entryId); + Integer orderQty = skuDO.getOrderQty(); + //主宿机生成路径 + String name = DateUtil.format(LocalDateTime.now(), "yyyyMMdd") + +"-"+IdUtil.simpleUUID().substring(0, 4); + String ouput = StrUtil.format(pathUrl + "/{}_{}.pdf", + s+"_"+orderQty,name); + + //请求wkapp + JSONObject params = new JSONObject(); + params.put("input_html_path", sourceFile); + params.put("output_pdf_path", ouput); + log.info("稿件导出 请求wkapp接口url：" + wkappUrl + "/exehtmltopdf"); + String result = HttpUtil.post(wkappUrl + "/exehtmltopdf", params, 5 * 60 * 1000); + log.info("稿件导出 请求wkapp接口返回结果：" + result); + //WKHtmlToPdfUtil.convert(templatePath, pdfPath); + File file = FileUtil.file(ouput); + files.add(file); + delFiles.add(ouput); + } + } + if(FuncUtil.isEmpty(files)){ + throw exception(ErrorCodeConstants.SALE_ORDER_NOT_FILE_EXPORT); + } + + String zipFileName = StrUtil.format(pathUrl + "/订单稿件_{}", new Date().getTime()); + + // 压缩到的位置 + File zipFile = new File(zipFileName + ".zip"); + + ZipUtil.zip(zipFile, false, files.toArray(new File[files.size()])); + + // 设置响应类型 + //response.setContentType("application/pdf"); + response.setContentType("application/octet-stream"); + response.setHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode(zipFile.getName(), "UTF-8")); + + // 输出PDF到响应输出流 + // 将文件内容写入响应流 + try (InputStream inputStream = new FileInputStream(zipFile)) { + IoUtil.copy(inputStream, response.getOutputStream()); + } catch (IOException e) { + // 异常处理 + log.info("导出销售合约写入流失败，{}", e.getMessage()); + } + // 导出完删除 + delFiles.add(zipFileName); + for (String delFile : delFiles) { + FileUtil.del(delFile); + } + } + /** * 下载ZIP压缩包(会对下载后的压缩包进行删除) * diff --git a/hangtag-ui/hangtag-ui-admin/src/api/oms/saleorder/index.ts b/hangtag-ui/hangtag-ui-admin/src/api/oms/saleorder/index.ts index a4e6f33..a558a4e 100644 --- a/hangtag-ui/hangtag-ui-admin/src/api/oms/saleorder/index.ts +++ b/hangtag-ui/hangtag-ui-admin/src/api/oms/saleorder/index.ts @@ -115,5 +115,13 @@ export const SaleOrderApi = { ids: ids.join(',') } return await request.download({ url: `/oms/sale-order/exportSalePIPDF`, params}) + } , + + // 导出稿件 + exportDesignSourceFile: async (ids: number[]) => { + const params = { + ids: ids.join(',') + } + return await request.download({ url: `/oms/sale-order/exportDesignSourceFile`, params}) } } diff --git a/hangtag-ui/hangtag-ui-admin/src/views/oms/saleorder/index.vue b/hangtag-ui/hangtag-ui-admin/src/views/oms/saleorder/index.vue index 93b89d3..4c22382 100644 --- a/hangtag-ui/hangtag-ui-admin/src/views/oms/saleorder/index.vue +++ b/hangtag-ui/hangtag-ui-admin/src/views/oms/saleorder/index.vue @@ -170,6 +170,15 @@ > 导出PI + + 导出订单稿件 + import { getIntDictOptions, getStrDictOptions, DICT_TYPE } from '@/utils/dict' -import {dateFormatter, dateFormatter2} from '@/utils/formatTime' +import {dateFormatter, dateFormatter2, formatDate} from '@/utils/formatTime' import download from '@/utils/download' import { SaleOrderApi, SaleOrderVO } from '@/api/oms/saleorder' import SaleOrderForm from './SaleOrderForm.vue' @@ -361,6 +370,7 @@ const queryParams = reactive({ const queryFormRef = ref() // 搜索的表单 const exportLoading = ref(false) // 导出的加载中 const exportLoading2 = ref(false) // 导出的加载中 +const exportLoading3 = ref(false) // 导出的加载中 //驳回参数 @@ -611,6 +621,24 @@ const openDetail = (id: number) => { push({ name: 'SaleOrderDetail', params: { id } }) } +/** 导出稿件元文件 */ +const exportDesignFile = async () => { + try { + const ids = selectionList.value.map((item) => item.id) + // 导出的二次确认 + await message.exportConfirm("是否确认导出订单稿件？") + // 发起导出 + exportLoading3.value = true + // 发起审批 + const data = await SaleOrderApi.exportDesignSourceFile(ids) + message.notifySuccess(`导出成功`); + download.zip(data, `订单稿件_${formatDate(new Date(), 'YYYYmmdd_HHMM')}.zip`) + selectionList.value = selectionList.value.filter((item) => !ids.includes(item.id)) + } catch { + } finally { + exportLoading3.value = false + } +} const tableRowClassName = ({ row, rowIndex,