From f81830743dbe91f6cb6f8b7cd59167847c196463 Mon Sep 17 00:00:00 2001 From: chenhao <852066789@qq.com> Date: Fri, 11 Apr 2025 18:18:22 +0800 Subject: [PATCH] =?UTF-8?q?refactor(sip):=20=E4=BC=98=E5=8C=96=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E5=AF=BC=E5=85=A5=E5=8A=9F=E8=83=BD=E5=B9=B6=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E9=83=A8=E9=97=A8=E5=90=8D=E7=A7=B0=E5=AD=97=E6=AE=B5?= =?UTF-8?q?-=20=E4=BF=AE=E6=94=B9=20DeliveryListController=20=E4=B8=AD?= =?UTF-8?q?=E7=9A=84=20importData=20=E6=96=B9=E6=B3=95=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E5=80=BC=E7=B1=BB=E5=9E=8B=20-=20=E6=9B=B4=E6=96=B0=20Delivery?= =?UTF-8?q?ListService=20=E6=8E=A5=E5=8F=A3=E5=92=8C=E5=AE=9E=E7=8E=B0?= =?UTF-8?q?=E7=B1=BB=EF=BC=8C=E4=BD=BF=E7=94=A8=20AjaxResult=20=E5=B0=81?= =?UTF-8?q?=E8=A3=85=E5=AF=BC=E5=85=A5=E7=BB=93=E6=9E=9C=20-=20=E5=9C=A8?= =?UTF-8?q?=20OrderInfo=E6=A8=A1=E5=9E=8B=E4=B8=AD=E6=B7=BB=E5=8A=A0=20ord?= =?UTF-8?q?erDeptName=20=E5=92=8C=20partenerDeptName=20=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=20-=20=E6=9B=B4=E6=96=B0=20OrderInfoController=20=E4=B8=AD?= =?UTF-8?q?=E7=9A=84=20edit=20=E6=96=B9=E6=B3=95=EF=BC=8C=E6=94=AF?= =?UTF-8?q?=E6=8C=81=E6=98=BE=E7=A4=BA=E9=83=A8=E9=97=A8=E5=90=8D=E7=A7=B0?= =?UTF-8?q?=20-=20=E4=BF=AE=E6=94=B9=20OrderInfoMapper.xml=EF=BC=8C?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=83=A8=E9=97=A8=E5=90=8D=E7=A7=B0=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/DeliveryListController.java | 4 +- .../sip/controller/OrderInfoController.java | 1 + .../java/com/ruoyi/sip/domain/OrderInfo.java | 18 ++++++++ .../sip/service/IDeliveryListService.java | 4 +- .../service/impl/DeliveryListServiceImpl.java | 12 ++--- .../mapper/manage/OrderInfoMapper.xml | 44 ++++++++++--------- 6 files changed, 55 insertions(+), 28 deletions(-) diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/DeliveryListController.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/DeliveryListController.java index b06bad62..0162e60b 100644 --- a/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/DeliveryListController.java +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/DeliveryListController.java @@ -64,8 +64,8 @@ public class DeliveryListController extends BaseController { ExcelUtil util = new ExcelUtil(DeliveryList.class); List deliveryList = util.importExcel(file.getInputStream()); - deliveryListService.importData(deliveryList, deliveryId); - return AjaxResult.success("导入成功"); + + return deliveryListService.importData(deliveryList, deliveryId); } /** 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 79880722..21f91cb5 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 @@ -100,6 +100,7 @@ public class OrderInfoController extends BaseController public String edit(@PathVariable("id") Long id, ModelMap mmap) { OrderInfo orderInfo = orderInfoService.selectOrderInfoById(id); + mmap.put("orderInfo", orderInfo); return prefix + "/edit"; } 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 74cb4525..38a8d63b 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 @@ -55,9 +55,11 @@ public class OrderInfo extends BaseEntity /** 代表处编码 */ private Long orderDept; + private String orderDeptName; /** 代理商编码 */ private Long partenerDept; + private String partenerDeptName; /** 合同签定日期 */ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @@ -260,6 +262,22 @@ public class OrderInfo extends BaseEntity this.orderListList = orderListList; } + public String getOrderDeptName() { + return orderDeptName; + } + + public void setOrderDeptName(String orderDeptName) { + this.orderDeptName = orderDeptName; + } + + public String getPartenerDeptName() { + return partenerDeptName; + } + + public void setPartenerDeptName(String partenerDeptName) { + this.partenerDeptName = partenerDeptName; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/IDeliveryListService.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/IDeliveryListService.java index 1f74900f..352825f3 100644 --- a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/IDeliveryListService.java +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/IDeliveryListService.java @@ -1,6 +1,8 @@ package com.ruoyi.sip.service; import java.util.List; + +import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.sip.domain.DeliveryList; /** @@ -59,5 +61,5 @@ public interface IDeliveryListService */ public int deleteDeliveryListById(Long id); - void importData(List deliveryList, Long deliveryId); + AjaxResult importData(List deliveryList, Long deliveryId); } diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/DeliveryListServiceImpl.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/DeliveryListServiceImpl.java index 064a5cda..a7091c93 100644 --- a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/DeliveryListServiceImpl.java +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/DeliveryListServiceImpl.java @@ -6,6 +6,7 @@ import java.util.Map; import java.util.function.Function; import java.util.stream.Collectors; +import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.exception.ServiceException; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.sip.domain.OrderList; @@ -106,19 +107,19 @@ public class DeliveryListServiceImpl implements IDeliveryListService { } @Override - public void importData(List deliveryList, Long deliveryId) { + public AjaxResult importData(List deliveryList, Long deliveryId) { List productCodeList = deliveryList.stream().map(DeliveryList::getProductCode).collect(Collectors.toList()); if (productCodeList.isEmpty()) { - throw new ServiceException("产品编码为空"); + return AjaxResult.error("产品编码为空"); } List orderLists = infoMapper.listOrderListByDeliveryId(deliveryId); if (orderLists.isEmpty()) { - throw new ServiceException("发货单中没有产品"); + return AjaxResult.error("发货单中没有产品"); } List existsProductCodeList = orderLists.stream().map(OrderList::getProductCode).collect(Collectors.toList()); List notExistsProductCodeList = productCodeList.stream().filter(productCode -> !existsProductCodeList.contains(productCode)).collect(Collectors.toList()); if (!notExistsProductCodeList.isEmpty()) { - throw new ServiceException(StringUtils.format("产品编码为[{}]的产品在发货单中未找到,请确认后重试;", String.join(",", notExistsProductCodeList))); + return AjaxResult.error(StringUtils.format("产品编码为[{}]的产品在发货单中未找到,请确认后重试;", String.join(",", notExistsProductCodeList))); } for (DeliveryList list : deliveryList) { @@ -126,10 +127,11 @@ public class DeliveryListServiceImpl implements IDeliveryListService { } List deliveryLists = deliveryListMapper.listBySerialNumberList(deliveryList); if (!deliveryLists.isEmpty()){ - throw new ServiceException("产品序列号为[" + deliveryLists.stream().map(DeliveryList::getSerialNumber).collect(Collectors.joining(",")) + "]的产品已存在,请确认后重试;"); + return AjaxResult.error("产品序列号为[" + deliveryLists.stream().map(DeliveryList::getSerialNumber).collect(Collectors.joining(",")) + "]的产品已存在,请确认后重试;"); } deliveryListMapper.insertBatch(deliveryList); + return AjaxResult.success("导入成功"); } } diff --git a/ruoyi-sip/src/main/resources/mapper/manage/OrderInfoMapper.xml b/ruoyi-sip/src/main/resources/mapper/manage/OrderInfoMapper.xml index 5081c750..2620aeaa 100644 --- a/ruoyi-sip/src/main/resources/mapper/manage/OrderInfoMapper.xml +++ b/ruoyi-sip/src/main/resources/mapper/manage/OrderInfoMapper.xml @@ -78,26 +78,30 @@