|
|
@@ -579,7 +579,7 @@ public class dispatchItems extends Controller {
|
|
|
querySQL.addJoinTable(JOINTYPE.inner, "sa_dispatch", "t4", "t4.sa_dispatchid = t1.sa_dispatchid AND t4.siteid = t1.siteid",
|
|
|
"billno", "status", "billdate", "closedate");
|
|
|
querySQL.addJoinTable(JOINTYPE.left, "sa_orderitems", "t5", "t5.sa_orderitemsid=t1.sa_orderitemsid and t5.siteid=t1.siteid",
|
|
|
- "spec","price","undeliqty","deliedqty","amount","rowno");
|
|
|
+ "spec","price","undeliqty","deliedqty","rowno");
|
|
|
querySQL.addJoinTable(JOINTYPE.left, "sa_order", "t8", "t8.sa_orderid=t4.sa_orderid and t8.siteid=t4.siteid",
|
|
|
"sonum","type","typemx","sa_accountclassinfos","sa_orderid");
|
|
|
querySQL.addJoinTable(JOINTYPE.left, "sa_agents", "t9", "t9.sys_enterpriseid = t4.sys_enterpriseid and t9.siteid = t4.siteid",
|
|
|
@@ -592,6 +592,7 @@ public class dispatchItems extends Controller {
|
|
|
querySQL.addJoinTable(JOINTYPE.left, "sa_accountclass", "t12", "t12.sa_accountclassid=t8.sa_accountclassid and t12.siteid=t8.siteid");
|
|
|
querySQL.addQueryFields("qty", "ifnull(t1.qty, 0)");
|
|
|
querySQL.addQueryFields("outwarehouseqty", "ifnull(t1.outwarehouseqty, 0)");
|
|
|
+ querySQL.addQueryFields("amount", "ifnull(t1.outwarehouseqty*t5.price, 0)");
|
|
|
querySQL.addQueryFields("orderRowno", "t5.rowno");
|
|
|
querySQL.addQueryFields("accountnames", "if(ifnull(replace(replace(replace(JSON_EXTRACT (t8.sa_accountclassinfos, '$**.accountname' ),'[',''),']',''),'\\\"',''),'')='',t12.accountname,replace(replace(replace(JSON_EXTRACT (t8.sa_accountclassinfos, '$**.accountname' ),'[',''),']',''),'\\\"',''))");
|
|
|
querySQL.setWhere("t1.siteid", siteid);
|