Skip to content

孙克 / smf-core

转到一个项目
切换导航栏
切换导航栏固定状态
Commit 5ffd4959 由 LN
选项

API002解析错误

1 个父辈 2d6cdf9f
内嵌 并排
正在显示 4 个修改的文件 包含 24 行增加 和 18 行删除
src/main/java/com/neotel/smfcore/core/order/LiteOrderCache.java
...@@ -1064,7 +1064,7 @@ public class LiteOrderCache { ...@@ -1064,7 +1064,7 @@ public class LiteOrderCache {
for (LiteOrderItem reelItem : for (LiteOrderItem reelItem :
item.getSelectItems()) { item.getSelectItems()) {
MaterialStatus s = apiResultMap.get(reelItem.getRi()); MaterialStatus s = apiResultMap.get(reelItem.getRi());
if (s.StatusOk()) { if (s.isSuccess()) {
reelItem.setStatus(OrderItemStatus.CheckOk); reelItem.setStatus(OrderItemStatus.CheckOk);
StoragePos pos = storagePosManager.getByBarcode(s.getSerialNum()); StoragePos pos = storagePosManager.getByBarcode(s.getSerialNum());
log.info("工单【" + orderNo + "】PN [" + item.getPn() + "] RI [" + item.getRi() + "] API009 验证成功，更改状态为 CheckOk ,锁定库位【" + pos.getPosName() + "】"); log.info("工单【" + orderNo + "】PN [" + item.getPn() + "] RI [" + item.getRi() + "] API009 验证成功，更改状态为 CheckOk ,锁定库位【" + pos.getPosName() + "】");
......
src/main/java/com/neotel/smfcore/custom/micron1053/api/MicronApi.java
...@@ -274,10 +274,13 @@ public class MicronApi { ...@@ -274,10 +274,13 @@ public class MicronApi {
log.info("调用MES接口 API002: url=" + url + ",body=" + paramStr + ""); log.info("调用MES接口 API002: url=" + url + ",body=" + paramStr + "");
MicronResult result = HttpHelper.postMicronJson(url, paramsMap); MicronResult result = HttpHelper.postMicronJson(url, paramsMap);
if (result.isOk()&& result.statusIsSuccess()) { if (result.isOk()&& result.statusIsSuccess()) {
List<MaterialStatus> resultList = result.getResult("materialStatusList"); List<Object> resultList = result.getResult("materialStatusList");
for (MaterialStatus s : for (Object Obj :
resultList) { resultList) {
if (s.getMaterialStatus().toUpperCase().equals("SUCCESS")) {
MaterialStatus s= JsonUtil.toObj(JsonUtil.toJsonStr( Obj) ,MaterialStatus.class);
// if (s.getMaterialStatus().toUpperCase().equals("SUCCESS")) {
if(s.isSuccess()){
resultMap.put(s.getSerialNum(), true); resultMap.put(s.getSerialNum(), true);
} else { } else {
resultMap.put(s.getSerialNum(), false); resultMap.put(s.getSerialNum(), false);
...@@ -520,7 +523,7 @@ public class MicronApi { ...@@ -520,7 +523,7 @@ public class MicronApi {
if(Debug){ if(Debug){
for (Barcode barcode: for (Barcode barcode:
barcodeList) { barcodeList) {
resultMap.put(barcode.getBarcode(),new MaterialStatus(barcode.getBarcode(),barcode.getPartNumber(),"success","")); resultMap.put(barcode.getBarcode(),new MaterialStatus(barcode.getBarcode(),barcode.getPartNumber(),"","",true));
} }
} }
...@@ -560,15 +563,11 @@ public class MicronApi { ...@@ -560,15 +563,11 @@ public class MicronApi {
// "linePrepOrderId": <LinePrepOrderId>|null // "linePrepOrderId": <LinePrepOrderId>|null
// ] // ]
// } // }
List<MaterialStatus> resultList = micronResult.getResult("results"); List<Object> resultList = micronResult.getResult("results");
for (MaterialStatus s : for (Object Obj :
resultList) { resultList) {
// if (s.getMaterialStatus().toUpperCase().equals("SUCCESS")) { MaterialStatus s= JsonUtil.toObj(JsonUtil.toJsonStr( Obj) ,MaterialStatus.class);
// resultMap.put(s.getSerialNum(), true); resultMap.put(s.getSerialNum(), s);
// } else {
// resultMap.put(s.getSerialNum(), false);
// }
resultMap.put(s.getSerialNum(), s);
} }
} else { } else {
...@@ -599,7 +598,12 @@ public class MicronApi { ...@@ -599,7 +598,12 @@ public class MicronApi {
// String trackStatus = jsonObject.getString("trackStatus"); // String trackStatus = jsonObject.getString("trackStatus");
if (micronResult.isOk()&& micronResult.statusIsSuccess()) { if (micronResult.isOk()&& micronResult.statusIsSuccess()) {
statusList = micronResult.getResult("trackStatus"); List<Object> objects = micronResult.getResult("trackStatus");
for (Object obj :
objects) {
TrackStatus s= JsonUtil.toObj(JsonUtil.toJsonStr( obj) ,TrackStatus.class);
statusList.add(s);
}
if(statusList==null||statusList.size()<=0){ if(statusList==null||statusList.size()<=0){
log.info("API010 ,接口通信失败"); log.info("API010 ,接口通信失败");
......
src/main/java/com/neotel/smfcore/custom/micron1053/api/bean/MaterialStatus.java
...@@ -16,8 +16,10 @@ public class MaterialStatus implements Serializable { ...@@ -16,8 +16,10 @@ public class MaterialStatus implements Serializable {
private String materialStatus; private String materialStatus;
private String linePrepOrderId; private String linePrepOrderId;
public boolean StatusOk() { private boolean success=false;
return materialStatus.equalsIgnoreCase("SUCCESS");
} // public boolean StatusOk() {
// return materialStatus.equalsIgnoreCase("SUCCESS");
// }
} }
src/main/java/com/neotel/smfcore/custom/micron1053/task/MicronDispatchController.java
...@@ -345,7 +345,7 @@ private IStoragePosManager storagePosManager; ...@@ -345,7 +345,7 @@ private IStoragePosManager storagePosManager;
reelItem.setNeedNum(pos.getBarcode().getAmount()); reelItem.setNeedNum(pos.getBarcode().getAmount());
MaterialStatus s = apiResultMap.get(barcode.getBarcode()); MaterialStatus s = apiResultMap.get(barcode.getBarcode());
if (s.StatusOk()) { if (s.isSuccess()) {
reelItem.setStatus(OrderItemStatus.CheckOk); reelItem.setStatus(OrderItemStatus.CheckOk);
log.info("工单【" + order.getOrderNo() + "】PN [" + item.getPn() + "] RI [" + item.getRi() + "] API009 验证成功，更改状态为 CheckOk ,锁定库位【" + pos.getPosName() + "】"); log.info("工单【" + order.getOrderNo() + "】PN [" + item.getPn() + "] RI [" + item.getRi() + "] API009 验证成功，更改状态为 CheckOk ,锁定库位【" + pos.getPosName() + "】");
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!