测试节点通过后,状态取上一节点状态,而不是默认完成

刘小明

2024-07-16 843c50e9c2b35196f5f4c150e33fdc6f6c2d6826

 pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/assemblyStep/AssemblyStepSv.java

@@ -227,6 +227,9 @@
        }
        assemblyPlanDao.updateByPrimaryKeySelective(assemblyPlan);
        record.status = getStatus(params.status, node.isEnd,workLast.workType.toString());
        if(record.status == null){
            record.status = preRecord.status;
        }
        return record;
    }

@@ -244,13 +247,13 @@
    }

    /**
     * 状态: 1:组装中,2:完成,3:维修,4:报废
     * 状态: 0:待生产,1:组装中,2:完成,3:维修,4:报废,5:测试不通过,6:品检不通过
     *
     * @param status    状态
     * @param isEndNode 是否结束节点
     * @return 状态
     */
    private int getStatus(String status, boolean isEndNode,String workType) {
    private Integer getStatus(String status, boolean isEndNode,String workType) {
        //组装,维修
        if (WORK_TYPE_ASSEMBLY.equals(workType)||WORK_TYPE_REPAIR.equals(workType)) {
            return switch (status) {
@@ -262,7 +265,7 @@
        //品检,测试
        }else if(WORK_TYPE_INSPECTION.equals(workType)||WORK_TYPE_TEST.equals(workType)){
            return switch (status) {
                case QrCodeConstant.MarkOk -> DeviceStatus.COMPLETED.getCode();
                case QrCodeConstant.MarkOk -> null;//DeviceStatus.COMPLETED.getCode();
                case QrCodeConstant.MarkUnqualified -> DeviceStatus.TEST_FAILED.getCode();
                case QrCodeConstant.MarkWaste -> DeviceStatus.WASTE.getCode();
                default -> throw new RuntimeException("状态错误");