Commit 8ff69f74 zshaohui

1.工单出库调用批量禁用料接口

1 个父辈 be5f0b65
......@@ -1014,7 +1014,22 @@ public class LiteOrderCache {
subCodeList = subCodeList.stream().sorted(Comparator.comparing(Barcode::getAmount)).collect(Collectors.toList());
//判断禁用料信息
//禁用的物料信息
List<String> batchCheckReelList = LuxsanApi.batchCheckReel(subCodeList);
if (batchCheckReelList != null && !batchCheckReelList.isEmpty()){
for (Barcode subCode : subCodeList){
if (disablePosNameList.contains(subCode.getPosName())) {
continue;
}
if (batchCheckReelList.contains(subCode.getBarcode())){
log.info(subCode.getBarcode()+"为禁用料,禁用库位为:"+subCode.getPosName());
disablePosNameList.add(subCode.getPosName());
}
}
}
/* //判断禁用料信息
for (Barcode subCode : subCodeList) {
if (disablePosNameList != null && !disablePosNameList.isEmpty()) {
if (disablePosNameList.contains(subCode.getPosName())) {
......@@ -1036,7 +1051,7 @@ public class LiteOrderCache {
if (DisableBarcodeUtil.isDisable(subCode.getBarcode())){
disablePosNameList.add(subCode.getPosName());
}
}
}*/
List<String> subCodeIds = new ArrayList<>();
......
......@@ -2,6 +2,7 @@ package com.neotel.smfcore.custom.luxsan.api;
import cn.hutool.core.util.NumberUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.neotel.smfcore.common.exception.ApiException;
import com.neotel.smfcore.common.exception.ValidateException;
......@@ -1079,6 +1080,62 @@ public class LuxsanApi extends DefaultSmfApiListener {
return result;
}
public static void main(String[] args) {
List<String> batchCheckReel = batchCheckReel(new ArrayList<>());
System.out.println(JSON.toJSONString(batchCheckReel));
}
public static List<String> batchCheckReel(List<Barcode> barcodeList) {
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");
paramMap.put("picking","ALL");
paramList.add(paramMap);
}
log.info("批量禁用入参为:"+JSON.toJSONString(paramList));
List<String> reelList = new ArrayList<>();
try {
String resultStr = HttpHelper.postJson(batchCheckReelUrl, paramList);
log.info("批量禁用接口返回结果为:"+resultStr);
JSONObject resultObj = JSONObject.parseObject(resultStr);
String status = resultObj.getString("status");
if ("200".equals(status)){
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");
if (StringUtils.isNotBlank(reelId)){
reelList.add(reelId);
}
}
}
}
}
}
} catch (Exception e){
log.info("批量禁用接口调用失败:"+e.getMessage());
}
return reelList;
}
@Override
public void outTaskStatusChange(String outNotifyUrl, DataLog task) {
......@@ -1091,6 +1148,13 @@ public class LuxsanApi extends DefaultSmfApiListener {
}
private static String batchCheckReelUrl;
@Value("${api.batchCheckReel}")
public void setBatchCheckReelUrl(String url) {
LuxsanApi.batchCheckReelUrl = url;
}
private static String queryBinUrl;
@Value("${api.queryBin}")
......
......@@ -176,3 +176,6 @@ api:
#自动仓手动绑定栈板
manualPallet: http://10.68.30.22:8082/api/mlb/manualPallet
#批量禁用料
batchCheckReel: http://10.68.27.68:8001/Npm/CheckReelBatch
......@@ -175,4 +175,7 @@ api:
ticketPickPost: http://10.42.220.171:8082/api/mlb/TicketPickPost
#自动仓手动绑定栈板
manualPallet: http://10.42.220.171:8082/api/mlb/manualPallet
\ No newline at end of file
manualPallet: http://10.42.220.171:8082/api/mlb/manualPallet
#批量禁用料
batchCheckReel: http://10.68.27.68:8001/Npm/CheckReelBatch
\ No newline at end of file
支持 Markdown 格式
你添加了 0 到此讨论。请谨慎行事。
Finish editing this message first!