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 2545fe95..0c9068b0 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
@@ -1,6 +1,10 @@
package com.ruoyi.aftersales.controller;
import java.util.List;
+
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.system.domain.SysCustomer;
+import com.ruoyi.system.service.ISysCustomerService;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
@@ -34,6 +38,9 @@ public class AfterSalesShippingDeviceController extends BaseController
@Autowired
private IAfterSalesShippingDeviceService afterSalesShippingDeviceService;
+ @Autowired
+ private ISysCustomerService customerService;
+
@RequiresPermissions("aftersales:shippingDevice:view")
@GetMapping()
public String shippingDevice()
@@ -96,7 +103,17 @@ public class AfterSalesShippingDeviceController extends BaseController
public String edit(@PathVariable("shippingDeviceCode") Long shippingDeviceCode, ModelMap mmap)
{
AfterSalesShippingDevice afterSalesShippingDevice = afterSalesShippingDeviceService.selectAfterSalesShippingDeviceById(shippingDeviceCode);
+ //查找客户信息
+ String customerId = afterSalesShippingDevice.getCustomerId();
+ SysCustomer sysCustomer = customerService.selectSysCustomerByEnterpriseCode(customerId);
+ if (StringUtils.isNotNull(sysCustomer)){
+ mmap.put("sysCustomer",sysCustomer);
+ }
+ //查找生产信息 后续补充
+ //查找仓库信息 后续补充
+ //查找售后信息 后续补充
mmap.put("afterSalesShippingDevice", afterSalesShippingDevice);
+// mmap.put("sysCustomer",sysCustomer);
return prefix + "/edit";
}
diff --git a/ruoyi-admin/src/main/resources/templates/aftersales/shippingDevice/detail.html b/ruoyi-admin/src/main/resources/templates/aftersales/shippingDevice/detail.html
new file mode 100644
index 00000000..281a8452
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/templates/aftersales/shippingDevice/detail.html
@@ -0,0 +1,266 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/templates/aftersales/shippingDevice/edit.html b/ruoyi-admin/src/main/resources/templates/aftersales/shippingDevice/edit.html
index 8176474c..176df39a 100644
--- a/ruoyi-admin/src/main/resources/templates/aftersales/shippingDevice/edit.html
+++ b/ruoyi-admin/src/main/resources/templates/aftersales/shippingDevice/edit.html
@@ -27,7 +27,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-