bug修改

6.program/wms-empty/src/main/java/com/mt/wms/empty/service/impl/OrderInfoHisServiceImpl.java

@@ -105,8 +105,8 @@ public class OrderInfoHisServiceImpl extends BaseService implements OrderInfoHis
                 {
                     //获取对应的任务
                     CurrTaskVo currTask = taskHisService.getById(IdParam.builder().id(orderInfo.getCurrTaskId()).build());
-                    orderInfo.setABeginTime(currTask.getABeginTime());
-                    orderInfo.setAEndTime(currTask.getAEndTime());
+                    orderInfo.setABeginTime(currTask.getBeginTime());
+                    orderInfo.setAEndTime(currTask.getEndTime());
                     orderInfo.setTaskType(currTask.getTaskType());
                     orderInfo.setStatus(currTask.getStatus());
                     orderInfo.setKilnId(currTask.getKilnId());

6.program/wms-empty/src/main/java/com/mt/wms/empty/service/impl/OrderInfoServiceImpl.java

@@ -176,8 +176,8 @@ public class OrderInfoServiceImpl extends BaseService implements OrderInfoServic
                 {
                     //获取对应的任务
                     CurrTaskVo currTask = currTaskService.getCurrTask(IdParam.builder().id(orderInfo.getCurrTaskId()).build());
-                    orderInfo.setABeginTime(currTask.getABeginTime());
-                    orderInfo.setAEndTime(currTask.getAEndTime());
+                    orderInfo.setABeginTime(currTask.getBeginTime());
+                    orderInfo.setAEndTime(currTask.getEndTime());
                     orderInfo.setTaskType(currTask.getProcessType());
                     orderInfo.setStatus(currTask.getStatus());
                     orderInfo.setKilnId(currTask.getKilnId());

6.program/wms-empty/src/main/java/com/mt/wms/empty/task/ScheduledTask.java

@@ -200,7 +200,7 @@ public class ScheduledTask extends BaseService {
     /**
      * 查询加工完成的工业炉
      */
-    @Scheduled(fixedDelay = 1000*60*2)
+    @Scheduled(fixedDelay = 1000*30)
     public void taskForStockToKiln() throws IOException {
         //两辆车是否都空闲，只有两辆车都空闲才被允许做任务
         List<VehicleInfo> vehicleInfoList = vehicleInfoServiceBiz.list(new QueryWrapper<VehicleInfo>().eq(VehicleInfo.STATUS, 0));
@@ -494,12 +494,10 @@ public class ScheduledTask extends BaseService {
                 Boolean kilnReadyIn=false;
                 if (kilnInfo.getType()==1){
                     kilnReadyIn=kilnReadyIn(kilnInfo.getId());
-                }else {
-                    kilnReadyIn=true;
                 }
                 //查询炉子是否allowIn
                 Boolean kilnAllowIn = kilnAllowIn(kilnInfo.getId());
-                if (kilnReadyIn&&kilnAllowIn){
+                if (kilnReadyIn||kilnAllowIn){
                     //缓存区是否有目标位置为工业炉的待加工任务
                     List<InStockInfo> inStockInfoList = inStockInfoServiceBiz.list(new QueryWrapper<InStockInfo>()
                             .eq(InStockInfo.TYPE, 1)

6.program/wms-empty/src/main/java/com/mt/wms/empty/vo/CurrTaskVo.java

@@ -85,13 +85,13 @@ public class CurrTaskVo extends BaseVo implements PageVo.ConvertVo {
      * 缓存前开始时间，车辆开始执行
      */
     @ApiModelProperty("任务开始")
-    private LocalDateTime aBeginTime;
+    private LocalDateTime beginTime;
 
     /**
      * 完成当前任务时间（可能是到缓存区，有可能直接到工业炉），车辆放完货物到缓存区收到的时间
      */
     @ApiModelProperty("任务结束")
-    private LocalDateTime aEndTime;
+    private LocalDateTime endTime;
 
     /**
      * 开始位置