From c4a1126fa6dcc12c8def6b394884ed198d55387c Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期一, 17 八月 2026 17:54:44 +0800
Subject: [PATCH] fix：mes调用同步库注释企业微信和ifs

---
 ruoyi-common/src/main/java/com/ruoyi/common/utils/api/IfsApiUtils.java |   87 +++++++++++++++++++++++++------------------
 1 files changed, 50 insertions(+), 37 deletions(-)

diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/api/IfsApiUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/api/IfsApiUtils.java
index ca4d3a9..783c765 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/api/IfsApiUtils.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/api/IfsApiUtils.java
@@ -13,6 +13,7 @@
 import org.jetbrains.annotations.NotNull;
 import org.springframework.stereotype.Component;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -32,20 +33,22 @@
      * 鏌ヨ閲囪喘璁㈠崟鏈楠�
      */
     public List<Map<String, Object>> getInventory(String inAttr) {
-        String procedureName = "QUERY_POL_RECEIPT_STD";
-        JSONObject stockMap = getJsonObject(procedureName, inAttr);
-        String body = HttpRequest.post(ifsProperties.getCustorderPort()).form(stockMap).execute().body();
-        ObjectMapper objectMapper = new ObjectMapper();
-        try {
-            Map map = objectMapper.readValue(body, Map.class);
-            List<Map<String, Object>> maps = objectMapper.readValue(JSONUtil.toJsonStr(map.get("LIST_INFO")), new TypeReference<List<Map<String, Object>>>() {
-            });
-            log.info("鑾峰彇閲囪喘璁㈠崟-->>" + maps);
-            return maps;
-        } catch (JsonProcessingException e) {
-            e.printStackTrace();
-            throw new RuntimeException(e);
-        }
+        log.info("IFS璋冪敤宸茬鐢� - getInventory");
+        return new ArrayList<>();
+//        String procedureName = "QUERY_POL_RECEIPT_STD";
+//        JSONObject stockMap = getJsonObject(procedureName, inAttr);
+//        String body = HttpRequest.post(ifsProperties.getCustorderPort()).form(stockMap).execute().body();
+//        ObjectMapper objectMapper = new ObjectMapper();
+//        try {
+//            Map map = objectMapper.readValue(body, Map.class);
+//            List<Map<String, Object>> maps = objectMapper.readValue(JSONUtil.toJsonStr(map.get("LIST_INFO")), new TypeReference<List<Map<String, Object>>>() {
+//            });
+//            log.info("鑾峰彇閲囪喘璁㈠崟-->>" + maps);
+//            return maps;
+//        } catch (JsonProcessingException e) {
+//            e.printStackTrace();
+//            throw new RuntimeException(e);
+//        }
     }
 
 
@@ -79,7 +82,15 @@
         return getResult("MODIFY_PURCH_RECEIPT_LOT_STD", inAttr, ifsProperties.getCustorder(), "淇敼閲囪喘璁㈠崟鎵规鍙�-->");
     }
 
-
+    /**
+     * 搴撳瓨鐗╂枡鎵规灞炴�ф柊澧炰慨鏀规帴鍙�
+     *
+     * @param inAttr
+     * @return
+     */
+    public Result importPartLotAttr(String inAttr) {
+        return getResult("IMPORT_PART_LOT_ATTR_STD", inAttr, ifsProperties.getCustorder(), "搴撳瓨鐗╂枡鎵规灞炴�ф柊澧炰慨鏀规帴鍙�-->");
+    }
 
     /**
      * 鏌ヨ搴撳瓨鏁版嵁
@@ -101,27 +112,29 @@
      * @return
      */
     private Result<?> getResult(String procedureName, String inAttr, String url, String image) {
-        JSONObject stockMap = new JSONObject();
-        stockMap.put("procedureName", procedureName);
-        stockMap.put("contract", ifsProperties.getContract());
-        stockMap.put("contractKey", ifsProperties.getContractKeyPost());
-        stockMap.put("userId", "lims_user");
-        stockMap.put("inAttr", inAttr);
-        String body = HttpRequest.post(url).form(stockMap).execute().body();
-        log.info(image + body);
-        ObjectMapper objectMapper = new ObjectMapper();
-        try {
-            Map map = objectMapper.readValue(body, Map.class);
-            String successFlag = map.get("SuccessFlag").toString();
-            if (Integer.valueOf(successFlag) == 1) {
-                return Result.success(map);
-            } else {
-                return Result.fail(map.get("ErrorMsg").toString());
-            }
-        } catch (JsonProcessingException e) {
-            e.printStackTrace();
-            return Result.fail(e.getMessage());
-        }
+        log.info("IFS璋冪敤宸茬鐢� - getResult: {}", procedureName);
+        return Result.success();
+//        JSONObject stockMap = new JSONObject();
+//        stockMap.put("procedureName", procedureName);
+//        stockMap.put("contract", ifsProperties.getContract());
+//        stockMap.put("contractKey", ifsProperties.getContractKeyPost());
+//        stockMap.put("userId", "lims_user");
+//        stockMap.put("inAttr", inAttr);
+//        String body = HttpRequest.post(url).form(stockMap).execute().body();
+//        log.info(image + body);
+//        ObjectMapper objectMapper = new ObjectMapper();
+//        try {
+//            Map map = objectMapper.readValue(body, Map.class);
+//            String successFlag = map.get("SuccessFlag").toString();
+//            if (Integer.valueOf(successFlag) == 1) {
+//                return Result.success(map);
+//            } else {
+//                return Result.fail(map.get("ErrorMsg").toString());
+//            }
+//        } catch (JsonProcessingException e) {
+//            e.printStackTrace();
+//            return Result.fail(e.getMessage());
+//        }
     }
 
     /**
@@ -139,4 +152,4 @@
         stockMap.put("inAttr", inAttr);
         return stockMap;
     }
-}
+}
\ No newline at end of file

--
Gitblit v1.9.3