微调

jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/ims/Dao/CategoryDao.java

@@ -96,6 +96,32 @@ public class CategoryDao {
         return "";
     }
 
+    private String whereByList(Map<String, String> map) {
+        StringBuilder where = null;
+        for (String key : map.keySet()) {
+            String value = String.valueOf(map.get(key));
+            if (value != null && value.length() != 0) {
+                if (where != null) {
+                    if (value.contains(",")) {
+                        where.append(" AND ").append(key).append(" IN (").append(value).append(")");
+                    } else {
+                        where.append(" AND ").append(key).append("='").append(value).append("'");
+                    }
+                } else {
+                    if (value.contains(",")) {
+                        where = new StringBuilder(key + " IN (" + value + ")");
+                    } else {
+                        where = new StringBuilder(key + "='" + value + "'");
+                    }
+                }
+            }
+        }
+        if (where != null) {
+            return ",\"FilterString\":\"" + where + "\"";
+        }
+        return "";
+    }
+
     //添加批量查询
     private String whereByIds(Map<String, String> map) {
         String where = null;
@@ -123,7 +149,7 @@ public class CategoryDao {
                 if (where != null) {
                     where = where + " AND " + key + "='" + value + "'";
                 } else {
-                    where = key + " IN ('" + value + "')";
+                    where = key + " IN (" + value + ")";
                 }
             }
         }
@@ -336,9 +362,6 @@ public class CategoryDao {
 
     /**
      * 查询单据体并添加日志
-     *
-     * @return
-     * @throws Exception
      */
     public List<List<Object>> selectAndLog(String sFormId, Map<String, String> key, Map<String, String> where, String name) {
         List<List<Object>> list = null;
@@ -368,6 +391,36 @@ public class CategoryDao {
         return list;
     }
 
+    /**
+     * 查询单据体并添加日志
+     */
+    public List<List<Object>> selectAndLogTo(String sFormId, Map<String, String> key, Map<String, String> where, String name) {
+        List<List<Object>> list = null;
+        String content = null;
+        try {
+
+            if (result) {
+                if (where != null) {
+                    content = "{\"FormId\":\"" + sFormId + "\"," + Stringkey(key) + whereByList(where) + "}";
+                } else {
+                    content = "{\"FormId\":\"" + sFormId + "\"," + Stringkey(key) + "}";
+                }
+                list = client.executeBillQuery(content);
+                KingdeeLogUtil kingdeeLogUtil = new KingdeeLogUtil();
+                //记录金蝶云的响应信息
+                kingdeeLogUtil.KingdeeLog(list, name, content);
+            } else {
+                throw new KingdeeConnectException(loginResult);
+            }
+        } catch (KingdeeConnectException e) {
+            throw new KingdeeConnectException(loginResult);
+        } catch (Exception e) {
+            e.printStackTrace();
+            throw new KingdeeConnectException(KingDeeConstant.URL, baseCommonService);
+        }
+        return list;
+    }
+
     public Map<String, List<List<Object>>> selectMap(String sFormId, Map<String, String> key, Map<String, String> where) {
         List<List<Object>> list = null;
         Map<String, List<List<Object>>> stringListHashMap = new HashMap<String, List<List<Object>>>();

jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/ims/kingdeeapi/ImsProduceOrderCloseApi.java

@@ -32,7 +32,7 @@ public class ImsProduceOrderCloseApi {
     }
 
     public String addReturnResult(List<Map<String, Object>> list, String sFormId) {
-        String erpMo = list.stream().map(m -> String.valueOf(m.get("ERP_MO"))).distinct().collect(Collectors.joining(","));
+        String erpMo = list.stream().map(m -> "'" + m.get("ERP_MO") + "'").distinct().collect(Collectors.joining(","));
 
         Map<String, String> key = new LinkedHashMap<>();
         //单据头实体主键

jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/ims/service/impl/ImsWplanServiceImpl.java

@@ -125,6 +125,7 @@ public class ImsWplanServiceImpl extends ServiceImpl<ImsWplanMapper, ImsWplan> i
             Map<String, String> idmap = new HashMap<>();
             //将对应的参数设置成金蝶云的查询条件
             idmap.put("FBillNo", poId);
+            idmap.put("FStatus", "'3', '4'");
             //从金蝶云获取对应数据
             list1 = wplanKingdeeApi.selectAndLog(idmap, null, "ERP工单信息");
             //将每次获取的数据添加到集合一起返回