From 90ac22fffb1cbe92c1aca8a40b6dd683c82c2a57 Mon Sep 17 00:00:00 2001 From: renfan <2206580733@qq.com> Date: Wed, 23 Oct 2024 17:17:59 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90admin&front=E3=80=91=20=E6=96=B0?= =?UTF-8?q?=E5=A2=9E&=E4=BC=98=E5=8C=96=20#=201=E3=80=81=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E9=80=81=E8=B4=A7=E5=8D=95=E6=8A=A5=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../order/RepairOrderController.java | 26 +-- .../impl/RepairOrderShippingServiceImpl.java | 205 +++++++++++++----- .../vo/excel/ReleaseRecordListExcel.java | 11 + .../templates/excel/deliveryNote.xlsx | Bin 11491 -> 11563 bytes .../enums/order/RepairOrderStatusEnum.java | 1 + 5 files changed, 179 insertions(+), 64 deletions(-) diff --git a/admin/src/main/java/com/hcy/admin/controller/order/RepairOrderController.java b/admin/src/main/java/com/hcy/admin/controller/order/RepairOrderController.java index d04ad0a..4afe607 100644 --- a/admin/src/main/java/com/hcy/admin/controller/order/RepairOrderController.java +++ b/admin/src/main/java/com/hcy/admin/controller/order/RepairOrderController.java @@ -186,19 +186,19 @@ public class RepairOrderController { return AjaxResult.success(); } - /** - * 维修模块派单 - 重新派单 - * - * @author hcy - * @param repairOrderParam 参数 - * @return Object - */ - @Log(title = "维修模块派单 - 重新派单") - @PostMapping("/reorder") - public Object reorder(@Validated(value = RepairOrderParam.update.class) @RequestBody RepairOrderParam repairOrderParam) { - iRepairOrderService.reorder(repairOrderParam); - return AjaxResult.success(); - } +// /** +// * 维修模块派单 - 重新派单 +// * +// * @author hcy +// * @param repairOrderParam 参数 +// * @return Object +// */ +// @Log(title = "维修模块派单 - 重新派单") +// @PostMapping("/reorder") +// public Object reorder(@Validated(value = RepairOrderParam.update.class) @RequestBody RepairOrderParam repairOrderParam) { +// iRepairOrderService.reorder(repairOrderParam); +// return AjaxResult.success(); +// } /** * 维修模块 - 返修确认 diff --git a/admin/src/main/java/com/hcy/admin/service/order/impl/RepairOrderShippingServiceImpl.java b/admin/src/main/java/com/hcy/admin/service/order/impl/RepairOrderShippingServiceImpl.java index 0311261..2e95a9f 100644 --- a/admin/src/main/java/com/hcy/admin/service/order/impl/RepairOrderShippingServiceImpl.java +++ b/admin/src/main/java/com/hcy/admin/service/order/impl/RepairOrderShippingServiceImpl.java @@ -36,6 +36,7 @@ import com.hcy.common.mapper.order.RepairOrderMapper; import com.hcy.common.mapper.order.RepairOrderShippingMapper; import com.hcy.common.mapper.setting.DictDataMapper; import com.hcy.common.mapper.system.SystemAuthAdminMapper; +import com.hcy.common.utils.StringUtil; import com.hcy.common.utils.TimeUtil; import com.hcy.common.utils.excel.EasyExcelUtil; import com.hcy.common.utils.excel.LocalImageModifyStrategy; @@ -352,6 +353,7 @@ public class RepairOrderShippingServiceImpl implements IRepairOrderShippingServi OfferDetailEntity offerDetail = new OfferDetailEntity(); //送货单 List releaseRecordListExcelList = new LinkedList<>(); + Map releaseRecordListExcelMap = new HashMap<>(); int index = 1; //功率字典 @@ -367,66 +369,167 @@ public class RepairOrderShippingServiceImpl implements IRepairOrderShippingServi offerDetail.setCreator(contentAdmin.getUsername()); } - List repairOrderShippings = repairOrderShippingMapper.selectList(new LambdaQueryWrapper() - .in(RepairOrderShipping::getId, params.getIds()) - .orderByDesc(RepairOrderShipping::getDeliveryTime)); +// List repairOrderShippings = repairOrderShippingMapper.selectList(new LambdaQueryWrapper() +// .in(RepairOrderShipping::getId, params.getIds()) +// .orderByDesc(RepairOrderShipping::getDeliveryTime)); - repairOrderMapper.selectList(new LambdaQueryWrapper() +// for (RepairOrderShipping item : repairOrderShippings) { +// ReleaseRecordListExcel releaseRecordListExcel = new ReleaseRecordListExcel(); +// BeanUtils.copyProperties(item, releaseRecordListExcel); +// //序号 +// releaseRecordListExcel.setIndex(index); +// //规格型号 +// RepairOrder repairOrder = repairOrderMapper.selectOne(new LambdaQueryWrapper() +// .eq(RepairOrder::getShippingId, item.getId()) +// .eq(RepairOrder::getIsDelete, GlobalConstant.NOT_DELETE) +// .orderByDesc(RepairOrder::getCreateTime) +// .last("limit 1")); +// releaseRecordListExcel.setModuleNumber(repairOrder.getModuleNumber()); +// releaseRecordListExcel.setModelCode(repairOrder.getModuleCode()); // 料号 +// //工单编号 +// ParentRepairOrder parentRepairOrder = parentRepairOrderMapper.selectOne(new LambdaQueryWrapper() +// .eq(ParentRepairOrder::getId, repairOrder.getParentRepairOrderId())); +// releaseRecordListExcel.setOrderNo(parentRepairOrder.getOrderNo()); +// +// //单位 +// releaseRecordListExcel.setUnit("PCS"); +// +// //备注 功率 + 本次交货数量 + 返修结论 例如：20KW，5台OK +// //模块功率（0=10kw，1=20kw，2=30kw，3=40kw，4=50kw，5=60kw，6=70kw） +// String modulePower = distMap.get(repairOrder.getModulePower().toString()); +// +// //1、查询出维修结论报废的数量 +// Integer scrapCount = repairOrderMapper.selectCount(new LambdaQueryWrapper() +// .eq(RepairOrder::getShippingId, item.getId()) +// .eq(RepairOrder::getMaintenanceResult, RepairOrderStatusEnum.SCRAP.getStatus()) +// .eq(RepairOrder::getIsDelete, GlobalConstant.NOT_DELETE)); +// +// //2、查询出维修结论ok的数量 +// Integer okCount = repairOrderMapper.selectCount(new LambdaQueryWrapper() +// .eq(RepairOrder::getShippingId, item.getId()) +// .eq(RepairOrder::getMaintenanceResult, RepairOrderStatusEnum.OK.getStatus()) +// .eq(RepairOrder::getIsDelete, GlobalConstant.NOT_DELETE)); +// +// if(scrapCount != 0 && okCount != 0){ +// releaseRecordListExcel.setRemark(modulePower + "，" + scrapCount + "台报废，" + okCount + "台OK"); +// }else if(scrapCount != 0){ +// releaseRecordListExcel.setRemark(modulePower + "，" + scrapCount + "台报废"); +// }else if(okCount != 0){ +// releaseRecordListExcel.setRemark(modulePower + "，" + okCount + "台OK"); +// } +// +// //送货日期 +// releaseRecordListExcel.setDeliveryTime(TimeUtil.dateToString(item.getDeliveryTime(), TimeConstant.DATE_FORMAT)); +// +// releaseRecordListExcelList.add(releaseRecordListExcel); +// index++; // 序号累计 +// offerDetail.setTotalQty(offerDetail.getTotalQty() + item.getTheQuantityShipped()); // 合计 +// } + + List repairOrders = repairOrderMapper.selectList(new LambdaQueryWrapper() .in(RepairOrder::getShippingId, params.getIds()) .orderByDesc(RepairOrder::getCreateTime)); - - for (RepairOrderShipping item : repairOrderShippings) { - ReleaseRecordListExcel releaseRecordListExcel = new ReleaseRecordListExcel(); - BeanUtils.copyProperties(item, releaseRecordListExcel); - //序号 - releaseRecordListExcel.setIndex(index); - //规格型号 - RepairOrder repairOrder = repairOrderMapper.selectOne(new LambdaQueryWrapper() - .eq(RepairOrder::getShippingId, item.getId()) - .eq(RepairOrder::getIsDelete, GlobalConstant.NOT_DELETE) - .orderByDesc(RepairOrder::getCreateTime) - .last("limit 1")); - releaseRecordListExcel.setModuleNumber(repairOrder.getModuleNumber()); - releaseRecordListExcel.setModelCode(repairOrder.getModuleCode()); // 料号 - //工单编号 - ParentRepairOrder parentRepairOrder = parentRepairOrderMapper.selectOne(new LambdaQueryWrapper() - .eq(ParentRepairOrder::getId, repairOrder.getParentRepairOrderId())); - releaseRecordListExcel.setOrderNo(parentRepairOrder.getOrderNo()); - //单位 - releaseRecordListExcel.setUnit("PCS"); + for (RepairOrder item : repairOrders) { + ReleaseRecordListExcel releaseRecordListExcel = null; - //备注 功率 + 本次交货数量 + 返修结论 例如：20KW，5台OK - //模块功率（0=10kw，1=20kw，2=30kw，3=40kw，4=50kw，5=60kw，6=70kw） - String modulePower = distMap.get(repairOrder.getModulePower().toString()); - - //1、查询出维修结论报废的数量 - Integer scrapCount = repairOrderMapper.selectCount(new LambdaQueryWrapper() - .eq(RepairOrder::getShippingId, item.getId()) - .eq(RepairOrder::getMaintenanceResult, RepairOrderStatusEnum.SCRAP.getStatus()) - .eq(RepairOrder::getIsDelete, GlobalConstant.NOT_DELETE)); - - //2、查询出维修结论ok的数量 - Integer okCount = repairOrderMapper.selectCount(new LambdaQueryWrapper() - .eq(RepairOrder::getShippingId, item.getId()) - .eq(RepairOrder::getMaintenanceResult, RepairOrderStatusEnum.OK.getStatus()) - .eq(RepairOrder::getIsDelete, GlobalConstant.NOT_DELETE)); - - if(scrapCount != 0 && okCount != 0){ - releaseRecordListExcel.setRemark(modulePower + "，" + scrapCount + "台报废，" + okCount + "台OK"); - }else if(scrapCount != 0){ - releaseRecordListExcel.setRemark(modulePower + "，" + scrapCount + "台报废"); - }else if(okCount != 0){ - releaseRecordListExcel.setRemark(modulePower + "，" + okCount + "台OK"); + String key = item.getModuleNumber() + item.getModulePower(); + if(releaseRecordListExcelMap.get(key) != null){ + releaseRecordListExcel = releaseRecordListExcelMap.get(key); } - //送货日期 - releaseRecordListExcel.setDeliveryTime(TimeUtil.dateToString(item.getDeliveryTime(), TimeConstant.DATE_FORMAT)); + //客户名称 + Client client = clientMapper.selectOne(new LambdaQueryWrapper() + .eq(Client::getId, item.getClientId())); + if(client != null){ + offerDetail.setClientName(client.getClientName()); + } - releaseRecordListExcelList.add(releaseRecordListExcel); - index++; // 序号累计 - offerDetail.setTotalQty(offerDetail.getTotalQty() + item.getTheQuantityShipped()); // 合计 + if(releaseRecordListExcel == null){ + releaseRecordListExcel = new ReleaseRecordListExcel(); + //序号 + releaseRecordListExcel.setIndex(index); + //单位 + releaseRecordListExcel.setUnit("PCS"); + //工单编号 + ParentRepairOrder parentRepairOrder = parentRepairOrderMapper.selectOne(new LambdaQueryWrapper() + .eq(ParentRepairOrder::getId, item.getParentRepairOrderId())); + releaseRecordListExcel.setOrderNo(parentRepairOrder.getOrderNo()); + //型号 + releaseRecordListExcel.setModuleNumber(item.getModuleNumber()); + //功率 + releaseRecordListExcel.setPower(distMap.get(item.getModulePower().toString())); + //订单数量 + releaseRecordListExcel.setOrderAmount(1); + //本次交货数量 + releaseRecordListExcel.setTheQuantityShipped(1); + + //发货记录 + RepairOrderShipping repairOrderShipping = repairOrderShippingMapper.selectOne(new LambdaQueryWrapper() + .eq(RepairOrderShipping::getId, item.getShippingId())); + //累计交货数量 + releaseRecordListExcel.setAccumulativeQuantityShipped(repairOrderShipping.getAccumulativeQuantityShipped()); + //未交数量 + releaseRecordListExcel.setUndeliveredQuantity(repairOrderShipping.getUndeliveredQuantity()); + + //维修结论 + if(item.getMaintenanceResult() != null){ + String result; + if(item.getMaintenanceResult() == 0){ + result = "报废"; + releaseRecordListExcel.getRemarkMap().put(RepairOrderStatusEnum.SCRAP.getDesc(),1); + }else{ + result = "OK"; + releaseRecordListExcel.getRemarkMap().put(RepairOrderStatusEnum.OK.getDesc(),1); + } + releaseRecordListExcel.setRemark(1 + "台" + result); + }else{ + //备注 功率 + 本次交货数量 + 返修结论 例如：20KW，5台OK + releaseRecordListExcel.setRemark(1 + "台"); + releaseRecordListExcel.getRemarkMap().put(RepairOrderStatusEnum.EMPTY.getDesc(),1); + } + + //送货日期 + releaseRecordListExcel.setDeliveryTime(TimeUtil.dateToString(repairOrderShipping.getDeliveryTime(), TimeConstant.DATE_FORMAT)); + releaseRecordListExcelList.add(releaseRecordListExcel); + releaseRecordListExcelMap.put(key,releaseRecordListExcel); + index++; // 序号累计 + }else{ + releaseRecordListExcel.setOrderAmount(releaseRecordListExcel.getOrderAmount() + 1); + releaseRecordListExcel.setTheQuantityShipped(releaseRecordListExcel.getTheQuantityShipped() + 1); + if(item.getMaintenanceResult() != null){ + String result; + if(item.getMaintenanceResult() == 0){ + result = "报废"; + releaseRecordListExcel.getRemarkMap().put(RepairOrderStatusEnum.SCRAP.getDesc() + ,releaseRecordListExcel.getRemarkMap().get(RepairOrderStatusEnum.SCRAP.getDesc()) == null ? 1 : releaseRecordListExcel.getRemarkMap().get(RepairOrderStatusEnum.SCRAP.getDesc()) + 1); + }else{ + result = "OK"; + releaseRecordListExcel.getRemarkMap().put(RepairOrderStatusEnum.OK.getDesc() + ,releaseRecordListExcel.getRemarkMap().get(RepairOrderStatusEnum.OK.getDesc()) == null ? 1 : releaseRecordListExcel.getRemarkMap().get(RepairOrderStatusEnum.OK.getDesc()) + 1); + } + releaseRecordListExcel.setRemark(1 + "台" + result); + }else{ + //备注 功率 + 本次交货数量 + 返修结论 例如：20KW，5台OK + releaseRecordListExcel.setRemark(1 + "台"); + releaseRecordListExcel.getRemarkMap().put(RepairOrderStatusEnum.EMPTY.getDesc() + ,releaseRecordListExcel.getRemarkMap().get(RepairOrderStatusEnum.EMPTY.getDesc()) == null ? 1 : releaseRecordListExcel.getRemarkMap().get(RepairOrderStatusEnum.EMPTY.getDesc()) + 1); + } + StringBuilder builder = new StringBuilder(); + for (String flag : releaseRecordListExcel.getRemarkMap().keySet()) { + if(RepairOrderStatusEnum.SCRAP.getDesc().equals(flag)){ + builder.append(StringUtil.isEmpty(builder) ? releaseRecordListExcel.getRemarkMap().get(flag) + "台报废" : "," + releaseRecordListExcel.getRemarkMap().get(flag) + "台报废"); + }else if(RepairOrderStatusEnum.OK.getDesc().equals(flag)){ + builder.append(StringUtil.isEmpty(builder) ? releaseRecordListExcel.getRemarkMap().get(flag) + "台OK" : "," + releaseRecordListExcel.getRemarkMap().get(flag) + "台OK"); + }else if(RepairOrderStatusEnum.EMPTY.getDesc().equals(flag)){ + builder.append(StringUtil.isEmpty(builder) ? releaseRecordListExcel.getRemarkMap().get(flag) + "台" : "," + releaseRecordListExcel.getRemarkMap().get(flag) + "台"); + } + } + releaseRecordListExcel.setRemark(builder.toString()); + } + offerDetail.setTotalQty(offerDetail.getTotalQty() + 1); // 合计 } + WriteSheet sheet = EasyExcel.writerSheet(0).build(); writer.fill(offerDetail, sheet); writer.fill(releaseRecordListExcelList, fillConfig, sheet); diff --git a/admin/src/main/java/com/hcy/admin/vo/excel/ReleaseRecordListExcel.java b/admin/src/main/java/com/hcy/admin/vo/excel/ReleaseRecordListExcel.java index 390707b..870ad1b 100644 --- a/admin/src/main/java/com/hcy/admin/vo/excel/ReleaseRecordListExcel.java +++ b/admin/src/main/java/com/hcy/admin/vo/excel/ReleaseRecordListExcel.java @@ -9,7 +9,9 @@ import lombok.NoArgsConstructor; import java.io.Serializable; import java.util.Date; +import java.util.HashMap; import java.util.List; +import java.util.Map; @Data @Builder @@ -43,4 +45,13 @@ public class ReleaseRecordListExcel implements Serializable { private String remark; //备注 @ApiModelProperty(value = "送货日期") private String deliveryTime; + + private Map remarkMap; + + public Map getRemarkMap() { + if(remarkMap == null){ + remarkMap = new HashMap<>(); + } + return remarkMap; + } } diff --git a/admin/src/main/resources/templates/excel/deliveryNote.xlsx b/admin/src/main/resources/templates/excel/deliveryNote.xlsx index 70915c237918923c33e39177db56b3a6192cf267..cf07a0dde84f1cd07d322a6313793151be89b641 100644 GIT binary patch delta 5494 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 delta 5468 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 diff --git a/common/src/main/java/com/hcy/common/enums/order/RepairOrderStatusEnum.java b/common/src/main/java/com/hcy/common/enums/order/RepairOrderStatusEnum.java index f917a6b..d13d365 100644 --- a/common/src/main/java/com/hcy/common/enums/order/RepairOrderStatusEnum.java +++ b/common/src/main/java/com/hcy/common/enums/order/RepairOrderStatusEnum.java @@ -40,6 +40,7 @@ public enum RepairOrderStatusEnum { // 维修结论（0=报废，1=OK） SCRAP(0, "报废"), OK(1, "OK"), + EMPTY(2, "空"), // 事项（0=派单事项、1=发货事项） DISPATCH_ITEM(0,"派单事项"),