Merge remote-tracking branch 'origin/250109-回收单提交后打印，首序外协一箱多批，快速报工选择设备等'

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

@@ -1529,7 +1529,7 @@ public class BizDayworkItemController extends BaseController {
                 if (bizDayworkItem.getStatus().equals("7") || bizDayworkItem.getStatus().equals("4")) {
                     v.setDeptId(bizDayworkItem.getDeptId());
                     int sum = bizDayworkItems.stream()
-                            .filter(l -> l.getProcessStepNumber().equals(bizDayworkItem.getProcessStepNumber()))
+                            .filter(l -> l.getProcessStepNumber().equals(bizDayworkItem.getProcessStepNumber())&&l.getDayworkId().equals(v.getId()))
                             .mapToInt(BizDayworkItem::getQualifiedNum) // 假设 getNum 返回一个 int 类型的值
                             .sum();
                     v.setTemporaryProcessQualifiedNum(sum);

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

@@ -511,8 +511,18 @@ public class BizQuickDayworkController extends BaseController {
             if (hasNoProcess.get()) {
                 return error("该工段没有可报工工序");
             }
+            //快速报工选择设备
+            List<BizProductionResourceGroupDetail> productionResourceGroupDetailList = bizProductionResourceGroupDetailService.query().eq("dept_id", bizDayworkItem.getDeptId())
+                    .eq("common_id", SecurityUtils.getLoginUser().getUserId()).eq("common_type", "person").list();
+            if (productionResourceGroupDetailList.isEmpty()) {
+                return error("当前员工未分配资源组");
+            }
+            List<Long> productionResourceGroupIds = productionResourceGroupDetailList.stream().map(BizProductionResourceGroupDetail::getProductionResourceGroupId).distinct().collect(Collectors.toList());
+            List<BizProductionResourceGroupDetail> equipmentDetailList = bizProductionResourceGroupDetailService.query().in("production_resource_group_id", productionResourceGroupIds)
+                    .eq("common_type", "equipmentDetail").inSql("common_id", "SELECT id FROM biz_equipment_detail WHERE equipment_status_code = 'NA'").list();
             result.put("items", items);
             result.put("workShops", workshops.stream().filter(v -> !v.getDepts().isEmpty()).collect(Collectors.toList()));
+            result.put("equipmentDetailList", equipmentDetailList);
             return success(result);
         }
     }
@@ -587,6 +597,8 @@ public class BizQuickDayworkController extends BaseController {
             bizDayworkItem.setUserName(user.getUserName());
             bizDayworkItem.setNickName(user.getNickName());
             bizDayworkItem.setTenantId(l.getTenantId());
+            bizDayworkItem.setEquipmentDetailCode(l.getEquipmentDetailCode());
+            bizDayworkItem.setEquipmentDetailId(l.getEquipmentDetailId());
             if (l.getDaywork().getIsAmend().equals(1)) {
                 bizDayworkItem.setFormDayworkItemId(1L);
             }