MES质量评审接口调试

topsun-xt/src/main/webapp/template/print/topsun/unqualifiedMaterials.ftl

@@ -49,7 +49,7 @@
     </tr>
     <tr style="height: 70px">
         <td class="center">异常描述</td>
-        <td class="center" colspan="5">${exceptionDesc?default("")?html}</td>
+        <td class="left" colspan="5">${exceptionDesc?default("")?html}</td>
     </tr>
     <tr>
         <td class="center">责任部门:</td>

topsun/src/main/java/com/huigou/topsun/mes/unqualifiedMaterials/application/impl/UnqualifiedMaterialsApplicationImpl.java

@@ -169,11 +169,11 @@ public class UnqualifiedMaterialsApplicationImpl extends FlowBroker implements U
         ClassHelper.copyProperties(unqualifiedMaterials,unqualifiedMaterialsFeedBack);
         unqualifiedMaterialsFeedBack.setActionType("checkIqcResult");
         try {
-            String execute = httpClient.executeForEp(unqualifiedMaterialsFeedBack, "v1/iqc/bpmapi");
+            String execute = httpClient.executeForMes(unqualifiedMaterialsFeedBack, "v1/iqc/bpmapi");
             MesResult mesResult = JSONObject.parseObject(execute, MesResult.class);
             resultMap.put("TYPE", mesResult.getCode());
             resultMap.put("message", mesResult.getMsg());
-            if (!"200".equals(mesResult.getCode())){
+            if (!"S".equals(mesResult.getCode())){
                 throw new RuntimeException("数据传输失败，"+ mesResult.getMsg());
             }
             unqualifiedMaterials.setCode(mesResult.getCode());

topsun/src/main/java/com/huigou/topsun/sap/common/DefaultHttpClient.java

@@ -105,13 +105,16 @@ public class DefaultHttpClient extends BaseApplication implements HttpClient {
         String ip = SystemCache.getParameter("mes.service.ip", 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";
         StringBuffer serverUrl = new StringBuffer();
         serverUrl
                 .append(ip)
                 .append(applicationContext)
                 .append(url);
-        return this.buildHttpClient(param, String.valueOf(serverUrl),"");
+        return this.buildHttpClient(param, String.valueOf(serverUrl),usernameAndPassword);
     }
 
     /**