diff --git a/erp_web/js/pages/materials/allocation_out_list.js b/erp_web/js/pages/materials/allocation_out_list.js
index 7b028507..799b2376 100644
--- a/erp_web/js/pages/materials/allocation_out_list.js
+++ b/erp_web/js/pages/materials/allocation_out_list.js
@@ -1940,56 +1940,33 @@ function bindEvent(){
 function showDepotHeadDetails(pageNo,pageSize){
     var materialParam = $.trim($("#searchMaterial").val());
     $.ajax({
-        type:"get",
-        url: "/depotItem/getHeaderIdByMaterial",
+        type: "get",
+        url: "/depotHead/list",
         dataType: "json",
         data: ({
-            materialParam: materialParam,
-            depotIds: depotString
+            search: JSON.stringify({
+                type: listType,
+                subType: listSubType,
+                state: $.trim($("#searchState").val()),
+                number: $.trim($("#searchNumber").val()),
+                beginTime: $("#searchBeginTime").val(),
+                endTime: $("#searchEndTime").val(),
+                materialParam: materialParam,
+                depotIds: depotString
+            }),
+            currentPage: pageNo,
+            pageSize: pageSize
         }),
         success: function (res) {
-            if(res && res.code === 200) {
-                var ids = res.data;
-                if(ids){
-                    $.ajax({
-                        type: "get",
-                        url: "/depotHead/list",
-                        dataType: "json",
-                        data: ({
-                            search: JSON.stringify({
-                                type: listType,
-                                subType: listSubType,
-                                state: $.trim($("#searchState").val()),
-                                number: $.trim($("#searchNumber").val()),
-                                beginTime: $("#searchBeginTime").val(),
-                                endTime: $("#searchEndTime").val(),
-                                dhIds: ids
-                            }),
-                            currentPage: pageNo,
-                            pageSize: pageSize
-                        }),
-                        success: function (res) {
-                            if(res && res.code === 200){
-                                if(res.data && res.data.page) {
-                                    $("#tableData").datagrid('loadData', res.data.page);
-                                }
-                            }
-                        },
-                        //此处添加错误处理
-                        error: function () {
-                            $.messager.alert('查询提示', '查询数据后台异常，请稍后再试！', 'error');
-                            return;
-                        }
-                    });
-                }
-                else {
-                    $("#tableData").datagrid('loadData', []);
+            if(res && res.code === 200){
+                if(res.data && res.data.page) {
+                    $("#tableData").datagrid('loadData', res.data.page);
                 }
             }
         },
         //此处添加错误处理
-        error:function() {
-            $.messager.alert('查询提示','查询数据后台异常，请稍后再试！','error');
+        error: function () {
+            $.messager.alert('查询提示', '查询数据后台异常，请稍后再试！', 'error');
             return;
         }
     });
diff --git a/erp_web/js/pages/materials/assemble_list.js b/erp_web/js/pages/materials/assemble_list.js
index 740d8162..647e7a8d 100644
--- a/erp_web/js/pages/materials/assemble_list.js
+++ b/erp_web/js/pages/materials/assemble_list.js
@@ -1938,56 +1938,33 @@ function bindEvent(){
 function showDepotHeadDetails(pageNo,pageSize){
     var materialParam = $.trim($("#searchMaterial").val());
     $.ajax({
-        type:"get",
-        url: "/depotItem/getHeaderIdByMaterial",
+        type: "get",
+        url: "/depotHead/list",
         dataType: "json",
         data: ({
-            materialParam: materialParam,
-            depotIds: depotString
+            search: JSON.stringify({
+                type: listType,
+                subType: listSubType,
+                state: $.trim($("#searchState").val()),
+                number: $.trim($("#searchNumber").val()),
+                beginTime: $("#searchBeginTime").val(),
+                endTime: $("#searchEndTime").val(),
+                materialParam: materialParam,
+                depotIds: depotString
+            }),
+            currentPage: pageNo,
+            pageSize: pageSize
         }),
         success: function (res) {
-            if(res && res.code === 200) {
-                var ids = res.data;
-                if(ids){
-                    $.ajax({
-                        type: "get",
-                        url: "/depotHead/list",
-                        dataType: "json",
-                        data: ({
-                            search: JSON.stringify({
-                                type: listType,
-                                subType: listSubType,
-                                state: $.trim($("#searchState").val()),
-                                number: $.trim($("#searchNumber").val()),
-                                beginTime: $("#searchBeginTime").val(),
-                                endTime: $("#searchEndTime").val(),
-                                dhIds: ids
-                            }),
-                            currentPage: pageNo,
-                            pageSize: pageSize
-                        }),
-                        success: function (res) {
-                            if(res && res.code === 200){
-                                if(res.data && res.data.page) {
-                                    $("#tableData").datagrid('loadData', res.data.page);
-                                }
-                            }
-                        },
-                        //此处添加错误处理
-                        error: function () {
-                            $.messager.alert('查询提示', '查询数据后台异常，请稍后再试！', 'error');
-                            return;
-                        }
-                    });
-                }
-                else {
-                    $("#tableData").datagrid('loadData', []);
+            if(res && res.code === 200){
+                if(res.data && res.data.page) {
+                    $("#tableData").datagrid('loadData', res.data.page);
                 }
             }
         },
         //此处添加错误处理
-        error:function() {
-            $.messager.alert('查询提示','查询数据后台异常，请稍后再试！','error');
+        error: function () {
+            $.messager.alert('查询提示', '查询数据后台异常，请稍后再试！', 'error');
             return;
         }
     });
diff --git a/erp_web/js/pages/materials/disassemble_list.js b/erp_web/js/pages/materials/disassemble_list.js
index c87b105d..7132076d 100644
--- a/erp_web/js/pages/materials/disassemble_list.js
+++ b/erp_web/js/pages/materials/disassemble_list.js
@@ -1942,61 +1942,37 @@ function bindEvent(){
 function showDepotHeadDetails(pageNo,pageSize){
     var materialParam = $.trim($("#searchMaterial").val());
     $.ajax({
-        type:"get",
-        url: "/depotItem/getHeaderIdByMaterial",
+        type: "get",
+        url: "/depotHead/list",
         dataType: "json",
         data: ({
-            materialParam: materialParam,
-            depotIds: depotString
+            search: JSON.stringify({
+                type: listType,
+                subType: listSubType,
+                state: $.trim($("#searchState").val()),
+                number: $.trim($("#searchNumber").val()),
+                beginTime: $("#searchBeginTime").val(),
+                endTime: $("#searchEndTime").val(),
+                materialParam: materialParam,
+                depotIds: depotString
+            }),
+            currentPage: pageNo,
+            pageSize: pageSize
         }),
         success: function (res) {
-            if(res && res.code === 200) {
-                var ids = res.data;
-                if(ids){
-                    $.ajax({
-                        type: "get",
-                        url: "/depotHead/list",
-                        dataType: "json",
-                        data: ({
-                            search: JSON.stringify({
-                                type: listType,
-                                subType: listSubType,
-                                state: $.trim($("#searchState").val()),
-                                number: $.trim($("#searchNumber").val()),
-                                beginTime: $("#searchBeginTime").val(),
-                                endTime: $("#searchEndTime").val(),
-                                dhIds: ids
-                            }),
-                            currentPage: pageNo,
-                            pageSize: pageSize
-                        }),
-                        success: function (res) {
-                            if(res && res.code === 200){
-                                if(res.data && res.data.page) {
-                                    $("#tableData").datagrid('loadData', res.data.page);
-                                }
-                            }
-                        },
-                        //此处添加错误处理
-                        error: function () {
-                            $.messager.alert('查询提示', '查询数据后台异常，请稍后再试！', 'error');
-                            return;
-                        }
-                    });
-                }
-                else {
-                    $("#tableData").datagrid('loadData', []);
+            if(res && res.code === 200){
+                if(res.data && res.data.page) {
+                    $("#tableData").datagrid('loadData', res.data.page);
                 }
             }
         },
         //此处添加错误处理
-        error:function() {
-            $.messager.alert('查询提示','查询数据后台异常，请稍后再试！','error');
+        error: function () {
+            $.messager.alert('查询提示', '查询数据后台异常，请稍后再试！', 'error');
             return;
         }
     });
 }
-
 //自动计算事件
 function autoReckon() {
     //延时绑定事件
diff --git a/erp_web/js/pages/materials/other_in_list.js b/erp_web/js/pages/materials/other_in_list.js
index c58b9b5a..ed8eadac 100644
--- a/erp_web/js/pages/materials/other_in_list.js
+++ b/erp_web/js/pages/materials/other_in_list.js
@@ -2026,56 +2026,33 @@ function bindEvent(){
 function showDepotHeadDetails(pageNo,pageSize){
     var materialParam = $.trim($("#searchMaterial").val());
     $.ajax({
-        type:"get",
-        url: "/depotItem/getHeaderIdByMaterial",
+        type: "get",
+        url: "/depotHead/list",
         dataType: "json",
         data: ({
-            materialParam: materialParam,
-            depotIds: depotString
+            search: JSON.stringify({
+                type: listType,
+                subType: listSubType,
+                state: $.trim($("#searchState").val()),
+                number: $.trim($("#searchNumber").val()),
+                beginTime: $("#searchBeginTime").val(),
+                endTime: $("#searchEndTime").val(),
+                materialParam: materialParam,
+                depotIds: depotString
+            }),
+            currentPage: pageNo,
+            pageSize: pageSize
         }),
         success: function (res) {
-            if(res && res.code === 200) {
-                var ids = res.data;
-                if(ids){
-                    $.ajax({
-                        type: "get",
-                        url: "/depotHead/list",
-                        dataType: "json",
-                        data: ({
-                            search: JSON.stringify({
-                                type: listType,
-                                subType: listSubType,
-                                state: $.trim($("#searchState").val()),
-                                number: $.trim($("#searchNumber").val()),
-                                beginTime: $("#searchBeginTime").val(),
-                                endTime: $("#searchEndTime").val(),
-                                dhIds: ids
-                            }),
-                            currentPage: pageNo,
-                            pageSize: pageSize
-                        }),
-                        success: function (res) {
-                            if(res && res.code === 200){
-                                if(res.data && res.data.page) {
-                                    $("#tableData").datagrid('loadData', res.data.page);
-                                }
-                            }
-                        },
-                        //此处添加错误处理
-                        error: function () {
-                            $.messager.alert('查询提示', '查询数据后台异常，请稍后再试！', 'error');
-                            return;
-                        }
-                    });
-                }
-                else {
-                    $("#tableData").datagrid('loadData', []);
+            if(res && res.code === 200){
+                if(res.data && res.data.page) {
+                    $("#tableData").datagrid('loadData', res.data.page);
                 }
             }
         },
         //此处添加错误处理
-        error:function() {
-            $.messager.alert('查询提示','查询数据后台异常，请稍后再试！','error');
+        error: function () {
+            $.messager.alert('查询提示', '查询数据后台异常，请稍后再试！', 'error');
             return;
         }
     });
diff --git a/erp_web/js/pages/materials/other_out_list.js b/erp_web/js/pages/materials/other_out_list.js
index 13cdbd06..bab7afd2 100644
--- a/erp_web/js/pages/materials/other_out_list.js
+++ b/erp_web/js/pages/materials/other_out_list.js
@@ -1936,56 +1936,33 @@ function bindEvent(){
 function showDepotHeadDetails(pageNo,pageSize){
     var materialParam = $.trim($("#searchMaterial").val());
     $.ajax({
-        type:"get",
-        url: "/depotItem/getHeaderIdByMaterial",
+        type: "get",
+        url: "/depotHead/list",
         dataType: "json",
         data: ({
-            materialParam: materialParam,
-            depotIds: depotString
+            search: JSON.stringify({
+                type: listType,
+                subType: listSubType,
+                state: $.trim($("#searchState").val()),
+                number: $.trim($("#searchNumber").val()),
+                beginTime: $("#searchBeginTime").val(),
+                endTime: $("#searchEndTime").val(),
+                materialParam: materialParam,
+                depotIds: depotString
+            }),
+            currentPage: pageNo,
+            pageSize: pageSize
         }),
         success: function (res) {
-            if(res && res.code === 200) {
-                var ids = res.data;
-                if(ids){
-                    $.ajax({
-                        type: "get",
-                        url: "/depotHead/list",
-                        dataType: "json",
-                        data: ({
-                            search: JSON.stringify({
-                                type: listType,
-                                subType: listSubType,
-                                state: $.trim($("#searchState").val()),
-                                number: $.trim($("#searchNumber").val()),
-                                beginTime: $("#searchBeginTime").val(),
-                                endTime: $("#searchEndTime").val(),
-                                dhIds: ids
-                            }),
-                            currentPage: pageNo,
-                            pageSize: pageSize
-                        }),
-                        success: function (res) {
-                            if(res && res.code === 200){
-                                if(res.data && res.data.page) {
-                                    $("#tableData").datagrid('loadData', res.data.page);
-                                }
-                            }
-                        },
-                        //此处添加错误处理
-                        error: function () {
-                            $.messager.alert('查询提示', '查询数据后台异常，请稍后再试！', 'error');
-                            return;
-                        }
-                    });
-                }
-                else {
-                    $("#tableData").datagrid('loadData', []);
+            if(res && res.code === 200){
+                if(res.data && res.data.page) {
+                    $("#tableData").datagrid('loadData', res.data.page);
                 }
             }
         },
         //此处添加错误处理
-        error:function() {
-            $.messager.alert('查询提示','查询数据后台异常，请稍后再试！','error');
+        error: function () {
+            $.messager.alert('查询提示', '查询数据后台异常，请稍后再试！', 'error');
             return;
         }
     });
diff --git a/erp_web/js/pages/materials/purchase_back_list.js b/erp_web/js/pages/materials/purchase_back_list.js
index 11fc80bf..932f3474 100644
--- a/erp_web/js/pages/materials/purchase_back_list.js
+++ b/erp_web/js/pages/materials/purchase_back_list.js
@@ -1976,56 +1976,33 @@ function bindEvent(){
 function showDepotHeadDetails(pageNo,pageSize){
     var materialParam = $.trim($("#searchMaterial").val());
     $.ajax({
-        type:"get",
-        url: "/depotItem/getHeaderIdByMaterial",
+        type: "get",
+        url: "/depotHead/list",
         dataType: "json",
         data: ({
-            materialParam: materialParam,
-            depotIds: depotString
+            search: JSON.stringify({
+                type: listType,
+                subType: listSubType,
+                state: $.trim($("#searchState").val()),
+                number: $.trim($("#searchNumber").val()),
+                beginTime: $("#searchBeginTime").val(),
+                endTime: $("#searchEndTime").val(),
+                materialParam: materialParam,
+                depotIds: depotString
+            }),
+            currentPage: pageNo,
+            pageSize: pageSize
         }),
         success: function (res) {
-            if(res && res.code === 200) {
-                var ids = res.data;
-                if(ids){
-                    $.ajax({
-                        type: "get",
-                        url: "/depotHead/list",
-                        dataType: "json",
-                        data: ({
-                            search: JSON.stringify({
-                                type: listType,
-                                subType: listSubType,
-                                state: $.trim($("#searchState").val()),
-                                number: $.trim($("#searchNumber").val()),
-                                beginTime: $("#searchBeginTime").val(),
-                                endTime: $("#searchEndTime").val(),
-                                dhIds: ids
-                            }),
-                            currentPage: pageNo,
-                            pageSize: pageSize
-                        }),
-                        success: function (res) {
-                            if(res && res.code === 200){
-                                if(res.data && res.data.page) {
-                                    $("#tableData").datagrid('loadData', res.data.page);
-                                }
-                            }
-                        },
-                        //此处添加错误处理
-                        error: function () {
-                            $.messager.alert('查询提示', '查询数据后台异常，请稍后再试！', 'error');
-                            return;
-                        }
-                    });
-                }
-                else {
-                    $("#tableData").datagrid('loadData', []);
+            if(res && res.code === 200){
+                if(res.data && res.data.page) {
+                    $("#tableData").datagrid('loadData', res.data.page);
                 }
             }
         },
         //此处添加错误处理
-        error:function() {
-            $.messager.alert('查询提示','查询数据后台异常，请稍后再试！','error');
+        error: function () {
+            $.messager.alert('查询提示', '查询数据后台异常，请稍后再试！', 'error');
             return;
         }
     });
diff --git a/erp_web/js/pages/materials/purchase_in_list.js b/erp_web/js/pages/materials/purchase_in_list.js
index 3b52af48..4d604f3a 100644
--- a/erp_web/js/pages/materials/purchase_in_list.js
+++ b/erp_web/js/pages/materials/purchase_in_list.js
@@ -2052,61 +2052,37 @@ function bindEvent(){
 function showDepotHeadDetails(pageNo,pageSize){
     var materialParam = $.trim($("#searchMaterial").val());
     $.ajax({
-        type:"get",
-        url: "/depotItem/getHeaderIdByMaterial",
+        type: "get",
+        url: "/depotHead/list",
         dataType: "json",
         data: ({
-            materialParam: materialParam,
-            depotIds: depotString
+            search: JSON.stringify({
+                type: listType,
+                subType: listSubType,
+                state: $.trim($("#searchState").val()),
+                number: $.trim($("#searchNumber").val()),
+                beginTime: $("#searchBeginTime").val(),
+                endTime: $("#searchEndTime").val(),
+                materialParam: materialParam,
+                depotIds: depotString
+            }),
+            currentPage: pageNo,
+            pageSize: pageSize
         }),
         success: function (res) {
-            if(res && res.code === 200) {
-                var ids = res.data;
-                if(ids){
-                    $.ajax({
-                        type: "get",
-                        url: "/depotHead/list",
-                        dataType: "json",
-                        data: ({
-                            search: JSON.stringify({
-                                type: listType,
-                                subType: listSubType,
-                                state: $.trim($("#searchState").val()),
-                                number: $.trim($("#searchNumber").val()),
-                                beginTime: $("#searchBeginTime").val(),
-                                endTime: $("#searchEndTime").val(),
-                                dhIds: ids
-                            }),
-                            currentPage: pageNo,
-                            pageSize: pageSize
-                        }),
-                        success: function (res) {
-                            if(res && res.code === 200){
-                                if(res.data && res.data.page) {
-                                    $("#tableData").datagrid('loadData', res.data.page);
-                                }
-                            }
-                        },
-                        //此处添加错误处理
-                        error: function () {
-                            $.messager.alert('查询提示', '查询数据后台异常，请稍后再试！', 'error');
-                            return;
-                        }
-                    });
-                }
-                else {
-                    $("#tableData").datagrid('loadData', []);
+            if(res && res.code === 200){
+                if(res.data && res.data.page) {
+                    $("#tableData").datagrid('loadData', res.data.page);
                 }
             }
         },
         //此处添加错误处理
-        error:function() {
-            $.messager.alert('查询提示','查询数据后台异常，请稍后再试！','error');
+        error: function () {
+            $.messager.alert('查询提示', '查询数据后台异常，请稍后再试！', 'error');
             return;
         }
     });
 }
-
 //自动计算事件
 function autoReckon() {
     //延时绑定事件
diff --git a/erp_web/js/pages/materials/purchase_orders_list.js b/erp_web/js/pages/materials/purchase_orders_list.js
index 84464c96..f6d9a70e 100644
--- a/erp_web/js/pages/materials/purchase_orders_list.js
+++ b/erp_web/js/pages/materials/purchase_orders_list.js
@@ -2048,56 +2048,33 @@ function bindEvent(){
 function showDepotHeadDetails(pageNo,pageSize){
     var materialParam = $.trim($("#searchMaterial").val());
     $.ajax({
-        type:"get",
-        url: "/depotItem/getHeaderIdByMaterial",
+        type: "get",
+        url: "/depotHead/list",
         dataType: "json",
         data: ({
-            materialParam: materialParam,
-            depotIds: depotString
+            search: JSON.stringify({
+                type: listType,
+                subType: listSubType,
+                state: $.trim($("#searchState").val()),
+                number: $.trim($("#searchNumber").val()),
+                beginTime: $("#searchBeginTime").val(),
+                endTime: $("#searchEndTime").val(),
+                materialParam: materialParam,
+                depotIds: depotString
+            }),
+            currentPage: pageNo,
+            pageSize: pageSize
         }),
         success: function (res) {
-            if(res && res.code === 200) {
-                var ids = res.data;
-                if(ids){
-                    $.ajax({
-                        type: "get",
-                        url: "/depotHead/list",
-                        dataType: "json",
-                        data: ({
-                            search: JSON.stringify({
-                                type: listType,
-                                subType: listSubType,
-                                state: $.trim($("#searchState").val()),
-                                number: $.trim($("#searchNumber").val()),
-                                beginTime: $("#searchBeginTime").val(),
-                                endTime: $("#searchEndTime").val(),
-                                dhIds: ids
-                            }),
-                            currentPage: pageNo,
-                            pageSize: pageSize
-                        }),
-                        success: function (res) {
-                            if(res && res.code === 200){
-                                if(res.data && res.data.page) {
-                                    $("#tableData").datagrid('loadData', res.data.page);
-                                }
-                            }
-                        },
-                        //此处添加错误处理
-                        error: function () {
-                            $.messager.alert('查询提示', '查询数据后台异常，请稍后再试！', 'error');
-                            return;
-                        }
-                    });
-                }
-                else {
-                    $("#tableData").datagrid('loadData', []);
+            if(res && res.code === 200){
+                if(res.data && res.data.page) {
+                    $("#tableData").datagrid('loadData', res.data.page);
                 }
             }
         },
         //此处添加错误处理
-        error:function() {
-            $.messager.alert('查询提示','查询数据后台异常，请稍后再试！','error');
+        error: function () {
+            $.messager.alert('查询提示', '查询数据后台异常，请稍后再试！', 'error');
             return;
         }
     });
diff --git a/erp_web/js/pages/materials/retail_back_list.js b/erp_web/js/pages/materials/retail_back_list.js
index 80bb0186..8f65b1ed 100644
--- a/erp_web/js/pages/materials/retail_back_list.js
+++ b/erp_web/js/pages/materials/retail_back_list.js
@@ -2060,61 +2060,37 @@ function bindEvent(){
 function showDepotHeadDetails(pageNo,pageSize){
     var materialParam = $.trim($("#searchMaterial").val());
     $.ajax({
-        type:"get",
-        url: "/depotItem/getHeaderIdByMaterial",
+        type: "get",
+        url: "/depotHead/list",
         dataType: "json",
         data: ({
-            materialParam: materialParam,
-            depotIds: depotString
+            search: JSON.stringify({
+                type: listType,
+                subType: listSubType,
+                state: $.trim($("#searchState").val()),
+                number: $.trim($("#searchNumber").val()),
+                beginTime: $("#searchBeginTime").val(),
+                endTime: $("#searchEndTime").val(),
+                materialParam: materialParam,
+                depotIds: depotString
+            }),
+            currentPage: pageNo,
+            pageSize: pageSize
         }),
         success: function (res) {
-            if(res && res.code === 200) {
-                var ids = res.data;
-                if(ids){
-                    $.ajax({
-                        type: "get",
-                        url: "/depotHead/list",
-                        dataType: "json",
-                        data: ({
-                            search: JSON.stringify({
-                                type: listType,
-                                subType: listSubType,
-                                state: $.trim($("#searchState").val()),
-                                number: $.trim($("#searchNumber").val()),
-                                beginTime: $("#searchBeginTime").val(),
-                                endTime: $("#searchEndTime").val(),
-                                dhIds: ids
-                            }),
-                            currentPage: pageNo,
-                            pageSize: pageSize
-                        }),
-                        success: function (res) {
-                            if(res && res.code === 200){
-                                if(res.data && res.data.page) {
-                                    $("#tableData").datagrid('loadData', res.data.page);
-                                }
-                            }
-                        },
-                        //此处添加错误处理
-                        error: function () {
-                            $.messager.alert('查询提示', '查询数据后台异常，请稍后再试！', 'error');
-                            return;
-                        }
-                    });
-                }
-                else {
-                    $("#tableData").datagrid('loadData', []);
+            if(res && res.code === 200){
+                if(res.data && res.data.page) {
+                    $("#tableData").datagrid('loadData', res.data.page);
                 }
             }
         },
         //此处添加错误处理
-        error:function() {
-            $.messager.alert('查询提示','查询数据后台异常，请稍后再试！','error');
+        error: function () {
+            $.messager.alert('查询提示', '查询数据后台异常，请稍后再试！', 'error');
             return;
         }
     });
 }
-
 //自动计算事件
 function autoReckon() {
     //延时绑定事件
diff --git a/erp_web/js/pages/materials/retail_out_list.js b/erp_web/js/pages/materials/retail_out_list.js
index 6e5c4d13..e381d946 100644
--- a/erp_web/js/pages/materials/retail_out_list.js
+++ b/erp_web/js/pages/materials/retail_out_list.js
@@ -2166,61 +2166,37 @@ function bindEvent(){
 function showDepotHeadDetails(pageNo,pageSize){
     var materialParam = $.trim($("#searchMaterial").val());
     $.ajax({
-        type:"get",
-        url: "/depotItem/getHeaderIdByMaterial",
+        type: "get",
+        url: "/depotHead/list",
         dataType: "json",
         data: ({
-            materialParam: materialParam,
-            depotIds: depotString
+            search: JSON.stringify({
+                type: listType,
+                subType: listSubType,
+                state: $.trim($("#searchState").val()),
+                number: $.trim($("#searchNumber").val()),
+                beginTime: $("#searchBeginTime").val(),
+                endTime: $("#searchEndTime").val(),
+                materialParam: materialParam,
+                depotIds: depotString
+            }),
+            currentPage: pageNo,
+            pageSize: pageSize
         }),
         success: function (res) {
-            if(res && res.code === 200) {
-                var ids = res.data;
-                if(ids){
-                    $.ajax({
-                        type: "get",
-                        url: "/depotHead/list",
-                        dataType: "json",
-                        data: ({
-                            search: JSON.stringify({
-                                type: listType,
-                                subType: listSubType,
-                                state: $.trim($("#searchState").val()),
-                                number: $.trim($("#searchNumber").val()),
-                                beginTime: $("#searchBeginTime").val(),
-                                endTime: $("#searchEndTime").val(),
-                                dhIds: ids
-                            }),
-                            currentPage: pageNo,
-                            pageSize: pageSize
-                        }),
-                        success: function (res) {
-                            if(res && res.code === 200){
-                                if(res.data && res.data.page) {
-                                    $("#tableData").datagrid('loadData', res.data.page);
-                                }
-                            }
-                        },
-                        //此处添加错误处理
-                        error: function () {
-                            $.messager.alert('查询提示', '查询数据后台异常，请稍后再试！', 'error');
-                            return;
-                        }
-                    });
-                }
-                else {
-                    $("#tableData").datagrid('loadData', []);
+            if(res && res.code === 200){
+                if(res.data && res.data.page) {
+                    $("#tableData").datagrid('loadData', res.data.page);
                 }
             }
         },
         //此处添加错误处理
-        error:function() {
-            $.messager.alert('查询提示','查询数据后台异常，请稍后再试！','error');
+        error: function () {
+            $.messager.alert('查询提示', '查询数据后台异常，请稍后再试！', 'error');
             return;
         }
     });
 }
-
 //自动计算事件
 function autoReckon() {
     //延时绑定事件
diff --git a/erp_web/js/pages/materials/sale_back_list.js b/erp_web/js/pages/materials/sale_back_list.js
index 0a8faa0c..b52de66d 100644
--- a/erp_web/js/pages/materials/sale_back_list.js
+++ b/erp_web/js/pages/materials/sale_back_list.js
@@ -2028,56 +2028,33 @@ function bindEvent(){
 function showDepotHeadDetails(pageNo,pageSize){
     var materialParam = $.trim($("#searchMaterial").val());
     $.ajax({
-        type:"get",
-        url: "/depotItem/getHeaderIdByMaterial",
+        type: "get",
+        url: "/depotHead/list",
         dataType: "json",
         data: ({
-            materialParam: materialParam,
-            depotIds: depotString
+            search: JSON.stringify({
+                type: listType,
+                subType: listSubType,
+                state: $.trim($("#searchState").val()),
+                number: $.trim($("#searchNumber").val()),
+                beginTime: $("#searchBeginTime").val(),
+                endTime: $("#searchEndTime").val(),
+                materialParam: materialParam,
+                depotIds: depotString
+            }),
+            currentPage: pageNo,
+            pageSize: pageSize
         }),
         success: function (res) {
-            if(res && res.code === 200) {
-                var ids = res.data;
-                if(ids){
-                    $.ajax({
-                        type: "get",
-                        url: "/depotHead/list",
-                        dataType: "json",
-                        data: ({
-                            search: JSON.stringify({
-                                type: listType,
-                                subType: listSubType,
-                                state: $.trim($("#searchState").val()),
-                                number: $.trim($("#searchNumber").val()),
-                                beginTime: $("#searchBeginTime").val(),
-                                endTime: $("#searchEndTime").val(),
-                                dhIds: ids
-                            }),
-                            currentPage: pageNo,
-                            pageSize: pageSize
-                        }),
-                        success: function (res) {
-                            if(res && res.code === 200){
-                                if(res.data && res.data.page) {
-                                    $("#tableData").datagrid('loadData', res.data.page);
-                                }
-                            }
-                        },
-                        //此处添加错误处理
-                        error: function () {
-                            $.messager.alert('查询提示', '查询数据后台异常，请稍后再试！', 'error');
-                            return;
-                        }
-                    });
-                }
-                else {
-                    $("#tableData").datagrid('loadData', []);
+            if(res && res.code === 200){
+                if(res.data && res.data.page) {
+                    $("#tableData").datagrid('loadData', res.data.page);
                 }
             }
         },
         //此处添加错误处理
-        error:function() {
-            $.messager.alert('查询提示','查询数据后台异常，请稍后再试！','error');
+        error: function () {
+            $.messager.alert('查询提示', '查询数据后台异常，请稍后再试！', 'error');
             return;
         }
     });
diff --git a/erp_web/js/pages/materials/sale_orders_list.js b/erp_web/js/pages/materials/sale_orders_list.js
index 486d9847..41803f17 100644
--- a/erp_web/js/pages/materials/sale_orders_list.js
+++ b/erp_web/js/pages/materials/sale_orders_list.js
@@ -2045,56 +2045,33 @@ function bindEvent(){
 function showDepotHeadDetails(pageNo,pageSize){
     var materialParam = $.trim($("#searchMaterial").val());
     $.ajax({
-        type:"get",
-        url: "/depotItem/getHeaderIdByMaterial",
+        type: "get",
+        url: "/depotHead/list",
         dataType: "json",
         data: ({
-            materialParam: materialParam,
-            depotIds: depotString
+            search: JSON.stringify({
+                type: listType,
+                subType: listSubType,
+                state: $.trim($("#searchState").val()),
+                number: $.trim($("#searchNumber").val()),
+                beginTime: $("#searchBeginTime").val(),
+                endTime: $("#searchEndTime").val(),
+                materialParam: materialParam,
+                depotIds: depotString
+            }),
+            currentPage: pageNo,
+            pageSize: pageSize
         }),
         success: function (res) {
-            if(res && res.code === 200) {
-                var ids = res.data;
-                if(ids){
-                    $.ajax({
-                        type: "get",
-                        url: "/depotHead/list",
-                        dataType: "json",
-                        data: ({
-                            search: JSON.stringify({
-                                type: listType,
-                                subType: listSubType,
-                                state: $.trim($("#searchState").val()),
-                                number: $.trim($("#searchNumber").val()),
-                                beginTime: $("#searchBeginTime").val(),
-                                endTime: $("#searchEndTime").val(),
-                                dhIds: ids
-                            }),
-                            currentPage: pageNo,
-                            pageSize: pageSize
-                        }),
-                        success: function (res) {
-                            if(res && res.code === 200){
-                                if(res.data && res.data.page) {
-                                    $("#tableData").datagrid('loadData', res.data.page);
-                                }
-                            }
-                        },
-                        //此处添加错误处理
-                        error: function () {
-                            $.messager.alert('查询提示', '查询数据后台异常，请稍后再试！', 'error');
-                            return;
-                        }
-                    });
-                }
-                else {
-                    $("#tableData").datagrid('loadData', []);
+            if(res && res.code === 200){
+                if(res.data && res.data.page) {
+                    $("#tableData").datagrid('loadData', res.data.page);
                 }
             }
         },
         //此处添加错误处理
-        error:function() {
-            $.messager.alert('查询提示','查询数据后台异常，请稍后再试！','error');
+        error: function () {
+            $.messager.alert('查询提示', '查询数据后台异常，请稍后再试！', 'error');
             return;
         }
     });
diff --git a/erp_web/js/pages/materials/sale_out_list.js b/erp_web/js/pages/materials/sale_out_list.js
index 76b4506a..210c47bc 100644
--- a/erp_web/js/pages/materials/sale_out_list.js
+++ b/erp_web/js/pages/materials/sale_out_list.js
@@ -2099,56 +2099,33 @@ function bindEvent(){
 function showDepotHeadDetails(pageNo,pageSize){
     var materialParam = $.trim($("#searchMaterial").val());
     $.ajax({
-        type:"get",
-        url: "/depotItem/getHeaderIdByMaterial",
+        type: "get",
+        url: "/depotHead/list",
         dataType: "json",
         data: ({
-            materialParam: materialParam,
-            depotIds: depotString
+            search: JSON.stringify({
+                type: listType,
+                subType: listSubType,
+                state: $.trim($("#searchState").val()),
+                number: $.trim($("#searchNumber").val()),
+                beginTime: $("#searchBeginTime").val(),
+                endTime: $("#searchEndTime").val(),
+                materialParam: materialParam,
+                depotIds: depotString
+            }),
+            currentPage: pageNo,
+            pageSize: pageSize
         }),
         success: function (res) {
-            if(res && res.code === 200) {
-                var ids = res.data;
-                if(ids){
-                    $.ajax({
-                        type: "get",
-                        url: "/depotHead/list",
-                        dataType: "json",
-                        data: ({
-                            search: JSON.stringify({
-                                type: listType,
-                                subType: listSubType,
-                                state: $.trim($("#searchState").val()),
-                                number: $.trim($("#searchNumber").val()),
-                                beginTime: $("#searchBeginTime").val(),
-                                endTime: $("#searchEndTime").val(),
-                                dhIds: ids
-                            }),
-                            currentPage: pageNo,
-                            pageSize: pageSize
-                        }),
-                        success: function (res) {
-                            if(res && res.code === 200){
-                                if(res.data && res.data.page) {
-                                    $("#tableData").datagrid('loadData', res.data.page);
-                                }
-                            }
-                        },
-                        //此处添加错误处理
-                        error: function () {
-                            $.messager.alert('查询提示', '查询数据后台异常，请稍后再试！', 'error');
-                            return;
-                        }
-                    });
-                }
-                else {
-                    $("#tableData").datagrid('loadData', []);
+            if(res && res.code === 200){
+                if(res.data && res.data.page) {
+                    $("#tableData").datagrid('loadData', res.data.page);
                 }
             }
         },
         //此处添加错误处理
-        error:function() {
-            $.messager.alert('查询提示','查询数据后台异常，请稍后再试！','error');
+        error: function () {
+            $.messager.alert('查询提示', '查询数据后台异常，请稍后再试！', 'error');
             return;
         }
     });
diff --git a/src/main/resources/mapper_xml/DepotItemMapperEx.xml b/src/main/resources/mapper_xml/DepotItemMapperEx.xml
index 1250e355..403d2741 100644
--- a/src/main/resources/mapper_xml/DepotItemMapperEx.xml
+++ b/src/main/resources/mapper_xml/DepotItemMapperEx.xml
@@ -8,9 +8,6 @@
         <result column="b_num" jdbcType="BIGINT" property="bnum" />
         <result column="oTime" jdbcType="TIMESTAMP" property="otime" />
     </resultMap>
-    <resultMap id="HeaderIdResultMap" type="com.jsh.erp.datasource.entities.DepotItemVo4HeaderId">
-        <result column="HeaderId" jdbcType="BIGINT" property="headerid" />
-    </resultMap>
 
     <resultMap extends="com.jsh.erp.datasource.mappers.DepotItemMapper.BaseResultMap" id="ResultAndMaterialMap" type="com.jsh.erp.datasource.entities.DepotItemVo4Material">
         <result column="mName" jdbcType="VARCHAR" property="mname" />
@@ -91,24 +88,6 @@
         </if>
         and ifnull(delete_Flag,'0') !='1'
     </select>
-    <select id="getHeaderIdByMaterial" parameterType="com.jsh.erp.datasource.entities.DepotItemExample" resultMap="HeaderIdResultMap">
-        select dt.HeaderId from jsh_depotitem dt
-        INNER JOIN jsh_material m on dt.MaterialId = m.Id and ifnull(m.delete_Flag,'0') !='1'
-        where 1=1
-        <if test="materialParam != null and materialParam != ''">
-            <bind name="materialParam" value="'%' + _parameter.materialParam + '%'"/>
-            and ( m.Name like #{materialParam}
-            or m.Model like #{materialParam} )
-        </if>
-
-        <if test="depotIds != null and depotIds != ''">
-            and dt.DepotId in
-            <foreach item="depotId" index="index" collection="depotIds.split(',')" open="(" separator="," close=")">
-                #{depotId}
-            </foreach>
-        </if>
-        and ifnull(dt.delete_Flag,'0') !='1'
-    </select>
 
     <select id="findDetailByTypeAndMaterialIdList" parameterType="com.jsh.erp.datasource.entities.DepotItemExample" resultMap="DetailByTypeAndMIdResultMap">
         select dh.Number,concat(dh.SubType,dh.Type) as newType,