1 vuosi sitten
vanhempi
commit
61ecb09547

+ 19 - 15
platform-service/src/main/java/com/platform/service/yongyou/impl/YongyouServiceImpl.java

@@ -532,11 +532,13 @@ public class YongyouServiceImpl implements YongyouService {
             for (Map.Entry<Integer, List<SpareVO>> entry : map.entrySet()) {
                 GetCurrentStockHandler handler = new GetCurrentStockHandler();
                 GetCurrentStockRequest req = new GetCurrentStockRequest();
+                req.setPageNum(1);
+                req.setPageSize(9999);
                 StringBuffer whereStr = new StringBuffer(" 1=1 ");
 
                 if (entry.getValue().size() > 0) {
+                    whereStr.append(" and cInvCode in (");
                     if (!isDev) {
-                        whereStr.append(" and cInvCode in (");
                         if (entry.getKey() == 1) {
                             req.setCAcc_ID("005");
                             req.setToken(geToken(1));
@@ -603,24 +605,26 @@ public class YongyouServiceImpl implements YongyouService {
                         }
                         return returnList;
                     }
-                } else {
-                    req.setCAcc_ID("993");
-                    req.setToken(geToken(1));
-                    req.setConn(getConn2(1));
-                    for (SpareVO spareVO : newF) {
-                        whereStr.append(spareVO.getBeiJianCode() + ",");
-                    }
-                    sqlStr = whereStr.toString().substring(0, whereStr.toString().length() - 1) + ")";
-                    if (!sqlStr.equals("")) {
-                        req.setStrWhere(sqlStr);
-                    } else {
-                        req.setStrWhere(whereStr.toString());
+                    else {
+                        req.setCAcc_ID("993");
+                        req.setToken(geToken(1));
+                        req.setConn(getConn2(1));
+                        for (SpareVO spareVO : newF) {
+                            whereStr.append(spareVO.getBeiJianCode() + ",");
+                        }
+                        sqlStr = whereStr.toString().substring(0, whereStr.toString().length() - 1) + ")";
+                        if (!sqlStr.equals("")) {
+                            req.setStrWhere(sqlStr);
+                        } else {
+                            req.setStrWhere(whereStr.toString());
+                        }
+                        returnList.addAll(getList(handler, req));
+                        return returnList;
                     }
-                    returnList.addAll(getList(handler, req));
                 }
             }
         }
-        return null;
+        return new ArrayList<SpareStoreVO>();
     }