|
@@ -2747,6 +2747,7 @@ public class Order extends Controller {
|
|
|
cashJsonObject.put("sqlList", sqlList);
|
|
|
return cashJsonObject;
|
|
|
}
|
|
|
+
|
|
|
/**
|
|
|
* 订单结案验证
|
|
|
*
|
|
@@ -2884,9 +2885,9 @@ public class Order extends Controller {
|
|
|
public String logisticsList() throws YosException {
|
|
|
Long sa_orderid = content.getLong("sa_orderid");
|
|
|
|
|
|
- QuerySQL querySQL = SQLFactory.createQuerySQL(this, "sa_logistics", "sa_logisticsid", "billno", "billdate", "logisticsstatus", "packageqty", "logisticsamount", "address", "remarks").setTableAlias("t1");
|
|
|
- querySQL.addJoinTable(JOINTYPE.inner, "sa_logistics_items", "t2", "t1.sa_logisticsid = t2.sa_logisticsid");
|
|
|
- querySQL.addJoinTable(JOINTYPE.inner, "st_stockbill_items", "t3", "t2.st_stockbill_itemsid = t3.st_stockbill_itemsid");
|
|
|
+ QuerySQL querySQL = SQLFactory.createQuerySQL(this, "expressform", "expressformid", "txlogisticid as billno", "pushdate as billdate", "status as logisticsstatus", "number as packageqty", "agencyfund as logisticsamount", "rcv_address as address", "remarks").setTableAlias("t1");
|
|
|
+ querySQL.addJoinTable(JOINTYPE.inner, "st_stockbill", "t2", "t1.txlogisticid = t2.txlogisticid");
|
|
|
+ querySQL.addJoinTable(JOINTYPE.inner, "st_stockbill_items", "t3", "t2.st_stockbillid = t3.st_stockbillid");
|
|
|
querySQL.setWhere("t1.`status`!='新建'");
|
|
|
querySQL.setWhere("t3.sa_orderid", sa_orderid);
|
|
|
querySQL.setDistinct(true);
|