zcy
/
jee_wms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

波次增加商品条码搜索

master
erzhongxmu 2020-11-22 09:31:24 +08:00
parent a3c38dffc6
commit aad6ec5ca1
4 changed files with 54 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/com/zzjee/wave/controller/WaveToDownController.java
View File

@ -393,10 +393,15 @@ public class WaveToDownController extends BaseController {
} }
if(StringUtil.isNotEmpty(searchstr3)){ if(StringUtil.isNotEmpty(searchstr3)){
for(WaveToDownEntity t: listWaveToDowns ){ for(WaveToDownEntity t: listWaveToDowns ){
if(StringUtil.strPos(t.getGoodsId(),searchstr3)){ try{
if(StringUtil.strPos(t.getGoodsId(),searchstr3)||StringUtil.strPos(t.getShpTiaoMa(),searchstr3)){
listWaveToDownsnew.add(t); listWaveToDownsnew.add(t);
} }
}catch (Exception e){
}
} }
D0.setObj(listWaveToDownsnew); D0.setObj(listWaveToDownsnew);

7
src/main/java/com/zzjee/wave/controller/WaveToFjController.java
View File

@ -376,9 +376,14 @@ public class WaveToFjController extends BaseController {
String chehao = ""; String chehao = "";
for(WaveToFjEntity t:listWaveToFjs) { for(WaveToFjEntity t:listWaveToFjs) {
if (StringUtil.isNotEmpty(searchstr3)) { if (StringUtil.isNotEmpty(searchstr3)) {
if (!StringUtil.strPos(t.getGoodsId(), searchstr3)) { try{
if (!StringUtil.strPos(t.getGoodsId(), searchstr3)||StringUtil.strPos(t.getShpTiaoMa(),searchstr3)) {
continue; continue;
} }
}catch (Exception e){
}
} }
WaveToFjEntity t1 = new WaveToFjEntity(); WaveToFjEntity t1 = new WaveToFjEntity();
try{ try{

19
src/main/java/com/zzjee/wave/entity/WaveToDownEntity.java
View File

@ -95,7 +95,8 @@ public class WaveToDownEntity implements java.io.Serializable {
/**by5*/ /**by5*/
@Excel(name="by5") @Excel(name="by5")
private String by5; private String by5;
@Excel(name="商品条码")
private java.lang.String shpTiaoMa;
/** /**
*方法: 取得java.lang.String *方法: 取得java.lang.String
*@return: java.lang.String 主键 *@return: java.lang.String 主键
@ -451,4 +452,20 @@ public class WaveToDownEntity implements java.io.Serializable {
public void setBy5(String by5){ public void setBy5(String by5){
this.by5 = by5; this.by5 = by5;
} }
/**
*方法: 取得java.lang.String
*@return: java.lang.String shpTiaoMa
*/
@Column(name ="SHP_TIAO_MA",nullable=true,length=32)
public java.lang.String getShpTiaoMa(){
return this.shpTiaoMa;
}
/**
*方法: 设置java.lang.String
*@param: java.lang.String shpTiaoMa
*/
public void setShpTiaoMa(java.lang.String shpTiaoMa){
this.shpTiaoMa = shpTiaoMa;
}
} }

19
src/main/java/com/zzjee/wave/entity/WaveToFjEntity.java
View File

@ -95,7 +95,8 @@ public class WaveToFjEntity implements java.io.Serializable {
/**by5*/ /**by5*/
@Excel(name="by5") @Excel(name="by5")
private String by5; private String by5;
@Excel(name="商品条码")
private java.lang.String shpTiaoMa;
/** /**
*方法: 取得java.lang.String *方法: 取得java.lang.String
*@return: java.lang.String 主键 *@return: java.lang.String 主键
@ -451,4 +452,20 @@ public class WaveToFjEntity implements java.io.Serializable {
public void setBy5(String by5){ public void setBy5(String by5){
this.by5 = by5; this.by5 = by5;
} }
/**
*方法: 取得java.lang.String
*@return: java.lang.String shpTiaoMa
*/
@Column(name ="SHP_TIAO_MA",nullable=true,length=32)
public java.lang.String getShpTiaoMa(){
return this.shpTiaoMa;
}
/**
*方法: 设置java.lang.String
*@param: java.lang.String shpTiaoMa
*/
public void setShpTiaoMa(java.lang.String shpTiaoMa){
this.shpTiaoMa = shpTiaoMa;
}
} }