转试修改

blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkOrderServiceImpl.java

@@ -1105,13 +1105,13 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
                         }
 
                         // 转试记录
-                        List<PlanTest> prPlanTests = planTestService.list(Wrappers.lambdaQuery(PlanTest.class).eq(PlanTest::getWpId, prWorkPlan.getPpsId()));
+                        List<PlanTest> 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 +2625,24 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
 
     @Override
     public Boolean isTransferTest(Long woId) {
-        List<WorkPlanItem> 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<DsProcessProjectEntity> dsProcessProjectEntities = dsPartService.selectDsProcessProjectByCraftId(yieldOrder.getCraftId());
+        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;
@@ -2711,7 +2715,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
         StringBuilder pptCode = new StringBuilder("LCR" + year + "-" + formattedMonth);
 
         if (latestData != null && latestData.getId() != null) {
-            if (org.apache.commons.lang3.StringUtils.isNotBlank(latestData.getCode())) {
+            if (StringUtils.isNotBlank(latestData.getCode())) {
                 String numStr = String.valueOf(Integer.parseInt(latestData.getCode().substring(10)) + 1);
                 pptCode.append("0".repeat(Math.max(0, 6 - numStr.length())));
                 pptCode.append(numStr);
@@ -2723,13 +2727,15 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
     }
 
     private WorkPlan findRelevantWorkPlan(Long woId) {
-        List<WorkPlanItem> prWorkPlanItems = workPlanItemService.listByWoId(woId);
+        WorkOrder workOrder = this.getById(woId);
+        YieldOrder yieldOrder = yieldOrderService.getById(workOrder.getYoId());
+        List<DsProcessProjectEntity> dsProcessProjectEntities = dsPartService.selectDsProcessProjectByCraftId(yieldOrder.getCraftId());
         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());
-                }
+        for (DsProcessProjectEntity dsProcessProjectEntity : dsProcessProjectEntities) {
+            if ("承压检测".equals(dsProcessProjectEntity.getProjectName())) {
+                prWorkPlan = workPlanService.getOne(new LambdaQueryWrapper<WorkPlan>()
+                        .eq(WorkPlan::getWoId, woId)
+                        .eq(WorkPlan::getOrders,null));
             }
         }
         return prWorkPlan;

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IWorkPlanItemService.java

@@ -55,11 +55,4 @@ public interface IWorkPlanItemService extends BaseService<WorkPlanItem> {
 	void saveCheckItem(WorkPlan wp, List<WorkPlanItem> checkItemList, List<Long> deleteIds, String s);
 
 	void deleteItem(List<Long> deleteIds);
-
-	/**
-	 * 根据订单id查询
-	 * @param woId 订单id
-	 * @return 工序检验项
-	 */
-    List<WorkPlanItem> listByWoId(Long woId);
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/WorkPlanItemServiceImpl.java

@@ -228,26 +228,4 @@ public class WorkPlanItemServiceImpl extends BaseServiceImpl<WorkPlanItemMapper,
             wpItemDetailService.remove(Wrappers.lambdaQuery(WorkPlanItemDetail.class).in(WorkPlanItemDetail::getWorkPlanItemId, deleteIds));
         }
     }
-
-    @Override
-    public List<WorkPlanItem> listByWoId(Long woId) {
-        if (woId == null) {
-            return null;
-        }
-        // 创建查询条件
-        LambdaQueryWrapper<WorkPlanItem> 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);
-    }
 }