add quality OK Status

Fancy

2024-07-25 99f3bd0aef6cec3e29876e3e1683c3f021e01606

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

@@ -281,6 +281,7 @@
        if (WORK_TYPE_ASSEMBLY.equals(workType) || WORK_TYPE_TEST.equals(workType) || WORK_TYPE_INSPECTION.equals(workType) || WORK_TYPE_REPAIR.equals(workType)) {
            return switch (status) {
                case QrCodeConstant.MarkOk -> isEnd ? DeviceStatus.COMPLETED.getCode() : DeviceStatus.ASSEMBLING.getCode();
                case QrCodeConstant.MarkQualified -> isEnd ? DeviceStatus.COMPLETED.getCode() : DeviceStatus.ASSEMBLING.getCode();
                case QrCodeConstant.MarkUnqualified -> DeviceStatus.REPAIR.getCode();
                case QrCodeConstant.MarkWaste -> DeviceStatus.WASTE.getCode();
                default -> throw new RuntimeException("状态错误");
@@ -304,14 +305,14 @@
            //测试
        }else if (WORK_TYPE_TEST.equals(workType)) {
            return switch (status) {
                case QrCodeConstant.MarkOk -> DeviceResult.TEST_PASS.getCode();
                case QrCodeConstant.MarkQualified  -> DeviceResult.TEST_PASS.getCode();
                case QrCodeConstant.MarkUnqualified -> DeviceResult.TEST_FAIL.getCode();
                default -> throw new RuntimeException("状态错误");
            };
            //品检
        }else if (WORK_TYPE_INSPECTION.equals(workType)) {
            return switch (status) {
                case QrCodeConstant.MarkOk -> DeviceResult.INSPECTION_PASS.getCode();
                case QrCodeConstant.MarkQualified -> DeviceResult.INSPECTION_PASS.getCode();
                case QrCodeConstant.MarkUnqualified -> DeviceResult.INSPECTION_FAIL.getCode();
                default -> throw new RuntimeException("状态错误");
            };
@@ -325,6 +326,7 @@
        }
        throw new RuntimeException("状态错误，无效的节点类型: " + workType);
    }
    @Transactional
    public int repair(QueryVo vo) {
        long workId = Long.parseLong(vo.workId);
        StaAssemblyWorkLast workLast = assemblyWorkLastDao.selectByPrimaryKey(workId);
@@ -353,7 +355,26 @@
        return count;
    }

    @Transactional
    public int testing(QueryVo vo) {
        long workId = Long.parseLong(vo.workId);
        StaAssemblyWorkLast workLast = assemblyWorkLastDao.selectByPrimaryKey(workId);
        if (workLast == null) {
            throw new RuntimeException("系统中没有该条登录信息");
        }
        StaDeviceLast deviceLast = buildDeviceLast(vo, workLast, vo.deviceNo[0]);
        int count = deviceLast.id == null ? deviceLastDao.insertSelective(deviceLast) :
                deviceLastDao.updateByPrimaryKeySelective(deviceLast);
        saveDeviceProductionLog(deviceLast);
        PrProductionNode node = nodeDao.selectByPrimaryKey(workLast.nodeId);
        if (node.isRecord) {
            saveDeviceLife(deviceLast);
        }
        return count;
    }

    @Transactional
    public int inspectQuality(QueryVo vo) {
        long workId = Long.parseLong(vo.workId);
        StaAssemblyWorkLast workLast = assemblyWorkLastDao.selectByPrimaryKey(workId);
        if (workLast == null) {
@@ -525,4 +546,6 @@
    public List<StaDeviceProductionLog> queryLogByDeviceNo(String devoiceNo) {
        return deviceProductionLogDao.selectByDeviceNo(devoiceNo);
    }


}