Merge branch 'develop' of http://gitlab.sothing.top/843502640/jyzb_platformV2 into develop-zhaojw

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

@@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.serializer.SerializerFeature;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -185,8 +186,10 @@ public class BusFormServiceImpl extends ServiceImpl<BusFormMapper, BusForm> impl
             //业务类型
             startProcessInstanceDTO.setType("busFormDto");
 
-            Object A= JSON.toJSONString(req);
+//            Object A= JSON.toJSONString(req);
+            Object A= JSON.toJSONString(req, SerializerFeature.WriteDateUseDateFormat);
             JSONObject jsonObject = JSON.parseObject(A.toString());
+
             startProcessInstanceDTO.setFormData(jsonObject);
             processInstanceId= FlowInstanceService.startProcessInstanceById(startProcessInstanceDTO);
 

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

@@ -317,11 +317,6 @@ public class InventoryServiceImpl extends ServiceImpl<InventoryMapper, Inventory
         return PageResultFactory.createPageResult(page1);
     }
 
-//    public PageResult<InventoryDto> GetDetailByTerms(InventoryReq req) {
-//        IPage<InventoryDto> dtoIPage=inventoryMapper.GetDetailByTerms(PageFactory.getDefaultPage(req.getPageNo(), req.getPageSize()),req);
-//        return PageResultFactory.createPageResult(null);
-//    }
-
     //批量进行调整
     @Override
     @Transactional(rollbackFor = Exception.class)

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

@@ -103,6 +103,9 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
     private BussinessInventoryService bussinessInventoryService;
 
     @Resource
+    private BussinessInventoryDetailService bussinessInventoryDetailService;
+
+    @Resource
     private ReassignmentService reassignmentService;
 
     @Resource
@@ -1334,7 +1337,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

@@ -776,7 +776,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()));