维修退货申请单新建时，通过序列号带入数量、单位、进货日期

src/custom/restcontroller/webmanage/sale/aftersalesmag/aftersalesmag.java

@@ -198,7 +198,7 @@ public class aftersalesmag extends Controller {
 //        sqlFactory.addParameter("siteid", siteid);
 //        sqlFactory.addParameter("sys_enterpriseid", sys_enterpriseid);
 //        Rows rows = dbConnect.runSqlQuery(sqlFactory.getSQL(false));
-        QuerySQL querySQL = SQLFactory.createQuerySQL(this, "sa_itemsku ", "sku");
+        QuerySQL querySQL = SQLFactory.createQuerySQL(this, "sa_itemsku", "sku");
         querySQL.setTableAlias("t1");
         querySQL.addJoinTable(JOINTYPE.left, "plm_item", "t2", "t1.itemid=t2.itemid and t1.siteid=t2.siteid", "itemid", "itemno", "itemname", "model", "spec");
         querySQL.addJoinTable(JOINTYPE.left, "plm_unit", "t3", "t3.unitid=t2.unitid and t3.siteid=t2.siteid", "unitname");
@@ -214,6 +214,22 @@ public class aftersalesmag extends Controller {
         querySQL.setPage(pageSize, pageNumber);
         Rows rows = querySQL.query();
 
+        QuerySQL skuquerySQL = SQLFactory.createQuerySQL(this, "st_stockbill_items_sku", "sku");
+        skuquerySQL.setTableAlias("t1");
+        skuquerySQL.addJoinTable(JOINTYPE.inner, "st_stockbill", "t2", "t1.st_stockbillid=t2.st_stockbillid and t1.siteid=t2.siteid","checkdate");
+        skuquerySQL.setWhere("t2.status='审核'");
+        skuquerySQL.setWhere("t1.sku",rows.toArrayList("sku"));
+        skuquerySQL.setSiteid(siteid);
+        Rows skurows = skuquerySQL.query();
+        RowsMap skurowsMap = skurows.toRowsMap("sku");
+        for(Row row :rows){
+            if(skurowsMap.containsKey(row.getString("sku"))){
+                row.put("stockdate",skurowsMap.get(row.getString("sku")).get(0).getString("checkdate"));
+            }else{
+                row.put("stockdate","");
+            }
+        }
+
         return getSucReturnObject().setData(rows).toString();
     }
 

src/custom/restcontroller/webmanage/sale/sendrepair/sendrepair.java

@@ -179,6 +179,7 @@ public class sendrepair extends Controller {
 
         querySQL.setSiteid(siteid);
         querySQL.setWhere(where.toString());
+        querySQL.setOrderBy("t1.sa_sendrepairid desc");
         querySQL.setPage(pageSize, pageNumber);
         Rows rows = querySQL.query();