shenjingwei пре 1 недеља
родитељ
комит
685aebb962

+ 1 - 0
src/custom/restcontroller/crm/agent/stock/invbal.java

@@ -24,6 +24,7 @@ public class invbal extends Controller {
         querySQL.addJoinTable(JOINTYPE.inner, "sys_enterprise_stock", "t3", "t1.sys_enterprise_stockid=t3.sys_enterprise_stockid", "stockno", "stockname");
         querySQL.addJoinTable(JOINTYPE.inner, "sys_enterprise_stock", "t3", "t1.sys_enterprise_stockid=t3.sys_enterprise_stockid", "stockno", "stockname");
         querySQL.addJoinTable(JOINTYPE.left, "plm_unit", "t4", "t2.unitid=t4.unitid", "unitname");
         querySQL.addJoinTable(JOINTYPE.left, "plm_unit", "t4", "t2.unitid=t4.unitid", "unitname");
         querySQL.setSiteid(siteid);
         querySQL.setSiteid(siteid);
+        querySQL.setWhere("t1.sys_enterpriseid", sys_enterpriseid);
         querySQL.setPage(pageSize, pageNumber);
         querySQL.setPage(pageSize, pageNumber);
         Rows rows = querySQL.query();
         Rows rows = querySQL.query();
         return getSucReturnObject().setData(rows).toString();
         return getSucReturnObject().setData(rows).toString();

+ 2 - 2
src/custom/restcontroller/webmanage/sale/stockbill/stockbill.java

@@ -2017,14 +2017,14 @@ public class stockbill extends Controller {
     }
     }
 
 
     public String[] getDistinctArray(String[] arrays) {
     public String[] getDistinctArray(String[] arrays) {
-        ArrayList<String> a = new ArrayList<String>();
+        ArrayList<String> a = new ArrayList<>();
         for (String array : arrays) {
         for (String array : arrays) {
             if (!a.contains(array)) {
             if (!a.contains(array)) {
                 a.add(array);
                 a.add(array);
             }
             }
         }
         }
         int size = a.size();
         int size = a.size();
-        return (String[]) a.toArray(new String[size]);
+        return a.toArray(new String[size]);
     }
     }
 
 
     public String getPeriod(boolean isjudge, Date date) throws YosException {
     public String getPeriod(boolean isjudge, Date date) throws YosException {