提示信息修改

src/main/java/com/neotel/smfcore/custom/micron1053/api/MicronApi.java

@@ -351,7 +351,16 @@ public class MicronApi  {
     }
     }
 
 
 
 
-    public static List<DispatchId> Api004(String operationId) {
+    public static List<DispatchId> Api004(String mode,String operationId) {
+//        PCBPRETASK，MCLPRETASK，LINEPREP
+//        PCB PRETASK
+//        No line prep available for pcb pretask
+//
+//        MCL PRETASK
+//        No line prep available for mcl pretask
+//
+//        LINE PREP Dispatch
+//        No line prep available for Dispatch
         String url = config.getUrl(config.api_name_004);
         String url = config.getUrl(config.api_name_004);
         url = MessageFormat.format(url, operationId);
         url = MessageFormat.format(url, operationId);
         if( Debug){
         if( Debug){
@@ -378,9 +387,19 @@ public class MicronApi  {
             if (result.isOk() ) {
             if (result.isOk() ) {
                 List<DispatchId> resultDis= result.getResult("dispatchIds",false);
                 List<DispatchId> resultDis= result.getResult("dispatchIds",false);
                 if(resultDis==null||resultDis.size()<=0){
                 if(resultDis==null||resultDis.size()<=0){
-                    log.info("API004 ,接口通信失败");
+
+//                    这个需要改进一些，如果dispatchIds 长度为0，能不能显示 no line prep available for pcb pretask, depending on the mode,
+//                            如果是lineprep dispatch 和 mcl pretask 也reply 相对的message, 再说这个API transaction 没有fail，只是没有lineprep, 这个error fail to get data 有点误导了
+                    log.info("API004 ,接口通信失败: no line prep available for pcb pretask, depending on the mode");
                     //throw new ApiException("smfcore.api.fail", "{0} Failed to get data", new String[]{"API004"});
                     //throw new ApiException("smfcore.api.fail", "{0} Failed to get data", new String[]{"API004"});
-                    String msg = "API004 Failed to get data";
+                    String msg = "No line prep available for pcb pretask ";
+                    if(mode.equalsIgnoreCase("PCBPRETASK")){
+                        msg ="No line prep available for pcb pretask ";
+                    }  else if(mode.equalsIgnoreCase("MCLPRETASK")){
+                        msg ="No line prep available for mcl pretask ";
+                    } else  if(mode.equalsIgnoreCase("LINEPREP")) {
+                        msg = "No line prep available for Dispatch ";
+                    }
                     Object message = result.getResult("message", false);
                     Object message = result.getResult("message", false);
                     if (message != null){
                     if (message != null){
                         msg = message.toString();
                         msg = message.toString();

src/main/java/com/neotel/smfcore/custom/micron1053/task/MicronPreTaskController.java

@@ -135,7 +135,7 @@ public class MicronPreTaskController {
             }
             }
 
 
             //获取Pre Task ID
             //获取Pre Task ID
-            List<DispatchId> dispatchIdList = MicronApi.Api004(operationId);
+            List<DispatchId> dispatchIdList = MicronApi.Api004(mode,operationId);
             if (dispatchIdList != null && !dispatchIdList.isEmpty()) {
             if (dispatchIdList != null && !dispatchIdList.isEmpty()) {
                 dto.setType(1);
                 dto.setType(1);
                 dto.setDispatchIdList(dispatchIdList);
                 dto.setDispatchIdList(dispatchIdList);