Skip to content

孙克 / smf-core

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

api005返回空列表提示“无物料需领取”

1 个父辈 589e95ec
内嵌 并排
正在显示 7 个修改的文件 包含 28 行增加 和 14 行删除
src/main/java/com/neotel/smfcore/custom/micron1053/api/MicronApi.java
...@@ -456,10 +456,10 @@ public class MicronApi { ...@@ -456,10 +456,10 @@ public class MicronApi {
List<Material> materialList = new ArrayList<>(); List<Material> materialList = new ArrayList<>();
if (Debug) { if (Debug) {
materialList.add(new Material("ASCH240312AV007472", "510-502260A")); // materialList.add(new Material("ASCH240312AV007472", "510-502260A"));
materialList.add(new Material("ASA240326052256333", "510-502259A")); // materialList.add(new Material("ASA240326052256333", "510-502259A"));
materialList.add(new Material("240301M1000000358", "511-500804D")); // materialList.add(new Material("240301M1000000358", "511-500804D"));
materialList.add(new Material("PFF4130CE7T19", "511-500839D")); // materialList.add(new Material("PFF4130CE7T19", "511-500839D"));
return materialList; return materialList;
} }
url = MessageFormat.format(url, operationId, linePrepOrderId); url = MessageFormat.format(url, operationId, linePrepOrderId);
...@@ -470,17 +470,20 @@ public class MicronApi { ...@@ -470,17 +470,20 @@ public class MicronApi {
String errMsg = getDErrorMsg(result); String errMsg = getDErrorMsg(result);
if (result.isOk()) { if (result.isOk()) {
List<Object> objects = result.getResult("materials", false); List<Object> objects = result.getResult("materials", false);
if (objects == null || objects.size() <= 0) { if(objects==null){
if (ObjectUtil.isNotEmpty(errMsg)) { objects=new ArrayList<>();
log.info("API005 ,接口通信失败：" + errMsg);
throw new ApiException(errMsg);
} else {
log.info("API005 ,接口通信失败 :" + result.getResponseData());
throw new ApiException("smfcore.api.fail", "{0} Failed to get data", new String[]{"API005 : " + result.getResponseData()});
}
} }
// if (objects == null || objects.size() <= 0) {
// if (ObjectUtil.isNotEmpty(errMsg)) {
//
// log.info("API005 ,接口通信失败：" + errMsg);
// throw new ApiException(errMsg);
// } else {
//
// log.info("API005 ,接口通信失败 :" + result.getResponseData());
// throw new ApiException("smfcore.api.fail", "{0} Failed to get data", new String[]{"API005 : " + result.getResponseData()});
// }
// }
for (Object object : for (Object object :
objects) { objects) {
Material material = JsonUtil.toObj(JsonUtil.toJsonStr(object), Material.class); Material material = JsonUtil.toObj(JsonUtil.toJsonStr(object), Material.class);
......
src/main/java/com/neotel/smfcore/custom/micron1053/task/MicronPreTaskController.java
...@@ -265,6 +265,12 @@ public class MicronPreTaskController { ...@@ -265,6 +265,12 @@ public class MicronPreTaskController {
} }
}else{
//提示：无物料需要领取
UpdateTaskDto(dto,0);
log.info(dto.getOperationId()+"无物料需领取，提示后可点abort结束");
return ResultBean.newOkResult("smfcore.micron.nomaterialList", "无物料需领取");
} }
} catch (Exception ex) { } catch (Exception ex) {
......
src/main/resources/messages.properties
...@@ -384,3 +384,4 @@ smfcore.logMonitor=\u65E5\u5FD7\u76D1\u63A7 ...@@ -384,3 +384,4 @@ smfcore.logMonitor=\u65E5\u5FD7\u76D1\u63A7
smfcore.materialTrace=\u7269\u6599\u8FFD\u6EAF smfcore.materialTrace=\u7269\u6599\u8FFD\u6EAF
smfcore.message.critical=\u4E25\u91CD\u9519\u8BEF smfcore.message.critical=\u4E25\u91CD\u9519\u8BEF
smfcore.micron.apiProcess=\u6B63\u5728\u5904\u7406\u4E2D\uFF0C\u8BF7\u7A0D\u540E smfcore.micron.apiProcess=\u6B63\u5728\u5904\u7406\u4E2D\uFF0C\u8BF7\u7A0D\u540E
smfcore.micron.nomaterialList=\u65E0\u7269\u6599\u9700\u9886\u53D6
\ No newline at end of file \ No newline at end of file
src/main/resources/messages_en_US.properties
...@@ -373,3 +373,4 @@ smfcore.logMonitor=Log Monitoring ...@@ -373,3 +373,4 @@ smfcore.logMonitor=Log Monitoring
smfcore.materialTrace=Material Trace smfcore.materialTrace=Material Trace
smfcore.message.critical=Critical smfcore.message.critical=Critical
smfcore.micron.apiProcess=Processing, please wait smfcore.micron.apiProcess=Processing, please wait
smfcore.micron.nomaterialList=No materials need to be collected
\ No newline at end of file \ No newline at end of file
src/main/resources/messages_ja_JP.properties
...@@ -368,3 +368,4 @@ smfcore.logMonitor=\u30ED\u30B0\u76E3\u8996 ...@@ -368,3 +368,4 @@ smfcore.logMonitor=\u30ED\u30B0\u76E3\u8996
smfcore.materialTrace=\u30DE\u30C6\u30EA\u30A2\u30EB\u30C8\u30EC\u30FC\u30B9 smfcore.materialTrace=\u30DE\u30C6\u30EA\u30A2\u30EB\u30C8\u30EC\u30FC\u30B9
smfcore.message.critical=\u91CD\u5927\u30A8\u30E9\u30FC smfcore.message.critical=\u91CD\u5927\u30A8\u30E9\u30FC
smfcore.micron.apiProcess=\u51E6\u7406\u4E2D\u3067\u3059\u3001\u3057\u3070\u3089\u304F\u304A\u5F85\u3061\u304F\u3060\u3055\u3044 smfcore.micron.apiProcess=\u51E6\u7406\u4E2D\u3067\u3059\u3001\u3057\u3070\u3089\u304F\u304A\u5F85\u3061\u304F\u3060\u3055\u3044
smfcore.micron.nomaterialList=\u5F15\u304D\u53D6\u308B\u3079\u304D\u6750\u6599\u306F\u3042\u308A\u307E\u305B\u3093
\ No newline at end of file \ No newline at end of file
src/main/resources/messages_zh_CN.properties
...@@ -368,3 +368,4 @@ smfcore.logMonitor=\u65E5\u5FD7\u76D1\u63A7 ...@@ -368,3 +368,4 @@ smfcore.logMonitor=\u65E5\u5FD7\u76D1\u63A7
smfcore.materialTrace=\u7269\u6599\u8FFD\u6EAF smfcore.materialTrace=\u7269\u6599\u8FFD\u6EAF
smfcore.message.critical=\u4E25\u91CD\u9519\u8BEF smfcore.message.critical=\u4E25\u91CD\u9519\u8BEF
smfcore.micron.apiProcess=\u6B63\u5728\u5904\u7406\u4E2D\uFF0C\u8BF7\u7A0D\u540E smfcore.micron.apiProcess=\u6B63\u5728\u5904\u7406\u4E2D\uFF0C\u8BF7\u7A0D\u540E
smfcore.micron.nomaterialList=\u65E0\u7269\u6599\u9700\u9886\u53D6
\ No newline at end of file \ No newline at end of file
src/main/resources/messages_zh_TW.properties
...@@ -369,3 +369,4 @@ smfcore.logMonitor=\u65E5\u8A8C\u76E3\u63A7 ...@@ -369,3 +369,4 @@ smfcore.logMonitor=\u65E5\u8A8C\u76E3\u63A7
smfcore.materialTrace=\u7269\u6599\u8FFD\u6EAF smfcore.materialTrace=\u7269\u6599\u8FFD\u6EAF
smfcore.message.critical=\u56B4\u91CD\u932F\u8AA4 smfcore.message.critical=\u56B4\u91CD\u932F\u8AA4
smfcore.micron.apiProcess=\u6B63\u5728\u8655\u7406\u4E2D\uFF0C\u8ACB\u7A0D\u5F8C smfcore.micron.apiProcess=\u6B63\u5728\u8655\u7406\u4E2D\uFF0C\u8ACB\u7A0D\u5F8C
smfcore.micron.nomaterialList=\u7121\u7269\u6599\u9700\u9818\u53D6
\ No newline at end of file \ No newline at end of file
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!