diff --git a/blade-ops/blade-job/src/main/java/org/springblade/job/processor/quality/TestPlanInCompleteProcessor.java b/blade-ops/blade-job/src/main/java/org/springblade/job/processor/quality/TestPlanInCompleteProcessor.java index acc695e4..fd5d9800 100644 --- a/blade-ops/blade-job/src/main/java/org/springblade/job/processor/quality/TestPlanInCompleteProcessor.java +++ b/blade-ops/blade-job/src/main/java/org/springblade/job/processor/quality/TestPlanInCompleteProcessor.java @@ -1,6 +1,7 @@ package org.springblade.job.processor.quality; import jakarta.annotation.Resource; +import lombok.extern.slf4j.Slf4j; import org.springblade.desk.quality.feign.ITestPlanInCompleteTaskClient; import org.springframework.stereotype.Component; import tech.powerjob.worker.core.processor.ProcessResult; @@ -13,6 +14,7 @@ import tech.powerjob.worker.core.processor.sdk.BasicProcessor; * @create 2026-04-22 14:00 */ @Component +@Slf4j public class TestPlanInCompleteProcessor implements BasicProcessor { @Resource @@ -21,7 +23,8 @@ public class TestPlanInCompleteProcessor implements BasicProcessor { @Override public ProcessResult process(TaskContext taskContext) throws Exception { - client.testPlanIncomplete(); + Integer count = client.testPlanIncomplete(); + log.info("转试计划完成修改数量:{}", count); return new ProcessResult(true); } } diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsProcessProjectVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsProcessProjectVO.java index 88f10dab..304097cc 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsProcessProjectVO.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/vo/DsProcessProjectVO.java @@ -42,4 +42,6 @@ public class DsProcessProjectVO extends DsProcessProjectEntity { @Serial private static final long serialVersionUID = 1L; + private String processNo; + } diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/logistics/pojo/dto/AllocationMessPageDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/logistics/pojo/dto/AllocationMessPageDTO.java index 66686879..51a454ca 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/logistics/pojo/dto/AllocationMessPageDTO.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/logistics/pojo/dto/AllocationMessPageDTO.java @@ -13,7 +13,7 @@ import org.springblade.desk.logistics.pojo.vo.AllocationMessVO; @Data public class AllocationMessPageDTO extends AllocationMessVO { - private Integer pageNum; + private Integer current; - private Integer pageSize; + private Integer size; } diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/feign/ITestPlanInCompleteTaskClient.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/feign/ITestPlanInCompleteTaskClient.java index 96df3782..4525d867 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/feign/ITestPlanInCompleteTaskClient.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/feign/ITestPlanInCompleteTaskClient.java @@ -22,5 +22,5 @@ public interface ITestPlanInCompleteTaskClient { * 转试计划未完成 */ @GetMapping(TEST_PLAN_INCOMPLETE) - void testPlanIncomplete(); + Integer testPlanIncomplete(); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/controller/DsPartController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/controller/DsPartController.java index ebed63a7..31e5fbce 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/controller/DsPartController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/controller/DsPartController.java @@ -297,11 +297,10 @@ public class DsPartController extends BladeController { * 测试接口 */ @GetMapping("/test") - public R test(@RequestParam String partCode, - @RequestParam String roamNo, - @RequestParam String partVersion) { + public R test(@RequestParam Long creatId, + @RequestParam String processNo) { - return R.data(dsPartService.getClassCakeWork(partCode,roamNo,partVersion)); + return R.data(dsPartService.selectDsProcessProjectByCraftId(creatId,processNo)); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/DsProcessMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/DsProcessMapper.java index f978c354..895b7315 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/DsProcessMapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/DsProcessMapper.java @@ -77,4 +77,6 @@ public interface DsProcessMapper extends BaseMapper { List selectOldMesProcessByOldMesCraftId(@Param("oldMesCraftId") Long oldMesCraftId); List selectDsProcessByCraftIdList(@Param("craftIds") List craftIds); + + List selectDsProcessByCraftIdAndProcessNo(@Param("craftId")Long craftId, @Param("processNo")String processNo); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/DsProcessProjectMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/DsProcessProjectMapper.java index 9d2fbee6..52b5b992 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/DsProcessProjectMapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/DsProcessProjectMapper.java @@ -77,4 +77,6 @@ public interface DsProcessProjectMapper extends BaseMapper selectDsProcessProjectByProcessId(@Param("processId")Long processId); List selectOldMesByPid(@Param("oldMesProcessId") Long oldMesProcessId); + + List selectProjectByProcessIds(@Param("processIds") List processIdList); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/PrReworkProcessMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/PrReworkProcessMapper.java index eb64af32..669b2b0f 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/PrReworkProcessMapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/PrReworkProcessMapper.java @@ -68,4 +68,9 @@ public interface PrReworkProcessMapper extends BaseMapper @Param("partCode") String partCode, @Param("batchNo") String batchNo, @Param("reworkNo") String reworkNo); + + List selectPrReworkProcessByProcessNo(@Param("reworkOrder")String reworkOrder, + @Param("partCode") String partCode, + @Param("batchNo") String batchNo, + @Param("processNo") String processNo); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/ProcessMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/ProcessMapper.xml index 0d1134d1..af749cd7 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/ProcessMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/ProcessMapper.xml @@ -60,6 +60,16 @@ #{craftId} + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/ProcessProjectMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/ProcessProjectMapper.xml index aea93a4b..315dbefb 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/ProcessProjectMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/ProcessProjectMapper.xml @@ -53,6 +53,16 @@ resultType="org.springblade.desk.dashboard.pojo.entity.DsProcessProjectEntity"> select * from P_RB_SYNC_PROCESS_PROJECT where PROCESS_ID = #{oldMesProcessId} + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/ReworkProcessMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/ReworkProcessMapper.xml index b5d3f8f9..1addc93d 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/ReworkProcessMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/ReworkProcessMapper.xml @@ -61,5 +61,15 @@ and BATCH_NO = #{batchNo} and REWORK_NO = #{reworkNo} + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/TaskingMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/TaskingMapper.xml index 7cfe81e8..1ddd8d6d 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/TaskingMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/TaskingMapper.xml @@ -126,7 +126,7 @@ diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IDsPartService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IDsPartService.java index 6a404243..c866e984 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IDsPartService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IDsPartService.java @@ -301,6 +301,6 @@ public interface IDsPartService extends BaseService { * @param creatId * @return */ - List selectDsProcessProjectByCraftId(Long creatId); + List selectDsProcessProjectByCraftId(Long creatId,String processNo); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IDsProcessProjectService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IDsProcessProjectService.java index d221770f..95292c47 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IDsProcessProjectService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IDsProcessProjectService.java @@ -104,4 +104,11 @@ public interface IDsProcessProjectService extends BaseService selectOldMesByPid(Long oldMesProcessId); + + /** + * 查询检验项目（包含工序） + * @param processIdList + * @return + */ + List selectProjectByProcessIds(List processIdList); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IDsProcessService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IDsProcessService.java index dcea70e1..8a8c9d5b 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IDsProcessService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IDsProcessService.java @@ -104,4 +104,12 @@ public interface IDsProcessService extends BaseService { * @return */ List selectDsProcessByCraftIdList(List craftIds); + + /** + * 根据工艺ID和工序号查询 + * @param craftId + * @param processNo + * @return + */ + List selectDsProcessByCraftIdAndProcessNo(Long craftId, String processNo); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IPrReworkProcessService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IPrReworkProcessService.java index 2e8e2df1..83dac14b 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IPrReworkProcessService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IPrReworkProcessService.java @@ -81,4 +81,14 @@ public interface IPrReworkProcessService extends BaseService selectPrReworkProcess(String reworkOrder, String partCode, String batchNo,String reworkNo); + + /** + * 查询返工工序 + * @param reworkOrder + * @param partCode + * @param batchNo + * @param processNo + * @return + */ + List selectPrReworkProcessByProcessNo(String reworkOrder, String partCode, String batchNo, String processNo); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsPartServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsPartServiceImpl.java index 9f5f97cf..1ff4bc2e 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsPartServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsPartServiceImpl.java @@ -897,7 +897,7 @@ public class DsPartServiceImpl extends BaseServiceImpl selectDsProcessProjectByCraftId(Long craftId) { + public List selectDsProcessProjectByCraftId(Long craftId,String processNo) { //参数校验 if (craftId == null) { log.warn("工艺ID为空"); @@ -912,20 +912,22 @@ public class DsPartServiceImpl extends BaseServiceImpl processIdList = getProcessIdListByCraft(craft); + List processIdList = getProcessIdListByCraft(craft,processNo); if (CollectionUtils.isEmpty(processIdList)) { log.info("未找到工序ID, craftId: {}, reworkOrder: {}", craftId, craft.getReworkOrder()); return Collections.emptyList(); } //查询工序项目 - return processProjectService.selectDsProcessProjectByProcessIds(processIdList); + List processProjectEntityList = processProjectService.selectProjectByProcessIds(processIdList); + + return processProjectEntityList; } /** * 根据工艺获取工序ID列表（支持返工工艺和正常工艺） */ - private List getProcessIdListByCraft(DsCraftEntity craft) { + private List getProcessIdListByCraft(DsCraftEntity craft, String processNo) { if (craft == null) { return Collections.emptyList(); } @@ -934,10 +936,11 @@ public class DsPartServiceImpl extends BaseServiceImpl reworkProcessList = prReworkProcessService.selectPrReworkProcess( + List reworkProcessList = prReworkProcessService.selectPrReworkProcessByProcessNo( craft.getReworkOrder(), craft.getPartCode(), - craft.getPartVersions() + craft.getPartVersions(), + processNo ); return Optional.ofNullable(reworkProcessList) @@ -950,7 +953,8 @@ public class DsPartServiceImpl extends BaseServiceImpl processList = processService.selectDsProcessByCraftId(craft.getId()); + List processList = processService.selectDsProcessByCraftIdAndProcessNo(craft.getId(),processNo); + return Optional.ofNullable(processList) .orElse(Collections.emptyList()) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsProcessProjectServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsProcessProjectServiceImpl.java index 88a2a07d..b9ff2272 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsProcessProjectServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsProcessProjectServiceImpl.java @@ -118,4 +118,9 @@ public class DsProcessProjectServiceImpl extends BaseServiceImpl selectProjectByProcessIds(List processIdList) { + return processProjectMapper.selectProjectByProcessIds(processIdList); + } + } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsProcessServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsProcessServiceImpl.java index 6e21aa07..7cbdab77 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsProcessServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsProcessServiceImpl.java @@ -170,4 +170,9 @@ public class DsProcessServiceImpl extends BaseServiceImpl selectDsProcessByCraftIdAndProcessNo(Long craftId, String processNo) { + return processMapper.selectDsProcessByCraftIdAndProcessNo(craftId,processNo); + } + } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/PrReworkProcessServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/PrReworkProcessServiceImpl.java index 1de07767..9ee75e54 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/PrReworkProcessServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/PrReworkProcessServiceImpl.java @@ -81,4 +81,9 @@ public class PrReworkProcessServiceImpl extends BaseServiceImpl selectPrReworkProcessByProcessNo(String reworkOrder, String partCode, String batchNo, String processNo) { + return reworkProcessMapper.selectPrReworkProcessByProcessNo(reworkOrder,partCode,batchNo,processNo); + } + } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkOrderServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkOrderServiceImpl.java index b0cbdc18..e4e387f1 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkOrderServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkOrderServiceImpl.java @@ -30,6 +30,7 @@ import org.springblade.desk.basic.pojo.entity.OemCraftAbilityEntity; import org.springblade.desk.basic.pojo.entity.WorkCenter; import org.springblade.desk.basic.service.*; import org.springblade.desk.dashboard.pojo.entity.*; +import org.springblade.desk.dashboard.pojo.vo.DsProcessProjectVO; import org.springblade.desk.dashboard.service.IBsProcessSetService; import org.springblade.desk.dashboard.service.IBsTeamSetService; import org.springblade.desk.dashboard.service.IDsPartService; @@ -1105,13 +1106,13 @@ public class WorkOrderServiceImpl extends BaseServiceImpl prPlanTests = planTestService.list(Wrappers.lambdaQuery(PlanTest.class).eq(PlanTest::getWpId, prWorkPlan.getPpsId())); + List prPlanTests = planTestService.list(Wrappers.lambdaQuery(PlanTest.class).eq(PlanTest::getWpId, prWorkPlan.getId())); if (prPlanTests != null && !prPlanTests.isEmpty()) { for (PlanTest planTest : prPlanTests) { newPlanTest = new PlanTest(); BeanUtils.copyProperties(planTest, newPlanTest); newPlanTest.setId(null); - newPlanTest.setWpId(workPlan.getPpsId()); + newPlanTest.setWpId(workPlan.getId()); planTestService.save(newPlanTest); } } @@ -2625,20 +2626,24 @@ public class WorkOrderServiceImpl extends BaseServiceImpl prWorkPlanItems = workPlanItemService.listByWoId(woId); - - // 没有试验项目，不能转试 - if (!(prWorkPlanItems != null && !prWorkPlanItems.isEmpty())) { + WorkOrder workOrder = this.getById(woId); + if(workOrder == null){ + return false; + } + YieldOrder yieldOrder = yieldOrderService.getById(workOrder.getYoId()); + if(yieldOrder == null){ + return false; + } + List dsProcessProjectEntities = dsPartService.selectDsProcessProjectByCraftId(yieldOrder.getCraftId(),null); + if (dsProcessProjectEntities == null || dsProcessProjectEntities.isEmpty()) { return false; } - boolean flag = false; - for (WorkPlanItem prWorkPlanItem : prWorkPlanItems) { + for (DsProcessProjectEntity dsProcessProjectEntity : dsProcessProjectEntities) { // 如果试验项目中包含 承压检测 则代表可以发起转试 24/8/5 牛营杰确认 - if ("承压检测".equals(prWorkPlanItem.getItemName())) { - if (prWorkPlanItem.getCheckResult() == -1) { - flag = true; - } + if ("承压检测".equals(dsProcessProjectEntity.getProjectName())) { + flag = true; + break; } } return flag; @@ -2669,7 +2674,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl allocationMessList = erpDataLogisticsClient.queryAllocationMess(dto).getData(); int totalAllocationMessNum = erpDataLogisticsClient.queryAllocationMessNum(dto).getData(); Map result = new HashMap<>(3); - result.put("current",dto.getPageNum()); + result.put("current",dto.getCurrent()); result.put("record",allocationMessList); result.put("total",totalAllocationMessNum); return result; @@ -2711,7 +2716,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl prWorkPlanItems = workPlanItemService.listByWoId(woId); + WorkOrder workOrder = this.getById(woId); + YieldOrder yieldOrder = yieldOrderService.getById(workOrder.getYoId()); + List dsProcessProjectEntities = dsPartService.selectDsProcessProjectByCraftId(yieldOrder.getCraftId(),null); WorkPlan prWorkPlan = null; - for (WorkPlanItem item : prWorkPlanItems) { - if ("承压检测".equals(item.getItemName()) || "承压测试".equals(item.getItemName()) || "承压测试检测".equals(item.getItemName())) { - if (item.getCheckResult() == -1) { - prWorkPlan = workPlanService.getById(item.getWpId()); + if (dsProcessProjectEntities != null && !dsProcessProjectEntities.isEmpty()) { + for (DsProcessProjectEntity dsProcessProjectEntity : dsProcessProjectEntities) { + if ("承压检测".equals(dsProcessProjectEntity.getProjectName())) { + prWorkPlan = workPlanService.getOne(new LambdaQueryWrapper() + .eq(WorkPlan::getWoId, woId) + .eq(WorkPlan::getOrders,null)); } } } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/feign/TestPlanInCompleteTaskClient.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/feign/TestPlanInCompleteTaskClient.java index 27094a38..ce6f272e 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/feign/TestPlanInCompleteTaskClient.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/feign/TestPlanInCompleteTaskClient.java @@ -18,7 +18,7 @@ public class TestPlanInCompleteTaskClient implements ITestPlanInCompleteTaskClie private IPlanTestService planTestService; @Override - public void testPlanIncomplete() { - planTestService.testPlanIncomplete(); + public Integer testPlanIncomplete() { + return planTestService.testPlanIncomplete(); } } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IPlanTestService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IPlanTestService.java index c7dbdbe5..bcb5c751 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IPlanTestService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IPlanTestService.java @@ -75,5 +75,5 @@ public interface IPlanTestService extends BaseService { /** * 转试计划未完成 */ - void testPlanIncomplete(); + Integer testPlanIncomplete(); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IWorkPlanItemService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IWorkPlanItemService.java index f46e02e2..9772b7ea 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IWorkPlanItemService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IWorkPlanItemService.java @@ -55,11 +55,4 @@ public interface IWorkPlanItemService extends BaseService { void saveCheckItem(WorkPlan wp, List checkItemList, List deleteIds, String s); void deleteItem(List deleteIds); - - /** - * 根据订单id查询 - * @param woId 订单id - * @return 工序检验项 - */ - List listByWoId(Long woId); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/PlanTestServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/PlanTestServiceImpl.java index c75101ae..bc60a1f2 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/PlanTestServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/PlanTestServiceImpl.java @@ -178,9 +178,10 @@ public class PlanTestServiceImpl extends BaseServiceImpl planTestList = this.list(new LambdaQueryWrapper() .isNull(PlanTest::getResult)); + Integer count = 0; if (planTestList != null && !planTestList.isEmpty()) { for (PlanTest prPlanTest : planTestList) { List prWorkOrderList = workOrderMapper.selectList(new LambdaQueryWrapper() @@ -206,8 +207,10 @@ public class PlanTestServiceImpl extends BaseServiceImpl listByWoId(Long woId) { - if (woId == null) { - return null; - } - // 创建查询条件 - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - // 关联查询条件 - queryWrapper.exists( - "SELECT 1 FROM MES_WORK_PLAN wp " + - "JOIN BS_PROCESS_SET ps ON wp.pps_id = ps.id " + - "WHERE wp.wo_id = {0} " + - "AND ps.name <> {1}", - woId, "烧结包装防护" - ); - // 其他条件 - queryWrapper.ne(WorkPlanItem::getItemName, "单件包装材料数量") - .orderByAsc(WorkPlanItem::getItemCode) - .orderByDesc(WorkPlanItem::getId); - return this.list(queryWrapper); - } } diff --git a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpDataLogisticsMapper.xml b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpDataLogisticsMapper.xml index 2fe3234b..42ab2d94 100644 --- a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpDataLogisticsMapper.xml +++ b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpDataLogisticsMapper.xml @@ -3,45 +3,50 @@ +