From 6c2e32f47013b65f3906a8b6d98856c707623525 Mon Sep 17 00:00:00 2001 From: chenhao <852066789@qq.com> Date: Tue, 20 May 2025 10:13:38 +0800 Subject: [PATCH] =?UTF-8?q?refactor(sip):=20=E9=87=8D=E6=9E=84=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E5=AF=BC=E5=85=A5=E5=8A=9F=E8=83=BD=E5=B9=B6=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E4=BA=A7=E5=93=81=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 优化了订单导入功能，增加了对不同模板的兼容性和产品库匹配校验 - 在产品信息中添加了上架编码字段并更新了相关映射 - 修改了订单列表中的产品编码、单价和总价的Excel列名 - 更新了系统首页标题和logo- 优化了Excel导入错误提示信息 --- .../resources/templates/index-topnav.html | 4 +- .../com/ruoyi/common/utils/poi/ExcelUtil.java | 2 +- .../sip/controller/OrderInfoController.java | 44 ++++++++++++++----- .../java/com/ruoyi/sip/domain/OrderList.java | 8 ++-- .../com/ruoyi/sip/domain/ProductInfo.java | 2 + .../mapper/system/ProductInfoMapper.xml | 15 ++++++- 6 files changed, 58 insertions(+), 17 deletions(-) diff --git a/ruoyi-admin/src/main/resources/templates/index-topnav.html b/ruoyi-admin/src/main/resources/templates/index-topnav.html index 61012ae3..88a6e5d6 100644 --- a/ruoyi-admin/src/main/resources/templates/index-topnav.html +++ b/ruoyi-admin/src/main/resources/templates/index-topnav.html @@ -4,7 +4,7 @@ - 若依系统首页 + 售后服务平台(SIP) @@ -27,7 +27,7 @@
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java index 00ed75da..ee276d92 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java @@ -357,7 +357,7 @@ public class ExcelUtil Sheet sheet = StringUtils.isNotEmpty(sheetName) ? wb.getSheet(sheetName) : wb.getSheetAt(0); if (sheet == null) { - throw new IOException("文件sheet不存在"); + throw new IOException(StringUtils.format("文件sheet[{}]不存在",sheetName)); } boolean isXSSFWorkbook = !(wb instanceof HSSFWorkbook); Map pictures; diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/OrderInfoController.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/OrderInfoController.java index 1e3a1fed..d0ef7657 100644 --- a/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/OrderInfoController.java +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/OrderInfoController.java @@ -1,10 +1,15 @@ package com.ruoyi.sip.controller; import java.util.List; +import java.util.Objects; +import java.util.Set; +import java.util.stream.Collectors; -import com.ruoyi.sip.domain.DeliveryList; -import com.ruoyi.sip.domain.MaintenanceRecordsDto; -import com.ruoyi.sip.domain.OrderList; +import cn.hutool.core.collection.CollUtil; +import com.ruoyi.common.exception.ServiceException; +import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.sip.domain.*; +import com.ruoyi.sip.service.IProductInfoService; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -12,7 +17,6 @@ import org.springframework.ui.ModelMap; import org.springframework.web.bind.annotation.*; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.sip.domain.OrderInfo; import com.ruoyi.sip.service.IOrderInfoService; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; @@ -34,6 +38,8 @@ public class OrderInfoController extends BaseController @Autowired private IOrderInfoService orderInfoService; + @Autowired + private IProductInfoService productInfoService; @RequiresPermissions("manage:order:view") @GetMapping() @@ -165,19 +171,37 @@ public class OrderInfoController extends BaseController @ResponseBody public AjaxResult listImportData(MultipartFile file, Long orderId) throws Exception { - ExcelUtil util = new ExcelUtil(OrderList.class); - List orderListList = util.importExcel(file.getInputStream()); - + List orderListList = getOrderLists(file); return orderInfoService.listImportData(orderListList, orderId); } + + private List getOrderLists(MultipartFile file) throws Exception { + ExcelUtil util = new ExcelUtil(OrderList.class); + List orderListList = util.importExcel(file.getInputStream()); + orderListList=orderListList.stream().filter(Objects::nonNull).collect(Collectors.toList()); + if (CollUtil.isEmpty(orderListList)){ + orderListList = util.importExcel("价格明细清单", file.getInputStream(), 4); + } + if (CollUtil.isEmpty(orderListList)){ + throw new ServiceException("excel模板错误,导入失败"); + } + //只处理当前产品表有的数据 + List productInfos = productInfoService.selectProductInfoList(new ProductInfo()); + Set productSet = productInfos.stream().map(ProductInfo::getProductCode).collect(Collectors.toSet()); + orderListList = orderListList.stream().filter(item -> item != null && StringUtils.isNotEmpty(item.getProductCode()) + && productSet.contains(item.getProductCode())).collect(Collectors.toList()); + if (CollUtil.isEmpty(orderListList)){ + throw new ServiceException("导入excel的产品均未在产品库中,导入失败"); + } + return orderListList; + } + @PostMapping("/list/readData") @ResponseBody public AjaxResult listReadData(MultipartFile file, Long orderId) throws Exception { - ExcelUtil util = new ExcelUtil(OrderList.class); - List orderListList = util.importExcel(file.getInputStream()); - + List orderListList = getOrderLists(file); return AjaxResult.success(orderListList); } diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/OrderList.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/OrderList.java index e90a2a39..ec936693 100644 --- a/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/OrderList.java +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/OrderList.java @@ -30,7 +30,7 @@ public class OrderList extends BaseEntity private Long orderId; /** 产品编码，关联产品编码表 */ - @Excel(name = "BOM编码") + @Excel(name = "产品编码") private String productCode; // @Excel(name = "产品名称") @@ -41,14 +41,16 @@ public class OrderList extends BaseEntity private Long quantity; /** 单价 */ - @Excel(name = "单价") + @Excel(name = "目录单价(RMB)") private BigDecimal price; /** 优惠 */ @Excel(name = "折扣") private BigDecimal discount; /** 总价 */ - @Excel(name = "总价") + @Excel(name = "目录总价(RMB)") private BigDecimal amount; + @Excel(name = "备注") + private String remark; diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/ProductInfo.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/ProductInfo.java index 3eb944bd..f35c3946 100644 --- a/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/ProductInfo.java +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/ProductInfo.java @@ -28,6 +28,8 @@ public class ProductInfo extends BaseEntity /** 产品编码 */ @Excel(name = "产品编码") private String productCode; + @Excel(name = "上架编码") + private String hzCode; private String type; private String value; diff --git a/ruoyi-sip/src/main/resources/mapper/system/ProductInfoMapper.xml b/ruoyi-sip/src/main/resources/mapper/system/ProductInfoMapper.xml index 642d0894..97bae91a 100644 --- a/ruoyi-sip/src/main/resources/mapper/system/ProductInfoMapper.xml +++ b/ruoyi-sip/src/main/resources/mapper/system/ProductInfoMapper.xml @@ -16,10 +16,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + - select id, product_code, product_name, model, description, remark, created_at, updated_at, deleted_at,value,type from product_info + select id, product_code, product_name, model, description, remark, created_at, updated_at, deleted_at,value,type,hz_code from product_info