排产修改-sjx

blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/feign/IWorkOrderClient.java

@@ -1,13 +1,11 @@
 package org.springblade.scheduling.feign;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 import org.springblade.scheduling.pojo.vo.GlassCakeOrderPageQuery;
 import org.springblade.scheduling.pojo.vo.WorkOrderVO;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestParam;
 
 /**
  * TODO：功能描述

blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/dto/WorkOrderDto.java

@@ -48,6 +48,7 @@ public class WorkOrderDto {
     private String priorityAps;
     private String teamMembers;
     private String releaseDate;
+    private String remindStatus;
 
     private List<String> planStatusList;
 

blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/WorkOrderMapper.xml

@@ -119,7 +119,7 @@
         LEFT JOIN MES_YIELD_ORDER g on g.id = a.yo_id
         <where>
             a.is_deleted = 0 and b.is_deleted = 0 and a.status in (1,2,3,5)
-            and b.start_time is not null and b.end_time is not null
+            and b.start_time is not null and b.end_time is not null and g.work_center_id = 81
             <if test="startTime !=null and startTime != ''">
                 and to_char(b.start_time,'YYYY-MM-DD') <![CDATA[ >= ]]> #{startTime}
             </if>

blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/WorkOrderServiceImpl.java

@@ -35,6 +35,8 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.time.DateFormatUtils;
+import org.apache.commons.lang3.time.DateUtils;
 import org.springblade.core.mp.base.BaseEntity;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.core.tool.utils.DateUtil;
@@ -53,6 +55,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
+import java.text.ParseException;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.time.format.DateTimeParseException;
@@ -224,7 +227,20 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
     @Override
     public List<WorkOrderDto> schedulingBoard(WorkOrderDto workOrder) {
         List<WorkOrderDto> list = baseMapper.selectWorkOrderList(workOrder);
+        String yesterday = DateFormatUtils.format(DateUtils.addDays(new Date(),-1),"yyyy-MM-dd");
+        String twodaysAgo = DateFormatUtils.format(DateUtils.addDays(new Date(),-2),"yyyy-MM-dd");
+        String threeDaysAgo = DateFormatUtils.format(DateUtils.addDays(new Date(),-3),"YYYY-MM-DD");
         list.forEach(item -> {
+            if((yesterday.equals(item.getReceiveTime()) || twodaysAgo.equals(item.getReceiveTime())) && "1".equals(item.getPlanStatus())){
+                item.setRemindStatus("1");
+            }
+            try {
+                if(DateUtils.parseDate(threeDaysAgo,"yyyy-MM-dd").compareTo(DateUtils.parseDate(item.getReceiveTime(),"yyyy-MM-dd")) > 0 && "1".equals(item.getPlanStatus())){
+                    item.setRemindStatus("2");
+                }
+            } catch (ParseException e) {
+                throw new RuntimeException(e);
+            }
             item.setPriorityAps(YieldOrderEnum.getName(Integer.parseInt(item.getPriorityAps())));
         });
         Map<String, List<WorkOrderDto>> woCodeGroup = list.stream().collect(Collectors.groupingBy(WorkOrderDto::getWoCode));