Skip to content

孙克 / smf-core

转到一个项目
切换导航栏
切换导航栏固定状态
Commit ac1d1fd3 由 zshaohui
选项

1.禁用料按model取交集

1 个父辈 6201d872
内嵌 并排
正在显示 1 个修改的文件 包含 69 行增加 和 16 行删除
src/main/java/com/neotel/smfcore/custom/luxsan/api/LuxsanApi.java
...@@ -1230,7 +1230,15 @@ public class LuxsanApi extends DefaultSmfApiListener { ...@@ -1230,7 +1230,15 @@ public class LuxsanApi extends DefaultSmfApiListener {
} }
public static List<String> batchCheckReel(List<Barcode> barcodeList,String pickingId,String model) { 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";
}
//开始循环调用接口
for (String singleModel : model.split(",")) {
List<Map<String, Object>> paramList = new ArrayList<>(); List<Map<String, Object>> paramList = new ArrayList<>();
for (Barcode barcode : barcodeList) { for (Barcode barcode : barcodeList) {
Map<String, Object> paramMap = new HashMap<>(); Map<String, Object> paramMap = new HashMap<>();
...@@ -1242,10 +1250,7 @@ public class LuxsanApi extends DefaultSmfApiListener { ...@@ -1242,10 +1250,7 @@ public class LuxsanApi extends DefaultSmfApiListener {
paramMap.put("vendor", barcode.getProvider()); paramMap.put("vendor", barcode.getProvider());
paramMap.put("remark", "ALL"); paramMap.put("remark", "ALL");
paramMap.put("werks", "ALL"); paramMap.put("werks", "ALL");
paramMap.put("model", "ALL"); paramMap.put("model", singleModel);
if (StringUtils.isNotEmpty(model)) {
paramMap.put("model", model);
}
paramMap.put("picking", "ALL"); paramMap.put("picking", "ALL");
if (StringUtils.isNotEmpty(pickingId)) { if (StringUtils.isNotEmpty(pickingId)) {
paramMap.put("picking", pickingId); paramMap.put("picking", pickingId);
...@@ -1254,13 +1259,14 @@ public class LuxsanApi extends DefaultSmfApiListener { ...@@ -1254,13 +1259,14 @@ public class LuxsanApi extends DefaultSmfApiListener {
} }
log.info("批量禁用入参为:" + JSON.toJSONString(paramList)); log.info("批量禁用入参为:" + JSON.toJSONString(paramList));
Map<String, String> resultMap = new HashMap<>(); //禁用的信息
List<String> reelList = new ArrayList<>(); List<String> disAbleModelList = new ArrayList<>();
//如果超过3次,没有记录,则直接
int maxRetries = 3; int maxRetries = 3;
int retryCount = 0; int retryCount = 0;
boolean isSuccess = false; boolean isSuccess = false;
// 重试机制：最多请求3次
while (retryCount < maxRetries && !isSuccess) { while (retryCount < maxRetries && !isSuccess) {
retryCount++; retryCount++;
try { try {
...@@ -1284,8 +1290,14 @@ public class LuxsanApi extends DefaultSmfApiListener { ...@@ -1284,8 +1290,14 @@ public class LuxsanApi extends DefaultSmfApiListener {
String reelId = result.getString("reelId"); String reelId = result.getString("reelId");
String message = result.getString("message"); String message = result.getString("message");
if (StringUtils.isNotBlank(reelId)) { if (StringUtils.isNotBlank(reelId)) {
reelList.add(reelId); disAbleModelList.add(reelId);
resultMap.put(reelId, message); String disAbleMsg = disAbleAllMap.get(reelId);
if (StringUtils.isNotEmpty(disAbleMsg)) {
disAbleMsg = disAbleMsg + ";" + singleModel + ":" + message;
} else {
disAbleMsg = singleModel + ":" + message;
}
disAbleAllMap.put(reelId, disAbleMsg);
} }
} }
} }
...@@ -1304,26 +1316,67 @@ public class LuxsanApi extends DefaultSmfApiListener { ...@@ -1304,26 +1316,67 @@ public class LuxsanApi extends DefaultSmfApiListener {
log.info("经过" + maxRetries + "次重试后仍失败，将所有条码加入结果列表"); log.info("经过" + maxRetries + "次重试后仍失败，将所有条码加入结果列表");
for (Barcode barcode : barcodeList) { for (Barcode barcode : barcodeList) {
String reelId = barcode.getBarcode(); String reelId = barcode.getBarcode();
reelList.add(reelId); disAbleModelList.add(reelId);
resultMap.put(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) { for (Barcode barcode : barcodeList) {
if (reelList.contains(barcode.getBarcode())) { String reelId = barcode.getBarcode();
String message = resultMap.get(barcode.getBarcode()); if (intersectionReelList.contains(reelId)) {
// 在交集中，设置禁用信息
String message = disAbleAllMap.get(reelId);
barcode.setDisableMsg(message); barcode.setDisableMsg(message);
barcodeManager.save(barcode); barcodeManager.save(barcode);
log.debug("设置条码 {} 禁用信息: {}", reelId, message);
} else { } else {
// 不在交集中，清除禁用信息
if (StringUtils.isNotEmpty(barcode.getDisableMsg())) { if (StringUtils.isNotEmpty(barcode.getDisableMsg())) {
barcode.setDisableMsg(""); barcode.setDisableMsg("");
barcodeManager.save(barcode); barcodeManager.save(barcode);
log.debug("清除条码 {} 的禁用信息", reelId);
}
} }
} }
return intersectionReelList;
} }
return reelList; /**
* 从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<>();
} }
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!