1

fhKeeper/formulahousekeeper/collectdata/src/main/java/com/management/collectdata/controller/DataCollectController.java

@@ -655,7 +655,7 @@ public class DataCollectController {
 //        String sqlQueryMain = "select id,cSOCode,iStatus ,dverifysystime,dcreatesystime,dverifydate,iverifystate,dDate   " +
 //                "from  SO_SOMAIN ssm  where ssm.dverifydate >= DATEADD(day, -30, GETDATE()) order by ID OFFSET ? ROWS FETCH NEXT ? ROWS ONLY ";
         String sqlQueryMain = "select id,cSOCode,iStatus ,FORMAT(dverifysystime,'yyyy-MM-dd HH:mm:ss') as dverifysystime,FORMAT(dverifydate,'yyyy-MM-dd') as dverifydate,iverifystate,FORMAT(dDate,'yyyy-MM-dd') as dDate   " +
-                "from  SO_SOMAIN ssm  where ssm.iStatus = 1  and  ssm.cdefine1 = '设备' and  cstcode = 10 and ssm.dverifydate >= DATEADD(day, -1095, GETDATE()) order by ID";
+                "from  SO_SOMAIN ssm  where ssm.iStatus = 1  and  ssm.cdefine1 = '设备' and  cstcode = 10  order by ID";
         //获取销售主表单信息数据
         String sqlQueryDetail = "select id,autoId,cSOCode,cItemCode ,cItemName from SO_SODetails ssd where ssd.id in (%s)";
 
@@ -710,7 +710,7 @@ public class DataCollectController {
 
     @RequestMapping("/getProdOrderData")
     public List<ProdOrderMain> getProdOrderData(@RequestBody PageBO pageBO) {
-        String sqlQueryMain = "select moId,moCode,FORMAT(createDate,'yyyy-MM-dd') AS createDate ,FORMAT(modifyDate,'yyyy-MM-dd') AS modifyDate from mom_order mom where  mom.createDate >= DATEADD(day, -1095, GETDATE()) order by moId";
+        String sqlQueryMain = "select moId,moCode,FORMAT(createDate,'yyyy-MM-dd') AS createDate ,FORMAT(modifyDate,'yyyy-MM-dd') AS modifyDate from mom_order mom order by moId";
         //获取销售主表单信息数据
         String sqlQueryDetail = "select FORMAT(relsTime, 'yyyy-MM-dd HH:mm:ss') AS relsTime, CostItemName ,Define24 ,OrderDId ,CostItemCode ,MoDId ,moid ,FORMAT(relsDate, 'yyyy-MM-dd') AS relsDate,Status  from mom_orderdetail momd where momd.relsDate is not null and momd.moid in (%s)";
 

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

@@ -466,7 +466,7 @@ public class TaskGroupController {
         //针对泓浒 需要特殊处理分组
         if(user.getCompanyId()==7536){
             //针对项目编号为HH-EQ的才进行处理
-            if(project.getProjectCode().startsWith("HH-EQ")){
+            if(project.getProjectCode().startsWith("HH-EQ")&&!project.getProjectCode().endsWith("-P")&&!project.getProjectName().contains("样机")&&!project.getProjectName().contains("试产")&&!project.getProjectName().contains("赠品")){
                 //检查生产订单和销售订单
                 DateTimeFormatter df=DateTimeFormatter.ofPattern("yyyy-MM-dd");
                 String projectCode = project.getProjectCode();
@@ -488,15 +488,21 @@ public class TaskGroupController {
                         if(relsDate.isBefore(orderApproveDate)){
                             if(relsDate.isAfter(workDateValue)){
                                 taskGroups=taskGroups.stream().filter(i->i.getName().equals("售前工时")).collect(Collectors.toList());
+                            } else {
+                                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 {
+                                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 {
+                            taskGroups=taskGroups.stream().filter(i->!i.getName().equals("售前工时")).collect(Collectors.toList());
                         }
                     }
 
@@ -507,10 +513,14 @@ public class TaskGroupController {
                     LocalDate relsDate = prodOrderDetail.getRelsDate();
                     if(relsDate.isAfter(workDateValue)){
                         taskGroups=taskGroups.stream().filter(i->i.getName().equals("售前工时")).collect(Collectors.toList());
+                    } else {
+                        taskGroups=taskGroups.stream().filter(i->!i.getName().equals("售前工时")).collect(Collectors.toList());
                     }
                 } else {
-                    taskGroups=taskGroups.stream().filter(i->i.getName().equals("售前工时")).collect(Collectors.toList());
+                    taskGroups=taskGroups.stream().filter(i->!i.getName().equals("售前工时")).collect(Collectors.toList());
                 }
+            }else {
+                taskGroups=taskGroups.stream().filter(i->!i.getName().equals("售前工时")).collect(Collectors.toList());
             }
         }
         msg.data=taskGroups;

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ProjectServiceImpl.java

@@ -13574,6 +13574,13 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                                     projectMapper.insert(project);
                                     if (company.getPackageProject() == 1) {
                                         initGroup(honghuCompId,project.getId());
+                                        //针对新同步过来的项目 默认新增"售前工时任务分组"
+                                        if(project.getProjectCode().startsWith("HH-EQ")&&!project.getProjectCode().endsWith("-P")&&!project.getProjectName().contains("样机")&&!project.getProjectName().contains("试产")&&!project.getProjectName().contains("赠品")){
+                                            TaskGroup taskGroup=new TaskGroup();
+                                            taskGroup.setProjectId(project.getId());
+                                            taskGroup.setName("售前工时");
+                                            taskGroupMapper.insert(taskGroup);
+                                        }
                                     }
                                 }
                             }