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 51b56445..b96c14fc 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 @@ -201,6 +201,31 @@ public class WarehouseOutOrderController extends BaseController return toAjax(warehouseOutOrderService.updateSalesOutWarehouse(warehouseOutOrder)); } + + /** + * 销售单-出库 + */ + @GetMapping("/salesOutWarehouseDetail/{outOrderId}") + public String salesOutWarehouseDetail(@PathVariable("outOrderId") Long outOrderId, ModelMap mmap) + { + WarehouseOutOrder warehouseOutOrder = warehouseOutOrderService.selectWarehouseOutOrderById(outOrderId); + mmap.put("warehouseOutOrder", warehouseOutOrder); + return prefix + "/salesOutWarehouseDetail"; + } + + /** + * 修改保存销售单-出库 + */ + @RequiresPermissions("warehouse:warehouseOutOrder:salesOutWarehouseDetail") + @Log(title = "仓库出库单", businessType = BusinessType.UPDATE) + @PostMapping("/salesOutWarehouseDetail") + @ResponseBody + public AjaxResult salesOutWarehouseDetailSave(@RequestBody WarehouseOutOrder warehouseOutOrder) + { + return toAjax(warehouseOutOrderService.updateSalesOutWarehouse(warehouseOutOrder)); + } + + /** * 销售单-出库 物料信息关联设备信息 */ @@ -230,7 +255,7 @@ public class WarehouseOutOrderController extends BaseController } /** - * 修改保存出库单-出库 + * 修改保存生产单-出库 */ @RequiresPermissions("warehouse:warehouseOutOrder:makeOutWarehouse") @Log(title = "仓库出库单", businessType = BusinessType.UPDATE) diff --git a/ruoyi-admin/src/main/resources/templates/warehouse/warehouseOutOrder/salesOutWarehouse.html b/ruoyi-admin/src/main/resources/templates/warehouse/warehouseOutOrder/salesOutWarehouse.html index 27bf3549..cab7e0dc 100644 --- a/ruoyi-admin/src/main/resources/templates/warehouse/warehouseOutOrder/salesOutWarehouse.html +++ b/ruoyi-admin/src/main/resources/templates/warehouse/warehouseOutOrder/salesOutWarehouse.html @@ -1,7 +1,7 @@ - + diff --git a/ruoyi-admin/src/main/resources/templates/warehouse/warehouseOutOrder/salesOutWarehouseDetail.html b/ruoyi-admin/src/main/resources/templates/warehouse/warehouseOutOrder/salesOutWarehouseDetail.html new file mode 100644 index 00000000..7d5e01f5 --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/warehouse/warehouseOutOrder/salesOutWarehouseDetail.html @@ -0,0 +1,303 @@ + + + + + + + +
+
+ +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+
+ + +
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+
+
+
+
+
+
+
+ + + + + + + \ 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 505448ef..dbc81684 100644 --- a/ruoyi-admin/src/main/resources/templates/warehouse/warehouseOutOrder/warehouseOutOrder.html +++ b/ruoyi-admin/src/main/resources/templates/warehouse/warehouseOutOrder/warehouseOutOrder.html @@ -77,6 +77,8 @@ var prepareMaterialDetailFlag = [[${@permission.hasPermi('warehouse:warehouseOutOrder:prepareMaterialDetail')}]]; + var salesOutWarehouseDetailFlag = [[${@permission.hasPermi('warehouse:warehouseOutOrder:salesOutWarehouseDetail')}]]; + var warehouseOutStatusDatas = [[${@dict.getType('warehouse_out_status')}]]; var warehouseOrderTypeDatas = [[${@dict.getType('warehouse_order_type')}]]; @@ -187,6 +189,7 @@ /*销售单-出库*/ if (row.warehouseOutStatus == 4 && row.warehouseOrderType == 0 && row.warehouseOutType == 0){ actions.push('出库 '); + actions.push('详情 '); } /*生产单-出库*/ if (row.warehouseOutStatus == 4 && row.warehouseOrderType == 1 && row.warehouseOutType == 1){ @@ -226,6 +229,13 @@ $.modal.open("出库",url); } + /*销售单-出库详情*/ + function salesOutWarehouseDetail(outOrderId){ + var url = ctx + 'warehouse/warehouseOutOrder/salesOutWarehouseDetail/' + outOrderId; + $.modal.open("出库详情",url); + } + + /*生产单-出库*/ function makeOutWarehouse(outOrderId){ var url = ctx + 'warehouse/warehouseOutOrder/makeOutWarehouse/' + outOrderId;