1.增加工单计算时间,开始出库时间,工单完成时间

src/main/java/com/neotel/smfcore/core/order/LiteOrderCache.java

@@ -524,6 +524,7 @@ public class LiteOrderCache {
         }
         }
 
 
         log.info("开始执行工单[" + orderNo + "] outBom=" + outBom);
         log.info("开始执行工单[" + orderNo + "] outBom=" + outBom);
+        cacheOrder.setStartDate(new Date());
         cacheOrder.setTaskReelCount(0);
         cacheOrder.setTaskReelCount(0);
         cacheOrder.setTaskFinishedTime(-1);
         cacheOrder.setTaskFinishedTime(-1);
         cacheOrder.setFinishedReelCount(0);
         cacheOrder.setFinishedReelCount(0);
@@ -820,6 +821,7 @@ public class LiteOrderCache {
         cacheOrder.setTaskReelCount(taskReelCount);
         cacheOrder.setTaskReelCount(taskReelCount);
         //cacheOrder.setTotalTaskReelCount(cacheOrder.getTotalTaskReelCount()+taskReelCount);
         //cacheOrder.setTotalTaskReelCount(cacheOrder.getTotalTaskReelCount()+taskReelCount);
         log.info("工单[" + orderNo + "]任务分配结束,任务数[" + taskReelCount + "]");
         log.info("工单[" + orderNo + "]任务分配结束,任务数[" + taskReelCount + "]");
+        cacheOrder.setEndDate(new Date());
         smfApi.onOrderStatusChange(cacheOrder);
         smfApi.onOrderStatusChange(cacheOrder);
         //有需要出库的
         //有需要出库的
         if (taskReelCount <= 0) {
         if (taskReelCount <= 0) {

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

@@ -345,7 +345,9 @@ 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("创建时间"));
-                    headerList.add(Arrays.asList("完成时间"));
+                    headerList.add(Arrays.asList("开始计算时间"));
+                    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;
                     return headerList;
@@ -375,6 +377,8 @@ public class OrderController {
                             }
                             }
                             data.add(order.getLine());
                             data.add(order.getLine());
                             data.add(order.getCreateDate());
                             data.add(order.getCreateDate());
+                            data.add(order.getStartDate());
+                            data.add(order.getEndDate());
                             data.add(order.getFinishDate());
                             data.add(order.getFinishDate());
                             data.add(order.getUpdateDate());
                             data.add(order.getUpdateDate());
                             data.add(order.getExport());
                             data.add(order.getExport());
@@ -397,7 +401,9 @@ 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("创建时间"));
-                    headerList.add(Arrays.asList("完成时间"));
+                    headerList.add(Arrays.asList("开始计算时间"));
+                    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<List<Object>> datas = new ArrayList<>();
@@ -418,6 +424,8 @@ public class OrderController {
                     }
                     }
                     data.add(liteOrder.getLine());
                     data.add(liteOrder.getLine());
                     data.add(liteOrder.getCreateDate());
                     data.add(liteOrder.getCreateDate());
+                    data.add(liteOrder.getStartDate());
+                    data.add(liteOrder.getEndDate());
                     data.add(liteOrder.getFinishDate());
                     data.add(liteOrder.getFinishDate());
                     data.add(liteOrder.getUpdateDate());
                     data.add(liteOrder.getUpdateDate());
                     data.add(liteOrder.getExport());
                     data.add(liteOrder.getExport());