|
|
@@ -504,12 +504,12 @@ public class dispatchItems extends Controller {
|
|
|
//查询订单列表(管理端)
|
|
|
public QuerySQL queryListManage(String where) throws YosException {
|
|
|
QuerySQL querySQL = SQLFactory.createQuerySQL(this, "sa_dispatch_items",
|
|
|
- "sa_dispatchid", "outwarehousedate", "remarks");
|
|
|
+ "sa_dispatch_itemsid", "sa_dispatchid", "sa_orderitemsid", "isclose", "rowno", "itemid", "outwarehousedate", "batchno", "remarks");
|
|
|
querySQL.setTableAlias("t1");
|
|
|
querySQL.addJoinTable(JOINTYPE.left, "plm_item", "t2", "t2.itemid = t1.itemid AND t2.siteid = t1.siteid",
|
|
|
"itemno");
|
|
|
querySQL.addJoinTable(JOINTYPE.left, "sa_dispatch", "t4", "t4.sa_dispatchid = t1.sa_dispatchid AND t4.siteid = t1.siteid",
|
|
|
- "billno", "status", "billdate");
|
|
|
+ "billno", "status", "billdate", "closedate");
|
|
|
querySQL.addJoinTable(JOINTYPE.left, "sa_orderitems", "t5", "t5.sa_orderitemsid=t1.sa_orderitemsid and t5.siteid=t1.siteid",
|
|
|
"spec");
|
|
|
querySQL.addJoinTable(JOINTYPE.left, "sa_order", "t8", "t8.sa_orderid=t4.sa_orderid and t8.siteid=t4.siteid",
|
|
|
@@ -517,7 +517,7 @@ public class dispatchItems extends Controller {
|
|
|
querySQL.addJoinTable(JOINTYPE.left, "sa_agents", "t9", "t9.sys_enterpriseid = t4.sys_enterpriseid and t9.siteid = t4.siteid",
|
|
|
"agentnum");
|
|
|
querySQL.addJoinTable(JOINTYPE.left, "sys_enterprise", "t10", "t10.sys_enterpriseid = t4.sys_enterpriseid and t10.siteid = t4.siteid",
|
|
|
- "enterprisename");
|
|
|
+ "enterprisename", "sys_enterpriseid");
|
|
|
querySQL.addQueryFields("qty", "ifnull(t1.qty, 0)");
|
|
|
querySQL.addQueryFields("outwarehouseqty", "ifnull(t1.outwarehouseqty, 0)");
|
|
|
querySQL.setWhere("t1.siteid", siteid);
|
