1.增加工单出库总用时

2.启用库位不清空库存

src/main/java/com/neotel/smfcore/common/utils/DateUtil.java

@@ -203,6 +203,15 @@ public class DateUtil {
         return  c.getTime();
         return  c.getTime();
     }
     }
 
 
+    public static String convertToHMS(long milliseconds) {
+        long seconds = milliseconds / 1000;
+        long hours = seconds / 3600;
+        long minutes = (seconds % 3600) / 60;
+        long remainingSeconds = seconds % 60;
+        return String.format("%02d:%02d:%02d", hours, minutes, remainingSeconds);
+    }
+
+
     public static class Req{
     public static class Req{
         private String seq;
         private String seq;
         private int op;
         private int op;

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

@@ -303,6 +303,19 @@ public class OrderController {
             }
             }
             PageData<LiteOrder> orderList = liteOrderManager.findByPage(query, pageable);
             PageData<LiteOrder> orderList = liteOrderManager.findByPage(query, pageable);
             PageData<OrderDto> resultList = orderMapper.toDto(orderList);
             PageData<OrderDto> resultList = orderMapper.toDto(orderList);
+
+            List<OrderDto> content = resultList.getContent();
+            for (OrderDto orderDto : content) {
+                Date finishDate = orderDto.getFinishDate();
+                Date endDate = orderDto.getEndDate();
+                if (finishDate != null && endDate != null){
+                    long l = finishDate.getTime() - endDate.getTime();
+                    String s = DateUtil.convertToHMS(l);
+                    orderDto.setTotalOutboundTime(s);
+                }
+            }
+            resultList.setContent(content);
+
             return resultList;
             return resultList;
         } else {
         } else {
             PageData<OrderDto> resultList = new PageData<>();
             PageData<OrderDto> resultList = new PageData<>();
@@ -317,6 +330,20 @@ public class OrderController {
                     resultList.setTotalElements(1);
                     resultList.setTotalElements(1);
                 }
                 }
             }
             }
+
+
+            List<OrderDto> content = resultList.getContent();
+            for (OrderDto orderDto : content) {
+                Date finishDate = orderDto.getFinishDate();
+                Date endDate = orderDto.getEndDate();
+                if (finishDate != null && endDate != null){
+                    long l = finishDate.getTime() - endDate.getTime();
+                    String s = DateUtil.convertToHMS(l);
+                    orderDto.setTotalOutboundTime(s);
+                }
+            }
+            resultList.setContent(content);
+
             return resultList;
             return resultList;
         }
         }
     }
     }
@@ -348,6 +375,7 @@ 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("出口"));
                     return headerList;
                     return headerList;
@@ -380,6 +408,12 @@ public class OrderController {
                             data.add(order.getStartDate());
                             data.add(order.getStartDate());
                             data.add(order.getEndDate());
                             data.add(order.getEndDate());
                             data.add(order.getFinishDate());
                             data.add(order.getFinishDate());
+                            String totalTime = "";
+                            if (order.getFinishDate() != null && order.getEndDate() != null){
+                                long l = order.getFinishDate().getTime() - order.getEndDate().getTime();
+                                totalTime = DateUtil.convertToHMS(l);
+                            }
+                            data.add(totalTime);
                             data.add(order.getUpdateDate());
                             data.add(order.getUpdateDate());
                             data.add(order.getExport());
                             data.add(order.getExport());
                             resultList.add(data);
                             resultList.add(data);

src/main/java/com/neotel/smfcore/core/order/rest/bean/dto/OrderDto.java

@@ -116,4 +116,7 @@ public class OrderDto implements Serializable {
 
 
     @ApiModelProperty("是否迈征")
     @ApiModelProperty("是否迈征")
     private boolean maiZheng = false;
     private boolean maiZheng = false;
+
+    @ApiModelProperty("出库总用时")
+    private String totalOutboundTime;
 }
 }

src/main/java/com/neotel/smfcore/core/storage/rest/StoragePosController.java

@@ -415,10 +415,11 @@ public class StoragePosController {
     public ResultBean enabled(@RequestParam("cid") String cid, @RequestParam("posName") String posName) {
     public ResultBean enabled(@RequestParam("cid") String cid, @RequestParam("posName") String posName) {
         StoragePos storagePos = storagePosManager.getByPosName(posName);
         StoragePos storagePos = storagePosManager.getByPosName(posName);
         if (storagePos != null && !storagePos.isEnabled()){
         if (storagePos != null && !storagePos.isEnabled()){
-            Barcode barcode = storagePos.getBarcode();
+            /*Barcode barcode = storagePos.getBarcode();
             if (barcode != null){
             if (barcode != null){
                 taskService.addTaskToFinished(storagePos,barcode,"admin-enable");
                 taskService.addTaskToFinished(storagePos,barcode,"admin-enable");
-            }
+            }*/
+            log.info(SecurityUtils.getLoginUsername()+"启用库位:"+posName);
             storagePos.setEnabled(true);
             storagePos.setEnabled(true);
             storagePosManager.save(storagePos);
             storagePosManager.save(storagePos);
             Storage storage = dataCache.getStorageById(storagePos.getStorageId());
             Storage storage = dataCache.getStorageById(storagePos.getStorageId());