|
|
@@ -615,15 +615,14 @@ public class OrderItems extends Controller {
|
|
|
if (whereObject.containsKey("isfreeze") && !"".equals(whereObject.getString("isfreeze"))) {
|
|
|
where.append(" and t1.isfreeze ='").append(whereObject.getString("isfreeze")).append("' ");
|
|
|
}
|
|
|
-// if (whereObject.containsKey("isuncheckout") && !"".equals(whereObject.getString("isuncheckout"))) {
|
|
|
-// String isuncheckout = whereObject.getStringValue("isuncheckout");
|
|
|
-// if (isuncheckout.equals("0")) {
|
|
|
-// where.append(" and t1.sa_orderitemsid in (select t1.sa_orderitemsid from sa_orderitems t1 inner join (select t2.sa_orderitemsid,t2.siteid,sum(outwarehouseqty) sumoutwarehouseqty from sa_dispatch_items t2 inner join sa_dispatch t3 on t2.sa_dispatchid=t3.sa_dispatchid and t2.siteid=t3.siteid GROUP BY sa_orderitemsid,siteid) t2 on t1.sa_orderitemsid=t2.sa_orderitemsid and t1.siteid=t2.siteid where t1.qty>t2.sumoutwarehouseqty or t1.u)");
|
|
|
-// } else {
|
|
|
-// where.append(" and 1=1");
|
|
|
-// }
|
|
|
-// where.append(" and t1.isfreeze ='").append(whereObject.getString("isfreeze")).append("' ");
|
|
|
-// }
|
|
|
+ if (whereObject.containsKey("isuncheckout") && !"".equals(whereObject.getString("isuncheckout"))) {
|
|
|
+ String isuncheckout = whereObject.getStringValue("isuncheckout");
|
|
|
+ if (isuncheckout.equals("0")) {
|
|
|
+ where.append(" and t1.sa_orderitemsid in (select t1.sa_orderitemsid from sa_orderitems t1 inner join (select t2.sa_orderitemsid,t2.siteid,sum(outwarehouseqty) sumoutwarehouseqty from sa_dispatch_items t2 inner join sa_dispatch t3 on t2.sa_dispatchid=t3.sa_dispatchid and t2.siteid=t3.siteid GROUP BY sa_orderitemsid,siteid) t2 on t1.sa_orderitemsid=t2.sa_orderitemsid and t1.siteid=t2.siteid where t1.qty>t2.sumoutwarehouseqty or t1.undeliqty>0)");
|
|
|
+ } else {
|
|
|
+ where.append(" and 1=1");
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
boolean isExport = content.getBooleanValue("isExport");
|