1.没有出到弹夹的料盘不返回

2.mes接口地址修改

src/main/java/com/neotel/smfcore/core/device/bean/StatusBean.java

@@ -163,10 +163,10 @@ public class StatusBean {
     }
 
     /**
-     * 是否超时(30秒)
+     * 是否超时(120秒)
      */
     public boolean timeOut(){
-        return (System.currentTimeMillis() - time) >( 30 * 1000);
+        return (System.currentTimeMillis() - time) >(2 * 60 * 1000);
     }
 
     /**

src/main/java/com/neotel/smfcore/core/order/rest/OrderController.java

@@ -345,6 +345,8 @@ public class OrderController {
                     headerList.add(Arrays.asList("工单状态"));
                     headerList.add(Arrays.asList("线别"));
                     headerList.add(Arrays.asList("创建时间"));
+                    headerList.add(Arrays.asList("完成时间"));
+                    headerList.add(Arrays.asList("最后一次修改时间"));
                     headerList.add(Arrays.asList("出口"));
                     return headerList;
                 }
@@ -373,6 +375,8 @@ public class OrderController {
                             }
                             data.add(order.getLine());
                             data.add(order.getCreateDate());
+                            data.add(order.getFinishDate());
+                            data.add(order.getUpdateDate());
                             data.add(order.getExport());
                             resultList.add(data);
                         }
@@ -393,6 +397,8 @@ public class OrderController {
                     headerList.add(Arrays.asList("工单状态"));
                     headerList.add(Arrays.asList("线别"));
                     headerList.add(Arrays.asList("创建时间"));
+                    headerList.add(Arrays.asList("完成时间"));
+                    headerList.add(Arrays.asList("最后一次修改时间"));
                     headerList.add(Arrays.asList("出口"));
                     List<List<Object>> datas = new ArrayList<>();
                     List<Object> data = new ArrayList<>();
@@ -412,6 +418,8 @@ public class OrderController {
                     }
                     data.add(liteOrder.getLine());
                     data.add(liteOrder.getCreateDate());
+                    data.add(liteOrder.getFinishDate());
+                    data.add(liteOrder.getUpdateDate());
                     data.add(liteOrder.getExport());
                     datas.add(data);
                     FileUtil.downloadExcel(headerList, datas, response);

src/main/java/com/neotel/smfcore/custom/lizhen/third/maicheng/controller/MaiZhengDeviceController.java

@@ -122,17 +122,19 @@ public class MaiZhengDeviceController {
             List<ItemOutDetail> outDetailList = orderItem.getOutDetailList();
             if (outDetailList != null && !outDetailList.isEmpty()){
                 for (ItemOutDetail detail : outDetailList) {
+                    if (StringUtils.isNotEmpty(detail.getX()) && StringUtils.isNotEmpty(detail.getY())) {
                         Map<String, Object> map = new HashMap<>();
-                    map.put("PARTNUMBER",orderItem.getPn());
-                    map.put("ReelNewLong",detail.getReelNewLong());
-                    map.put("ReelNew",detail.getReelNew());
-                    map.put("ReelOld",orderItem.getReel());
-                    map.put("X",detail.getX());
-                    map.put("Y",detail.getY());
+                        map.put("PARTNUMBER", orderItem.getPn());
+                        map.put("ReelNewLong", detail.getReelNewLong());
+                        map.put("ReelNew", detail.getReelNew());
+                        map.put("ReelOld", orderItem.getReel());
+                        map.put("X", detail.getX());
+                        map.put("Y", detail.getY());
                         list.add(map);
                     }
                 }
             }
+        }
         paramMap.put("List", list);
         return ResultBean.newOkResult(paramMap);
     }

src/main/resources/config/application-21088prod.yml

@@ -3,7 +3,7 @@ api:
   name: Lizhen
   inCheckUrl: http://10.68.27.35:8001/Npm/WmsCheckReelfob   #禁用料接口
   outNotifyUrl: http://10.68.30.22:8082/api/mlb/TowerIssue
-  inNotifyUrl: http://10.68.25.42:8001/Sct/SaveReelInfo
+  inNotifyUrl: http://10.68.27.35:8001/Sct/SaveReelInfo
   getBarcode: http://10.68.27.83/smf-core/thirdBarcode/getBarcode
   fetchReel: http://10.68.30.22:8082/api/mlb/FetchReel
   #批量禁用料
@@ -11,14 +11,14 @@ api:
   #Tower发料检查
   towerCheck: http://10.68.30.22:8082/api/mlb/TowerCheck
   #获取MES数量
-  barcodeInfoUrl: http://10.68.25.42:8001/Sct/GetReelInfo
+  barcodeInfoUrl: http://10.68.27.35:8001/Sct/GetReelInfo
 
   #入库
-  save2DReelInfoUrl: http://10.68.25.40:8002/SmtAutoWH/Save2DReelInfo
+  save2DReelInfoUrl: http://10.68.27.35:8002/SmtAutoWH/Save2DReelInfo
   #发料
-  commonGIRecordUrl: http://10.68.25.40:8002/Sct/CommonGIRecord
+  commonGIRecordUrl: http://10.68.27.35:8002/Sct/CommonGIRecord
   #退料
-  commonRMRecordUrl: http://10.68.25.40:8002/Sct/CommonRMRecord
+  commonRMRecordUrl: http://10.68.27.35:8002/Sct/CommonRMRecord
   #获取有限期
   getInDateUrl: http://10.68.30.22:8082/api/mes/GetInDate
   #散料是否量测