Merge remote-tracking branch 'origin/develop' into develop

src/custom/restcontroller/webmanage/sale/accessoryorder/SQL/查询可添加配件列表.sql

@@ -27,12 +27,15 @@ SELECT t1.itemid,
        t3.erpitemname,
        t3.specalnote,
        t3.prodline,
-       t3.device
+       t3.device,
+       t7.bomfullname
 from plm_item t1
          LEFT JOIN plm_unitgroup t2 ON t2.unitgroupid = t1.unitgroupid and t2.siteid = t1.siteid
          left join plm_itemextend t3 on t3.itemid = t1.itemid and t3.siteid = t1.siteid
          LEFT JOIN plm_unit t4 ON t4.unitid = t1.unitid AND t4.siteid = t1.siteid
          LEFT JOIN plm_unit t5 ON t5.unitid = t2.auxunitid AND t5.siteid = t2.siteid
+         LEFT JOIN sa_itemsalebom t6 ON t6.itemid = t1.itemid and t6.siteid = t1.siteid
+         LEFT JOIN plm_bom t7 ON t7.plm_bomid = t6.plm_bomid and t7.siteid = t6.siteid
 WHERE t1.siteid = $siteid$
   and t1.isonsale = 1
   and t1.isused = 1

src/custom/restcontroller/webmanage/sale/tpartreimbursement/tpartreimbursementdetail.java

@@ -41,7 +41,7 @@ public class tpartreimbursementdetail extends Controller {
                 where.append(")");
             }
         }
-
+        pageSorting=" t1.rowno asc";
         QuerySQL querySQL = SQLFactory.createQuerySQL(this, "sa_orderitems ", "itemid","qty","price","amount","rowno","sa_orderitemsid","sa_orderid");
         querySQL.setTableAlias("t1");
         querySQL.addJoinTable(JOINTYPE.inner,"sa_order", "t2", "t1.sa_orderid = t2.sa_orderid AND t1.siteid = t2.siteid", "sonum");