|
|
@@ -588,6 +588,14 @@ public class accessoryorder extends Controller {
|
|
|
where = where + " and DATE_FORMAT(t1.begindate, '%Y-%m-%d') <='" + skudate + "'";
|
|
|
where = where + " and DATE_FORMAT(t1.enddate, '%Y-%m-%d') >='" + skudate + "'";
|
|
|
}
|
|
|
+ if (content.containsKey("where")) {
|
|
|
+ JSONObject whereObject = content.getJSONObject("where");
|
|
|
+ if (whereObject.containsKey("condition") && !"".equals(whereObject.getString("condition"))) {
|
|
|
+ where = where + " and (t1.itemno like'%" + whereObject.getString("condition")
|
|
|
+ + "%' or t1.itemname like'%" + whereObject.getString("condition")
|
|
|
+ + "%' or t3.model like'%" + whereObject.getString("condition") + "%' ) ";
|
|
|
+ }
|
|
|
+ }
|
|
|
|
|
|
Long sa_orderid = content.getLong("sa_orderid");
|
|
|
Rows orderRows = getOrderRows(this, sa_orderid);
|