From a8f0578513a28463390d3753f0f9de3847a5def0 Mon Sep 17 00:00:00 2001 From: liuxiaoxu <1793812695@qq.com> Date: Sat, 27 Apr 2024 15:29:40 +0800 Subject: [PATCH] =?UTF-8?q?[feat]=E5=94=AE=E5=90=8E=E7=AE=A1=E7=90=86:=20?= =?UTF-8?q?=E5=87=BA=E8=B4=A7=E8=AE=BE=E5=A4=87=E5=88=97=E8=A1=A8=20?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=AF=A6=E6=83=85=E6=8C=89=E9=92=AE=20?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AfterSalesShippingDeviceController.java | 29 ++ .../aftersales/shippingDevice/detail.html | 302 +++++++++--------- .../shippingDevice/shippingDevice.html | 11 + 3 files changed, 198 insertions(+), 144 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/aftersales/controller/AfterSalesShippingDeviceController.java b/ruoyi-admin/src/main/java/com/ruoyi/aftersales/controller/AfterSalesShippingDeviceController.java index fd032311..408ac130 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/aftersales/controller/AfterSalesShippingDeviceController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/aftersales/controller/AfterSalesShippingDeviceController.java @@ -2,6 +2,7 @@ package com.ruoyi.aftersales.controller; import java.util.List; +import com.ruoyi.aftersales.domain.AftersalesOrder; import com.ruoyi.aftersales.domain.dto.*; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.system.domain.SysCustomer; @@ -135,6 +136,34 @@ public class AfterSalesShippingDeviceController extends BaseController return toAjax(afterSalesShippingDeviceService.updateAfterSalesShippingDevice(dto)); } + /** + * 查看出货设备详情 + */ + @GetMapping("/detail/{shippingDeviceCode}") + public String detail(@PathVariable("shippingDeviceCode") Long shippingDeviceCode, ModelMap mmap) + { + AfterSalesShippingDeviceDto afterSalesShippingDeviceDto = afterSalesShippingDeviceService.selectAfterSalesShippingDeviceDtoById(shippingDeviceCode); + //查找客户信息 + String customerId = afterSalesShippingDeviceDto.getCustomerId(); + CustomerDto customerDto = customerService.selectCustomerDtoByEnterpriseCode(customerId); + if (StringUtils.isNotNull(customerDto)){ + mmap.put("customerDto",customerDto); + } + //查找生产信息 + AfterSalesMakeOrderDto makeOrderDto = afterSalesShippingDeviceService.selectAfterSalesMakeOrderDtoById(shippingDeviceCode); + if (StringUtils.isNotNull(makeOrderDto)){ + mmap.put("makeOrderDto",makeOrderDto); + } + //查找仓库和售后信息 后续补充 + WarehouseAndAfterSalesDto warehouseAndAfterSalesDto = afterSalesShippingDeviceService.selectWarehouseAndAfterSalesDtoById(shippingDeviceCode); + if (StringUtils.isNotNull(warehouseAndAfterSalesDto)){ + mmap.put("warehouseAndAfterSalesDto",warehouseAndAfterSalesDto); + } + mmap.put("afterSalesShippingDeviceDto", afterSalesShippingDeviceDto); + return prefix + "/detail"; + } + + /** * 删除出货设备 */ diff --git a/ruoyi-admin/src/main/resources/templates/aftersales/shippingDevice/detail.html b/ruoyi-admin/src/main/resources/templates/aftersales/shippingDevice/detail.html index 281a8452..f363e77e 100644 --- a/ruoyi-admin/src/main/resources/templates/aftersales/shippingDevice/detail.html +++ b/ruoyi-admin/src/main/resources/templates/aftersales/shippingDevice/detail.html @@ -1,234 +1,248 @@ - +
-
+ +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- -
-
-
- -
- +
- +
- -
-
-
- -
- -
-
-
- -
- +
-
- -
- + + +
+

客户信息

+
+
+
+ +
+ +
-
-
- -
- +
+ +
+ +
-
-
- -
- +
+ +
+ +
-
-
- -
-
- - +
+ +
+
-
-
- -
- +
+ +
+ +
-
-
- -
- +
+ +
+ +
-
-
- -
-
- - + +
+ +
+

生产信息

+
+
+
+ +
+
-
-
- -
- +
+ +
+ +
-
-
- -
-
- - +
+ +
+
-
-
- -
- +
+ +
+ +
-
-
- -
-
- - + +
+ + +
+

仓库和售后信息

+
+
+
+ +
+
-
-
- -
- +
+ +
+ +
-
-
- -
- +
+ +
+
+ + +
+
-
-
- -
- +
+ +
+ +
-
-
- -
- +
+ +
+
+ + +
+
-
-
- -
- +
+ +
+ +
-
-
- -
- +
+ +
+
+ + +
+
-
-
- -
-
- - +
+ +
+
+ + +
-
- + +
+ \ No newline at end of file