Fancy
2024-06-27 af0ee4d30ae6cb2eee76ed9da7aad007edd4113f
some NotNull error
3个文件已修改
10 ■■■■■ 已修改文件
pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoPr/PrAssemblyPlan.java 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoPr/PrProductionNode.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/workOrder/WorkOrderSv.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoPr/PrAssemblyPlan.java
@@ -53,9 +53,7 @@
    public Long processId;
    @TableField(exist = false)
    @Valid
    @NotEmpty(message = "流程节点不能为空")
    public List<PrProductionNode> nodes;
    public PrProductionProcess process;
    /**
     * 名称
pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoPr/PrProductionNode.java
@@ -51,7 +51,7 @@
    /**
     * 排序
     */
    @NotNull(message = "节点类型不能为空")
    //@NotNull(message = "节点类型不能为空")
    public Integer nodeType;
    /**
pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/workOrder/WorkOrderSv.java
@@ -191,7 +191,7 @@
        params.setProcessId(vo.getProcessId());
        List<PrAssemblyPlan> planList = selectAssyPlanList(params);
        boolean hasNodeId= planList.stream()
                .flatMap(process -> process.nodes.stream())
                .flatMap(process -> process.getProcess().getNodes().stream())
                .anyMatch(node -> node.id.equals(vo.getNodeId()));
        if(!hasNodeId){
            throw new RuntimeException("节点信息有误或被其他人员修改,请重新选择节点信息");
@@ -247,7 +247,7 @@
    public List<PrAssemblyPlan> selectAssyPlanList(PrAssemblyPlan params){
        List<PrAssemblyPlan> planList = assemblyDao.selectAssyPlanList(params);
        planList.stream().forEach(process -> {
            process.nodes.forEach(node -> {
            process.getProcess().getNodes().forEach(node -> {
                if(node.instruction != null){
                    addUrl(node.instruction);
                }