From 11394040ea1a2753df3516dbd2686f744d3b6e47 Mon Sep 17 00:00:00 2001 From: liuxiaoxu <1793812695@qq.com> Date: Thu, 6 Jun 2024 10:24:55 +0800 Subject: [PATCH] =?UTF-8?q?[feat]=E4=BB=93=E5=BA=93=E7=AE=A1=E7=90=86:=20?= =?UTF-8?q?=E5=87=BA=E5=BA=93=E5=8D=95=20=E6=96=B0=E5=A2=9E=E9=80=80?= =?UTF-8?q?=E6=8D=A2=E8=B4=A7-=E5=87=BA=E5=BA=93=E8=AF=A6=E6=83=85=20?= =?UTF-8?q?=E6=8C=89=E9=92=AE=20=E6=96=B0=E5=A2=9E=E9=80=80=E6=8D=A2?= =?UTF-8?q?=E8=B4=A7-=E5=87=BA=E5=BA=93=E8=AF=A6=E6=83=85=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2refundsExchangesOutWarehouseDetail.html=20=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E9=80=80=E6=8D=A2=E8=B4=A7-=E5=87=BA=E5=BA=93?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E5=90=8E=E7=AB=AF=E6=9F=A5=E8=AF=A2=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E6=8E=A5=E5=8F=A3=20=E6=96=B0=E5=A2=9E=E9=80=80?= =?UTF-8?q?=E6=8D=A2=E8=B4=A7-=E5=87=BA=E5=BA=93=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E5=90=8E=E7=AB=AF=E4=BF=AE=E6=94=B9=E4=BF=9D=E5=AD=98=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WarehouseOutOrderController.java | 24 ++ .../refundsExchangesOutWarehouseDetail.html | 215 ++++++++++++++++++ .../warehouseOutOrder/warehouseOutOrder.html | 9 + 3 files changed, 248 insertions(+) create mode 100644 ruoyi-admin/src/main/resources/templates/warehouse/warehouseOutOrder/refundsExchangesOutWarehouseDetail.html 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