From d35aa859944b5fc71a61479c27e2ff48531b3b79 Mon Sep 17 00:00:00 2001
From: liuxiaoxu <1793812695@qq.com>
Date: Thu, 6 Jun 2024 10:13:29 +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=E8=AF=B7?=
 =?UTF-8?q?=E8=B4=AD=E5=8D=95-=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=E8=AF=B7=E8=B4=AD?=
 =?UTF-8?q?=E5=8D=95-=E5=87=BA=E5=BA=93=E8=AF=A6=E6=83=85=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2requisitioningOutWarehouseDetail.html=20=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E8=AF=B7=E8=B4=AD=E5=8D=95-=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=E8=AF=B7?=
 =?UTF-8?q?=E8=B4=AD=E5=8D=95-=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          |  23 +++
 .../requisitioningOutWarehouse.html           |   2 +-
 .../requisitioningOutWarehouseDetail.html     | 190 ++++++++++++++++++
 .../warehouseOutOrder/warehouseOutOrder.html  |   8 +
 4 files changed, 222 insertions(+), 1 deletion(-)
 create mode 100644 ruoyi-admin/src/main/resources/templates/warehouse/warehouseOutOrder/requisitioningOutWarehouseDetail.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 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 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('请购单-出库')" />
+    <th:block th:include="include :: datetimepicker-css" />
+</head>
+<body class="white-bg">
+<div class="wrapper wrapper-content animated fadeInRight ibox-content">
+    <form class="form-horizontal m" id="form-makeOutWarehouse-edit" th:object="${warehouseOutOrder}">
+        <input name="outOrderId" th:field="*{outOrderId}" type="hidden">
+        <div class="form-group">
+            <label class="col-sm-3 control-label">出库单号：</label>
+            <div class="col-sm-8">
+                <input name="outOrderCode" th:field="*{outOrderCode}" class="form-control" type="text" disabled>
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">订单类型：</label>
+            <div class="col-sm-8">
+                <select name="warehouseOrderType" class="form-control m-b" th:with="type=${@dict.getType('warehouse_order_type')}" disabled>
+                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{warehouseOrderType}"></option>
+                </select>
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">请购单号：</label>
+            <div class="col-sm-8">
+                <input name="requisitioningCode" th:field="*{requisitioningCode}" class="form-control" type="text" disabled>
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">申请人员：</label>
+            <div class="col-sm-8">
+                <input name="applyName" th:field="*{applyName}" class="form-control" type="text" disabled>
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">备注：</label>
+            <div class="col-sm-8">
+                <input name="remark" th:field="*{remark}" class="form-control" type="text" disabled>
+            </div>
+        </div>
+    </form>
+    <!--物料信息-->
+    <div class="container">
+        <div class="row">
+            <div class="col-sm-12 select-table table-striped">
+                <table id="bootstrap-table"></table>
+            </div>
+        </div>
+    </div>
+</div>
+<th:block th:include="include :: footer" />
+<th:block th:include="include :: datetimepicker-js" />
+<!--用于可以修改列表字段的插件-->
+<th:block th:include="include :: bootstrap-table-editable-js" />
+<script th:inline="javascript">
+
+
+    var warehouseOutOrder = [[${warehouseOutOrder}]];
+
+    var prefix = ctx + "warehouse/warehouseOutOrder";
+    $("#form-makeOutWarehouse-edit").validate({
+        focusCleanup: true
+    });
+
+    // 新增提交
+    function submitHandler() {
+        // 获取表单数据
+        const warehouseOutOrderData = $("#form-makeOutWarehouse-edit").serializeArray().reduce((obj, item) => {
+            obj[item.name] = item.value;
+            return obj;
+        }, {});
+        // 获取bootstrap-table的数据，这里假设你使用bootstrap-table的API获取所有数据
+        var table = $('#bootstrap-table').bootstrapTable('getData');
+
+        // 将表数据转换成与complaintNoticeData格式一致的数组
+        var materialDataList = table.map(function(item) {
+            // 根据实际字段名调整
+            return {
+                "outOrderDetailId":item.outOrderDetailId,
+                "outOrderCode":item.outOrderCode,
+                "materialNo": item.materialNo, // 假设id对应materialId
+                "prepareOutOrderSum":item.prepareOutOrderSum,
+                "actualOutOrderSum":item.actualOutOrderSum
+                // ...其他字段
+            };
+        });
+
+        const combinedData = Object.assign({}, warehouseOutOrderData, {
+            warehouseOutOrderDetailList: materialDataList,
+        });
+        // 合并表单数据和表格数据
+        console.log(combinedData)
+        // 使用 JSON.stringify() 序列化数据
+        const jsonData = JSON.stringify(combinedData);
+        // 发送 AJAX 请求到后端接口
+        $.operate.saveJson(prefix + "/requisitioningOutWarehouseDetail", jsonData);
+    }
+
+    //物料信息展示列表
+    $(function() {
+        var options = {
+            modalName: "选择物料",
+            url: ctx + "warehouse/warehouseOutOrder/getMaterialListByOutOrderCode",
+            queryParams: queryParams,
+            showSearch: false,
+            showRefresh: false,
+            showToggle: false,
+            showColumns: false,
+            pagination: false, // 设置不分页
+            columns: [{
+                checkbox: true
+            },
+                {
+                    title: '出库单详情ID',
+                    field: 'outOrderDetailId',
+                    visible: false
+                },
+                {
+                    title: '出库单号',
+                    field: 'outOrderCode',
+                    visible: false
+                },
+
+                {
+                    title: '料号',
+                    field: 'materialNo',
+                },
+                {
+                    title: '图片',
+                    field: 'materialPhotourl',
+                },
+                {
+                    title: '物料名称',
+                    field: 'materialName',
+                },
+                {
+                    title: '物料类型',
+                    field: 'materialType',
+                },
+                {
+                    title: '描述',
+                    field: 'materialDescribe',
+                },
+                {
+                    title: '品牌',
+                    field: 'materialBrand',
+                },
+                {
+                    title: '单位',
+                    field: 'materialUnit',
+                },
+                {
+                    title: '加工方式',
+                    field: 'materialProcessMethod',
+                },
+                {
+                    title: '订单数量',
+                    field: 'makeNum',
+                },
+                {
+                    title: '已出库数',
+                    field: 'hasOutOrderSum',
+                },
+                {
+                    title: '申请出库数',
+                    field: 'applyOutOrderSum',
+                },
+                {
+                    title: '实际出库数',
+                    field: 'actualOutOrderSum',
+                }
+            ]
+        };
+        $.table.init(options);
+    })
+
+    function queryParams(params) {
+        var curParams = {
+            // 传递参数查询参数
+            outOrderCode:  warehouseOutOrder.outOrderCode
+        };
+        console.log(curParams);
+        return curParams;
+    }
+
+</script>
+</body>
+</html>
\ 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('<a class="btn btn-success btn-xs ' + requisitioningOutWarehouseFlag + '" href="javascript:void(0)" onclick="requisitioningOutWarehouse(\'' + row.outOrderId + '\')"><i class="fa fa-edit"></i>出库</a> ');
+                            actions.push('<a class="btn btn-success btn-xs ' + requisitioningOutWarehouseDetailFlag + '" href="javascript:void(0)" onclick="requisitioningOutWarehouseDetail(\'' + row.outOrderId + '\')"><i class="fa fa-edit"></i>详情</a> ');
                         }
 
                         /*退换货-出库*/
@@ -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;