1

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/TaskGroupController.java

@@ -485,18 +485,25 @@ public class TaskGroupController {
                     List<SaleOrderMain> orderMains = saleOrderMainMapper.selectList(new LambdaQueryWrapper<SaleOrderMain>().in(SaleOrderMain::getId, mainIdList).orderByAsc(SaleOrderMain::getOrderApproveDate));
                     //校验最早审批通过时间
                     SaleOrderMain saleOrderMain = orderMains.get(0);
-                    ProdOrderDetail prodOrderDetail = prodOrderDetails.get(0);
                     LocalDate orderApproveDate = saleOrderMain.getOrderApproveDate();
-                    LocalDate relsDate = prodOrderDetail.getRelsDate();
-                    if(relsDate.isBefore(orderApproveDate)){
-                        if(relsDate.isAfter(workDateValue)){
-                            taskGroups=taskGroups.stream().filter(i->i.getName().equals("售前工时")).collect(Collectors.toList());
+                    if(prodOrderDetails!=null && prodOrderDetails.size()>0){
+                        ProdOrderDetail prodOrderDetail = prodOrderDetails.get(0);
+                        LocalDate relsDate = prodOrderDetail.getRelsDate();
+                        if(relsDate.isBefore(orderApproveDate)){
+                            if(relsDate.isAfter(workDateValue)){
+                                taskGroups=taskGroups.stream().filter(i->i.getName().equals("售前工时")).collect(Collectors.toList());
+                            }
+                        }else {
+                            if(orderApproveDate.isAfter(workDateValue)){
+                                taskGroups=taskGroups.stream().filter(i->i.getName().equals("售前工时")).collect(Collectors.toList());
+                            }
                         }
                     }else {
                         if(orderApproveDate.isAfter(workDateValue)){
                             taskGroups=taskGroups.stream().filter(i->i.getName().equals("售前工时")).collect(Collectors.toList());
                         }
                     }
+
                 }else if(prodOrderDetails!=null && prodOrderDetails.size()>0){
                     //不存在销售订单 但是存在生产订单的情况
                     //校验最早审批通过时间