1.差异料查询中转

src/main/java/com/neotel/smfcore/custom/lizhen/innerBox/util/PreWarningItemCache.java

@@ -277,7 +277,7 @@ public class PreWarningItemCache {
         }
         }
         processing = true;
         processing = true;
         try {
         try {
-            generateTask();
+            //generateTask();
         } catch (Exception e) {
         } catch (Exception e) {
             log.error("预警缓存定时器出错", e);
             log.error("预警缓存定时器出错", e);
         } finally {
         } finally {

src/main/java/com/neotel/smfcore/custom/lizhen/wcs/LizhenController.java

@@ -46,6 +46,7 @@ import java.util.*;
 import java.util.concurrent.Executors;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
 
 
 @Slf4j
 @Slf4j
 @RestController
 @RestController
@@ -435,6 +436,73 @@ public class LizhenController {
     }
     }
 
 
 
 
+    @Value("${lizhen.queryOrderStatus.bg}")
+    private String queryOrderStatusBg;
+
+    @Value("${lizhen.queryOrderStatus.cg}")
+    private String queryOrderStatusCg;
+
+    //查询工单状态
+    @PostMapping("/queryOrderStatus")
+    @AnonymousAccess
+    public Map<String, Object> queryOrderStatus(@RequestBody Map<String, String> paramMap) {
+        String wo = paramMap.get("wo");
+        if (StringUtils.isNotEmpty(wo)) {
+            List<String> woList = Arrays.stream(wo.split(","))
+                    .map(String::trim)       // 去掉每个元素前后空格
+                    .filter(StringUtils::isNotEmpty) // 过滤空字符串
+                    .collect(Collectors.toList());
+            try {
+                Map<String, Integer> statusMap = new HashMap<>();
+                //先从bg查,再从cg查
+                Map<String, Object> params = new HashMap<>();
+                params.put("orderNoList", woList);
+                String result = HttpHelper.postJson(queryOrderStatusBg, params);
+                ResultBean resultBean = JSONObject.parseObject(result, ResultBean.class);
+                if (resultBean.getData() != null) {
+                    Map<String, Integer> resultMap = (Map<String, Integer>) resultBean.getData();
+                    if (resultMap != null) {
+                        statusMap.putAll(resultMap);
+                    }
+                }
+
+                //再从cg查
+                String cgResult = HttpHelper.postJson(queryOrderStatusCg, params);
+                ResultBean cgResultBean = JSONObject.parseObject(cgResult, ResultBean.class);
+                if (cgResultBean.getData() != null) {
+                    Map<String, Integer> resultMap = (Map<String, Integer>) cgResultBean.getData();
+                    if (resultMap != null) {
+                        statusMap.putAll(resultMap);
+                    }
+                }
+
+                List<Map<String, Object>> resultList = new ArrayList<>();
+                for (String woStr : woList) {
+                    Map<String, Object> resultMap = new HashMap<>();
+                    resultMap.put("wo", woStr);
+                    Integer status = statusMap.get(woStr);
+                    if (status == null) {
+                        resultMap.put("status", 0 + "");
+                    } else {
+                        resultMap.put("status", status);
+                    }
+                    resultList.add(resultMap);
+                }
+                Map<String, Object> resultMap = new HashMap<>();
+                resultMap.put("data", resultList);
+                return resultMap;
+            } catch (ApiException e) {
+                log.info("查询工单状态失败,工单号为:[{}]", wo, e.getMessage());
+            }
+        }
+        Map<String, Object> resultMap = new HashMap<>();
+        resultMap.put("data", new ArrayList<>());
+        return resultMap;
+    }
+
+
+
+
     private String getForwardUrl(String line) {
     private String getForwardUrl(String line) {
         String url = "";
         String url = "";
         for (Map.Entry<String, String> lineUrlEntry : lineUrlMap.entrySet()) {
         for (Map.Entry<String, String> lineUrlEntry : lineUrlMap.entrySet()) {

src/main/resources/config/application.yml

@@ -53,6 +53,11 @@ lizhen:
     url: http://10.68.27.105/smf-core/api/Mes/machineCallMaterial
     url: http://10.68.27.105/smf-core/api/Mes/machineCallMaterial
     differenceUrl: http://10.68.27.105/smf-core/api/Mes/differenceReel
     differenceUrl: http://10.68.27.105/smf-core/api/Mes/differenceReel
 
 
+  queryOrderStatus:
+    name: queryOrderStatus
+    bg: http://10.68.27.85/smf-core/wcs/queryOrderStatus
+    cg: http://10.68.27.79/smf-core/wcs/queryOrderStatus
+
 
 
 
 
   manual:
   manual: