返修入库列表添加字段

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

@@ -384,8 +384,9 @@ public class stockbill extends Controller {
         if (billtypes.contains("返修出库")) {
             querySQL.addJoinTable(JOINTYPE.left, "sa_sendrepair", "t10", "t10.sourceid=t1.st_stockbillid and t10.siteid = t1.siteid and t10.sourcetable='st_stockbill'","instockdate");
         }
-
-
+        if(billtypes.contains("返修入库")){
+            querySQL.addJoinTable(JOINTYPE.left, "(SELECT st_stockbillid,itemno,itemname,model FROM (SELECT *,ROW_NUMBER() OVER (PARTITION BY st_stockbillid ORDER BY st_stockbill_itemsid ASC) AS szrowno FROM st_stockbill_items) t WHERE szrowno = 1)", "t11", "t1.st_stockbillid=t11.st_stockbillid and t1.siteid = t11.siteid","itemno","itemname","model","sku");
+        }
 
         querySQL.setWhere("t1.siteid", siteid);
         querySQL.setWhere("t1.type", billtypes);
@@ -416,9 +417,7 @@ public class stockbill extends Controller {
                 }
             }
         }
-        if(billtypes.contains("返修入库")){
-            querySQL.addJoinTable(JOINTYPE.left, "(SELECT st_stockbillid,itemno,itemname,model FROM (SELECT *,ROW_NUMBER() OVER (PARTITION BY st_stockbillid ORDER BY st_stockbill_itemsid ASC) AS szrowno FROM st_stockbill_items) t WHERE szrowno = 1)", "t11", "t1.st_stockbillid=t11.st_stockbillid and t1.siteid = t11.siteid","itemno","itemname","model");
-        }
+
 
 
         return getSucReturnObject().setData(rows).toString();