From 338d039f30b8b4c9c622c7cd7ce5001f7a59f2fd Mon Sep 17 00:00:00 2001
From: liuxiaoxu <1793812695@qq.com>
Date: Fri, 31 May 2024 09:33:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=93=E5=BA=93=E5=85=A5=E5=BA=93=E5=8D=95?=
 =?UTF-8?q?=20=E6=96=B0=E5=A2=9E=20=E5=85=A5=E5=BA=93-=E7=94=9F=E4=BA=A7?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95(=E5=A7=94=E5=86=85=E5=85=A5=E5=BA=93)?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2storageMakeInDetail.html=20?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=AF=A6=E6=83=85=E6=8C=89=E9=92=AE=20?=
 =?UTF-8?q?=E5=90=8E=E7=AB=AF=E6=96=B0=E5=A2=9E=E8=AF=A6=E6=83=85=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=20=E4=BF=AE=E6=94=B9=E4=B9=8B=E5=89=8D=E4=BE=9B?=
 =?UTF-8?q?=E5=BA=94=E5=95=86=E7=89=A9=E7=90=86=E7=9B=B8=E5=85=B3=E5=92=8C?=
 =?UTF-8?q?=E5=AE=A2=E6=88=B7=E7=89=A9=E7=90=86=E7=9B=B8=E5=85=B3=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=8E=A5=E5=8F=A3=E7=9A=84URL=E8=B7=AF=E5=BE=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../WarehouseStorageOrderController.java      |  48 ++-
 .../warehouse/storageOrder/storageMake.html   |   2 +-
 .../storageOrder/storageMakeDetail.html       |   2 +-
 .../warehouse/storageOrder/storageMakeIn.html |   2 +-
 .../storageOrder/storageMakeInDetail.html     | 332 ++++++++++++++++++
 .../warehouse/storageOrder/storageOrder.html  |  10 +-
 .../storageOrder/storageOutOrder.html         |   2 +-
 .../storageOrder/storagePurchase.html         |   2 +-
 .../storagePurchaseWarehouse.html             |   2 +-
 .../storageOrder/storageRefundsExchanges.html |   2 +-
 .../storageOrder/temporaryOutOrder.html       |   2 +-
 .../storageOrder/temporaryPurchase.html       |   2 +-
 .../temporaryPurchaseWarehouse.html           |   2 +-
 13 files changed, 387 insertions(+), 23 deletions(-)
 create mode 100644 ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageMakeInDetail.html

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/controller/WarehouseStorageOrderController.java b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/controller/WarehouseStorageOrderController.java
index 5ad364e4..7b014cea 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/controller/WarehouseStorageOrderController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/controller/WarehouseStorageOrderController.java
@@ -146,7 +146,7 @@ public class WarehouseStorageOrderController extends BaseController
      * 暂收-采购单(仓库入库) 供应商物料详情列表
      */
     @ResponseBody
-    @RequestMapping("/temporaryPurchaseWarehouseDetail")
+    @RequestMapping("/temporaryPurchaseWarehouseDetailList")
     public Map<String,List<WarehouseStorageOrderDetail>> temporaryPurchaseWarehouseDetail(String warehouseStorageCode){
         List<WarehouseStorageOrderDetail> allDetails =  storageOrderDetailService.selectStorageOrderDetailListByCode(warehouseStorageCode);
         Map<String, List<WarehouseStorageOrderDetail>> groupedDetails = allDetails.stream().collect(Collectors.groupingBy(WarehouseStorageOrderDetail::getSupplierCode));
@@ -154,7 +154,6 @@ public class WarehouseStorageOrderController extends BaseController
     }
 
 
-
     /**
      * 暂收-采购单(采购入库)
      */
@@ -183,7 +182,7 @@ public class WarehouseStorageOrderController extends BaseController
      * 暂收-采购单(采购入库) 供应商物料详情列表
      */
     @ResponseBody
-    @RequestMapping("/temporaryPurchaseDetail")
+    @RequestMapping("/temporaryPurchaseDetailList")
     public Map<String,List<WarehouseStorageOrderDetail>> temporaryPurchaseDetail(String warehouseStorageCode){
         List<WarehouseStorageOrderDetail> allDetails =  storageOrderDetailService.selectStorageOrderDetailListByCode(warehouseStorageCode);
         Map<String, List<WarehouseStorageOrderDetail>> groupedDetails = allDetails.stream().collect(Collectors.groupingBy(WarehouseStorageOrderDetail::getSupplierCode));
@@ -219,7 +218,7 @@ public class WarehouseStorageOrderController extends BaseController
      * 暂收-委外订单 供应商物料详情列表
      */
     @ResponseBody
-    @RequestMapping("/temporaryOutOrderDetail")
+    @RequestMapping("/temporaryOutOrderDetailList")
     public Map<String,List<WarehouseStorageOrderDetail>> temporaryOutOrderDetail(String warehouseStorageCode){
         List<WarehouseStorageOrderDetail> allDetails =  storageOrderDetailService.selectStorageOrderDetailListByCode(warehouseStorageCode);
         Map<String, List<WarehouseStorageOrderDetail>> groupedDetails = allDetails.stream().collect(Collectors.groupingBy(WarehouseStorageOrderDetail::getSupplierCode));
@@ -256,7 +255,7 @@ public class WarehouseStorageOrderController extends BaseController
      * 入库-采购单(采购入库) 供应商物料详情列表
      */
     @ResponseBody
-    @RequestMapping("/storagePurchaseDetail")
+    @RequestMapping("/storagePurchaseDetailList")
     public Map<String,List<WarehouseStorageOrderDetail>> storagePurchaseDetail(String warehouseStorageCode){
         List<WarehouseStorageOrderDetail> allDetails =  storageOrderDetailService.selectStorageOrderDetailListByCode(warehouseStorageCode);
         Map<String, List<WarehouseStorageOrderDetail>> groupedDetails = allDetails.stream().collect(Collectors.groupingBy(WarehouseStorageOrderDetail::getSupplierCode));
@@ -293,7 +292,7 @@ public class WarehouseStorageOrderController extends BaseController
      * 入库-采购单(仓库入库) 供应商物料详情列表
      */
     @ResponseBody
-    @RequestMapping("/storagePurchaseWarehouseDetail")
+    @RequestMapping("/storagePurchaseWarehouseDetailList")
     public Map<String,List<WarehouseStorageOrderDetail>> storagePurchaseWarehouseDetail(String warehouseStorageCode){
         List<WarehouseStorageOrderDetail> allDetails =  storageOrderDetailService.selectStorageOrderDetailListByCode(warehouseStorageCode);
         Map<String, List<WarehouseStorageOrderDetail>> groupedDetails = allDetails.stream().collect(Collectors.groupingBy(WarehouseStorageOrderDetail::getSupplierCode));
@@ -329,7 +328,7 @@ public class WarehouseStorageOrderController extends BaseController
      * 入库-委外单 供应商物料详情列表
      */
     @ResponseBody
-    @RequestMapping("/storageOutOrderDetail")
+    @RequestMapping("/storageOutOrderDetailList")
     public Map<String,List<WarehouseStorageOrderDetail>> storageOutOrderDetail(String warehouseStorageCode){
         List<WarehouseStorageOrderDetail> allDetails =  storageOrderDetailService.selectStorageOrderDetailListByCode(warehouseStorageCode);
         Map<String, List<WarehouseStorageOrderDetail>> groupedDetails = allDetails.stream().collect(Collectors.groupingBy(WarehouseStorageOrderDetail::getSupplierCode));
@@ -363,7 +362,7 @@ public class WarehouseStorageOrderController extends BaseController
 
 
     /**
-     * 入库-生产订单(生产入库)
+     * 入库-生产订单(生产入库)详情
      */
     @GetMapping("/storageMakeDetail/{warehouseStorageId}")
     public String storageMakeDetail(@PathVariable("warehouseStorageId") Long warehouseStorageId, ModelMap mmap)
@@ -374,7 +373,7 @@ public class WarehouseStorageOrderController extends BaseController
     }
 
     /**
-     * 修改保存入库-生产订单(生产入库)
+     * 修改保存入库-生产订单(生产入库)详情
      */
     @RequiresPermissions("warehouse:storageOrder:storageMakeDetail")
     @Log(title = "仓库入库单", businessType = BusinessType.UPDATE)
@@ -390,7 +389,7 @@ public class WarehouseStorageOrderController extends BaseController
      * 入库-生产订单(生产入库) 客户物料详情列表
      */
     @ResponseBody
-    @RequestMapping("/storageMakeDetail")
+    @RequestMapping("/storageMakeDetailList")
     public Map<String,List<WarehouseStorageOrderDetail>> storageMakeDetail(String warehouseStorageCode){
         List<WarehouseStorageOrderDetail> allDetails =  storageOrderDetailService.selectStorageOrderDetailListByCode(warehouseStorageCode);
         Map<String, List<WarehouseStorageOrderDetail>> groupedDetails = allDetails.stream().collect(Collectors.groupingBy(WarehouseStorageOrderDetail::getCustomerId));
@@ -422,11 +421,36 @@ public class WarehouseStorageOrderController extends BaseController
     }
 
 
+
+
+    /**
+     * 入库-生产订单(委内入库)
+     */
+    @GetMapping("/storageMakeInDetail/{warehouseStorageId}")
+    public String storageMakeInDetail(@PathVariable("warehouseStorageId") Long warehouseStorageId, ModelMap mmap)
+    {
+        WarehouseStorageOrder warehouseStorageOrder = warehouseStorageOrderService.selectWarehouseStorageOrderById(warehouseStorageId);
+        mmap.put("warehouseStorageOrder", warehouseStorageOrder);
+        return prefix + "/storageMakeInDetail";
+    }
+
+    /**
+     * 修改保存入库-生产订单(委内入库)
+     */
+    @RequiresPermissions("warehouse:storageOrder:storageMakeInDetail")
+    @Log(title = "仓库入库单", businessType = BusinessType.UPDATE)
+    @PostMapping("/storageMakeInDetail")
+    @ResponseBody
+    public AjaxResult storageMakeInDetailSave(@RequestBody WarehouseStorageOrder warehouseStorageOrder)
+    {
+        return toAjax(warehouseStorageOrderService.updateStorageMake(warehouseStorageOrder));
+    }
+
     /**
      * 入库-生产订单(委内入库) 客户物料详情列表
      */
     @ResponseBody
-    @RequestMapping("/storageMakeInDetail")
+    @RequestMapping("/storageMakeInDetailList")
     public Map<String,List<WarehouseStorageOrderDetail>> storageMakeInDetail(String warehouseStorageCode){
         List<WarehouseStorageOrderDetail> allDetails =  storageOrderDetailService.selectStorageOrderDetailListByCode(warehouseStorageCode);
         Map<String, List<WarehouseStorageOrderDetail>> groupedDetails = allDetails.stream().collect(Collectors.groupingBy(WarehouseStorageOrderDetail::getCustomerId));
@@ -462,7 +486,7 @@ public class WarehouseStorageOrderController extends BaseController
      * 入库-退换货单 客户物料详情列表
      */
     @ResponseBody
-    @RequestMapping("/storageRefundsExchangesDetail")
+    @RequestMapping("/storageRefundsExchangesDetailList")
     public Map<String,List<WarehouseStorageOrderDetail>> storageRefundsExchangesDetail(String warehouseStorageCode){
         List<WarehouseStorageOrderDetail> allDetails =  storageOrderDetailService.selectStorageOrderDetailListByCode(warehouseStorageCode);
         Map<String, List<WarehouseStorageOrderDetail>> groupedDetails = allDetails.stream().collect(Collectors.groupingBy(WarehouseStorageOrderDetail::getCustomerId));
diff --git a/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageMake.html b/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageMake.html
index 4f83de07..6e387af9 100644
--- a/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageMake.html
+++ b/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageMake.html
@@ -163,7 +163,7 @@
         // 假设qualityOrderCode已经定义或者可以通过某种方式获取到
         var warehouseStorageCode = [[${warehouseStorageOrder.warehouseStorageCode}]]; // 这里需要实际赋值，比如从前端某个地方读取
 
-        $.getJSON(prefix + "/storageMakeDetail?warehouseStorageCode=" + warehouseStorageCode, function(data) {
+        $.getJSON(prefix + "/storageMakeDetailList?warehouseStorageCode=" + warehouseStorageCode, function(data) {
             for (var customerId in data) {
                 if (data.hasOwnProperty(customerId)) {
                     var customerData = data[customerId];
diff --git a/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageMakeDetail.html b/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageMakeDetail.html
index 9a4f41da..c2374ee8 100644
--- a/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageMakeDetail.html
+++ b/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageMakeDetail.html
@@ -163,7 +163,7 @@
         // 假设qualityOrderCode已经定义或者可以通过某种方式获取到
         var warehouseStorageCode = [[${warehouseStorageOrder.warehouseStorageCode}]]; // 这里需要实际赋值，比如从前端某个地方读取
 
-        $.getJSON(prefix + "/storageMakeDetail?warehouseStorageCode=" + warehouseStorageCode, function(data) {
+        $.getJSON(prefix + "/storageMakeDetailList?warehouseStorageCode=" + warehouseStorageCode, function(data) {
             for (var customerId in data) {
                 if (data.hasOwnProperty(customerId)) {
                     var customerData = data[customerId];
diff --git a/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageMakeIn.html b/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageMakeIn.html
index ffece872..681bd845 100644
--- a/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageMakeIn.html
+++ b/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageMakeIn.html
@@ -163,7 +163,7 @@
         // 假设qualityOrderCode已经定义或者可以通过某种方式获取到
         var warehouseStorageCode = [[${warehouseStorageOrder.warehouseStorageCode}]]; // 这里需要实际赋值，比如从前端某个地方读取
 
-        $.getJSON(prefix + "/storageMakeInDetail?warehouseStorageCode=" + warehouseStorageCode, function(data) {
+        $.getJSON(prefix + "/storageMakeInDetailList?warehouseStorageCode=" + warehouseStorageCode, function(data) {
             for (var customerId in data) {
                 if (data.hasOwnProperty(customerId)) {
                     var customerData = data[customerId];
diff --git a/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageMakeInDetail.html b/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageMakeInDetail.html
new file mode 100644
index 00000000..a95ac1a8
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageMakeInDetail.html
@@ -0,0 +1,332 @@
+<!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" />
+    <style>
+
+        .supplier-value span {
+            margin-right: 10px;
+        }
+
+    </style>
+</head>
+<body class="white-bg">
+<div class="wrapper wrapper-content animated fadeInRight ibox-content">
+    <form class="form-horizontal m" id="form-temporaryPurchaseWarehouse-edit" th:object="${warehouseStorageOrder}">
+        <input name="warehouseStorageId" th:field="*{warehouseStorageId}" type="hidden">
+        <div class="form-group">
+            <label class="col-sm-3 control-label">入库单号：</label>
+            <div class="col-sm-8">
+                <input name="warehouseStorageCode" th:field="*{warehouseStorageCode}" class="form-control" type="text" readonly>
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">关联单号：</label>
+            <div class="col-sm-8">
+                <input name="relatedOrderCode" th:field="*{relatedOrderCode}" class="form-control" type="text" readonly>
+            </div>
+        </div>
+        <div class="col-xs-12">
+            <label class="col-sm-1 control-label">入库类型：</label>
+            <div class="col-sm-4">
+                <select name="warehouseStorageType" class="form-control m-b" th:with="type=${@dict.getType('warehouse_storage_type')}" disabled>
+                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{warehouseStorageType}"></option>
+                </select>
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">到货时间：</label>
+            <div class="col-sm-8">
+                <div class="input-group date">
+                    <input name="arrivedTime" th:value="${#dates.format(warehouseStorageOrder.arrivedTime, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text" readonly>
+                    <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                </div>
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">交检时间：</label>
+            <div class="col-sm-8">
+                <div class="input-group date">
+                    <input name="deliveryInspectionTime" th:value="${#dates.format(warehouseStorageOrder.deliveryInspectionTime, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text" disabled>
+                    <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                </div>
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-4 control-label is-required">仓库ID：</label>
+            <div class="col-sm-8">
+                <select class="form-control" id="warehouseCode" name="warehouseCode" th:field="*{warehouseCode}" required disabled>
+                    <!-- 这里动态生成仓库ID选项 -->
+                </select>
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-4 control-label">仓库名称：</label>
+            <div class="col-sm-8">
+                <input name="warehouseName" th:field="*{warehouseName}" 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="warehouseDetailAddress" th:field="*{warehouseDetailAddress}" class="form-control" type="text" disabled>
+            </div>
+        </div>
+
+        <div class="container">
+            <!--客户物料相关-->
+            <div class="row">
+                <div class="col-sm-12" id="tablesContainer">
+                    <!-- 表格将在这里动态生成 -->
+                </div>
+            </div>
+        </div>
+    </form>
+</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 warehouseStorageCode = [[${warehouseStorageOrder.warehouseStorageCode}]]
+    var warehouseCode = [[${warehouseStorageOrder.warehouseCode}]]
+    var prefix = ctx + "warehouse/storageOrder";
+    $("#form-temporaryPurchaseWarehouse-edit").validate({
+        focusCleanup: true
+    });
+
+    //生成的不同table的id集合
+    var tableDatas = [];
+
+    function submitHandler() {
+        const storageOrderData = $("#form-temporaryPurchaseWarehouse-edit").serializeArray().reduce((obj, item) => {
+            obj[item.name] = item.value;
+            return obj;
+        }, {});
+        // 初始化一个数组用于存放所有表格的数据
+        let allMaterialDataList = [];
+        for(let i in tableDatas){
+            $('#' + tableDatas[i]).each(function() {
+                const tableData = $(this).bootstrapTable('getData');
+                console.log(JSON.stringify(tableData));
+                // 将表数据转换成与qualityReportData格式一致的数组
+                var materialDataList = tableData.map(function (item) {
+                    // 根据实际字段名调整
+                    return {
+                        "customerId": item.customerId,
+                        "materialNo": item.materialNo,
+                        "materialName": item.materialName,
+                        "materialType": item.materialType,
+                        "materialPhotourl": item.materialPhotourl,
+                        "materialDescribe": item.materialDescribe,
+                        "materialBrand": item.materialBrand,
+                        "materialUnit": item.materialUnit,
+                        "materialProcessMethod": item.materialProcessMethod,
+                        "qualityHasQualifiedNum": item.qualityHasQualifiedNum,
+                        "hasStorageNum": item.hasStorageNum,
+                        "makeStorageNum": item.makeStorageNum,
+                        "storageNum": item.storageNum,
+                        "storageLocation": item.storageLocation,
+                        // ...其他字段
+                    };
+                });
+                allMaterialDataList = allMaterialDataList.concat(materialDataList);
+            });
+        }
+
+        const combinedData = Object.assign({}, storageOrderData, {
+            warehouseStorageOrderDetailList: allMaterialDataList
+        });
+        // 合并表单数据和表格数据
+        // const combinedData = Object.assign({}, ...complaintNoticeData.array(item => ({ [item.name]: item.value })), ...materialData);
+        console.log(combinedData)
+        // 使用 JSON.stringify() 序列化数据
+        const jsonData = JSON.stringify(combinedData);
+        // 发送 AJAX 请求到后端接口
+        $.operate.saveJson(prefix + "/storageMake", jsonData);
+    }
+
+    $("input[name='arrivedTime']").datetimepicker({
+        format: "yyyy-mm-dd",
+        minView: "month",
+        autoclose: true
+    });
+
+    $("input[name='deliveryInspectionTime']").datetimepicker({
+        format: "yyyy-mm-dd",
+        minView: "month",
+        autoclose: true
+    });
+
+    $(function() {
+        // 假设qualityOrderCode已经定义或者可以通过某种方式获取到
+        var warehouseStorageCode = [[${warehouseStorageOrder.warehouseStorageCode}]]; // 这里需要实际赋值，比如从前端某个地方读取
+
+        $.getJSON(prefix + "/storageMakeInDetailList?warehouseStorageCode=" + warehouseStorageCode, function(data) {
+            for (var customerId in data) {
+                if (data.hasOwnProperty(customerId)) {
+                    var customerData = data[customerId];
+                    createTableForCustomer(customerId, customerData);
+                }
+            }
+        });
+    });
+    function createTableForCustomer(customerId, customerData) {
+        var tableId = 'bootstrap-table-' + customerId.replace(/[^a-z0-9]/gi, '_').toLowerCase();
+        tableDatas.push(tableId);
+        var $tableWrapper = $('<div class="table-responsive mt-3"></div>');
+
+        // 确保customerData至少有一条记录，并从中提取客户详细信息
+        var customerInfo = customerData.length > 0 ? customerData[0] : {}; // 默认为空对象，以防数据不存在
+
+        // 构建含有额外客户信息的标题字符串
+        var headerTitle ='客户'+'</br>'+customerId + ' -  ' + (customerInfo.customerName || 'N/A') +
+            ' </br> ' + (customerInfo.customerContactPeople || 'N/A') +
+            ' - ' + (customerInfo.customerContactNumber || 'N/A') +
+            ' - ' + (customerInfo.customerCompanyAddress || 'N/A');
+
+        var $header = $('<h4>' + headerTitle + '</h4>');
+        var $table = $('<table id="' + tableId + '" class="table table-striped table-bordered"></table>');
+
+        $table.bootstrapTable({
+            data: customerData,
+            columns: [{
+                checkbox: true
+            },
+                {
+                    title: '客户ID',
+                    field: 'customerId',
+                    visible: false
+                },
+                {
+                    title: '料号',
+                    field: 'materialNo'
+                }, {
+                    title: '物料名称',
+                    field: 'materialName'
+                },
+                {
+                    title: '物料类型',
+                    field: 'materialType',
+                },
+                {
+                    title: '物料图片地址',
+                    field: 'materialPhotourl',
+                },
+                {
+                    title: '物料描述',
+                    field: 'materialDescribe',
+                },
+                {
+                    title: '物料品牌',
+                    field: 'materialBrand',
+                },
+                {
+                    title: '物料单位',
+                    field: 'materialUnit',
+                },
+                {
+                    title: '物料加工方式',
+                    field: 'materialProcessMethod',
+                },
+                {
+                    title: '订单数',
+                    field: 'makeTotal',
+                },
+                {
+                    title: '品质已合格数',
+                    field: 'qualityHasQualifiedNum',
+                },
+                {
+                    title: '已入库数',
+                    field: 'hasStorageNum',
+                },
+                {
+                    title: '生产入库数',
+                    field: 'makeStorageNum',
+                },
+                {
+                    title: '入库数',
+                    field: 'storageNum',
+                },
+                {
+                    title: '存放位置',
+                    field: 'storageLocation',
+                }]
+        });
+
+        $tableWrapper.append($header).append($table);
+        $('#tablesContainer').append($tableWrapper);
+    }
+
+
+
+    //根据仓库ID查询仓库名称
+    $(document).ready(function() {
+        // 初始化时默认加载仓库ID列表
+        loadWarehouseCodes();
+
+        // 监听仓库ID下拉框的变化
+        $('#warehouseCode').on('change', function() {
+            var selectedWarehouseCode = $(this).val(); // 获取选中的仓库ID
+            if (selectedWarehouseCode) {
+                // 发起Ajax请求获取仓库名称
+                $.ajax({
+                    type: 'GET',
+                    url: ctx +'stock/stockInfo/getStockNameByWarehouseCode/' + selectedWarehouseCode,
+                    dataType: 'json', // 假设返回的数据格式是JSON
+                    success: function(data) {
+                        console.log(data);
+                        // 将获取到的仓库名称填充到输入框
+                        if(data.data == null){
+                            // 如果返回的数据有问题，可以给出提示或处理
+                            $.modal.alertWarning('未能获取到仓库名称！');
+                        }
+                        $('input[name="warehouseName"]').val(data.data.stockname);
+                    },
+                    error: function(jqXHR, textStatus, errorThrown) {
+                        console.error('Error:', textStatus, errorThrown);
+                        $.modal.alertWarning('查询仓库名称时发生错误！');
+                    }
+                });
+            } else {
+                // 如果没有选择仓库ID，清空仓库名称输入框
+                $('input[name="warehouseName"]').val('');
+            }
+        });
+    });
+
+
+    // 加载仓库Id列表函数
+    function loadWarehouseCodes() {
+        var url = ctx + 'stock/stockInfo/getAllWarehouseCode';
+        $.ajax({
+            type: 'GET', // 请求类型
+            url: url, // 后端接口URL
+            dataType: 'json', // 预期服务器返回的数据类型
+            success: function(data) {
+                if (data && Array.isArray(data)) {
+                    var selectElement = $('#warehouseCode'); // 获取仓库编号下拉框元素
+                    // 清空下拉框现有选项
+                    selectElement.empty();
+
+                    // 添加默认选项（如果需要）编辑时不需要添加默认选项
+                    selectElement.append('<option value="">所有</option>');
+
+                    // 遍历返回的数据，添加为下拉框的选项
+                    $.each(data, function(index, item) {
+                        // 仓库ID
+                        selectElement.append('<option value="' + item.stockNO + '">' + item.stockNO + '</option>');
+                    });
+                    // $('#warehouseCode').val(stockNO);
+                } else {
+                    $.modal.errMsg("数据为空");
+                }
+            }
+        });
+    }
+
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageOrder.html b/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageOrder.html
index 3b087079..cbfdac32 100644
--- a/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageOrder.html
+++ b/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageOrder.html
@@ -85,8 +85,9 @@
         var storageMakeInFlag = [[${@permission.hasPermi('warehouse:storageOrder:storageMakeIn')}]];
         var storageRefundsExchangesFlag = [[${@permission.hasPermi('warehouse:storageOrder:storageRefundsExchanges')}]];
 
-
         var storageMakeDetailFlag = [[${@permission.hasPermi('warehouse:storageOrder:storageMakeDetail')}]];
+        var storageMakeInDetailFlag = [[${@permission.hasPermi('warehouse:storageOrder:storageMakeInDetail')}]];
+
 
         var warehouseStorageStatusDatas = [[${@dict.getType('warehouse_storage_status')}]];
         var warehouseQualityStatusDatas = [[${@dict.getType('warehouse_quality_status')}]];
@@ -270,6 +271,7 @@
                         /*入库-生产订单(委内入库)*/
                         if ( row.warehouseStorageType == 2 && row.warehouseDeptType == 1 && row.warehouseOrderType == 1 && (row.warehouseStorageStatus == 2 || row.warehouseStorageStatus == 3) ){
                             actions.push('<a class="btn btn-success btn-xs ' + storageMakeInFlag + '" href="javascript:void(0)" onclick="storageMakeIn(\'' + row.warehouseStorageId + '\')"><i class="fa fa-edit"></i>入库</a> ');
+                            actions.push('<a class="btn btn-success btn-xs ' + storageMakeInDetailFlag + '" href="javascript:void(0)" onclick="storageMakeInDetail(\'' + row.warehouseStorageId + '\')"><i class="fa fa-edit"></i>详情</a> ');
                         }
 
                         /*入库-退换货单*/
@@ -338,6 +340,12 @@
             $.modal.open("入库",url);
         };
 
+        /*入库-生产订单(委内入库)详情*/
+        function storageMakeInDetail(warehouseStorageId){
+            var url = ctx + 'warehouse/storageOrder/storageMakeInDetail/' + warehouseStorageId;
+            $.modal.open("详情",url);
+        };
+
         /*入库-退换货单*/
         function storageRefundsExchanges(warehouseStorageId){
             var url = ctx + 'warehouse/storageOrder/storageRefundsExchanges/' + warehouseStorageId;
diff --git a/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageOutOrder.html b/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageOutOrder.html
index 884447cf..75e81a5d 100644
--- a/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageOutOrder.html
+++ b/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageOutOrder.html
@@ -170,7 +170,7 @@
         // 假设qualityOrderCode已经定义或者可以通过某种方式获取到
         var warehouseStorageCode = [[${warehouseStorageOrder.warehouseStorageCode}]]; // 这里需要实际赋值，比如从前端某个地方读取
 
-        $.getJSON(prefix + "/storageOutOrderDetail?warehouseStorageCode=" + warehouseStorageCode, function(data) {
+        $.getJSON(prefix + "/storageOutOrderDetailList?warehouseStorageCode=" + warehouseStorageCode, function(data) {
             for (var supplierCode in data) {
                 if (data.hasOwnProperty(supplierCode)) {
                     var supplierData = data[supplierCode];
diff --git a/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storagePurchase.html b/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storagePurchase.html
index f8554359..9b5fcbe7 100644
--- a/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storagePurchase.html
+++ b/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storagePurchase.html
@@ -170,7 +170,7 @@
         // 假设qualityOrderCode已经定义或者可以通过某种方式获取到
         var warehouseStorageCode = [[${warehouseStorageOrder.warehouseStorageCode}]]; // 这里需要实际赋值，比如从前端某个地方读取
 
-        $.getJSON(prefix + "/storagePurchaseDetail?warehouseStorageCode=" + warehouseStorageCode, function(data) {
+        $.getJSON(prefix + "/storagePurchaseDetailList?warehouseStorageCode=" + warehouseStorageCode, function(data) {
             for (var supplierCode in data) {
                 if (data.hasOwnProperty(supplierCode)) {
                     var supplierData = data[supplierCode];
diff --git a/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storagePurchaseWarehouse.html b/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storagePurchaseWarehouse.html
index 7d32ea08..3748e265 100644
--- a/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storagePurchaseWarehouse.html
+++ b/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storagePurchaseWarehouse.html
@@ -170,7 +170,7 @@
         // 假设qualityOrderCode已经定义或者可以通过某种方式获取到
         var warehouseStorageCode = [[${warehouseStorageOrder.warehouseStorageCode}]]; // 这里需要实际赋值，比如从前端某个地方读取
 
-        $.getJSON(prefix + "/storagePurchaseWarehouseDetail?warehouseStorageCode=" + warehouseStorageCode, function(data) {
+        $.getJSON(prefix + "/storagePurchaseWarehouseDetailList?warehouseStorageCode=" + warehouseStorageCode, function(data) {
             for (var supplierCode in data) {
                 if (data.hasOwnProperty(supplierCode)) {
                     var supplierData = data[supplierCode];
diff --git a/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageRefundsExchanges.html b/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageRefundsExchanges.html
index b2a13f8b..179b4d28 100644
--- a/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageRefundsExchanges.html
+++ b/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageRefundsExchanges.html
@@ -162,7 +162,7 @@
         // 假设qualityOrderCode已经定义或者可以通过某种方式获取到
         var warehouseStorageCode = [[${warehouseStorageOrder.warehouseStorageCode}]]; // 这里需要实际赋值，比如从前端某个地方读取
 
-        $.getJSON(prefix + "/storageRefundsExchangesDetail?warehouseStorageCode=" + warehouseStorageCode, function(data) {
+        $.getJSON(prefix + "/storageRefundsExchangesDetailList?warehouseStorageCode=" + warehouseStorageCode, function(data) {
             for (var supplierCode in data) {
                 if (data.hasOwnProperty(supplierCode)) {
                     var supplierData = data[supplierCode];
diff --git a/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/temporaryOutOrder.html b/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/temporaryOutOrder.html
index 697e8abd..74ee48de 100644
--- a/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/temporaryOutOrder.html
+++ b/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/temporaryOutOrder.html
@@ -168,7 +168,7 @@
         // 假设qualityOrderCode已经定义或者可以通过某种方式获取到
         var warehouseStorageCode = [[${warehouseStorageOrder.warehouseStorageCode}]]; // 这里需要实际赋值，比如从前端某个地方读取
 
-        $.getJSON(prefix + "/temporaryOutOrderDetail?warehouseStorageCode=" + warehouseStorageCode, function(data) {
+        $.getJSON(prefix + "/temporaryOutOrderDetailList?warehouseStorageCode=" + warehouseStorageCode, function(data) {
             for (var supplierCode in data) {
                 if (data.hasOwnProperty(supplierCode)) {
                     var supplierData = data[supplierCode];
diff --git a/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/temporaryPurchase.html b/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/temporaryPurchase.html
index fc5d4873..b34a95ea 100644
--- a/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/temporaryPurchase.html
+++ b/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/temporaryPurchase.html
@@ -167,7 +167,7 @@
         // 假设qualityOrderCode已经定义或者可以通过某种方式获取到
         var warehouseStorageCode = [[${warehouseStorageOrder.warehouseStorageCode}]]; // 这里需要实际赋值，比如从前端某个地方读取
 
-        $.getJSON(prefix + "/temporaryPurchaseDetail?warehouseStorageCode=" + warehouseStorageCode, function(data) {
+        $.getJSON(prefix + "/temporaryPurchaseDetailList?warehouseStorageCode=" + warehouseStorageCode, function(data) {
             for (var supplierCode in data) {
                 if (data.hasOwnProperty(supplierCode)) {
                     var supplierData = data[supplierCode];
diff --git a/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/temporaryPurchaseWarehouse.html b/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/temporaryPurchaseWarehouse.html
index 76604e81..8b435b20 100644
--- a/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/temporaryPurchaseWarehouse.html
+++ b/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/temporaryPurchaseWarehouse.html
@@ -168,7 +168,7 @@
         // 假设qualityOrderCode已经定义或者可以通过某种方式获取到
         var warehouseStorageCode = [[${warehouseStorageOrder.warehouseStorageCode}]]; // 这里需要实际赋值，比如从前端某个地方读取
 
-        $.getJSON(prefix + "/temporaryPurchaseWarehouseDetail?warehouseStorageCode=" + warehouseStorageCode, function(data) {
+        $.getJSON(prefix + "/temporaryPurchaseWarehouseDetailList?warehouseStorageCode=" + warehouseStorageCode, function(data) {
             for (var supplierCode in data) {
                 if (data.hasOwnProperty(supplierCode)) {
                     var supplierData = data[supplierCode];