1.23

src/main/java/cn/ezhizao/project/business/product/controller/BizDayworkController.java

@@ -629,6 +629,11 @@ public class BizDayworkController extends BaseController {
     public AjaxResult assistList(BizDaywork bizDaywork) {
         Long deptId = bizDaywork.getDeptId();
         String keywords = bizDaywork.getKeywords();
+        if(bizDaywork.getNormalStatus()){
+            bizDaywork.setIsAmend(0);
+        }else{
+            bizDaywork.setIsAmend(1);
+        }
         startPage();
         List<BizDaywork> dayworks = bizDayworkService.getAssistDayworkList(bizDaywork);
 //        // 如果关键字不为空，则根据关键字匹配批次，后面会根据批次进行daywork过滤

src/main/java/cn/ezhizao/project/business/product/controller/BizQuickDayworkController.java

@@ -461,6 +461,7 @@ public class BizQuickDayworkController extends BaseController {
                     } else {
                         l.setProcess(processDetails.stream().filter(v -> v.getProcessStepNumber().compareTo(l.getProcessStepNumber()) > 0).filter(v -> processes.stream().anyMatch(e -> e.getProcessId().equals(v.getProcessId()))).map(BizProcess::new).findFirst().orElse(new BizProcess()));
                         l.setProcessSequence(processDetails.stream().map(BizProcess::new).collect(Collectors.toList()));
+                        l.setLastProcess(l.getProcessSequence().stream().filter(e -> e.getProcessStepNumber().equals(l.getProcessStepNumber())).findFirst().orElse(null));
                         l.setNextProcess(l.getProcessSequence().stream().filter(e -> e.getProcessStepNumber().compareTo(l.getProcess().getProcessStepNumber()) > 0).min(Comparator.comparing(BizProcess::getProcessStepNumber)).orElse(null));
                         l.setNextProcesses(l.getProcess() != null ? processDetails.stream().sorted(Comparator.comparing(BizLotTechnologicalProcessDetail::getProcessStepNumber)).filter(v -> v.getProcessStepNumber().compareTo(l.getProcess().getProcessStepNumber()) > 0).map(BizProcess::new).collect(Collectors.toList()) : new ArrayList<>());
                         l.setWorkshopId(workshops.stream().filter(v -> v.getId().equals(l.getWorkshopId())).findFirst().orElse(new BizWorkshop()).getId());
@@ -491,7 +492,7 @@ public class BizQuickDayworkController extends BaseController {
                         l.setProcess(l.getProcessSequence().stream().sorted(Comparator.comparing(BizProcess::getProcessStepNumber)).filter(v -> v.getProcessStepNumber().compareTo(process.getProcessStepNumber()) > 0).filter(v -> processes.stream().anyMatch(e -> e.getProcessId().equals(v.getId()))).findFirst().orElse(null));
                         l.setNextProcesses(l.getProcess() != null ? l.getProcessSequence().stream().sorted(Comparator.comparing(BizProcess::getProcessStepNumber)).filter(v -> v.getProcessStepNumber().compareTo(l.getProcess().getProcessStepNumber()) > 0).collect(Collectors.toList()) : new ArrayList<>());
                         l.setNextProcess(l.getNextProcesses().isEmpty() ? null : l.getNextProcesses().get(0));
-
+                        l.setLastProcess(l.getProcessSequence().stream().filter(e -> e.getProcessStepNumber().equals(l.getProcessStepNumber())).findFirst().orElse(null));
                         l.setWorkshopId(workshops.stream().filter(v -> v.getId().equals(l.getWorkshopId())).findFirst().orElse(new BizWorkshop()).getId());
                         List<SysDept> nextDept = depts.stream().filter(e -> "170000".equals(e.getDeptCode()) || allProcesses.stream().filter(v -> l.getNextProcesses().stream().anyMatch(n -> v.getProcessId().equals(n.getId()))).anyMatch(v -> e.getDeptId().equals(v.getDeptId()))
                         ).collect(Collectors.toList());

src/main/java/cn/ezhizao/project/business/product/domain/BizDaywork.java

@@ -235,4 +235,6 @@ public class BizDaywork extends BaseEntity
     private String allNickName;
     @TableField(exist = false)
     private Long requisitionDepartmentId;
+    @TableField(exist = false)
+    private Boolean normalStatus;
 }

src/main/java/cn/ezhizao/project/business/product/domain/BizDayworkItem.java

@@ -187,6 +187,8 @@ public class BizDayworkItem extends BaseEntity
     /**下到序 */
     @TableField(exist = false)
     private BizProcess nextProcess;
+    @TableField(exist = false)
+    private BizProcess lastProcess;
     /** 载具 */
     @TableField(exist = false)
     private String carrierName;

src/main/resources/mybatis/business/product/BizDayworkMapper.xml

@@ -124,6 +124,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             LIMIT 1
             ) <5
             AND ( SELECT t2.from_dept_id FROM biz_daywork_item t2 WHERE t2.daywork_id = t1.id AND t2.deleted = 0 ORDER BY t2.create_time DESC LIMIT 1 ) in(0,#{deptId})
+            and (
+            SELECT t3.is_waste
+            FROM biz_lot t3
+            WHERE t1.lot_id = t3.id AND t3.deleted = 0 limit 1
+            ) =0
             <if test="keywords != null">
                 AND (
                 (
@@ -134,6 +139,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 OR t1.lot_code LIKE CONCAT('%', #{keywords}, '%')
                 )
             </if>
+            <if test="isAmend == 0">
+                AND t1.is_amend = 0 and t1.is_waste_recycling = 0
+            </if>
+            <if test="isAmend == 1">
+                AND (t1.is_amend = 1 or t1.is_waste_recycling = 1)
+            </if>
         </trim>
     </select>