电子档案表层积木打印

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/InspectionTaskListVO.java

@@ -125,4 +125,6 @@ public class InspectionTaskListVO extends InspectionTask {
 
     private Integer yieldType;
 
+    private Long wpId;
+
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/WorkPlanMapper.xml

@@ -294,7 +294,7 @@
     <select id="getByRfpId" resultType="org.springblade.desk.produce.pojo.entity.MesRbFilePreserveSlotEntity">
         select a.*  from MES_RB_FILE_PRESERVE_SLOT a
 --         left join DS_RB_FILE_PRESERVE slot on a.Id = slot.RFP_ID
-        left join MES_DS_RB_FILE_PRESERVE MES_DS_RB_FILE_PRESERVE on a.Id = slot.RFP_ID
+        left join MES_DS_RB_FILE_PRESERVE  on a.Id = slot.RFP_ID
         where slot.RFP_ID =#{rfpId}
 
     </select>

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

@@ -54,13 +54,16 @@ import org.springblade.desk.quality.constant.QAModuleConst;
 import org.springblade.desk.quality.excel.InspectionTaskExcel;
 import org.springblade.desk.quality.pojo.entity.InspectionTask;
 import org.springblade.desk.quality.pojo.entity.ReviewSheet;
+import org.springblade.desk.quality.pojo.entity.WorkPlanItem;
 import org.springblade.desk.quality.pojo.request.InspectionTaskSearch;
 import org.springblade.desk.quality.pojo.request.InspectionTaskStartNew;
 import org.springblade.desk.quality.pojo.vo.InspectionTaskDetailVO;
 import org.springblade.desk.quality.pojo.vo.InspectionTaskListVO;
 import org.springblade.desk.quality.pojo.vo.InspectionTaskSubPartVO;
+import org.springblade.desk.quality.pojo.vo.WorkPlanItemVO;
 import org.springblade.desk.quality.service.IInspectionTaskService;
 import org.springblade.desk.quality.service.IReviewSheetSubService;
+import org.springblade.desk.quality.service.IWorkPlanItemService;
 import org.springblade.desk.quality.service.InspectionTaskService2;
 import org.springblade.desk.quality.wrapper.InspectionTaskDetailWrapper;
 import org.springframework.beans.BeanUtils;
@@ -107,6 +110,8 @@ public class InspectionTaskController extends BladeController {
     private IYieldOrderService yieldOrderService;
     @Resource
     private WorkPlanMapper workPlanMapper;
+    @Resource
+    private IWorkPlanItemService workPlanItemService;
     /**
      * [检验任务] 详情
      */
@@ -122,6 +127,39 @@ public class InspectionTaskController extends BladeController {
         return R.data(detailDetailVO);
     }
 
+    @GetMapping("/getItems")
+    @ApiOperationSupport(order = 1)
+    @Operation(summary = "详情", description = "传入inspectionTask")
+    public R<List<WorkPlanItem>> getItems(Long wpId) {
+//        WorkPlan plan = workPlanService.getById(wpId);
+
+//        QueryWrapper<InspectionTask> qw = new QueryWrapper<>();
+//        qw.eq("WP_ID", wpId);
+//        List<InspectionTask> list = service.list(qw);
+////        InspectionTask inspectionTask = new InspectionTask();
+////        if(null != list && list.size() > 0){
+////            inspectionTask = list.get(0);
+////        }
+//
+//        List<WorkPlanItemVO> all = new ArrayList<>();
+//
+//        for(InspectionTask inspectionTask : list){
+//            InspectionTask detail = service.getOne(Condition.getQueryWrapper(inspectionTask));
+//            InspectionTaskDetailVO detailDetailVO = InspectionTaskDetailWrapper.build().entityVO(detail);
+////        InspectionTaskListVO detailDetail = service.detailById(inspectionTask);
+//            service.setDetailVOValueNew(detailDetailVO);
+//            List<WorkPlanItemVO> items = detailDetailVO.getWpItemList();
+//            all.addAll(items);
+//        }
+
+        QueryWrapper<WorkPlanItem> qw = new QueryWrapper<>();
+        qw.eq("WP_ID", wpId);
+        List<WorkPlanItem> list = workPlanItemService.list(qw);
+
+        return R.data(list);
+    }
+
+
     @GetMapping("/detailMut")
     @ApiOperationSupport(order = 1)
     @Operation(summary = "详情", description = "传入inspectionTask")

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/InspectionTaskMapper.xml

@@ -256,6 +256,7 @@
         wo.MAKE_QTY AS poQty,
         wo.WO_CODE AS woCode,
         wo.PART_CODE AS partCode,
+        wp.Id as wpId,
         wo.CARD_NO AS cardNo
         FROM MES_WORK_ORDER wo
         -- 车间作业计划 wp

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

@@ -57,6 +57,7 @@ public interface IInspectionTaskService extends BaseService<InspectionTask> {
      * @param vo
      */
     void setDetailVOValue(InspectionTaskDetailVO vo);
+    void setDetailVOValueNew(InspectionTaskDetailVO vo);
 
     /**
      * VO

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

@@ -49,6 +49,9 @@ public interface IWorkPlanItemService extends BaseService<WorkPlanItem> {
 
     List<WorkPlanItemVO> listVOByTaskId(Long taskId);
 
+	List<WorkPlanItemVO> listVOByTaskIdNew(Long taskId);
+
+
 	void saveCheckItem(WorkPlan wp, List<WorkPlanItem> checkItemList, List<Long> deleteIds, String s);
 
 	void deleteItem(List<Long> deleteIds);

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

@@ -197,6 +197,11 @@ public class InspectionTaskServiceImpl extends BaseServiceImpl<InspectionTaskMap
         vo.setWpItemList(wpItemService.listVOByTaskId(vo.getId()));
     }
 
+    @Override
+    public void setDetailVOValueNew(InspectionTaskDetailVO vo) {
+        vo.setWpItemList(wpItemService.listVOByTaskIdNew(vo.getId()));
+    }
+
     @Override
     public void setListVOValue(InspectionTaskListVO vo) {
 //        vo.setMainProcessingUnit(vo.getId() + "");

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

@@ -144,6 +144,20 @@ public class WorkPlanItemServiceImpl extends BaseServiceImpl<WorkPlanItemMapper,
         return listVO;
     }
 
+    @Override
+    public List<WorkPlanItemVO> listVOByTaskIdNew(Long taskId) {
+        LambdaQueryWrapper<WorkPlanItem> qw = Wrappers.lambdaQuery();
+        qw.eq(WorkPlanItem::getTaskId, taskId);
+        qw.like(WorkPlanItem::getSpecialType, 1);
+        qw.orderByAsc(WorkPlanItem::getItemCode);
+        List<WorkPlanItem> list = list(qw);
+        List<WorkPlanItemVO> listVO = WorkPlanItemWrapper.build().listVO(list);
+//        for (WorkPlanItemVO vo : listVO) {
+//            setVOValue(vo);
+//        }
+        return listVO;
+    }
+
     @Override
     public void saveCheckItem(WorkPlan wp, List<WorkPlanItem> checkItemList, List<Long> deleteIds, String s) {
         if (checkItemList != null) {