1

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/dto/ProcessOrderDto.java

@@ -22,5 +22,5 @@ public class ProcessOrderDto {
     /**
      * 盘库单据
      */
-    private StocktakeDto stocktakeDto;
+    private BussinessInventoryDto bussinessInventoryDto;
 }

jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/BusFormServiceImpl.java

@@ -189,6 +189,7 @@ public class BusFormServiceImpl extends ServiceImpl<BusFormMapper, BusForm> impl
 
             Object A= JSON.toJSONString(req);
             JSONObject jsonObject = JSON.parseObject(A.toString());
+            
             startProcessInstanceDTO.setFormData(jsonObject);
             processInstanceId= FlowInstanceService.startProcessInstanceById(startProcessInstanceDTO);
 

jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/OrderMainServiceImpl.java

@@ -115,6 +115,9 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
     private BussinessInventoryService bussinessInventoryService;
 
     @Resource
+    private BussinessInventoryDetailService bussinessInventoryDetailService;
+
+    @Resource
     private ReassignmentService reassignmentService;
 
     @Resource
@@ -1346,7 +1349,14 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
             BussinessInventoryDto bussinessInventoryDto = new BussinessInventoryDto();
             BussinessInventory one = bussinessInventoryService.getOne(new LambdaQueryWrapper<BussinessInventory>()
                     .eq(BussinessInventory::getProcessId, req.getProcessId()));
-
+            List<EquipmentListDto> collect = bussinessInventoryDetailService.list(new LambdaQueryWrapper<BussinessDetail>()
+                    .eq(BussinessDetail::getInventoryId, one.getId())).stream().map(bussinessDetail -> {
+                EquipmentListDto equipmentListDto = new EquipmentListDto();
+                BeanPlusUtil.copyProperties(bussinessDetail, equipmentListDto);
+                return equipmentListDto;
+            }).collect(Collectors.toList());
+            bussinessInventoryDto.setEquipmentList(collect);
+            processOrderDto.setBussinessInventoryDto(bussinessInventoryDto);
         } else if (req.getOrderType().equals("reassigment")) {
             ReassignmentDto reassignmentDto = new ReassignmentDto();
             Reassignment one = reassignmentService.getOne(new LambdaQueryWrapper<Reassignment>()

jyzb-process/src/main/java/com/junmp/junmpProcess/service/impl/FlowTaskServiceImpl.java

@@ -775,7 +775,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
         String detailJson= MapUtil.getStr(historicProcessInstance.getProcessVariables(),FORM_VAR);
         vo.setDetailJson(JSON.parseObject(detailJson));
         //设置类型
-        vo.setType(MapUtil.getStr(historicProcessInstance.getProcessVariables(),BUSSINESS_TYPE));
+        vo.setType(MapUtil.getStr(historicProcessInstance.getProcessVariables(),TYPE));
 
         Map<String, List<Comment>> commentsMap = processInstanceComments.stream()
                 .collect(Collectors.groupingBy(Comment::getTaskId, Collectors.toList()));