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 349730dd..51b56445 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 @@ -142,6 +142,30 @@ public class WarehouseOutOrderController extends BaseController } + /** + * 销售单-准备物料详情 + */ + @GetMapping("/prepareMaterialDetail/{outOrderId}") + public String prepareMaterialDetail(@PathVariable("outOrderId") Long outOrderId, ModelMap mmap) + { + WarehouseOutOrder warehouseOutOrder = warehouseOutOrderService.selectWarehouseOutOrderById(outOrderId); + mmap.put("warehouseOutOrder", warehouseOutOrder); + return prefix + "/prepareMaterialDetail"; + } + + /** + * 修改保存销售单-准备物料详情 + */ + @RequiresPermissions("warehouse:warehouseOutOrder:prepareMaterialDetail") + @Log(title = "仓库出库单", businessType = BusinessType.UPDATE) + @PostMapping("/prepareMaterialDetail") + @ResponseBody + public AjaxResult prepareMaterialDetailSave(@RequestBody WarehouseOutOrder warehouseOutOrder) + { + return toAjax(warehouseOutOrderService.updatePrepareMaterial(warehouseOutOrder)); + } + + /** * 销售单-准备物料 物料相关信息 */ diff --git a/ruoyi-admin/src/main/resources/templates/warehouse/warehouseOutOrder/prepareMaterialDetail.html b/ruoyi-admin/src/main/resources/templates/warehouse/warehouseOutOrder/prepareMaterialDetail.html new file mode 100644 index 00000000..320119c6 --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/warehouse/warehouseOutOrder/prepareMaterialDetail.html @@ -0,0 +1,225 @@ + + + + + + + +
+
+ +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+
+
+
+
+
+
+
+ + + + + + + \ 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 dbd0d5b3..505448ef 100644 --- a/ruoyi-admin/src/main/resources/templates/warehouse/warehouseOutOrder/warehouseOutOrder.html +++ b/ruoyi-admin/src/main/resources/templates/warehouse/warehouseOutOrder/warehouseOutOrder.html @@ -75,6 +75,9 @@ var refundsExchangesOutWarehouseFlag = [[${@permission.hasPermi('warehouse:warehouseOutOrder:refundsExchangesOutWarehouse')}]]; + + var prepareMaterialDetailFlag = [[${@permission.hasPermi('warehouse:warehouseOutOrder:prepareMaterialDetail')}]]; + var warehouseOutStatusDatas = [[${@dict.getType('warehouse_out_status')}]]; var warehouseOrderTypeDatas = [[${@dict.getType('warehouse_order_type')}]]; var warehouseOutTypeDatas = [[${@dict.getType('warehouse_out_type')}]]; @@ -176,10 +179,10 @@ align: 'center', formatter: function(value, row, index) { var actions = []; - actions.push('编辑 '); /*销售单-准备物料*/ if (row.warehouseOutStatus == 0 && row.warehouseOrderType == 0 && row.warehouseOutType == 0){ actions.push('准备物料 '); + actions.push('详情 '); } /*销售单-出库*/ if (row.warehouseOutStatus == 4 && row.warehouseOrderType == 0 && row.warehouseOutType == 0){ @@ -211,6 +214,12 @@ $.modal.open("准备物料",url); } + /*销售单-准备物料详情*/ + function prepareMaterialDetail(outOrderId){ + var url = ctx + 'warehouse/warehouseOutOrder/prepareMaterialDetail/' + outOrderId; + $.modal.open("准备物料详情",url); + } + /*销售单-出库*/ function salesOutWarehouse(outOrderId){ var url = ctx + 'warehouse/warehouseOutOrder/salesOutWarehouse/' + outOrderId;