Merge branch 'dev-ljw' into test
This commit is contained in:
commit
071236a7ef
@ -49,7 +49,7 @@ public class SparepartsNotShippedPlugin extends AbstractReportListDataPlugin {
|
|||||||
DataSet result = selected.where("yem_billno != ''");
|
DataSet result = selected.where("yem_billno != ''");
|
||||||
sb.append("yem_billno != ''");
|
sb.append("yem_billno != ''");
|
||||||
if (YEM.isNotEmpty(yemContract)) {
|
if (YEM.isNotEmpty(yemContract)) {
|
||||||
sb.append(" AND delivernoticebillno like '").append("%").append(yemContract).append("%").append("'");
|
sb.append(" AND yem_billno like '").append("%").append(yemContract).append("%").append("'");
|
||||||
}
|
}
|
||||||
if (YEM.isNotEmpty(yemClient)) {
|
if (YEM.isNotEmpty(yemClient)) {
|
||||||
sb.append(" AND yem_client = ").append("'" + yemClient.getString("name") + "'");
|
sb.append(" AND yem_client = ").append("'" + yemClient.getString("name") + "'");
|
||||||
|
Loading…
Reference in New Issue
Block a user