查询

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

@@ -141,7 +141,7 @@ public class BizDayworkController extends BaseController {
                     .list();
             List<Long> dayworkCarrierIds = bizDayworkCarrierService.query().like("carrier_code", keywords).eq("process_inspection_id", 0L).list().stream().map(BizDayworkCarrier::getDayworkId).collect(Collectors.toList());
             List<BizDaywork> dayworkByCarriers = bizDayworkService.query().in("id", dayworkCarrierIds.isEmpty() ? Collections.singletonList(0L) : dayworkCarrierIds).list();
-            List<BizLot> lotList2 = bizLotService.query().in("id", dayworkByCarriers.isEmpty() ? Collections.singletonList(0L) :dayworkByCarriers.stream().map(BizDaywork::getLotId).collect(Collectors.toList())).list();
+            List<BizLot> lotList2 = bizLotService.query().in("id", dayworkByCarriers.isEmpty() ? Collections.singletonList(0L) : dayworkByCarriers.stream().map(BizDaywork::getLotId).collect(Collectors.toList())).list();
             Set<BizLot> uniqueSet = Stream.of(lotList1, lotList2)
                     .flatMap(Collection::stream)
                     .collect(Collectors.toSet());
@@ -233,7 +233,7 @@ public class BizDayworkController extends BaseController {
             // 状态 == 5 时，说明已经进入周转中，那么该条daywork，将不再页面中显示，所以，通过对status的值的判断，添加到daywork集合中
             // 最后一条非周转报工的工段为当前工段。
             //20240806添加isSpecial!=1将最新一条报工为特殊报工的批次删除
-            if (!latestNoTurnover.getIsSpecial().equals(1)&&latestNoTurnover.getDeptId().equals(deptId) && Integer.parseInt(status) < 5 && latestProcess != null) {
+            if (!latestNoTurnover.getIsSpecial().equals(1) && latestNoTurnover.getDeptId().equals(deptId) && Integer.parseInt(status) < 5 && latestProcess != null) {
                 // 获取当前操作者自己的报工记录
                 List<BizDayworkItem> currentMyDayworkItems = myDayworkItems.stream()
                         .filter(di -> di.getDayworkId().equals(item.getId()))
@@ -310,7 +310,7 @@ public class BizDayworkController extends BaseController {
             List<Long> allDayworkIds = dayworkList.stream().map(BizDaywork::getId).collect(Collectors.toList());
             //查找被邀请者的id
             List<BizProductionResourceGroupDetail> protemResourceGroupDetail = bizProductionResourceGroupDetailService.query().in("protem_daywork_id", allDayworkIds.isEmpty() ? Collections.singletonList(0L) : allDayworkIds)
-                    .eq("common_id",userId).eq("common_type","person").list();
+                    .eq("common_id", userId).eq("common_type", "person").list();
             List<Long> protemUserIds = protemResourceGroupDetail.stream().map(BizProductionResourceGroupDetail::getCreatorId).distinct().collect(Collectors.toList());
             protemUserIds.add(0L);
             List<SysUser> sysUsers = sysUserService.selectUserListByIds(protemUserIds);
@@ -490,10 +490,10 @@ public class BizDayworkController extends BaseController {
                     daywork.setProcessSequence(processSequence);
                 }
                 /* ************************** 以下是为了获得当前登录这资源组信息，判断邀请报工 ************************** */
-                if(!sysUsers.isEmpty()){
-                    List<BizProductionResourceGroupDetail> protemDetailList = protemResourceGroupDetail.stream().filter(item ->item.getProtemDayworkId().equals(daywork.getId())).collect(Collectors.toList());
-                    protemDetailList.forEach(item ->{
-                        item.setProtemCreatorName(sysUsers.stream().filter(label ->label.getUserId().equals(item.getCreatorId())).collect(Collectors.toList()).get(0).getNickName());
+                if (!sysUsers.isEmpty()) {
+                    List<BizProductionResourceGroupDetail> protemDetailList = protemResourceGroupDetail.stream().filter(item -> item.getProtemDayworkId().equals(daywork.getId())).collect(Collectors.toList());
+                    protemDetailList.forEach(item -> {
+                        item.setProtemCreatorName(sysUsers.stream().filter(label -> label.getUserId().equals(item.getCreatorId())).collect(Collectors.toList()).get(0).getNickName());
                     });
                     daywork.setProtemResourceGroupDetailList(protemDetailList);
                 }
@@ -799,6 +799,7 @@ public class BizDayworkController extends BaseController {
         ExcelUtil<BizDaywork> util = new ExcelUtil<BizDaywork>(BizDaywork.class);
         util.exportExcel(response, list, "报工数据");
     }
+
     @PostMapping("/getDayworkInfoById")
     public AjaxResult getDayworkInfoById(@RequestBody BizDaywork bizDaywork) throws NoSuchFieldException, IllegalAccessException {
         List<BizDayworkItem> dayworkItemList = bizDayworkItemService.query().eq("daywork_id", bizDaywork.getId()).orderByDesc("process_step_number").list();
@@ -832,7 +833,7 @@ public class BizDayworkController extends BaseController {
     @Transactional
     @PostMapping
     public AjaxResult add(@RequestBody BizDaywork bizDaywork) throws NoSuchFieldException, IllegalAccessException {
-        System.out.println("新增报工数据："+bizDaywork);
+        System.out.println("新增报工数据：" + bizDaywork);
         if (bizDaywork.getId() == null) {
             //查询出该生产计划的投产总批数
             Integer lotNumber = bizDayworkService.getLotNumber(bizDaywork.getProductionPlanDetailId());
@@ -939,95 +940,100 @@ public class BizDayworkController extends BaseController {
             for (BizDayworkCarrier item : bizDaywork.getDayworkCarriers()) {
                 item.setDayworkId(bizDaywork.getId());
             }
-            List<BizDayworkCarrier> oldList = bizDayworkCarrierService.query().eq("daywork_id", bizDaywork.getId()).eq("process_inspection_id",0L).eq("is_changed", 0).list();
+            List<BizDayworkCarrier> oldList = bizDayworkCarrierService.query().eq("daywork_id", bizDaywork.getId()).eq("process_inspection_id", 0L).eq("is_changed", 0).list();
             return toAjax(saveOrUpdateCarrierBatch(bizDayworkCarrierService, bizDaywork.getDayworkCarriers(), oldList));
         }
     }
+
+    @Log(title = "扫码查询批次信息", businessType = BusinessType.SELECT)
     @PostMapping("/getLotInformation")
     public AjaxResult getLotInformation(@RequestBody BizDaywork bizDaywork) {
-            BizDaywork daywork= bizDayworkService.getLotInfo(bizDaywork);
-            List<BizTechnologicalProcessDetail> normalTechnologicalProcessDetailList = new ArrayList<>();
-            List<BizLotTechnologicalProcessDetail> abNormalTechnologicalProcessDetailList = new ArrayList<>();
-            //最新的工序步骤
-            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());
-            //当前操作者
-            daywork.setCurrentNickName(lastDayworkItemList.stream().sorted(Comparator.comparing(BizDayworkItem::getCreateTime).reversed()).collect(Collectors.toList()).get(0).getNickName());
-            //合格数量
-            daywork.setTotalQuantityNum(lastDayworkItemList.stream().filter(info -> info.getStatus().equals("1" )|| info.getStatus().equals("2") ||info.getStatus().equals("3")).map(BizDayworkItem::getQualifiedNum).reduce(0, Integer::sum));
-                if(daywork.getIsWasteRecycling() == 1 || daywork.getIsAmend() == 1) {
-                    abNormalTechnologicalProcessDetailList = bizLotTechnologicalProcessDetailService.query().in("lot_technological_process_id", daywork.getTechnologicalProcessId()).orderByAsc("process_step_number").list();
-                    List<BizProcess> processSequence = new ArrayList<>();
-                    for (BizLotTechnologicalProcessDetail detail : abNormalTechnologicalProcessDetailList) {
-                        BizProcess newProcess = new BizProcess();
-                        newProcess.setId(detail.getProcessId());
-                        newProcess.setProcessCode(detail.getProcessCode());
-                        newProcess.setProcessAlias(detail.getProcessAlias());
-                        newProcess.setTechnologicalProcessDetailId(detail.getId());
-                        newProcess.setProcessStepNumber(detail.getProcessStepNumber());
-                        processSequence.add(newProcess);
-                    }
-                    daywork.setProcessSequence(processSequence);
-                    BizLotTechnologicalProcessDetail currentProcessDetail = abNormalTechnologicalProcessDetailList.stream().filter(info->info.getProcessStepNumber().equals(lastProcessStepNumber)).collect(Collectors.toList()).get(0);
-                    BizProcess currentProcess = new BizProcess();
-                    currentProcess.setProcessStepNumber(lastProcessStepNumber);
-                    currentProcess.setProcessAlias(lastDayworkItemList.get(0).getProcessAlias());
-                    daywork.setCurrentProcess(currentProcess);
-                    //上一道序
-                    List<BizDayworkItem> filteredList = daywork.getDayworkItemList().stream()
-                            .filter(info -> !info.getProcessStepNumber().equals(lastProcessStepNumber))
-                            .sorted(Comparator.comparing(BizDayworkItem::getCreateTime).reversed())
-                            .collect(Collectors.toList());
-                    BizProcess prevProcess = new BizProcess();
-                    if(!filteredList.isEmpty()) {
-                        prevProcess.setProcessAlias(filteredList.get(0).getProcessAlias());
-                        daywork.setPrevProcess(prevProcess);
-                    }
-                    BizProcess nextProcess = new BizProcess();
-                    if(abNormalTechnologicalProcessDetailList.indexOf(currentProcessDetail) != abNormalTechnologicalProcessDetailList.size() -1) {
-                        nextProcess.setProcessAlias(abNormalTechnologicalProcessDetailList.get(abNormalTechnologicalProcessDetailList.indexOf(currentProcessDetail) + 1).getProcessAlias());
-                        daywork.setNextProcess(nextProcess);
-                    }
-                }else{
-                    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();
-                        newProcess.setId(detail.getProcessId());
-                        newProcess.setProcessCode(detail.getProcessCode());
-                        newProcess.setProcessAlias(detail.getProcessAlias());
-                        newProcess.setTechnologicalProcessDetailId(detail.getId());
-                        newProcess.setProcessStepNumber(detail.getProcessStepNumber());
-                        processSequence.add(newProcess);
-                    }
-                    daywork.setProcessSequence(processSequence);
-                    BizTechnologicalProcessDetail currentProcessDetail =normalTechnologicalProcessDetailList.stream().filter(info->info.getProcessStepNumber().equals(lastProcessStepNumber)).collect(Collectors.toList()).get(0);
-                    BizProcess currentProcess = new BizProcess();
-                    currentProcess.setProcessStepNumber(lastProcessStepNumber);
-                    currentProcess.setProcessAlias(lastDayworkItemList.get(0).getProcessAlias());
-                    daywork.setCurrentProcess(currentProcess);
-                    //上一道序
-                    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();
-                    if(!filteredList.isEmpty()) {
-                        prevProcess.setProcessAlias(filteredList.get(0).getProcessAlias());
-                        daywork.setPrevProcess(prevProcess);
-                    }
-                    BizProcess nextProcess = new BizProcess();
-                    if(normalTechnologicalProcessDetailList.indexOf(currentProcessDetail) != normalTechnologicalProcessDetailList.size() - 1){
-                        nextProcess.setProcessAlias(normalTechnologicalProcessDetailList.get(normalTechnologicalProcessDetailList.indexOf(currentProcessDetail) + 1).getProcessAlias());
-                        daywork.setNextProcess(nextProcess);
-                    }
-                }
-                daywork.setStatus(bizDayworkService.getStatus(daywork));
-                 return success(daywork);
+
+        BizDaywork daywork = bizDayworkService.getLotInfo(bizDaywork);
+        System.out.println("扫码查询批次信息：------------------------------------" + daywork);
+        List<BizTechnologicalProcessDetail> normalTechnologicalProcessDetailList = new ArrayList<>();
+        List<BizLotTechnologicalProcessDetail> abNormalTechnologicalProcessDetailList = new ArrayList<>();
+        //最新的工序步骤
+        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());
+        //当前操作者
+        daywork.setCurrentNickName(lastDayworkItemList.stream().sorted(Comparator.comparing(BizDayworkItem::getCreateTime).reversed()).collect(Collectors.toList()).get(0).getNickName());
+        //合格数量
+        daywork.setTotalQuantityNum(lastDayworkItemList.stream().filter(info -> info.getStatus().equals("1") || info.getStatus().equals("2") || info.getStatus().equals("3")).map(BizDayworkItem::getQualifiedNum).reduce(0, Integer::sum));
+        if (daywork.getIsWasteRecycling() == 1 || daywork.getIsAmend() == 1) {
+            abNormalTechnologicalProcessDetailList = bizLotTechnologicalProcessDetailService.query().in("lot_technological_process_id", daywork.getTechnologicalProcessId()).orderByAsc("process_step_number").list();
+            List<BizProcess> processSequence = new ArrayList<>();
+            for (BizLotTechnologicalProcessDetail detail : abNormalTechnologicalProcessDetailList) {
+                BizProcess newProcess = new BizProcess();
+                newProcess.setId(detail.getProcessId());
+                newProcess.setProcessCode(detail.getProcessCode());
+                newProcess.setProcessAlias(detail.getProcessAlias());
+                newProcess.setTechnologicalProcessDetailId(detail.getId());
+                newProcess.setProcessStepNumber(detail.getProcessStepNumber());
+                processSequence.add(newProcess);
+            }
+            daywork.setProcessSequence(processSequence);
+            BizLotTechnologicalProcessDetail currentProcessDetail = abNormalTechnologicalProcessDetailList.stream().filter(info -> info.getProcessStepNumber().equals(lastProcessStepNumber)).collect(Collectors.toList()).get(0);
+            BizProcess currentProcess = new BizProcess();
+            currentProcess.setProcessStepNumber(lastProcessStepNumber);
+            currentProcess.setProcessAlias(lastDayworkItemList.get(0).getProcessAlias());
+            daywork.setCurrentProcess(currentProcess);
+            //上一道序
+            List<BizDayworkItem> filteredList = daywork.getDayworkItemList().stream()
+                    .filter(info -> !info.getProcessStepNumber().equals(lastProcessStepNumber))
+                    .sorted(Comparator.comparing(BizDayworkItem::getCreateTime).reversed())
+                    .collect(Collectors.toList());
+            BizProcess prevProcess = new BizProcess();
+            if (!filteredList.isEmpty()) {
+                prevProcess.setProcessAlias(filteredList.get(0).getProcessAlias());
+                daywork.setPrevProcess(prevProcess);
+            }
+            BizProcess nextProcess = new BizProcess();
+            if (abNormalTechnologicalProcessDetailList.indexOf(currentProcessDetail) != abNormalTechnologicalProcessDetailList.size() - 1) {
+                nextProcess.setProcessAlias(abNormalTechnologicalProcessDetailList.get(abNormalTechnologicalProcessDetailList.indexOf(currentProcessDetail) + 1).getProcessAlias());
+                daywork.setNextProcess(nextProcess);
+            }
+        } else {
+            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();
+                newProcess.setId(detail.getProcessId());
+                newProcess.setProcessCode(detail.getProcessCode());
+                newProcess.setProcessAlias(detail.getProcessAlias());
+                newProcess.setTechnologicalProcessDetailId(detail.getId());
+                newProcess.setProcessStepNumber(detail.getProcessStepNumber());
+                processSequence.add(newProcess);
+            }
+            daywork.setProcessSequence(processSequence);
+            BizTechnologicalProcessDetail currentProcessDetail = normalTechnologicalProcessDetailList.stream().filter(info -> info.getProcessStepNumber().equals(lastProcessStepNumber)).collect(Collectors.toList()).get(0);
+            BizProcess currentProcess = new BizProcess();
+            currentProcess.setProcessStepNumber(lastProcessStepNumber);
+            currentProcess.setProcessAlias(lastDayworkItemList.get(0).getProcessAlias());
+            daywork.setCurrentProcess(currentProcess);
+            //上一道序
+            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();
+            if (!filteredList.isEmpty()) {
+                prevProcess.setProcessAlias(filteredList.get(0).getProcessAlias());
+                daywork.setPrevProcess(prevProcess);
+            }
+            BizProcess nextProcess = new BizProcess();
+            if (normalTechnologicalProcessDetailList.indexOf(currentProcessDetail) != normalTechnologicalProcessDetailList.size() - 1) {
+                nextProcess.setProcessAlias(normalTechnologicalProcessDetailList.get(normalTechnologicalProcessDetailList.indexOf(currentProcessDetail) + 1).getProcessAlias());
+                daywork.setNextProcess(nextProcess);
+            }
+        }
+        daywork.setStatus(bizDayworkService.getStatus(daywork));
+        return success(daywork);
     }
+
     @Transactional
     @PostMapping("/check")
     @Log(title = "报工", businessType = BusinessType.SELECT)
@@ -1221,7 +1227,7 @@ public class BizDayworkController extends BaseController {
         // 更新报工
         List<BizDaywork> updateDaywork = new ArrayList<>();
         dayworkItemList.forEach(l -> {
-            int sum = dayworkItemList1.stream().filter(m->m.getDayworkId().equals(l.getDayworkId()) &&(m.getProcessStepNumber().equals(l.getProcessStepNumber()))&&(("2".equals(m.getStatus())) || "3".equals(m.getStatus())))
+            int sum = dayworkItemList1.stream().filter(m -> m.getDayworkId().equals(l.getDayworkId()) && (m.getProcessStepNumber().equals(l.getProcessStepNumber())) && (("2".equals(m.getStatus())) || "3".equals(m.getStatus())))
                     .mapToInt(BizDayworkItem::getQualifiedNum) // 假设 getNum 返回一个 int 类型的值
                     .sum();
             // l.getDaywork().setProcessQualifiedNum(l.getProdNum());
@@ -1231,7 +1237,7 @@ public class BizDayworkController extends BaseController {
                 updates.add(l);
                 l.getDaywork().setDeptId(l.getDeptId());
             }
-            if(l.getStatus().equals("7")) {
+            if (l.getStatus().equals("7")) {
                 BizDaywork daywork = l.getDaywork();
                 daywork.setProtemProcessId(l.getProcessId());
                 daywork.setProtemProcessStepNumber(l.getProcessStepNumber());
@@ -1241,7 +1247,8 @@ public class BizDayworkController extends BaseController {
             updateDaywork.add(l.getDaywork());
 
             BizDayworkItem bizDayworkItem = new BizDayworkItem();
-            bizDayworkItem.setDayworkId(l.getDayworkId());;
+            bizDayworkItem.setDayworkId(l.getDayworkId());
+            ;
             if (l.getDaywork().getIsAmend() == 1) {
                 bizDayworkItem.setFormDayworkItemId(1L);
             }
@@ -1299,7 +1306,7 @@ public class BizDayworkController extends BaseController {
     public AjaxResult removeTurnover(@RequestBody BizDaywork bizDaywork) {
         // 先修改daywork 里面的部门id再删除
         BizDayworkItem item = bizDayworkItemService.query().eq("daywork_id", bizDaywork.getId())
-                                      .eq("status", 3).orderByDesc("create_time").list().get(0);
+                .eq("status", 3).orderByDesc("create_time").list().get(0);
         BizDaywork daywork = bizDayworkService.query().eq("id", bizDaywork.getId()).one();
         daywork.setDeptId(item.getDeptId());
         bizDayworkService.updateById(daywork);