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 3947944d..d2e6a827 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 @@ -314,6 +314,29 @@ public class WarehouseOutOrderController extends BaseController } + /** + * 请购单-出库详情 + */ + @GetMapping("/requisitioningOutWarehouseDetail/{outOrderId}") + public String requisitioningOutWarehouseDetail(@PathVariable("outOrderId") Long outOrderId, ModelMap mmap) + { + WarehouseOutOrder warehouseOutOrder = warehouseOutOrderService.selectWarehouseOutOrderById(outOrderId); + mmap.put("warehouseOutOrder", warehouseOutOrder); + return prefix + "/requisitioningOutWarehouseDetail"; + } + + /** + * 修改保存请购单-出库详情 + */ + @RequiresPermissions("warehouse:warehouseOutOrder:requisitioningOutWarehouseDetail") + @Log(title = "仓库出库单", businessType = BusinessType.UPDATE) + @PostMapping("/requisitioningOutWarehouseDetail") + @ResponseBody + public AjaxResult requisitioningOutWarehouseDetailSave(@RequestBody WarehouseOutOrder warehouseOutOrder) + { + return toAjax(warehouseOutOrderService.updatePrepareMaterial(warehouseOutOrder)); + } + /** * 退换货-出库 diff --git a/ruoyi-admin/src/main/resources/templates/warehouse/warehouseOutOrder/requisitioningOutWarehouse.html b/ruoyi-admin/src/main/resources/templates/warehouse/warehouseOutOrder/requisitioningOutWarehouse.html index 5d6cb1d8..44025a0a 100644 --- a/ruoyi-admin/src/main/resources/templates/warehouse/warehouseOutOrder/requisitioningOutWarehouse.html +++ b/ruoyi-admin/src/main/resources/templates/warehouse/warehouseOutOrder/requisitioningOutWarehouse.html @@ -95,7 +95,7 @@ // 使用 JSON.stringify() 序列化数据 const jsonData = JSON.stringify(combinedData); // 发送 AJAX 请求到后端接口 - $.operate.saveJson(prefix + "/makeOutWarehouse", jsonData); + $.operate.saveJson(prefix + "/requisitioningOutWarehouse", jsonData); } //物料信息展示列表 diff --git a/ruoyi-admin/src/main/resources/templates/warehouse/warehouseOutOrder/requisitioningOutWarehouseDetail.html b/ruoyi-admin/src/main/resources/templates/warehouse/warehouseOutOrder/requisitioningOutWarehouseDetail.html new file mode 100644 index 00000000..bbcfb116 --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/warehouse/warehouseOutOrder/requisitioningOutWarehouseDetail.html @@ -0,0 +1,190 @@ + + + + + + + +
+
+ +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+
+
+
+
+
+
+
+ + + + + + + \ 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 c8742348..3b331750 100644 --- a/ruoyi-admin/src/main/resources/templates/warehouse/warehouseOutOrder/warehouseOutOrder.html +++ b/ruoyi-admin/src/main/resources/templates/warehouse/warehouseOutOrder/warehouseOutOrder.html @@ -79,6 +79,7 @@ var prepareMaterialDetailFlag = [[${@permission.hasPermi('warehouse:warehouseOutOrder:prepareMaterialDetail')}]]; var salesOutWarehouseDetailFlag = [[${@permission.hasPermi('warehouse:warehouseOutOrder:salesOutWarehouseDetail')}]]; var makeOutWarehouseDetailFlag = [[${@permission.hasPermi('warehouse:warehouseOutOrder:makeOutWarehouseDetail')}]]; + var requisitioningOutWarehouseDetailFlag = [[${@permission.hasPermi('warehouse:warehouseOutOrder:requisitioningOutWarehouseDetail')}]]; var warehouseOutStatusDatas = [[${@dict.getType('warehouse_out_status')}]]; var warehouseOrderTypeDatas = [[${@dict.getType('warehouse_order_type')}]]; @@ -199,6 +200,7 @@ /*请购单-出库*/ if (row.warehouseOutStatus == 4 && row.warehouseOrderType == 2 && row.warehouseOutType == 2){ actions.push('出库 '); + actions.push('详情 '); } /*退换货-出库*/ @@ -255,6 +257,12 @@ $.modal.open("出库",url); } + /*请购单-出库详情*/ + function requisitioningOutWarehouseDetail(outOrderId){ + var url = ctx + 'warehouse/warehouseOutOrder/requisitioningOutWarehouseDetail/' + outOrderId; + $.modal.open("出库详情",url); + } + /*退换货-出库*/ function refundsExchangesOutWarehouse(outOrderId){ var url = ctx + 'warehouse/warehouseOutOrder/refundsExchangesOutWarehouse/' + outOrderId;