purovps/jshERP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

从源更新

Browse Source
This commit is contained in:
qiankunpingtai
2019-06-10 09:42:58 +08:00
parent d10cd9eebc
commit 71c7f20360
14 changed files with 247 additions and 571 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
erp_web/js/pages/materials/allocation_out_list.js
View File

@@ -1940,56 +1940,33 @@ function bindEvent(){
function showDepotHeadDetails(pageNo,pageSize){ function showDepotHeadDetails(pageNo,pageSize){
var materialParam = $.trim($("#searchMaterial").val()); var materialParam = $.trim($("#searchMaterial").val());
$.ajax({ $.ajax({
type:"get", type: "get",
url: "/depotItem/getHeaderIdByMaterial", url: "/depotHead/list",
dataType: "json", dataType: "json",
data: ({ data: ({
materialParam: materialParam, search: JSON.stringify({
depotIds: depotString 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) { success: function (res) {
if(res && res.code === 200) { if(res && res.code === 200){
var ids = res.data; if(res.data && res.data.page) {
if(ids){ $("#tableData").datagrid('loadData', res.data.page);
$.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', []);
} }
} }
}, },
//此处添加错误处理 //此处添加错误处理
error:function() { error: function () {
$.messager.alert('查询提示','查询数据后台异常，请稍后再试！','error'); $.messager.alert('查询提示', '查询数据后台异常，请稍后再试！', 'error');
return; return;
} }
}); });

61
erp_web/js/pages/materials/assemble_list.js
View File

@@ -1938,56 +1938,33 @@ function bindEvent(){
function showDepotHeadDetails(pageNo,pageSize){ function showDepotHeadDetails(pageNo,pageSize){
var materialParam = $.trim($("#searchMaterial").val()); var materialParam = $.trim($("#searchMaterial").val());
$.ajax({ $.ajax({
type:"get", type: "get",
url: "/depotItem/getHeaderIdByMaterial", url: "/depotHead/list",
dataType: "json", dataType: "json",
data: ({ data: ({
materialParam: materialParam, search: JSON.stringify({
depotIds: depotString 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) { success: function (res) {
if(res && res.code === 200) { if(res && res.code === 200){
var ids = res.data; if(res.data && res.data.page) {
if(ids){ $("#tableData").datagrid('loadData', res.data.page);
$.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', []);
} }
} }
}, },
//此处添加错误处理 //此处添加错误处理
error:function() { error: function () {
$.messager.alert('查询提示','查询数据后台异常，请稍后再试！','error'); $.messager.alert('查询提示', '查询数据后台异常，请稍后再试！', 'error');
return; return;
} }
}); });

62
erp_web/js/pages/materials/disassemble_list.js
View File

@@ -1942,61 +1942,37 @@ function bindEvent(){
function showDepotHeadDetails(pageNo,pageSize){ function showDepotHeadDetails(pageNo,pageSize){
var materialParam = $.trim($("#searchMaterial").val()); var materialParam = $.trim($("#searchMaterial").val());
$.ajax({ $.ajax({
type:"get", type: "get",
url: "/depotItem/getHeaderIdByMaterial", url: "/depotHead/list",
dataType: "json", dataType: "json",
data: ({ data: ({
materialParam: materialParam, search: JSON.stringify({
depotIds: depotString 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) { success: function (res) {
if(res && res.code === 200) { if(res && res.code === 200){
var ids = res.data; if(res.data && res.data.page) {
if(ids){ $("#tableData").datagrid('loadData', res.data.page);
$.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', []);
} }
} }
}, },
//此处添加错误处理 //此处添加错误处理
error:function() { error: function () {
$.messager.alert('查询提示','查询数据后台异常，请稍后再试！','error'); $.messager.alert('查询提示', '查询数据后台异常，请稍后再试！', 'error');
return; return;
} }
}); });
} }
//自动计算事件 //自动计算事件
function autoReckon() { function autoReckon() {
//延时绑定事件 //延时绑定事件

61
erp_web/js/pages/materials/other_in_list.js
View File

@@ -2026,56 +2026,33 @@ function bindEvent(){
function showDepotHeadDetails(pageNo,pageSize){ function showDepotHeadDetails(pageNo,pageSize){
var materialParam = $.trim($("#searchMaterial").val()); var materialParam = $.trim($("#searchMaterial").val());
$.ajax({ $.ajax({
type:"get", type: "get",
url: "/depotItem/getHeaderIdByMaterial", url: "/depotHead/list",
dataType: "json", dataType: "json",
data: ({ data: ({
materialParam: materialParam, search: JSON.stringify({
depotIds: depotString 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) { success: function (res) {
if(res && res.code === 200) { if(res && res.code === 200){
var ids = res.data; if(res.data && res.data.page) {
if(ids){ $("#tableData").datagrid('loadData', res.data.page);
$.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', []);
} }
} }
}, },
//此处添加错误处理 //此处添加错误处理
error:function() { error: function () {
$.messager.alert('查询提示','查询数据后台异常，请稍后再试！','error'); $.messager.alert('查询提示', '查询数据后台异常，请稍后再试！', 'error');
return; return;
} }
}); });

61
erp_web/js/pages/materials/other_out_list.js
View File

@@ -1936,56 +1936,33 @@ function bindEvent(){
function showDepotHeadDetails(pageNo,pageSize){ function showDepotHeadDetails(pageNo,pageSize){
var materialParam = $.trim($("#searchMaterial").val()); var materialParam = $.trim($("#searchMaterial").val());
$.ajax({ $.ajax({
type:"get", type: "get",
url: "/depotItem/getHeaderIdByMaterial", url: "/depotHead/list",
dataType: "json", dataType: "json",
data: ({ data: ({
materialParam: materialParam, search: JSON.stringify({
depotIds: depotString 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) { success: function (res) {
if(res && res.code === 200) { if(res && res.code === 200){
var ids = res.data; if(res.data && res.data.page) {
if(ids){ $("#tableData").datagrid('loadData', res.data.page);
$.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', []);
} }
} }
}, },
//此处添加错误处理 //此处添加错误处理
error:function() { error: function () {
$.messager.alert('查询提示','查询数据后台异常，请稍后再试！','error'); $.messager.alert('查询提示', '查询数据后台异常，请稍后再试！', 'error');
return; return;
} }
}); });

61
erp_web/js/pages/materials/purchase_back_list.js
View File

@@ -1976,56 +1976,33 @@ function bindEvent(){
function showDepotHeadDetails(pageNo,pageSize){ function showDepotHeadDetails(pageNo,pageSize){
var materialParam = $.trim($("#searchMaterial").val()); var materialParam = $.trim($("#searchMaterial").val());
$.ajax({ $.ajax({
type:"get", type: "get",
url: "/depotItem/getHeaderIdByMaterial", url: "/depotHead/list",
dataType: "json", dataType: "json",
data: ({ data: ({
materialParam: materialParam, search: JSON.stringify({
depotIds: depotString 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) { success: function (res) {
if(res && res.code === 200) { if(res && res.code === 200){
var ids = res.data; if(res.data && res.data.page) {
if(ids){ $("#tableData").datagrid('loadData', res.data.page);
$.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', []);
} }
} }
}, },
//此处添加错误处理 //此处添加错误处理
error:function() { error: function () {
$.messager.alert('查询提示','查询数据后台异常，请稍后再试！','error'); $.messager.alert('查询提示', '查询数据后台异常，请稍后再试！', 'error');
return; return;
} }
}); });

62
erp_web/js/pages/materials/purchase_in_list.js
View File

@@ -2052,61 +2052,37 @@ function bindEvent(){
function showDepotHeadDetails(pageNo,pageSize){ function showDepotHeadDetails(pageNo,pageSize){
var materialParam = $.trim($("#searchMaterial").val()); var materialParam = $.trim($("#searchMaterial").val());
$.ajax({ $.ajax({
type:"get", type: "get",
url: "/depotItem/getHeaderIdByMaterial", url: "/depotHead/list",
dataType: "json", dataType: "json",
data: ({ data: ({
materialParam: materialParam, search: JSON.stringify({
depotIds: depotString 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) { success: function (res) {
if(res && res.code === 200) { if(res && res.code === 200){
var ids = res.data; if(res.data && res.data.page) {
if(ids){ $("#tableData").datagrid('loadData', res.data.page);
$.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', []);
} }
} }
}, },
//此处添加错误处理 //此处添加错误处理
error:function() { error: function () {
$.messager.alert('查询提示','查询数据后台异常，请稍后再试！','error'); $.messager.alert('查询提示', '查询数据后台异常，请稍后再试！', 'error');
return; return;
} }
}); });
} }
//自动计算事件 //自动计算事件
function autoReckon() { function autoReckon() {
//延时绑定事件 //延时绑定事件

61
erp_web/js/pages/materials/purchase_orders_list.js
View File

@@ -2048,56 +2048,33 @@ function bindEvent(){
function showDepotHeadDetails(pageNo,pageSize){ function showDepotHeadDetails(pageNo,pageSize){
var materialParam = $.trim($("#searchMaterial").val()); var materialParam = $.trim($("#searchMaterial").val());
$.ajax({ $.ajax({
type:"get", type: "get",
url: "/depotItem/getHeaderIdByMaterial", url: "/depotHead/list",
dataType: "json", dataType: "json",
data: ({ data: ({
materialParam: materialParam, search: JSON.stringify({
depotIds: depotString 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) { success: function (res) {
if(res && res.code === 200) { if(res && res.code === 200){
var ids = res.data; if(res.data && res.data.page) {
if(ids){ $("#tableData").datagrid('loadData', res.data.page);
$.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', []);
} }
} }
}, },
//此处添加错误处理 //此处添加错误处理
error:function() { error: function () {
$.messager.alert('查询提示','查询数据后台异常，请稍后再试！','error'); $.messager.alert('查询提示', '查询数据后台异常，请稍后再试！', 'error');
return; return;
} }
}); });

62
erp_web/js/pages/materials/retail_back_list.js
View File

@@ -2060,61 +2060,37 @@ function bindEvent(){
function showDepotHeadDetails(pageNo,pageSize){ function showDepotHeadDetails(pageNo,pageSize){
var materialParam = $.trim($("#searchMaterial").val()); var materialParam = $.trim($("#searchMaterial").val());
$.ajax({ $.ajax({
type:"get", type: "get",
url: "/depotItem/getHeaderIdByMaterial", url: "/depotHead/list",
dataType: "json", dataType: "json",
data: ({ data: ({
materialParam: materialParam, search: JSON.stringify({
depotIds: depotString 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) { success: function (res) {
if(res && res.code === 200) { if(res && res.code === 200){
var ids = res.data; if(res.data && res.data.page) {
if(ids){ $("#tableData").datagrid('loadData', res.data.page);
$.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', []);
} }
} }
}, },
//此处添加错误处理 //此处添加错误处理
error:function() { error: function () {
$.messager.alert('查询提示','查询数据后台异常，请稍后再试！','error'); $.messager.alert('查询提示', '查询数据后台异常，请稍后再试！', 'error');
return; return;
} }
}); });
} }
//自动计算事件 //自动计算事件
function autoReckon() { function autoReckon() {
//延时绑定事件 //延时绑定事件

62
erp_web/js/pages/materials/retail_out_list.js
View File

@@ -2166,61 +2166,37 @@ function bindEvent(){
function showDepotHeadDetails(pageNo,pageSize){ function showDepotHeadDetails(pageNo,pageSize){
var materialParam = $.trim($("#searchMaterial").val()); var materialParam = $.trim($("#searchMaterial").val());
$.ajax({ $.ajax({
type:"get", type: "get",
url: "/depotItem/getHeaderIdByMaterial", url: "/depotHead/list",
dataType: "json", dataType: "json",
data: ({ data: ({
materialParam: materialParam, search: JSON.stringify({
depotIds: depotString 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) { success: function (res) {
if(res && res.code === 200) { if(res && res.code === 200){
var ids = res.data; if(res.data && res.data.page) {
if(ids){ $("#tableData").datagrid('loadData', res.data.page);
$.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', []);
} }
} }
}, },
//此处添加错误处理 //此处添加错误处理
error:function() { error: function () {
$.messager.alert('查询提示','查询数据后台异常，请稍后再试！','error'); $.messager.alert('查询提示', '查询数据后台异常，请稍后再试！', 'error');
return; return;
} }
}); });
} }
//自动计算事件 //自动计算事件
function autoReckon() { function autoReckon() {
//延时绑定事件 //延时绑定事件

61
erp_web/js/pages/materials/sale_back_list.js
View File

@@ -2028,56 +2028,33 @@ function bindEvent(){
function showDepotHeadDetails(pageNo,pageSize){ function showDepotHeadDetails(pageNo,pageSize){
var materialParam = $.trim($("#searchMaterial").val()); var materialParam = $.trim($("#searchMaterial").val());
$.ajax({ $.ajax({
type:"get", type: "get",
url: "/depotItem/getHeaderIdByMaterial", url: "/depotHead/list",
dataType: "json", dataType: "json",
data: ({ data: ({
materialParam: materialParam, search: JSON.stringify({
depotIds: depotString 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) { success: function (res) {
if(res && res.code === 200) { if(res && res.code === 200){
var ids = res.data; if(res.data && res.data.page) {
if(ids){ $("#tableData").datagrid('loadData', res.data.page);
$.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', []);
} }
} }
}, },
//此处添加错误处理 //此处添加错误处理
error:function() { error: function () {
$.messager.alert('查询提示','查询数据后台异常，请稍后再试！','error'); $.messager.alert('查询提示', '查询数据后台异常，请稍后再试！', 'error');
return; return;
} }
}); });

61
erp_web/js/pages/materials/sale_orders_list.js
View File

@@ -2045,56 +2045,33 @@ function bindEvent(){
function showDepotHeadDetails(pageNo,pageSize){ function showDepotHeadDetails(pageNo,pageSize){
var materialParam = $.trim($("#searchMaterial").val()); var materialParam = $.trim($("#searchMaterial").val());
$.ajax({ $.ajax({
type:"get", type: "get",
url: "/depotItem/getHeaderIdByMaterial", url: "/depotHead/list",
dataType: "json", dataType: "json",
data: ({ data: ({
materialParam: materialParam, search: JSON.stringify({
depotIds: depotString 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) { success: function (res) {
if(res && res.code === 200) { if(res && res.code === 200){
var ids = res.data; if(res.data && res.data.page) {
if(ids){ $("#tableData").datagrid('loadData', res.data.page);
$.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', []);
} }
} }
}, },
//此处添加错误处理 //此处添加错误处理
error:function() { error: function () {
$.messager.alert('查询提示','查询数据后台异常，请稍后再试！','error'); $.messager.alert('查询提示', '查询数据后台异常，请稍后再试！', 'error');
return; return;
} }
}); });

61
erp_web/js/pages/materials/sale_out_list.js
View File

@@ -2099,56 +2099,33 @@ function bindEvent(){
function showDepotHeadDetails(pageNo,pageSize){ function showDepotHeadDetails(pageNo,pageSize){
var materialParam = $.trim($("#searchMaterial").val()); var materialParam = $.trim($("#searchMaterial").val());
$.ajax({ $.ajax({
type:"get", type: "get",
url: "/depotItem/getHeaderIdByMaterial", url: "/depotHead/list",
dataType: "json", dataType: "json",
data: ({ data: ({
materialParam: materialParam, search: JSON.stringify({
depotIds: depotString 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) { success: function (res) {
if(res && res.code === 200) { if(res && res.code === 200){
var ids = res.data; if(res.data && res.data.page) {
if(ids){ $("#tableData").datagrid('loadData', res.data.page);
$.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', []);
} }
} }
}, },
//此处添加错误处理 //此处添加错误处理
error:function() { error: function () {
$.messager.alert('查询提示','查询数据后台异常，请稍后再试！','error'); $.messager.alert('查询提示', '查询数据后台异常，请稍后再试！', 'error');
return; return;
} }
}); });

21
src/main/resources/mapper_xml/DepotItemMapperEx.xml
View File

@@ -8,9 +8,6 @@
<result column="b_num" jdbcType="BIGINT" property="bnum" /> <result column="b_num" jdbcType="BIGINT" property="bnum" />
<result column="oTime" jdbcType="TIMESTAMP" property="otime" /> <result column="oTime" jdbcType="TIMESTAMP" property="otime" />
</resultMap> </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"> <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" /> <result column="mName" jdbcType="VARCHAR" property="mname" />
@@ -91,24 +88,6 @@
</if> </if>
and ifnull(delete_Flag,'0') !='1' and ifnull(delete_Flag,'0') !='1'
</select> </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 id="findDetailByTypeAndMaterialIdList" parameterType="com.jsh.erp.datasource.entities.DepotItemExample" resultMap="DetailByTypeAndMIdResultMap">
select dh.Number,concat(dh.SubType,dh.Type) as newType, select dh.Number,concat(dh.SubType,dh.Type) as newType,