huojin
/
ZW_MultiSelect
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

no message

main
liyang 2024-04-03 14:41:15 +08:00
parent 83e4d29fae
commit 242e4ddea2
5 changed files with 176 additions and 131 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
wms-vue/src/components/duochaxun/Rukuzhengli.vue
View File

@ -57,7 +57,7 @@
</el-col> </el-col>
</el-row> </el-row>
<el-row :gutter="24" v-if="isShow"> <el-row :gutter="24" v-show="isShow">
<el-col :span="8"> <el-col :span="8">
<el-form-item label="收货日期:"> <el-form-item label="收货日期:">
<el-date-picker style="width: 325px" <el-date-picker style="width: 325px"
@ -120,6 +120,8 @@
<el-table <el-table
v-loading="this.tableloding"
:max-height="480"
:header-cell-style="{background:'#000',color:'#fff'}" :header-cell-style="{background:'#000',color:'#fff'}"
:data="tableData" :data="tableData"
id="educe-table" id="educe-table"
@ -436,6 +438,7 @@ export default {
} }
}] }]
}, },
tableloding: false,
isShow:false,//是否展示全部搜索条件 isShow:false,//是否展示全部搜索条件
value1: '', value1: '',
value2: '', value2: '',
@ -496,9 +499,10 @@ export default {
} else { } else {
this.$message.error('获取数据失败'); this.$message.error('获取数据失败');
} }
})
.catch(function (err) { // eslint-disable-next-line no-unused-vars
console.log(err); },err=>{
this.tableloding=false;
}) })
}, },
PlantS(){ PlantS(){
@ -512,12 +516,14 @@ export default {
} else { } else {
this.$message.error('获取数据失败'); this.$message.error('获取数据失败');
} }
// eslint-disable-next-line no-unused-vars
},err=>{
this.tableloding=false;
}) })
.catch(function (err) {
console.log(err);
})
}, },
queryUser() { queryUser() {
this.tableloding=true;
//列表数据加载 //列表数据加载
this.$axios.post(this.$httpUrl + '/Rukuzhengli/queryUser', { this.$axios.post(this.$httpUrl + '/Rukuzhengli/queryUser', {
pageSize: this.pageSize, pageSize: this.pageSize,
@ -533,16 +539,13 @@ export default {
this.$message.error('获取数据失败'); this.$message.error('获取数据失败');
} }
// eslint-disable-next-line no-unused-vars
},err=>{
this.tableloding=false;
})
})
.catch(function (err) {
console.log(err);
})
}, },
find(){ find(){
if(this.checked){
this.checked=false;
}
this.queryUser(); this.queryUser();
}, },
Allquesr(){ Allquesr(){
@ -555,6 +558,8 @@ export default {
}, },
rest() { rest() {
//条件查询重置 //条件查询重置
this.checked=false;
this.isShow=false;
this.param={}; this.param={};
}, },
} }

25
wms-vue/src/components/duochaxun/Zhengliqingdan.vue
View File

@ -602,10 +602,6 @@ export default {
this.Plant(); this.Plant();
this.Loc(); this.Loc();
this.z_Name(); this.z_Name();
// this.$nextTick(()=> {
//
// this.MaxHeight = window.innerHeight - 220;//300是页面中除了表格外其他组件的高度
// })
}, },
methods: { methods: {
handleEdit(index, row) { handleEdit(index, row) {
@ -652,9 +648,9 @@ export default {
} else { } else {
this.$message.error('获取数据失败'); this.$message.error('获取数据失败');
} }
}) // eslint-disable-next-line no-unused-vars
.catch(function (err) { },err =>{
console.log(err); this.tableloding=false
}) })
}, },
z_Name(){ z_Name(){
@ -668,9 +664,9 @@ export default {
} else { } else {
this.$message.error('获取数据失败'); this.$message.error('获取数据失败');
} }
}) // eslint-disable-next-line no-unused-vars
.catch(function (err) { },err =>{
console.log(err); this.tableloding=false
}) })
}, },
queryUser() { queryUser() {
@ -695,9 +691,10 @@ export default {
}) })
}, },
find(){ find(){
if(this.checked){ // if(this.checked){
this.checked=false; // this.checked=false;
} // this.isShow=false;
// }
this.queryUser(); this.queryUser();
}, },
Allquesr(){ Allquesr(){
@ -711,6 +708,8 @@ export default {
rest() { rest() {
//表单重置 //表单重置
this.param={}; this.param={};
this.isShow=false;
this.checked=false;
}, },
add() { add() {
//点击新增按弹窗 //点击新增按弹窗

2
wms-vue/src/router/router.js
View File

@ -22,7 +22,7 @@ const routes=[
meta:{ meta:{
title:'首页' title:'首页'
}, },
component: () => import('../components/duochaxun/Zhengliqingdan.vue') component: () => import('../components/duochaxun/Rukuzhengli.vue')
}, },
{ {
path:'/Zhengliqingdan', path:'/Zhengliqingdan',

49
wms/src/main/java/com/yc/wms/service/impl/RukuzhengliImpl.java
View File

@ -46,8 +46,9 @@ public class RukuzhengliImpl implements com.yc.wms.service.Rukuzhengli {
//查询条件 //查询条件
//采购订单 //采购订单
if(rukuzhengli.sourceId!=null&&!rukuzhengli.sourceId.equals("")){ if(rukuzhengli.sourceId!=null){
String[] str=rukuzhengli.sourceId.split("\n"); if(!rukuzhengli.sourceId.trim().equals("")){
String[] str=rukuzhengli.sourceId.trim().split("\n");
StringBuffer sb = new StringBuffer(); StringBuffer sb = new StringBuffer();
for (int i=0;i<str.length;i++){ for (int i=0;i<str.length;i++){
@ -60,9 +61,12 @@ public class RukuzhengliImpl implements com.yc.wms.service.Rukuzhengli {
sql_bz+=" and ad.sourceId in ("+sb.toString()+")"; sql_bz+=" and ad.sourceId in ("+sb.toString()+")";
} }
}
//收货凭证 //收货凭证
if(rukuzhengli.strBill7!=null&&!rukuzhengli.strBill7.equals("")){ if(rukuzhengli.strBill7!=null){
String[] str=rukuzhengli.strBill7.split("\n"); if(!rukuzhengli.strBill7.trim().equals("")){
String[] str=rukuzhengli.strBill7.trim().split("\n");
StringBuffer sb = new StringBuffer(); StringBuffer sb = new StringBuffer();
for (int i=0;i<str.length;i++){ for (int i=0;i<str.length;i++){
@ -75,9 +79,12 @@ public class RukuzhengliImpl implements com.yc.wms.service.Rukuzhengli {
sql_bz+=" and ad.strBill7 in ("+sb.toString()+")"; sql_bz+=" and ad.strBill7 in ("+sb.toString()+")";
} }
}
//料号 //料号
if(rukuzhengli.code!=null&&!rukuzhengli.code.equals("")){ if(rukuzhengli.code!=null){
String[] str=rukuzhengli.code.split("\n"); if(!rukuzhengli.code.trim().equals("")){
String[] str=rukuzhengli.code.trim().split("\n");
StringBuffer sb = new StringBuffer(); StringBuffer sb = new StringBuffer();
for (int i=0;i<str.length;i++){ for (int i=0;i<str.length;i++){
@ -90,9 +97,12 @@ public class RukuzhengliImpl implements com.yc.wms.service.Rukuzhengli {
sql_bz+=" and i.code in ("+sb.toString()+")"; sql_bz+=" and i.code in ("+sb.toString()+")";
} }
}
//批次号 //批次号
if(rukuzhengli.PROP_C1!=null&&!rukuzhengli.PROP_C1.equals("")){ if(rukuzhengli.PROP_C1!=null){
String[] str=rukuzhengli.PROP_C1.split("\n"); if(!rukuzhengli.PROP_C1.trim().equals("")){
String[] str=rukuzhengli.PROP_C1.trim().split("\n");
StringBuffer sb = new StringBuffer(); StringBuffer sb = new StringBuffer();
for (int i=0;i<str.length;i++){ for (int i=0;i<str.length;i++){
@ -105,6 +115,8 @@ public class RukuzhengliImpl implements com.yc.wms.service.Rukuzhengli {
sql_bz+=" and ad.PROP_C1 in ("+sb.toString()+")"; sql_bz+=" and ad.PROP_C1 in ("+sb.toString()+")";
} }
}
//收货日期 //收货日期
if(rukuzhengli.ORDER_DATE!=null&& rukuzhengli.ORDER_DATE.length>0){ if(rukuzhengli.ORDER_DATE!=null&& rukuzhengli.ORDER_DATE.length>0){
String startDate = simpleDateFormat.format(rukuzhengli.ORDER_DATE[0]); String startDate = simpleDateFormat.format(rukuzhengli.ORDER_DATE[0]);
@ -120,8 +132,11 @@ public class RukuzhengliImpl implements com.yc.wms.service.Rukuzhengli {
} }
//特殊标记 //特殊标记
if(rukuzhengli.PROP_C3!=null&&!rukuzhengli.PROP_C3.equals("")){ if(rukuzhengli.PROP_C3!=null){
sql_bz+=" and ad.PROP_C3 ="+"'"+ rukuzhengli.PROP_C3+"'"; if(!rukuzhengli.PROP_C3.trim().equals("")){
sql_bz+=" and ad.PROP_C3 ="+"'"+ rukuzhengli.PROP_C3.trim()+"'";
}
} }
//工厂 //工厂
@ -150,15 +165,17 @@ public class RukuzhengliImpl implements com.yc.wms.service.Rukuzhengli {
} }
//SAP接口 //SAP接口
if(rukuzhengli.CODE!=null&&!rukuzhengli.CODE.equals("")){ if(rukuzhengli.CODE!=null){
if(!rukuzhengli.CODE.trim().equals("")){
sql_bz+=" and a.CODE ="+"'"+ rukuzhengli.CODE+"'"; sql_bz+=" and a.CODE ="+"'"+ rukuzhengli.CODE.trim()+"'";
}
} }
//加急标记 //加急标记
if(rukuzhengli.strBill11!=null&&!rukuzhengli.strBill11.equals("")){ if(rukuzhengli.strBill11!=null){
if(rukuzhengli.strBill11.trim().equals("")){
sql_bz+=" and ad.strBill11 ="+"'"+ rukuzhengli.strBill11+"'"; sql_bz+=" and ad.strBill11 ="+"'"+ rukuzhengli.strBill11.trim()+"'";
}
} }
String sqlCount = "select count(t.id) as nums from(" + sql_bz+") t"; String sqlCount = "select count(t.id) as nums from(" + sql_bz+") t";

68
wms/src/main/java/com/yc/wms/service/impl/ZhengliqingdanImpl.java
View File

@ -46,13 +46,15 @@ public class ZhengliqingdanImpl implements Zhengliqingdan {
//查询条件 //查询条件
//采购单号 //采购单号
System.out.println(zhengliqingdan.sourceId.trim()==null); if(zhengliqingdan.sourceId!=null){
if(zhengliqingdan.sourceId!=null&&!zhengliqingdan.sourceId.equals("")){ if(!zhengliqingdan.sourceId.trim().equals("")){
sql+=" and ad.sourceId="+"'"+zhengliqingdan.sourceId.trim()+"'"; sql+=" and ad.sourceId="+"'"+zhengliqingdan.sourceId.trim()+"'";
} }
}
//收货凭证 //收货凭证
if(zhengliqingdan.strBill7!=null&&!zhengliqingdan.strBill7.equals("")){ if(zhengliqingdan.strBill7!=null){
String[] str=zhengliqingdan.strBill7.split("\n"); if(!zhengliqingdan.strBill7.trim().equals("")){
String[] str=zhengliqingdan.strBill7.trim().split("\n");
StringBuffer sb = new StringBuffer(); StringBuffer sb = new StringBuffer();
for (int i=0;i<str.length;i++){ for (int i=0;i<str.length;i++){
@ -65,9 +67,12 @@ public class ZhengliqingdanImpl implements Zhengliqingdan {
sql+=" and ad.strBill7 in ("+sb.toString()+")"; sql+=" and ad.strBill7 in ("+sb.toString()+")";
} }
}
//料号 //料号
if(zhengliqingdan.i_CODE!=null&&!zhengliqingdan.i_CODE.equals("")){ if(zhengliqingdan.i_CODE!=null){
String[] str=zhengliqingdan.i_CODE.split("\n"); if(!zhengliqingdan.i_CODE.trim().equals("")){
String[] str=zhengliqingdan.i_CODE.trim().split("\n");
StringBuffer sb = new StringBuffer(); StringBuffer sb = new StringBuffer();
for (int i=0;i<str.length;i++){ for (int i=0;i<str.length;i++){
@ -79,10 +84,13 @@ public class ZhengliqingdanImpl implements Zhengliqingdan {
} }
sql+=" and i.CODE in ("+sb.toString()+")"; sql+=" and i.CODE in ("+sb.toString()+")";
} }
}
//物料描述 //物料描述
if(zhengliqingdan.i_name!=null&&!zhengliqingdan.i_name.equals("")){ if(zhengliqingdan.i_name!=null){
sql+=" and i.NAME="+"'"+zhengliqingdan.i_name+"'"; if(!zhengliqingdan.i_name.trim().equals("")){
sql+=" and i.NAME like "+"'%"+zhengliqingdan.i_name.trim()+"%'";
}
} }
//库区 //库区
@ -99,8 +107,9 @@ public class ZhengliqingdanImpl implements Zhengliqingdan {
} }
//库位号 //库位号
if(zhengliqingdan.lc_CODE!=null&&!zhengliqingdan.lc_CODE.equals("")){ if(zhengliqingdan.lc_CODE!=null){
String[] str=zhengliqingdan.lc_CODE.split("\n"); if(!zhengliqingdan.lc_CODE.trim().equals("")){
String[] str=zhengliqingdan.lc_CODE.trim().split("\n");
StringBuffer sb = new StringBuffer(); StringBuffer sb = new StringBuffer();
for (int i=0;i<str.length;i++){ for (int i=0;i<str.length;i++){
@ -112,10 +121,14 @@ public class ZhengliqingdanImpl implements Zhengliqingdan {
} }
sql+=" and lc.CODE in ("+sb.toString()+")"; sql+=" and lc.CODE in ("+sb.toString()+")";
} }
}
//批次号 //批次号
if(zhengliqingdan.PROP_C1!=null&&!zhengliqingdan.PROP_C1.equals("")){ if(zhengliqingdan.PROP_C1!=null){
sql+=" and ik.PROP_C1="+"'"+zhengliqingdan.PROP_C1+"'"; if(!zhengliqingdan.PROP_C1.trim().equals("")){
sql+=" and ik.PROP_C1="+"'"+zhengliqingdan.PROP_C1.trim()+"'";
}
} }
//LOC //LOC
@ -132,8 +145,10 @@ public class ZhengliqingdanImpl implements Zhengliqingdan {
} }
//特殊标记 //特殊标记
if(zhengliqingdan.PROP_C3!=null&&!zhengliqingdan.PROP_C3.equals("")){ if(zhengliqingdan.PROP_C3!=null){
sql+=" and ik.PROP_C3="+"'"+zhengliqingdan.PROP_C3+"'"; if(!zhengliqingdan.PROP_C3.trim().equals("")){
sql+=" and ik.PROP_C3="+"'"+zhengliqingdan.PROP_C3.trim()+"'";
}
} }
//工厂 //工厂
@ -150,8 +165,9 @@ public class ZhengliqingdanImpl implements Zhengliqingdan {
} }
//整理人 //整理人
if(zhengliqingdan.OPERATOR!=null&&!zhengliqingdan.OPERATOR.equals("")){ if(zhengliqingdan.OPERATOR!=null){
String[] str=zhengliqingdan.OPERATOR.split("\n"); if(!zhengliqingdan.OPERATOR.trim().equals("")){
String[] str=zhengliqingdan.OPERATOR.trim().split("\n");
StringBuffer sb = new StringBuffer(); StringBuffer sb = new StringBuffer();
for (int i=0;i<str.length;i++){ for (int i=0;i<str.length;i++){
@ -163,10 +179,13 @@ public class ZhengliqingdanImpl implements Zhengliqingdan {
} }
sql+=" and rd.OPERATOR in ("+sb.toString()+")"; sql+=" and rd.OPERATOR in ("+sb.toString()+")";
} }
}
//SAP接口 //SAP接口
if(zhengliqingdan.a_CODE!=null&&!zhengliqingdan.a_CODE.equals("")){ if(zhengliqingdan.a_CODE!=null){
sql+=" and a.CODE="+"'"+zhengliqingdan.a_CODE+"'"; if(!zhengliqingdan.a_CODE.trim().equals("")){
sql+=" and a.CODE="+"'"+zhengliqingdan.a_CODE.trim()+"'";
}
} }
//整理日期 //整理日期
@ -185,13 +204,16 @@ public class ZhengliqingdanImpl implements Zhengliqingdan {
} }
//备注 //备注
if(zhengliqingdan.description!=null&&!zhengliqingdan.description.equals("")){ if(zhengliqingdan.description!=null){
sql+=" and ad.description like"+"'%"+zhengliqingdan.description+"%'"; if(!zhengliqingdan.description.trim().equals("")){
sql+=" and ad.description like"+"'%"+zhengliqingdan.description.trim()+"%'";
}
} }
//容器码 //容器码
if(zhengliqingdan.LP!=null&&!zhengliqingdan.LP.equals("")){ if(zhengliqingdan.LP!=null){
String[] str=zhengliqingdan.LP.split("\n"); if(!zhengliqingdan.LP.trim().equals("")){
String[] str=zhengliqingdan.LP.trim().split("\n");
StringBuffer sb = new StringBuffer(); StringBuffer sb = new StringBuffer();
for (int i=0;i<str.length;i++){ for (int i=0;i<str.length;i++){
@ -204,6 +226,8 @@ public class ZhengliqingdanImpl implements Zhengliqingdan {
sql+=" and s.LP in ("+sb.toString()+")"; sql+=" and s.LP in ("+sb.toString()+")";
} }
}
String sqlCount = "select count(1) as Znum from(" + sql+") t"; String sqlCount = "select count(1) as Znum from(" + sql+") t";
String sqlFy = "select t.* from(" + sql+") t"; String sqlFy = "select t.* from(" + sql+") t";