Commit d2220509 authored by 鲁鑫's avatar 鲁鑫

MES质量评审接口调试

parent 9966afa9
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
</tr> </tr>
<tr style="height: 70px"> <tr style="height: 70px">
<td class="center">异常描述</td> <td class="center">异常描述</td>
<td class="center" colspan="5">${exceptionDesc?default("")?html}</td> <td class="left" colspan="5">${exceptionDesc?default("")?html}</td>
</tr> </tr>
<tr> <tr>
<td class="center">责任部门:</td> <td class="center">责任部门:</td>
......
...@@ -169,11 +169,11 @@ public class UnqualifiedMaterialsApplicationImpl extends FlowBroker implements U ...@@ -169,11 +169,11 @@ public class UnqualifiedMaterialsApplicationImpl extends FlowBroker implements U
ClassHelper.copyProperties(unqualifiedMaterials,unqualifiedMaterialsFeedBack); ClassHelper.copyProperties(unqualifiedMaterials,unqualifiedMaterialsFeedBack);
unqualifiedMaterialsFeedBack.setActionType("checkIqcResult"); unqualifiedMaterialsFeedBack.setActionType("checkIqcResult");
try { try {
String execute = httpClient.executeForEp(unqualifiedMaterialsFeedBack, "v1/iqc/bpmapi"); String execute = httpClient.executeForMes(unqualifiedMaterialsFeedBack, "v1/iqc/bpmapi");
MesResult mesResult = JSONObject.parseObject(execute, MesResult.class); MesResult mesResult = JSONObject.parseObject(execute, MesResult.class);
resultMap.put("TYPE", mesResult.getCode()); resultMap.put("TYPE", mesResult.getCode());
resultMap.put("message", mesResult.getMsg()); resultMap.put("message", mesResult.getMsg());
if (!"200".equals(mesResult.getCode())){ if (!"S".equals(mesResult.getCode())){
throw new RuntimeException("数据传输失败,"+ mesResult.getMsg()); throw new RuntimeException("数据传输失败,"+ mesResult.getMsg());
} }
unqualifiedMaterials.setCode(mesResult.getCode()); unqualifiedMaterials.setCode(mesResult.getCode());
......
...@@ -105,13 +105,16 @@ public class DefaultHttpClient extends BaseApplication implements HttpClient { ...@@ -105,13 +105,16 @@ public class DefaultHttpClient extends BaseApplication implements HttpClient {
String ip = SystemCache.getParameter("mes.service.ip", String.class); String ip = SystemCache.getParameter("mes.service.ip", String.class);
// 上下文 // 上下文
String applicationContext = SystemCache.getParameter("mes.service.application.context", String.class); String applicationContext = SystemCache.getParameter("mes.service.application.context", String.class);
String username = SystemCache.getParameter("mes.service.username", String.class);
String password = SystemCache.getParameter("mes.service.password", String.class);
String usernameAndPassword = username + ":" + password;
//String serverUrl = "http://192.168.23.15:8080/api/od/saleOrder/auditedResult.ajax"; //String serverUrl = "http://192.168.23.15:8080/api/od/saleOrder/auditedResult.ajax";
StringBuffer serverUrl = new StringBuffer(); StringBuffer serverUrl = new StringBuffer();
serverUrl serverUrl
.append(ip) .append(ip)
.append(applicationContext) .append(applicationContext)
.append(url); .append(url);
return this.buildHttpClient(param, String.valueOf(serverUrl),""); return this.buildHttpClient(param, String.valueOf(serverUrl),usernameAndPassword);
} }
/** /**
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment