From dcf797d865fab9947f4cb8f661964d2c718d06ab Mon Sep 17 00:00:00 2001
From: liuxiaoxu <1793812695@qq.com>
Date: Wed, 5 Jun 2024 19:20:44 +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=20=E9=94=80?=
=?UTF-8?q?=E5=94=AE=E5=8D=95-=E5=87=86=E5=A4=87=E7=89=A9=E6=96=99?=
=?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2=20prepareMaterialDetail.ht?=
=?UTF-8?q?ml=20=E6=96=B0=E5=A2=9E=20=E9=94=80=E5=94=AE=E5=8D=95-=E5=87=86?=
=?UTF-8?q?=E5=A4=87=E7=89=A9=E6=96=99=E8=AF=A6=E6=83=85=E6=8C=89=E9=92=AE?=
=?UTF-8?q?=20=E6=96=B0=E5=A2=9E=20=E9=94=80=E5=94=AE=E5=8D=95-=E5=87=86?=
=?UTF-8?q?=E5=A4=87=E7=89=A9=E6=96=99=E8=AF=A6=E6=83=85=E4=BF=AE=E6=94=B9?=
=?UTF-8?q?=E4=BF=9D=E5=AD=98=E5=90=8E=E7=AB=AF=E6=8E=A5=E5=8F=A3=20?=
=?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=94=80=E5=94=AE=E5=8D=95-=E5=87=86?=
=?UTF-8?q?=E5=A4=87=E7=89=A9=E6=96=99=E8=AF=A6=E6=83=85=E6=9F=A5=E8=AF=A2?=
=?UTF-8?q?=E5=90=8E=E7=AB=AF=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../WarehouseOutOrderController.java | 24 ++
.../prepareMaterialDetail.html | 225 ++++++++++++++++++
.../warehouseOutOrder/warehouseOutOrder.html | 11 +-
3 files changed, 259 insertions(+), 1 deletion(-)
create mode 100644 ruoyi-admin/src/main/resources/templates/warehouse/warehouseOutOrder/prepareMaterialDetail.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 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;