diff --git a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/controller/WarehouseOutOrderController.java b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/controller/WarehouseOutOrderController.java index d2e6a827..23b92308 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/controller/WarehouseOutOrderController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/controller/WarehouseOutOrderController.java @@ -361,6 +361,30 @@ public class WarehouseOutOrderController extends BaseController return toAjax(warehouseOutOrderService.updateRefundsExchangesOutWarehouse(warehouseOutOrder)); } + /** + * 退换货-出库详情 + */ + @GetMapping("/refundsExchangesOutWarehouseDetail/{outOrderId}") + public String refundsExchangesOutWarehouseDetail(@PathVariable("outOrderId") Long outOrderId, ModelMap mmap) + { + WarehouseOutOrder warehouseOutOrder = warehouseOutOrderService.selectWarehouseOutOrderById(outOrderId); + mmap.put("warehouseOutOrder", warehouseOutOrder); + return prefix + "/refundsExchangesOutWarehouseDetail"; + } + + /** + * 修改保存退换货-出库详情 + */ + @RequiresPermissions("warehouse:warehouseOutOrder:refundsExchangesOutWarehouseDetail") + @Log(title = "仓库出库单", businessType = BusinessType.UPDATE) + @PostMapping("/refundsExchangesOutWarehouseDetail") + @ResponseBody + public AjaxResult refundsExchangesOutWarehouseDetailSave(@RequestBody WarehouseOutOrder warehouseOutOrder) + { + return toAjax(warehouseOutOrderService.updateRefundsExchangesOutWarehouse(warehouseOutOrder)); + } + + /** * 退换货-出库 供应商物料详情列表 */ diff --git a/ruoyi-admin/src/main/resources/templates/warehouse/warehouseOutOrder/refundsExchangesOutWarehouseDetail.html b/ruoyi-admin/src/main/resources/templates/warehouse/warehouseOutOrder/refundsExchangesOutWarehouseDetail.html new file mode 100644 index 00000000..08d9f1c3 --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/warehouse/warehouseOutOrder/refundsExchangesOutWarehouseDetail.html @@ -0,0 +1,215 @@ + + + + + + + + +
+
+ +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+ + +
+ +
+
+ +
+
+
+
+
+ + + + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/warehouse/warehouseOutOrder/warehouseOutOrder.html b/ruoyi-admin/src/main/resources/templates/warehouse/warehouseOutOrder/warehouseOutOrder.html index 3b331750..9b2dd127 100644 --- a/ruoyi-admin/src/main/resources/templates/warehouse/warehouseOutOrder/warehouseOutOrder.html +++ b/ruoyi-admin/src/main/resources/templates/warehouse/warehouseOutOrder/warehouseOutOrder.html @@ -80,6 +80,8 @@ var salesOutWarehouseDetailFlag = [[${@permission.hasPermi('warehouse:warehouseOutOrder:salesOutWarehouseDetail')}]]; var makeOutWarehouseDetailFlag = [[${@permission.hasPermi('warehouse:warehouseOutOrder:makeOutWarehouseDetail')}]]; var requisitioningOutWarehouseDetailFlag = [[${@permission.hasPermi('warehouse:warehouseOutOrder:requisitioningOutWarehouseDetail')}]]; + var refundsExchangesOutWarehouseDetailFlag = [[${@permission.hasPermi('warehouse:warehouseOutOrder:refundsExchangesOutWarehouseDetail')}]]; + var warehouseOutStatusDatas = [[${@dict.getType('warehouse_out_status')}]]; var warehouseOrderTypeDatas = [[${@dict.getType('warehouse_order_type')}]]; @@ -206,6 +208,7 @@ /*退换货-出库*/ if (row.warehouseOutStatus == 4 && row.warehouseOrderType == 4 && row.warehouseOutType == 4){ actions.push('出库 '); + actions.push('详情 '); } return actions.join(''); } @@ -268,6 +271,12 @@ var url = ctx + 'warehouse/warehouseOutOrder/refundsExchangesOutWarehouse/' + outOrderId; $.modal.open("出库",url); } + + /*退换货-出库详情*/ + function refundsExchangesOutWarehouseDetail(outOrderId){ + var url = ctx + 'warehouse/warehouseOutOrder/refundsExchangesOutWarehouseDetail/' + outOrderId; + $.modal.open("出库详情",url); + } \ No newline at end of file