Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java =================================================================== diff -u -r33932 -r33934 --- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 33932) +++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 33934) @@ -1979,7 +1979,7 @@ int index = tousseOrDepart.indexOf("["); tousseOrDepart = tousseOrDepart.substring(0, index) + "\\" + tousseOrDepart.substring(index, tousseOrDepart.length()); tousseOrDepartSql += " and (po.tousseDefinition.spelling like '%" + tousseOrDepart + "%' "+ " escape '\\' " +" or po.tousseDefinition.wbCode like '%" - + tousseOrDepart + "%' "+ " escape '\\' " +" or po.tousseDefinition.externalCode like '" + tousseOrDepart + + tousseOrDepart + "%' "+ " escape '\\' " +" or po.tousseDefinition.externalCode like '%" + tousseOrDepart + "%' "+ " escape '\\' " +" or po.tousseDefinition.name like '%" + tousseOrDepart + "%' "+ " escape '\\' "; }else{ tousseOrDepartSql += " and (po.tousseDefinition.spelling like '%" + tousseOrDepart + "%' or po.tousseDefinition.wbCode like '%" @@ -2055,11 +2055,11 @@ int index = tousseOrDepart.indexOf("["); tousseOrDepart = tousseOrDepart.substring(0, index) + "\\" + tousseOrDepart.substring(index, tousseOrDepart.length()); sql += " and (td.spelling like '%" + tousseOrDepart + "%' "+ " escape '\\' " +" or td.wbCode like '%" - + tousseOrDepart + "%' "+ " escape '\\' " +" or td.externalCode like '" + tousseOrDepart + + tousseOrDepart + "%' "+ " escape '\\' " +" or td.externalCode like '%" + tousseOrDepart + "%' "+ " escape '\\' " +" or td.name like '%" + tousseOrDepart + "%' "+ " escape '\\' "; }else{ sql += " and (td.spelling like '%" + tousseOrDepart + "%' or td.wbCode like '%" - + tousseOrDepart + "%' or td.externalCode like '" + tousseOrDepart + + tousseOrDepart + "%' or td.externalCode like '%" + tousseOrDepart + "%' or td.name like '%" + tousseOrDepart + "%' "; } tousseOrDepart = StringTools.defaultString(tousseOrDepart).toUpperCase(); @@ -2352,11 +2352,11 @@ int index = tousseOrDepart.indexOf("["); tousseOrDepart = tousseOrDepart.substring(0, index) + "\\" + tousseOrDepart.substring(index, tousseOrDepart.length()); sql += " and (td.spelling like '%" + tousseOrDepart + "%' "+ " escape '\\' " +" or td.wbCode like '%" - + tousseOrDepart + "%' "+ " escape '\\' " +" or td.externalCode like '" + tousseOrDepart + + tousseOrDepart + "%' "+ " escape '\\' " +" or td.externalCode like '%" + tousseOrDepart + "%' "+ " escape '\\' " +" or td.name like '%" + tousseOrDepart + "%' "+ " escape '\\' "; }else{ sql += " and (td.spelling like '%" + tousseOrDepart + "%' or td.wbCode like '%" - + tousseOrDepart + "%' or td.externalCode like '" + tousseOrDepart + + tousseOrDepart + "%' or td.externalCode like '%" + tousseOrDepart + "%' or td.name like '%" + tousseOrDepart + "%' "; } tousseOrDepart = StringTools.defaultString(tousseOrDepart).toUpperCase(); @@ -2490,11 +2490,11 @@ int index = tousseOrDepart.indexOf("["); tousseOrDepart = tousseOrDepart.substring(0, index) + "\\" + tousseOrDepart.substring(index, tousseOrDepart.length()); sql += " and (td.spelling like '%" + tousseOrDepart + "%' "+ " escape '\\' " +" or td.wbCode like '%" - + tousseOrDepart + "%' "+ " escape '\\' " +" or td.externalCode like '" + tousseOrDepart + + tousseOrDepart + "%' "+ " escape '\\' " +" or td.externalCode like '%" + tousseOrDepart + "%' "+ " escape '\\' " +" or td.name like '%" + tousseOrDepart + "%' "+ " escape '\\' "; }else{ sql += " and (td.spelling like '%" + tousseOrDepart + "%' or td.wbCode like '%" - + tousseOrDepart + "%' or td.externalCode like '" + tousseOrDepart + + tousseOrDepart + "%' or td.externalCode like '%" + tousseOrDepart + "%' or td.name like '%" + tousseOrDepart + "%' "; } tousseOrDepart = StringTools.defaultString(tousseOrDepart).toUpperCase(); @@ -2584,11 +2584,11 @@ int index = tousseOrDepart.indexOf("["); tousseOrDepart = tousseOrDepart.substring(0, index) + "\\" + tousseOrDepart.substring(index, tousseOrDepart.length()); sql += " and (td.spelling like '%" + tousseOrDepart + "%' "+ " escape '\\' " +" or td.wbCode like '%" - + tousseOrDepart + "%' "+ " escape '\\' " +" or td.externalCode like '" + tousseOrDepart + + tousseOrDepart + "%' "+ " escape '\\' " +" or td.externalCode like '%" + tousseOrDepart + "%' "+ " escape '\\' " +" or td.name like '%" + tousseOrDepart + "%' "+ " escape '\\' "; }else{ sql += " and (td.spelling like '%" + tousseOrDepart + "%' or td.wbCode like '%" - + tousseOrDepart + "%' or td.externalCode like '" + tousseOrDepart + + tousseOrDepart + "%' or td.externalCode like '%" + tousseOrDepart + "%' or td.name like '%" + tousseOrDepart + "%' "; } tousseOrDepart = StringTools.defaultString(tousseOrDepart).toUpperCase();