From 0c049d166705fc79245f5b0efe55a5426deeae56 Mon Sep 17 00:00:00 2001 From: liuxiaoxu <1793812695@qq.com> Date: Tue, 24 Dec 2024 08:08:41 +0800 Subject: [PATCH] =?UTF-8?q?[feat]=20=E5=94=AE=E5=90=8E=E7=AE=A1=E7=90=86?= =?UTF-8?q?=20=E5=94=AE=E5=90=8E=E7=BB=B4=E6=8A=A4=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E5=87=BA=E5=BA=93=E5=89=8D=E7=AB=AF=E5=88=97=E8=A1=A8=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E6=96=B0=E5=A2=9E=E8=AF=A6=E6=83=85=E6=8C=89=E9=92=AE?= =?UTF-8?q?=20=E6=96=B0=E5=A2=9E=E5=94=AE=E5=90=8E=E7=BB=B4=E6=8A=A4?= =?UTF-8?q?=E8=AE=BE=E5=A4=87=E5=87=BA=E5=BA=93=E8=AF=A6=E6=83=85=20?= =?UTF-8?q?=E5=94=AE=E5=90=8E=E5=8D=95=E5=89=8D=E7=AB=AF=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=93=8D=E4=BD=9C=E6=A0=8F=E6=8C=89=E9=92=AE?= =?UTF-8?q?=E6=8C=89=E7=85=A7=E7=BB=9F=E4=B8=80=E6=A0=B7=E5=BC=8F=E8=B0=83?= =?UTF-8?q?=E6=95=B4=20=E6=96=B0=E5=A2=9E=E5=94=AE=E5=90=8E=E7=BB=B4?= =?UTF-8?q?=E6=8A=A4=E8=AE=BE=E5=A4=87=E5=87=BA=E5=BA=93=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E5=90=8E=E7=AB=AF=E6=8E=A5=E5=8F=A3=20=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BF=9D=E5=AD=98=E5=94=AE=E5=90=8E=E7=BB=B4?= =?UTF-8?q?=E6=8A=A4=E8=AE=BE=E5=A4=87=E5=87=BA=E5=BA=93=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E5=90=8E=E7=AB=AF=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AftersalesOutOrderController.java | 37 +++ .../service/IAftersalesOutOrderService.java | 7 + .../impl/AftersalesOutOrderServiceImpl.java | 9 + .../aftersalesOrder/aftersalesOrder.html | 9 +- .../aftersalesOutOrder.html | 6 + .../aftersales/aftersalesOutOrder/detail.html | 225 ++++++++++++++++++ 6 files changed, 289 insertions(+), 4 deletions(-) create mode 100644 ruoyi-admin/src/main/resources/templates/aftersales/aftersalesOutOrder/detail.html diff --git a/ruoyi-admin/src/main/java/com/ruoyi/aftersales/controller/AftersalesOutOrderController.java b/ruoyi-admin/src/main/java/com/ruoyi/aftersales/controller/AftersalesOutOrderController.java index 0b9553de..517c7818 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/aftersales/controller/AftersalesOutOrderController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/aftersales/controller/AftersalesOutOrderController.java @@ -467,6 +467,43 @@ public String addShippingDevicesOne(@RequestParam("outOrderDetailId") Long outOr return getDataTable(list); } + /** + * 售后维护设备出库详情 + */ + @GetMapping("/detail/{outOrderId}") + public String detail(@PathVariable("outOrderId") Long outOrderId, ModelMap mmap) + { + AftersalesOutOrder aftersalesOutOrder = aftersalesOutOrderService.selectAftersalesOutOrderById(outOrderId); + String outOrderCode = aftersalesOutOrder.getOutOrderCode(); + + SysSalesShippingInform sysSalesShippingInform = shippingInformService.selectSysSalesShippingInformByCode(outOrderCode); + + List
sysSalesOrders = new ArrayList<>(); + String salesOrderCode = sysSalesShippingInform.getSalesOrderCode(); + + List
salesOrderCodes = new ArrayList<>(); + + if (StringUtils.isNotEmpty(salesOrderCode)){ + String[] splitSalesOrderCode = salesOrderCode.split(","); + salesOrderCodes = Arrays.asList(splitSalesOrderCode); + } + + sysSalesOrders = sysSalesOrderService.selectSysSalesOrderListByCodeList(salesOrderCodes); + mmap.put("sysSalesOrders", sysSalesOrders); + mmap.put("sysSalesShippingInform", sysSalesShippingInform); + return prefix + "/detail"; + } + + /** + * 修改保存售后维护设备出库详情 + */ + @Log(title = "售后维护设备出库", businessType = BusinessType.UPDATE) + @PostMapping("/detail") + @ResponseBody + public AjaxResult detailSave(AftersalesOutOrder aftersalesOutOrder) + { + return toAjax(aftersalesOutOrderService.updateDetailAftersalesOutOrder(aftersalesOutOrder)); + } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/aftersales/service/IAftersalesOutOrderService.java b/ruoyi-admin/src/main/java/com/ruoyi/aftersales/service/IAftersalesOutOrderService.java index 6d96f5f9..516f8f30 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/aftersales/service/IAftersalesOutOrderService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/aftersales/service/IAftersalesOutOrderService.java @@ -151,4 +151,11 @@ public interface IAftersalesOutOrderService * @return */ List
aftersalesConfirmCheckDetailList(SysSalesShippingInform sysSalesShippingInform); + + /** + * 售后维护设备出库详情保存 + * @param aftersalesOutOrder + * @return + */ + int updateDetailAftersalesOutOrder(AftersalesOutOrder aftersalesOutOrder); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/aftersales/service/impl/AftersalesOutOrderServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/aftersales/service/impl/AftersalesOutOrderServiceImpl.java index ab49349c..6eaee598 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/aftersales/service/impl/AftersalesOutOrderServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/aftersales/service/impl/AftersalesOutOrderServiceImpl.java @@ -1057,4 +1057,13 @@ public class AftersalesOutOrderServiceImpl implements IAftersalesOutOrderService return confirmCheckDetailVos; } + + + /** + * 售后维护设备出库详情保存 + * */ + @Override + public int updateDetailAftersalesOutOrder(AftersalesOutOrder aftersalesOutOrder) { + return 1; + } } diff --git a/ruoyi-admin/src/main/resources/templates/aftersales/aftersalesOrder/aftersalesOrder.html b/ruoyi-admin/src/main/resources/templates/aftersales/aftersalesOrder/aftersalesOrder.html index 434283c2..933599a8 100644 --- a/ruoyi-admin/src/main/resources/templates/aftersales/aftersalesOrder/aftersalesOrder.html +++ b/ruoyi-admin/src/main/resources/templates/aftersales/aftersalesOrder/aftersalesOrder.html @@ -180,15 +180,16 @@ // 编辑 // actions.push('
编辑
'); if (row.aftersalesStatus == 0){ - actions.push('
派单
'); + actions.push('
派单
'); } if (row.aftersalesStatus == 1) { - actions.push('
上传报告
'); + actions.push('
上传报告
'); } // 详情 - actions.push('
详情
'); - return actions.join(''); + actions.push('
详情
'); + var actionLinks = actions.join(''); + return $.table.dropdownToggle(actionLinks); } } diff --git a/ruoyi-admin/src/main/resources/templates/aftersales/aftersalesOutOrder/aftersalesOutOrder.html b/ruoyi-admin/src/main/resources/templates/aftersales/aftersalesOutOrder/aftersalesOutOrder.html index 155d7706..e9fb4e76 100644 --- a/ruoyi-admin/src/main/resources/templates/aftersales/aftersalesOutOrder/aftersalesOutOrder.html +++ b/ruoyi-admin/src/main/resources/templates/aftersales/aftersalesOutOrder/aftersalesOutOrder.html @@ -201,6 +201,7 @@ if (row.warehouseOutStatus=="10" || row.warehouseOutStatus=="11"){ actions.push('
确认验收
'); } + actions.push('
详情
'); var actionLinks = actions.join(''); return $.table.dropdownToggle(actionLinks); @@ -232,6 +233,11 @@ $.modal.open("售后确认验收",url); } + //详情 + function detail(outOrderId) { + var url = ctx + 'aftersales/aftersalesOutOrder/detail/'+outOrderId; + $.modal.open("售后出库单详情",url); + }