0710

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

@@ -931,7 +931,7 @@ public class BizDayworkController extends BaseController {
             List<BizTechnologicalProcessDetail> normalTechnologicalProcessDetailList = new ArrayList<>();
             List<BizLotTechnologicalProcessDetail> abNormalTechnologicalProcessDetailList = new ArrayList<>();
             //最新的工序步骤
-            String lastProcessStepNumber = daywork.getDayworkItemList().stream().sorted(Comparator.comparing(BizDayworkItem::getCreateTime).reversed()).collect(Collectors.toList()).get(0).getProcessStepNumber();
+            String lastProcessStepNumber = daywork.getDayworkItemList().stream().sorted(Comparator.comparing(BizDayworkItem::getProcessStepNumber).reversed()).sorted(Comparator.comparing(BizDayworkItem::getCreateTime).reversed()).collect(Collectors.toList()).get(0).getProcessStepNumber();
             List<BizDayworkItem> lastDayworkItemList = daywork.getDayworkItemList().stream().filter(info -> info.getProcessStepNumber().equals(lastProcessStepNumber)).collect(Collectors.toList());
             //当前设备
             daywork.setCurrentEquipmentCode(lastDayworkItemList.stream().sorted(Comparator.comparing(BizDayworkItem::getCreateTime).reversed()).collect(Collectors.toList()).get(0).getEquipmentDetailCode());
@@ -973,7 +973,7 @@ public class BizDayworkController extends BaseController {
                         daywork.setNextProcess(nextProcess);
                     }
                 }else{
-                    normalTechnologicalProcessDetailList =  bizTechnologicalProcessDetailService.query().eq("technological_process_id", daywork.getTechnologicalProcessId()).orderByAsc("process_step_number").list();
+                    normalTechnologicalProcessDetailList =  bizTechnologicalProcessDetailService.query().eq("technological_process_id", daywork.getTechnologicalProcessId()).ne("tenant_id",9).orderByAsc("process_step_number").list();
                     List<BizProcess> processSequence = new ArrayList<>();
                     for (BizTechnologicalProcessDetail detail : normalTechnologicalProcessDetailList) {
                         BizProcess newProcess = new BizProcess();
@@ -993,6 +993,7 @@ public class BizDayworkController extends BaseController {
                     //上一道序
                     List<BizDayworkItem> filteredList = daywork.getDayworkItemList().stream()
                             .filter(info -> !info.getProcessStepNumber().equals(lastProcessStepNumber))
+                            .sorted(Comparator.comparing(BizDayworkItem::getProcessStepNumber).reversed())
                             .sorted(Comparator.comparing(BizDayworkItem::getCreateTime).reversed())
                             .collect(Collectors.toList());
                     BizProcess prevProcess = new BizProcess();
@@ -1104,7 +1105,7 @@ public class BizDayworkController extends BaseController {
                     .list();
 
             List<BizDayworkItem> allBizDayworkItem = bizDayworkItemService.query().in("daywork_id", bizDayworks.isEmpty() ? Collections.singletonList(0L) : bizDayworks.stream().map(BizDaywork::getId).collect(Collectors.toList())).orderByDesc("create_time").list();
-            bizDayworks.forEach(l -> l.setDayworkItemList(allBizDayworkItem.stream().filter(v -> v.getDayworkId().equals(l.getId())).collect(Collectors.toList())));
+            bizDayworks.forEach(l -> l.setDayworkItemList(allBizDayworkItem.stream().filter(v -> v.getDayworkId().equals(l.getId())).sorted(Comparator.comparing(BizDayworkItem::getCreateTime).reversed()).collect(Collectors.toList())));
             List<BizDayworkItem> turnoverItems = new ArrayList<>();
             for (BizDaywork bizDaywork : bizDayworks) {
                 if (bizDaywork.getDayworkItemList().get(0).getStatus().equals("4")
@@ -1215,6 +1216,7 @@ public class BizDayworkController extends BaseController {
             if(l.getStatus().equals("7")) {
                 BizDaywork daywork = l.getDaywork();
                 daywork.setProtemProcessId(l.getProcessId());
+                daywork.setProtemProcessStepNumber(l.getProcessStepNumber());
                 // 如果被邀请人不是本工段内的人，则需要从当前资源组中删除被邀请人
                 bizProductionResourceGroupDetailService.deleTemporanyPeople(daywork);
             }

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

@@ -290,6 +290,9 @@ public class BizDayworkItemController extends BaseController {
             List<Long> processIds = bizLotTechnologicalProcessDetailList.stream().map(BizLotTechnologicalProcessDetail::getProcessId).distinct().collect(Collectors.toList());
             List<BizDeptProcess> deptProcessList = bizDeptProcessService.query().in("process_id", processIds.isEmpty()? Collections.singletonList(0L) : processIds).list();
             list.forEach(info -> {
+                if(info.getTurnoverType().equals("1")) {
+                    info.setTurnoverArea(info.getPlace());
+                }
                 List<BizProcess> tempList = new ArrayList<>();
                 if (info.getIsAmend() == 1 || info.getIsWasteRecycling() == 1) {
                     List<BizLotTechnologicalProcessDetail> infoList = bizLotTechnologicalProcessDetailList.stream().filter(l -> l.getLotTechnologicalProcessId().equals(info.getTechnologicalProcessId())).collect(Collectors.toList());
@@ -640,6 +643,7 @@ public class BizDayworkItemController extends BaseController {
         if (bizDayworkItem.getStatus().equals("7")) {
             daywork.setDeptId(bizDayworkItem.getDeptId());
             daywork.setProcessQualifiedNum(daywork.getTemporaryProcessQualifiedNum());
+            daywork.setProtemProcessStepNumber(bizDayworkItem.getProcessStepNumber());
             bizDayworkService.updateById(daywork);
             // 如果被邀请人不是本工段内的人，则需要从当前资源组中删除被邀请人
             bizProductionResourceGroupDetailService.deleTemporanyPeople(daywork);
@@ -648,6 +652,7 @@ public class BizDayworkItemController extends BaseController {
         if (bizDayworkItem.getStatus().equals("5")) {
             daywork.setProcessQualifiedNum(daywork.getTemporaryProcessQualifiedNum());
             bizDayworkService.updateById(daywork);
+            daywork.setProtemProcessStepNumber(bizDayworkItem.getProcessStepNumber());
             // 如果被邀请人不是本工段内的人，则需要从当前资源组中删除被邀请人
             bizProductionResourceGroupDetailService.deleTemporanyPeople(daywork);
         }
@@ -1120,6 +1125,7 @@ public class BizDayworkItemController extends BaseController {
                 // 周转后如果是车间内的，状态为7，则需要从当前资源组中删除被邀请人
                 if(bizDayworkItem.getStatus().equals("7") || bizDayworkItem.getStatus().equals("5")) {
                     v.setProtemProcessId(lastItem.getProcessId());
+                    v.setProtemProcessStepNumber(lastItem.getProcessStepNumber());
                     // 如果被邀请人不是本工段内的人，则需要从当前资源组中删除被邀请人
                     bizProductionResourceGroupDetailService.deleTemporanyPeople(v);
                 }
@@ -1216,6 +1222,7 @@ public class BizDayworkItemController extends BaseController {
                 // 周转后如果是车间内的，状态为7，则需要从当前资源组中删除被邀请人
                 if(bizDayworkItem.getStatus().equals("7") || bizDayworkItem.getStatus().equals("5")) {
                     v.setProtemProcessId(lastItem.getProcessId());
+                    v.setProtemProcessStepNumber(lastItem.getProcessStepNumber());
                     // 如果被邀请人不是本工段内的人，则需要从当前资源组中删除被邀请人
                     bizProductionResourceGroupDetailService.deleTemporanyPeople(v);
                 }

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

@@ -204,6 +204,8 @@ public class BizDaywork extends BaseEntity
     private Integer totalQuantityNum;
     @TableField(exist = false)
     private String creatorName;
+    @TableField(exist = false)
+    private String protemProcessStepNumber;
 
 
 }

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

@@ -270,4 +270,7 @@ public class BizDayworkItem extends BaseEntity
     private String processAlias;
     private Integer isSort;
     private Integer isInnerTurnover;
+    @TableField(exist = false)
+    private String protemProcessStepNumber;
+
 }

src/main/java/cn/ezhizao/project/business/resourceGroup/service/impl/BizProductionResourceGroupDetailServiceImpl.java

@@ -90,7 +90,7 @@ public class BizProductionResourceGroupDetailServiceImpl  extends ServiceImpl<Bi
         QueryWrapper<BizProductionResourceGroupDetail> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("protem_daywork_id", bizDaywork.getId());
         queryWrapper.eq("protem_process_id", bizDaywork.getProtemProcessId());
-        queryWrapper.eq("protem_process_step_number", bizDaywork.getProcessStepNumber());
+        queryWrapper.eq("protem_process_step_number", bizDaywork.getProtemProcessStepNumber());
         queryWrapper.eq("deleted", 0);
         List<BizProductionResourceGroupDetail> list = list(queryWrapper);
         if (!list.isEmpty()) {

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

@@ -73,7 +73,7 @@
         select * from biz_daywork_item_reject where daywork_item_id = #{id} and deleted = 0 and process_inspection_id = 0
     </select>
     <select id="getSortConsultList" resultType="cn.ezhizao.project.business.product.domain.BizDayworkItemConsult">
-        select * from biz_daywork_item_consult where daywork_item_id = #{id} and deleted = 0
+        select t1.*,t2.nick_name as technicianName from biz_daywork_item_consult t1 left join sys_user t2 on t1.technician_id = t2.user_id where t1.daywork_item_id = #{id} and t1.deleted = 0 and t2.del_flag = 0
     </select>
     <select id="getListByDayworkId" resultMap="BizDayworkItemAndRejectList">
       select t1.*,t2.process_alias from biz_daywork_item t1 left join biz_process t2 on t1.process_id  = t2.id where t1.daywork_id = #{dayworkId} and t1.deleted = 0 and t2.deleted = 0 and (t1.status =2 ||t1.status =3)