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 9e06c07c..7a990d22 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 @@ -3,6 +3,7 @@ package com.ruoyi.aftersales.controller; import java.util.List; import com.ruoyi.aftersales.domain.AftersalesOutOrderDetail; +import com.ruoyi.aftersales.service.IAftersalesOutOrderDetailService; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -32,6 +33,9 @@ public class AftersalesOutOrderController extends BaseController @Autowired private IAftersalesOutOrderService aftersalesOutOrderService; + @Autowired + private IAftersalesOutOrderDetailService aftersalesOutOrderDetailService; + @RequiresPermissions("aftersales:aftersalesOutOrder:view") @GetMapping() public String aftersalesOutOrder() @@ -216,21 +220,21 @@ public class AftersalesOutOrderController extends BaseController // // // -// /** -// * 售后第一次维护设备 添加出货设备信息 -// */ -// @GetMapping("/addShippingDevicesOne") -// public String addShippingDevicesOne(@RequestParam("outOrderDetailId") Long outOrderDetailId, -// @RequestParam("salesOrderCode") String salesOrderCode, -// @RequestParam("makeNo") String makeNo, -// ModelMap mmap) -// { -// WarehouseOutOrderDetail warehouseOutOrderDetail = outOrderDetailService.selectWarehouseOutOrderDetailById(outOrderDetailId); -// mmap.put("salesOrderCode",salesOrderCode); -// mmap.put("makeNo",makeNo); -// mmap.put("warehouseOutOrderDetail", warehouseOutOrderDetail); -// return prefix + "/addShippingDevicesOne"; -// } + /** + * 售后第一次维护设备 成品添加出货设备信息 + */ + @GetMapping("/addShippingDevicesOne") + public String addShippingDevicesOne(@RequestParam("outOrderDetailId") Long outOrderDetailId, + @RequestParam("salesOrderCode") String salesOrderCode, + @RequestParam("makeNo") String makeNo, + ModelMap mmap) + { + AftersalesOutOrderDetail aftersalesOutOrderDetail = aftersalesOutOrderDetailService.selectAftersalesOutOrderDetailById(outOrderDetailId); + mmap.put("salesOrderCode",salesOrderCode); + mmap.put("makeNo",makeNo); + mmap.put("aftersalesOutOrderDetail", aftersalesOutOrderDetail); + return prefix + "/addShippingDevicesOne"; + } // // /** // * 修改保存售后第一次维护设备 添加出货设备信息 diff --git a/ruoyi-admin/src/main/resources/templates/aftersales/aftersalesOutOrder/addShippingDevicesOne.html b/ruoyi-admin/src/main/resources/templates/aftersales/aftersalesOutOrder/addShippingDevicesOne.html new file mode 100644 index 00000000..6f32290d --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/aftersales/aftersalesOutOrder/addShippingDevicesOne.html @@ -0,0 +1,375 @@ + + + + + + + +
+
+
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ + + + + + + +
+
+

销售订单的出货设备

+
+
+
+
+
+
+
+ + +
+
+

其他销售订单的出货设备

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