1.禁用料按model取交集

src/main/java/com/neotel/smfcore/custom/luxsan/api/LuxsanApi.java

@@ -1230,100 +1230,153 @@ public class LuxsanApi extends DefaultSmfApiListener {
     }
 
 
-    public static List<String> batchCheckReel(List<Barcode> barcodeList,String pickingId,String model) {
-        List<Map<String, Object>> paramList = new ArrayList<>();
-        for (Barcode barcode : barcodeList) {
-            Map<String, Object> paramMap = new HashMap<>();
-            paramMap.put("ipn", barcode.getPartNumber());
-            paramMap.put("reelId", barcode.getBarcode());
-            paramMap.put("wo", "");
-            paramMap.put("datecode", barcode.getDateCode());
-            paramMap.put("lot", barcode.getBatch());
-            paramMap.put("vendor", barcode.getProvider());
-            paramMap.put("remark", "ALL");
-            paramMap.put("werks", "ALL");
-            paramMap.put("model", "ALL");
-            if (StringUtils.isNotEmpty(model)) {
-                paramMap.put("model", model);
-            }
-            paramMap.put("picking", "ALL");
-            if (StringUtils.isNotEmpty(pickingId)) {
-                paramMap.put("picking", pickingId);
-            }
-            paramList.add(paramMap);
+    public static List<String> batchCheckReel(List<Barcode> barcodeList, String pickingId, String model) {
+        //key为barcode,value为禁用信息
+        Map<String, String> disAbleAllMap = new HashMap<>();
+        Map<String, List<String>> disAbleModeMap = new HashMap<>();
+        if (StringUtils.isEmpty(model)) {
+            model = "ALL";
         }
-        log.info("批量禁用入参为:" + JSON.toJSONString(paramList));
-
-        Map<String, String> resultMap = new HashMap<>();
-        List<String> reelList = new ArrayList<>();
-        int maxRetries = 3;
-        int retryCount = 0;
-        boolean isSuccess = false;
-
-        // 重试机制：最多请求3次
-        while (retryCount < maxRetries && !isSuccess) {
-            retryCount++;
-            try {
-                String resultStr = HttpHelper.postJson(batchCheckReelUrl, paramList);
-                log.info("第" + retryCount + "次批量禁用接口返回结果为:" + resultStr);
-
-                JSONObject resultObj = JSONObject.parseObject(resultStr);
-                String status = resultObj.getString("status");
-
-                // 只有返回200才认为成功
-                if ("200".equals(status)) {
-                    isSuccess = true;
-                    JSONArray dataArr = resultObj.getJSONArray("data");
-                    if (dataArr != null && !dataArr.isEmpty()) {
-                        for (int i = 0; i < dataArr.size(); i++) {
-                            JSONObject data = dataArr.getJSONObject(i);
-                            JSONArray resultList = data.getJSONArray("resultList");
-                            if (resultList != null && !resultList.isEmpty()) {
-                                for (int j = 0; j < resultList.size(); j++) {
-                                    JSONObject result = resultList.getJSONObject(j);
-                                    String reelId = result.getString("reelId");
-                                    String message = result.getString("message");
-                                    if (StringUtils.isNotBlank(reelId)) {
-                                        reelList.add(reelId);
-                                        resultMap.put(reelId, message);
+        //开始循环调用接口
+        for (String singleModel : model.split(",")) {
+            List<Map<String, Object>> paramList = new ArrayList<>();
+            for (Barcode barcode : barcodeList) {
+                Map<String, Object> paramMap = new HashMap<>();
+                paramMap.put("ipn", barcode.getPartNumber());
+                paramMap.put("reelId", barcode.getBarcode());
+                paramMap.put("wo", "");
+                paramMap.put("datecode", barcode.getDateCode());
+                paramMap.put("lot", barcode.getBatch());
+                paramMap.put("vendor", barcode.getProvider());
+                paramMap.put("remark", "ALL");
+                paramMap.put("werks", "ALL");
+                paramMap.put("model", singleModel);
+                paramMap.put("picking", "ALL");
+                if (StringUtils.isNotEmpty(pickingId)) {
+                    paramMap.put("picking", pickingId);
+                }
+                paramList.add(paramMap);
+            }
+            log.info("批量禁用入参为:" + JSON.toJSONString(paramList));
+
+            //禁用的信息
+            List<String> disAbleModelList = new ArrayList<>();
+
+            //如果超过3次,没有记录,则直接
+            int maxRetries = 3;
+            int retryCount = 0;
+            boolean isSuccess = false;
+
+            while (retryCount < maxRetries && !isSuccess) {
+                retryCount++;
+                try {
+                    String resultStr = HttpHelper.postJson(batchCheckReelUrl, paramList);
+                    log.info("第" + retryCount + "次批量禁用接口返回结果为:" + resultStr);
+
+                    JSONObject resultObj = JSONObject.parseObject(resultStr);
+                    String status = resultObj.getString("status");
+
+                    // 只有返回200才认为成功
+                    if ("200".equals(status)) {
+                        isSuccess = true;
+                        JSONArray dataArr = resultObj.getJSONArray("data");
+                        if (dataArr != null && !dataArr.isEmpty()) {
+                            for (int i = 0; i < dataArr.size(); i++) {
+                                JSONObject data = dataArr.getJSONObject(i);
+                                JSONArray resultList = data.getJSONArray("resultList");
+                                if (resultList != null && !resultList.isEmpty()) {
+                                    for (int j = 0; j < resultList.size(); j++) {
+                                        JSONObject result = resultList.getJSONObject(j);
+                                        String reelId = result.getString("reelId");
+                                        String message = result.getString("message");
+                                        if (StringUtils.isNotBlank(reelId)) {
+                                            disAbleModelList.add(reelId);
+                                            String disAbleMsg = disAbleAllMap.get(reelId);
+                                            if (StringUtils.isNotEmpty(disAbleMsg)) {
+                                                disAbleMsg = disAbleMsg + ";" + singleModel + ":" + message;
+                                            } else {
+                                                disAbleMsg = singleModel + ":" + message;
+                                            }
+                                            disAbleAllMap.put(reelId, disAbleMsg);
+                                        }
                                     }
                                 }
                             }
                         }
+                    } else {
+                        log.info("第" + retryCount + "次调用返回非200状态: " + status);
                     }
-                } else {
-                    log.info("第" + retryCount + "次调用返回非200状态: " + status);
+                } catch (Exception e) {
+                    log.error("第" + retryCount + "次批量禁用接口调用失败: " + e.getMessage(), e);
                 }
-            } catch (Exception e) {
-                log.error("第" + retryCount + "次批量禁用接口调用失败: " + e.getMessage(), e);
             }
-        }
 
-        // 如果3次都失败，将所有barcode加入reelList
-        if (!isSuccess) {
-            log.info("经过" + maxRetries + "次重试后仍失败，将所有条码加入结果列表");
-            for (Barcode barcode : barcodeList) {
-                String reelId = barcode.getBarcode();
-                reelList.add(reelId);
-                resultMap.put(reelId, "接口调用失败，默认禁用");
+            // 如果3次都失败，将所有barcode加入reelList
+            if (!isSuccess) {
+                log.info("经过" + maxRetries + "次重试后仍失败，将所有条码加入结果列表");
+                for (Barcode barcode : barcodeList) {
+                    String reelId = barcode.getBarcode();
+                    disAbleModelList.add(reelId);
+                    String disAbleMsg = disAbleAllMap.get(reelId);
+                    if (StringUtils.isNotEmpty(disAbleMsg)) {
+                        disAbleMsg = disAbleMsg + ";" + singleModel + ":接口调用失败，默认禁用";
+                    } else {
+                        disAbleMsg = singleModel + ":接口调用失败，默认禁用";
+                    }
+                    disAbleAllMap.put(reelId, disAbleMsg);
+                }
             }
+            disAbleModeMap.put(singleModel, disAbleModelList);
         }
 
-        // 更新条码状态
+        // ==================== 取交集逻辑 ====================
+        List<String> intersectionReelList = getIntersectionFromMap(disAbleModeMap);
+        log.info("多model检查完成 - model数量: {}, 交集禁用条码数量: {}", disAbleModeMap.size(), intersectionReelList.size());
+
+        // 更新条码状态 - 只更新交集中的条码
         for (Barcode barcode : barcodeList) {
-            if (reelList.contains(barcode.getBarcode())) {
-                String message = resultMap.get(barcode.getBarcode());
+            String reelId = barcode.getBarcode();
+            if (intersectionReelList.contains(reelId)) {
+                // 在交集中，设置禁用信息
+                String message = disAbleAllMap.get(reelId);
                 barcode.setDisableMsg(message);
                 barcodeManager.save(barcode);
+                log.debug("设置条码 {} 禁用信息: {}", reelId, message);
             } else {
+                // 不在交集中，清除禁用信息
                 if (StringUtils.isNotEmpty(barcode.getDisableMsg())) {
                     barcode.setDisableMsg("");
                     barcodeManager.save(barcode);
+                    log.debug("清除条码 {} 的禁用信息", reelId);
                 }
             }
         }
 
-        return reelList;
+        return intersectionReelList;
+    }
+
+    /**
+     * 从Map中获取所有List的交集
+     */
+    private static List<String> getIntersectionFromMap(Map<String, List<String>> disAbleModeMap) {
+        if (disAbleModeMap == null || disAbleModeMap.isEmpty()) {
+            return new ArrayList<>();
+        }
+        List<String> intersection = null;
+        for (List<String> reelList : disAbleModeMap.values()) {
+            if (reelList == null || reelList.isEmpty()) {
+                // 如果任何一个model没有禁用条码，则交集为空
+                return new ArrayList<>();
+            }
+            if (intersection == null) {
+                // 第一次遍历，初始化交集
+                intersection = new ArrayList<>(reelList);
+            } else {
+                // 后续遍历，取交集
+                intersection.retainAll(reelList);
+            }
+        }
+        return intersection != null ? intersection : new ArrayList<>();
     }