diff --git a/ruoyi-admin/src/main/resources/templates/system/partner/partner.html b/ruoyi-admin/src/main/resources/templates/system/partner/partner.html
index 75e3c63f..53617324 100644
--- a/ruoyi-admin/src/main/resources/templates/system/partner/partner.html
+++ b/ruoyi-admin/src/main/resources/templates/system/partner/partner.html
@@ -10,6 +10,9 @@
justify-content: flex-start;
flex-wrap: wrap;
}
+ .select-list li p, .select-list li label:not(.radio-box){
+ width: 80px;
+ }
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 b006a992..1dd27887 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
@@ -204,45 +204,37 @@ public class OrderInfoController extends BaseController
@ResponseBody
public AjaxResult listImportData(MultipartFile file, Long orderId) throws Exception
{
- List
orderListList = getOrderLists(file);
+ List orderListList = null;
+ try {
+ orderListList = orderInfoService.readData(file);
+ } catch (ServiceException e) {
+ return AjaxResult.error(e.getMessage());
+ }catch (Exception e) {
+ log.error("导入合同清单失败",e);
+ return AjaxResult.error("导入失败");
+ }
+ if (CollUtil.isEmpty(orderListList)){
+ return AjaxResult.error("导入数据不能为空");
+ }
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());
- Map productInfoMap = productInfos.stream().collect(Collectors.toMap(ProductInfo::getProductCode, Function.identity(), (v1, v2) -> v1));
- orderListList = orderListList.stream().filter(item -> item != null && StringUtils.isNotEmpty(item.getProductCode())
- && productInfoMap.containsKey(item.getProductCode()))
- .collect(Collectors.toList());
- for (OrderList orderList : orderListList) {
- orderList.setCreateBy(ShiroUtils.getUserId().toString());
- ProductInfo productInfo = productInfoMap.get(orderList.getProductCode());
- if (productInfo != null) {
- orderList.setProductName(productInfo.getProductName());
- }
- }
- if (CollUtil.isEmpty(orderListList)){
- throw new ServiceException("导入excel的产品均未在产品库中,导入失败");
- }
- return orderListList;
- }
@PostMapping("/list/readData")
@ResponseBody
public AjaxResult listReadData(MultipartFile file, Long orderId) throws Exception
{
- List orderListList = getOrderLists(file);
+ List orderListList = null;
+ try {
+ orderListList = orderInfoService.readData(file);
+ } catch (ServiceException e) {
+ return AjaxResult.error(e.getMessage());
+ }catch (Exception e) {
+ log.error("导入合同清单失败",e);
+ return AjaxResult.error("导入失败");
+ }
+
return AjaxResult.success(orderListList);
}
diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/DeliveryList.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/DeliveryList.java
index e626ad5a..751221c1 100644
--- a/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/DeliveryList.java
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/DeliveryList.java
@@ -4,6 +4,7 @@ import java.util.Date;
import java.util.StringJoiner;
import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
@@ -15,6 +16,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
* @author ruoyi
* @date 2025-04-11
*/
+@Data
public class DeliveryList extends BaseEntity
{
private static final long serialVersionUID = 1L;
@@ -54,115 +56,8 @@ public class DeliveryList extends BaseEntity
// @Excel(name = "删除时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date deletedAt;
+ private String productName;
+ private String description;
- public String getOrderCode() {
- return orderCode;
- }
-
- public void setOrderCode(String orderCode) {
- this.orderCode = orderCode;
- }
-
- public String getProductCode() {
- return productCode;
- }
-
- public void setProductCode(String productCode) {
- this.productCode = productCode;
- }
-
- public void setId(Long id)
- {
- this.id = id;
- }
-
- public Long getId()
- {
- return id;
- }
-
- public void setDeliveryId(Long deliveryId)
- {
- this.deliveryId = deliveryId;
- }
-
- public Long getDeliveryId()
- {
- return deliveryId;
- }
-
- @Override
- public String getRemark() {
- return remark;
- }
-
- @Override
- public void setRemark(String remark) {
- this.remark = remark;
- }
-
- public void setSerialNumber(String serialNumber)
- {
- this.serialNumber = serialNumber;
- }
-
- public String getSerialNumber()
- {
- return serialNumber;
- }
-
- public void setCreatedAt(Date createdAt)
- {
- this.createdAt = createdAt;
- }
-
- public Date getCreatedAt()
- {
- return createdAt;
- }
-
- public void setUpdatedAt(Date updatedAt)
- {
- this.updatedAt = updatedAt;
- }
-
- public Date getUpdatedAt()
- {
- return updatedAt;
- }
-
- public void setDeletedAt(Date deletedAt)
- {
- this.deletedAt = deletedAt;
- }
-
- public Date getDeletedAt()
- {
- return deletedAt;
- }
-
- public String getModel() {
- return model;
- }
-
- public void setModel(String model) {
- this.model = model;
- }
-
- @Override
- public String toString() {
- return new StringJoiner(", ", DeliveryList.class.getSimpleName() + "[", "]")
- .add("id=" + id)
- .add("deliveryId=" + deliveryId)
- .add("model=" + model)
- .add("orderCode='" + orderCode + "'")
- .add("productCode='" + productCode + "'")
- .add("serialNumber='" + serialNumber + "'")
- .add("remark='" + remark + "'")
- .add("createdAt=" + createdAt)
- .add("updatedAt=" + updatedAt)
- .add("deletedAt=" + deletedAt)
- .toString();
- }
}
diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/OrderDelivery.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/OrderDelivery.java
index 8384f5ef..3af068fa 100644
--- a/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/OrderDelivery.java
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/OrderDelivery.java
@@ -76,5 +76,6 @@ public class OrderDelivery extends BaseEntity
private Date deletedAt;
private String total;
private Integer status;
+ private String createByName;
}
diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/OrderInfo.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/OrderInfo.java
index 9a51713e..a3e03b28 100644
--- a/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/OrderInfo.java
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/OrderInfo.java
@@ -100,6 +100,7 @@ public class OrderInfo extends BaseEntity
/** 合同清单信息 */
private List orderListList;
private String serialNumber;
+ private String createByName;
diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/IOrderInfoService.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/IOrderInfoService.java
index 8b16209d..ae2306b5 100644
--- a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/IOrderInfoService.java
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/IOrderInfoService.java
@@ -8,6 +8,7 @@ import com.ruoyi.sip.domain.OrderInfo;
import com.ruoyi.sip.domain.OrderList;
import com.ruoyi.sip.dto.ApiDataQueryDto;
import com.ruoyi.sip.vo.OrderInfoVo;
+import org.springframework.web.multipart.MultipartFile;
/**
* 合同档案Service接口
@@ -78,4 +79,6 @@ public interface IOrderInfoService
List listExport(OrderList orderList);
AjaxResult listImportData(List orderListList, Long orderId);
+
+ List readData(MultipartFile file);
}
diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OrderInfoServiceImpl.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OrderInfoServiceImpl.java
index 02644b6e..1ff0573e 100644
--- a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OrderInfoServiceImpl.java
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OrderInfoServiceImpl.java
@@ -8,12 +8,15 @@ import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.lang.Assert;
import cn.hutool.core.lang.Dict;
import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.DictUtils;
import com.ruoyi.common.utils.ShiroUtils;
+import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.sip.domain.*;
import com.ruoyi.sip.dto.ApiDataQueryDto;
import com.ruoyi.sip.service.IAgentInfoService;
import com.ruoyi.sip.service.ICustomerInfoService;
+import com.ruoyi.sip.service.IProductInfoService;
import com.ruoyi.sip.vo.OrderInfoVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -26,6 +29,7 @@ import org.springframework.transaction.annotation.Transactional;
import com.ruoyi.sip.mapper.OrderInfoMapper;
import com.ruoyi.sip.service.IOrderInfoService;
import com.ruoyi.common.core.text.Convert;
+import org.springframework.web.multipart.MultipartFile;
/**
* 合同档案Service业务层处理
@@ -42,6 +46,8 @@ public class OrderInfoServiceImpl implements IOrderInfoService
private IAgentInfoService agentInfoService;
@Autowired
private ICustomerInfoService customerInfoService;
+ @Autowired
+ private IProductInfoService productInfoService;
/**
* 查询合同档案
*
@@ -285,6 +291,71 @@ public class OrderInfoServiceImpl implements IOrderInfoService
// }
return AjaxResult.success("导入成功");
}
+
+ @Override
+ public List readData(MultipartFile file) {
+ List orderListList = null;
+ try {
+ ExcelUtil util = new ExcelUtil(OrderList.class);
+ orderListList = util.importExcel(file.getInputStream());
+ orderListList=orderListList.stream().filter(Objects::nonNull).collect(Collectors.toList());
+ if (CollUtil.isEmpty(orderListList)){
+ orderListList = util.importExcel("价格明细清单", file.getInputStream(), 4);
+ }
+ } catch (Exception e) {
+ throw new ServiceException("读取文件错误,导入失败");
+ }
+ if (CollUtil.isEmpty(orderListList)){
+ throw new ServiceException("excel模板错误,导入失败");
+ }
+ //只处理当前产品表有的数据
+ List productInfos = productInfoService.selectProductInfoList(new ProductInfo());
+ Map productInfoMap = productInfos.stream().collect(Collectors.toMap(ProductInfo::getProductCode, Function.identity(), (v1, v2) -> v1));
+ orderListList = orderListList.stream().filter(item -> item != null && StringUtils.isNotEmpty(item.getProductCode())
+ && productInfoMap.containsKey(item.getProductCode()))
+ .collect(Collectors.toList());
+ for (OrderList orderList : orderListList) {
+ orderList.setCreateBy(ShiroUtils.getUserId().toString());
+ ProductInfo productInfo = productInfoMap.get(orderList.getProductCode());
+ if (productInfo != null) {
+ orderList.setProductName(productInfo.getProductName());
+ }
+ }
+ if (CollUtil.isEmpty(orderListList)){
+ throw new ServiceException("导入excel的产品均未在产品库中,导入失败");
+ }
+ List productCodeList = orderListList.stream()
+ .map(OrderList::getProductCode)
+ .filter(Objects::nonNull)
+ .collect(Collectors.toList());
+
+ if (productCodeList.isEmpty()) {
+ throw new ServiceException("文件为空或产品编码为空");
+ }
+ for (OrderList orderList : orderListList) {
+
+ if (orderList.getDiscount() == null) {
+ throw new ServiceException("折扣不能为空");
+ }
+ if (orderList.getDiscount().compareTo(BigDecimal.ONE) > 0 || orderList.getDiscount().compareTo(BigDecimal.ZERO) <= 0) {
+ throw new ServiceException("折扣区间需在0-1之间");
+ }
+ if (orderList.getPrice() == null) {
+ throw new ServiceException("单价不能为空");
+ }
+ if (orderList.getQuantity() == null) {
+ throw new ServiceException("数量不能为空");
+ }
+
+ BigDecimal amount = orderList.getPrice().multiply(new BigDecimal(orderList.getQuantity()));
+ if (orderList.getDiscount()!=null){
+ amount = amount.multiply(orderList.getDiscount()).setScale(2, RoundingMode.HALF_UP);
+ }
+ orderList.setAmount(amount);
+ }
+ return orderListList;
+ }
+
public Map> compareOrderLists(List orderInfoList, List orderListList) {
// 创建一个映射，用于快速查找订单
Map orderInfoMap = orderInfoList.stream()
diff --git a/ruoyi-sip/src/main/resources/mapper/manage/DeliveryListMapper.xml b/ruoyi-sip/src/main/resources/mapper/manage/DeliveryListMapper.xml
index 1d6c9398..38057c76 100644
--- a/ruoyi-sip/src/main/resources/mapper/manage/DeliveryListMapper.xml
+++ b/ruoyi-sip/src/main/resources/mapper/manage/DeliveryListMapper.xml
@@ -23,7 +23,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
select t1.id, t1.delivery_id,t1.product_code, t1.serial_number, t1.remark, t1.created_at, t1.updated_at, t1.deleted_at,
t2.delivery_code,
- t3.product_code, t3.product_name,t3.model,
+ t3.product_code, t3.product_name,t3.model,t3.description,
t4.order_code
from delivery_list t1
left join order_delivery t2 on t1.delivery_id = t2.id
diff --git a/ruoyi-sip/src/main/resources/mapper/manage/OrderDeliveryMapper.xml b/ruoyi-sip/src/main/resources/mapper/manage/OrderDeliveryMapper.xml
index 8de4e1e1..b3cf65c5 100644
--- a/ruoyi-sip/src/main/resources/mapper/manage/OrderDeliveryMapper.xml
+++ b/ruoyi-sip/src/main/resources/mapper/manage/OrderDeliveryMapper.xml
@@ -29,11 +29,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"