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

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

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

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

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

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

@ -18,12 +18,12 @@ import org.hibernate.annotations.GenericGenerator;
import javax.persistence.SequenceGenerator;
import org.jeecgframework.poi.excel.annotation.Excel;
/**
/**
* @Title: Entity
* @Description: wave_to_down
* @author onlineGenerator
* @date 2019-12-11 11:32:25
* @version V1.0
* @version V1.0
*
*/
@Entity
@ -95,7 +95,8 @@ public class WaveToDownEntity implements java.io.Serializable {
/**by5*/
@Excel(name="by5")
private String by5;
@Excel(name="商品条码")
private java.lang.String shpTiaoMa;
/**
*方法: 取得java.lang.String
*@return: java.lang.String 主键
@ -451,4 +452,20 @@ public class WaveToDownEntity implements java.io.Serializable {
public void setBy5(String 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;
}
}

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

@ -18,12 +18,12 @@ import org.hibernate.annotations.GenericGenerator;
import javax.persistence.SequenceGenerator;
import org.jeecgframework.poi.excel.annotation.Excel;
/**
/**
* @Title: Entity
* @Description: wave_to_fj
* @author onlineGenerator
* @date 2019-12-11 11:32:18
* @version V1.0
* @version V1.0
*
*/
@Entity
@ -95,7 +95,8 @@ public class WaveToFjEntity implements java.io.Serializable {
/**by5*/
@Excel(name="by5")
private String by5;
@Excel(name="商品条码")
private java.lang.String shpTiaoMa;
/**
*方法: 取得java.lang.String
*@return: java.lang.String 主键
@ -451,4 +452,20 @@ public class WaveToFjEntity implements java.io.Serializable {
public void setBy5(String 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;
}
}