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

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

@@ -1939,18 +1939,6 @@ function bindEvent(){
function showDepotHeadDetails(pageNo,pageSize){
var materialParam = $.trim($("#searchMaterial").val());
$.ajax({
type:"get",
url: "/depotItem/getHeaderIdByMaterial",
dataType: "json",
data: ({
materialParam: materialParam,
depotIds: depotString
}),
success: function (res) {
if(res && res.code === 200) {
var ids = res.data;
if(ids){
$.ajax({
type: "get",
url: "/depotHead/list",
@@ -1963,7 +1951,8 @@ function showDepotHeadDetails(pageNo,pageSize){
number: $.trim($("#searchNumber").val()),
beginTime: $("#searchBeginTime").val(),
endTime: $("#searchEndTime").val(),
dhIds: ids
materialParam: materialParam,
depotIds: depotString
}),
currentPage: pageNo,
pageSize: pageSize
@@ -1981,18 +1970,6 @@ function showDepotHeadDetails(pageNo,pageSize){
return;
}
});
}
else {
$("#tableData").datagrid('loadData', []);
}
}
},
//此处添加错误处理
error:function() {
$.messager.alert('查询提示','查询数据后台异常，请稍后再试！','error');
return;
}
});
}
//自动计算事件

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

@@ -1937,18 +1937,6 @@ function bindEvent(){
function showDepotHeadDetails(pageNo,pageSize){
var materialParam = $.trim($("#searchMaterial").val());
$.ajax({
type:"get",
url: "/depotItem/getHeaderIdByMaterial",
dataType: "json",
data: ({
materialParam: materialParam,
depotIds: depotString
}),
success: function (res) {
if(res && res.code === 200) {
var ids = res.data;
if(ids){
$.ajax({
type: "get",
url: "/depotHead/list",
@@ -1961,7 +1949,8 @@ function showDepotHeadDetails(pageNo,pageSize){
number: $.trim($("#searchNumber").val()),
beginTime: $("#searchBeginTime").val(),
endTime: $("#searchEndTime").val(),
dhIds: ids
materialParam: materialParam,
depotIds: depotString
}),
currentPage: pageNo,
pageSize: pageSize
@@ -1979,18 +1968,6 @@ function showDepotHeadDetails(pageNo,pageSize){
return;
}
});
}
else {
$("#tableData").datagrid('loadData', []);
}
}
},
//此处添加错误处理
error:function() {
$.messager.alert('查询提示','查询数据后台异常，请稍后再试！','error');
return;
}
});
}
//自动计算事件

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

@@ -1941,18 +1941,6 @@ function bindEvent(){
function showDepotHeadDetails(pageNo,pageSize){
var materialParam = $.trim($("#searchMaterial").val());
$.ajax({
type:"get",
url: "/depotItem/getHeaderIdByMaterial",
dataType: "json",
data: ({
materialParam: materialParam,
depotIds: depotString
}),
success: function (res) {
if(res && res.code === 200) {
var ids = res.data;
if(ids){
$.ajax({
type: "get",
url: "/depotHead/list",
@@ -1965,7 +1953,8 @@ function showDepotHeadDetails(pageNo,pageSize){
number: $.trim($("#searchNumber").val()),
beginTime: $("#searchBeginTime").val(),
endTime: $("#searchEndTime").val(),
dhIds: ids
materialParam: materialParam,
depotIds: depotString
}),
currentPage: pageNo,
pageSize: pageSize
@@ -1983,20 +1972,7 @@ function showDepotHeadDetails(pageNo,pageSize){
return;
}
});
}
else {
$("#tableData").datagrid('loadData', []);
}
}
},
//此处添加错误处理
error:function() {
$.messager.alert('查询提示','查询数据后台异常，请稍后再试！','error');
return;
}
});
}
//自动计算事件
function autoReckon() {
//延时绑定事件

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

@@ -2025,18 +2025,6 @@ function bindEvent(){
function showDepotHeadDetails(pageNo,pageSize){
var materialParam = $.trim($("#searchMaterial").val());
$.ajax({
type:"get",
url: "/depotItem/getHeaderIdByMaterial",
dataType: "json",
data: ({
materialParam: materialParam,
depotIds: depotString
}),
success: function (res) {
if(res && res.code === 200) {
var ids = res.data;
if(ids){
$.ajax({
type: "get",
url: "/depotHead/list",
@@ -2049,7 +2037,8 @@ function showDepotHeadDetails(pageNo,pageSize){
number: $.trim($("#searchNumber").val()),
beginTime: $("#searchBeginTime").val(),
endTime: $("#searchEndTime").val(),
dhIds: ids
materialParam: materialParam,
depotIds: depotString
}),
currentPage: pageNo,
pageSize: pageSize
@@ -2067,18 +2056,6 @@ function showDepotHeadDetails(pageNo,pageSize){
return;
}
});
}
else {
$("#tableData").datagrid('loadData', []);
}
}
},
//此处添加错误处理
error:function() {
$.messager.alert('查询提示','查询数据后台异常，请稍后再试！','error');
return;
}
});
}
//自动计算事件

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

@@ -1935,18 +1935,6 @@ function bindEvent(){
function showDepotHeadDetails(pageNo,pageSize){
var materialParam = $.trim($("#searchMaterial").val());
$.ajax({
type:"get",
url: "/depotItem/getHeaderIdByMaterial",
dataType: "json",
data: ({
materialParam: materialParam,
depotIds: depotString
}),
success: function (res) {
if(res && res.code === 200) {
var ids = res.data;
if(ids){
$.ajax({
type: "get",
url: "/depotHead/list",
@@ -1959,7 +1947,8 @@ function showDepotHeadDetails(pageNo,pageSize){
number: $.trim($("#searchNumber").val()),
beginTime: $("#searchBeginTime").val(),
endTime: $("#searchEndTime").val(),
dhIds: ids
materialParam: materialParam,
depotIds: depotString
}),
currentPage: pageNo,
pageSize: pageSize
@@ -1977,18 +1966,6 @@ function showDepotHeadDetails(pageNo,pageSize){
return;
}
});
}
else {
$("#tableData").datagrid('loadData', []);
}
}
},
//此处添加错误处理
error:function() {
$.messager.alert('查询提示','查询数据后台异常，请稍后再试！','error');
return;
}
});
}
//自动计算事件

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

@@ -1975,18 +1975,6 @@ function bindEvent(){
function showDepotHeadDetails(pageNo,pageSize){
var materialParam = $.trim($("#searchMaterial").val());
$.ajax({
type:"get",
url: "/depotItem/getHeaderIdByMaterial",
dataType: "json",
data: ({
materialParam: materialParam,
depotIds: depotString
}),
success: function (res) {
if(res && res.code === 200) {
var ids = res.data;
if(ids){
$.ajax({
type: "get",
url: "/depotHead/list",
@@ -1999,7 +1987,8 @@ function showDepotHeadDetails(pageNo,pageSize){
number: $.trim($("#searchNumber").val()),
beginTime: $("#searchBeginTime").val(),
endTime: $("#searchEndTime").val(),
dhIds: ids
materialParam: materialParam,
depotIds: depotString
}),
currentPage: pageNo,
pageSize: pageSize
@@ -2017,18 +2006,6 @@ function showDepotHeadDetails(pageNo,pageSize){
return;
}
});
}
else {
$("#tableData").datagrid('loadData', []);
}
}
},
//此处添加错误处理
error:function() {
$.messager.alert('查询提示','查询数据后台异常，请稍后再试！','error');
return;
}
});
}
//自动计算事件

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

@@ -2051,18 +2051,6 @@ function bindEvent(){
function showDepotHeadDetails(pageNo,pageSize){
var materialParam = $.trim($("#searchMaterial").val());
$.ajax({
type:"get",
url: "/depotItem/getHeaderIdByMaterial",
dataType: "json",
data: ({
materialParam: materialParam,
depotIds: depotString
}),
success: function (res) {
if(res && res.code === 200) {
var ids = res.data;
if(ids){
$.ajax({
type: "get",
url: "/depotHead/list",
@@ -2075,7 +2063,8 @@ function showDepotHeadDetails(pageNo,pageSize){
number: $.trim($("#searchNumber").val()),
beginTime: $("#searchBeginTime").val(),
endTime: $("#searchEndTime").val(),
dhIds: ids
materialParam: materialParam,
depotIds: depotString
}),
currentPage: pageNo,
pageSize: pageSize
@@ -2093,20 +2082,7 @@ function showDepotHeadDetails(pageNo,pageSize){
return;
}
});
}
else {
$("#tableData").datagrid('loadData', []);
}
}
},
//此处添加错误处理
error:function() {
$.messager.alert('查询提示','查询数据后台异常，请稍后再试！','error');
return;
}
});
}
//自动计算事件
function autoReckon() {
//延时绑定事件

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

@@ -2047,18 +2047,6 @@ function bindEvent(){
function showDepotHeadDetails(pageNo,pageSize){
var materialParam = $.trim($("#searchMaterial").val());
$.ajax({
type:"get",
url: "/depotItem/getHeaderIdByMaterial",
dataType: "json",
data: ({
materialParam: materialParam,
depotIds: depotString
}),
success: function (res) {
if(res && res.code === 200) {
var ids = res.data;
if(ids){
$.ajax({
type: "get",
url: "/depotHead/list",
@@ -2071,7 +2059,8 @@ function showDepotHeadDetails(pageNo,pageSize){
number: $.trim($("#searchNumber").val()),
beginTime: $("#searchBeginTime").val(),
endTime: $("#searchEndTime").val(),
dhIds: ids
materialParam: materialParam,
depotIds: depotString
}),
currentPage: pageNo,
pageSize: pageSize
@@ -2089,18 +2078,6 @@ function showDepotHeadDetails(pageNo,pageSize){
return;
}
});
}
else {
$("#tableData").datagrid('loadData', []);
}
}
},
//此处添加错误处理
error:function() {
$.messager.alert('查询提示','查询数据后台异常，请稍后再试！','error');
return;
}
});
}
//自动计算事件

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

@@ -2059,18 +2059,6 @@ function bindEvent(){
function showDepotHeadDetails(pageNo,pageSize){
var materialParam = $.trim($("#searchMaterial").val());
$.ajax({
type:"get",
url: "/depotItem/getHeaderIdByMaterial",
dataType: "json",
data: ({
materialParam: materialParam,
depotIds: depotString
}),
success: function (res) {
if(res && res.code === 200) {
var ids = res.data;
if(ids){
$.ajax({
type: "get",
url: "/depotHead/list",
@@ -2083,7 +2071,8 @@ function showDepotHeadDetails(pageNo,pageSize){
number: $.trim($("#searchNumber").val()),
beginTime: $("#searchBeginTime").val(),
endTime: $("#searchEndTime").val(),
dhIds: ids
materialParam: materialParam,
depotIds: depotString
}),
currentPage: pageNo,
pageSize: pageSize
@@ -2101,20 +2090,7 @@ function showDepotHeadDetails(pageNo,pageSize){
return;
}
});
}
else {
$("#tableData").datagrid('loadData', []);
}
}
},
//此处添加错误处理
error:function() {
$.messager.alert('查询提示','查询数据后台异常，请稍后再试！','error');
return;
}
});
}
//自动计算事件
function autoReckon() {
//延时绑定事件

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

@@ -2165,18 +2165,6 @@ function bindEvent(){
function showDepotHeadDetails(pageNo,pageSize){
var materialParam = $.trim($("#searchMaterial").val());
$.ajax({
type:"get",
url: "/depotItem/getHeaderIdByMaterial",
dataType: "json",
data: ({
materialParam: materialParam,
depotIds: depotString
}),
success: function (res) {
if(res && res.code === 200) {
var ids = res.data;
if(ids){
$.ajax({
type: "get",
url: "/depotHead/list",
@@ -2189,7 +2177,8 @@ function showDepotHeadDetails(pageNo,pageSize){
number: $.trim($("#searchNumber").val()),
beginTime: $("#searchBeginTime").val(),
endTime: $("#searchEndTime").val(),
dhIds: ids
materialParam: materialParam,
depotIds: depotString
}),
currentPage: pageNo,
pageSize: pageSize
@@ -2207,20 +2196,7 @@ function showDepotHeadDetails(pageNo,pageSize){
return;
}
});
}
else {
$("#tableData").datagrid('loadData', []);
}
}
},
//此处添加错误处理
error:function() {
$.messager.alert('查询提示','查询数据后台异常，请稍后再试！','error');
return;
}
});
}
//自动计算事件
function autoReckon() {
//延时绑定事件

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

@@ -2027,18 +2027,6 @@ function bindEvent(){
function showDepotHeadDetails(pageNo,pageSize){
var materialParam = $.trim($("#searchMaterial").val());
$.ajax({
type:"get",
url: "/depotItem/getHeaderIdByMaterial",
dataType: "json",
data: ({
materialParam: materialParam,
depotIds: depotString
}),
success: function (res) {
if(res && res.code === 200) {
var ids = res.data;
if(ids){
$.ajax({
type: "get",
url: "/depotHead/list",
@@ -2051,7 +2039,8 @@ function showDepotHeadDetails(pageNo,pageSize){
number: $.trim($("#searchNumber").val()),
beginTime: $("#searchBeginTime").val(),
endTime: $("#searchEndTime").val(),
dhIds: ids
materialParam: materialParam,
depotIds: depotString
}),
currentPage: pageNo,
pageSize: pageSize
@@ -2069,18 +2058,6 @@ function showDepotHeadDetails(pageNo,pageSize){
return;
}
});
}
else {
$("#tableData").datagrid('loadData', []);
}
}
},
//此处添加错误处理
error:function() {
$.messager.alert('查询提示','查询数据后台异常，请稍后再试！','error');
return;
}
});
}
//自动计算事件

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

@@ -2044,18 +2044,6 @@ function bindEvent(){
function showDepotHeadDetails(pageNo,pageSize){
var materialParam = $.trim($("#searchMaterial").val());
$.ajax({
type:"get",
url: "/depotItem/getHeaderIdByMaterial",
dataType: "json",
data: ({
materialParam: materialParam,
depotIds: depotString
}),
success: function (res) {
if(res && res.code === 200) {
var ids = res.data;
if(ids){
$.ajax({
type: "get",
url: "/depotHead/list",
@@ -2068,7 +2056,8 @@ function showDepotHeadDetails(pageNo,pageSize){
number: $.trim($("#searchNumber").val()),
beginTime: $("#searchBeginTime").val(),
endTime: $("#searchEndTime").val(),
dhIds: ids
materialParam: materialParam,
depotIds: depotString
}),
currentPage: pageNo,
pageSize: pageSize
@@ -2086,18 +2075,6 @@ function showDepotHeadDetails(pageNo,pageSize){
return;
}
});
}
else {
$("#tableData").datagrid('loadData', []);
}
}
},
//此处添加错误处理
error:function() {
$.messager.alert('查询提示','查询数据后台异常，请稍后再试！','error');
return;
}
});
}
//自动计算事件

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

@@ -2098,18 +2098,6 @@ function bindEvent(){
function showDepotHeadDetails(pageNo,pageSize){
var materialParam = $.trim($("#searchMaterial").val());
$.ajax({
type:"get",
url: "/depotItem/getHeaderIdByMaterial",
dataType: "json",
data: ({
materialParam: materialParam,
depotIds: depotString
}),
success: function (res) {
if(res && res.code === 200) {
var ids = res.data;
if(ids){
$.ajax({
type: "get",
url: "/depotHead/list",
@@ -2122,7 +2110,8 @@ function showDepotHeadDetails(pageNo,pageSize){
number: $.trim($("#searchNumber").val()),
beginTime: $("#searchBeginTime").val(),
endTime: $("#searchEndTime").val(),
dhIds: ids
materialParam: materialParam,
depotIds: depotString
}),
currentPage: pageNo,
pageSize: pageSize
@@ -2140,18 +2129,6 @@ function showDepotHeadDetails(pageNo,pageSize){
return;
}
});
}
else {
$("#tableData").datagrid('loadData', []);
}
}
},
//此处添加错误处理
error:function() {
$.messager.alert('查询提示','查询数据后台异常，请稍后再试！','error');
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="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,