Fancy
2024-07-17 1f64989b3cbf7c031acc4a3f706431fba3af2081
pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/assemblyStep/AssemblyStepSv.java
@@ -217,6 +217,7 @@
        if (preRecord != null) {
            record.id = preRecord.id;
            record.inTime = preRecord.outTime;
            record.outLineTime = preRecord.outLineTime;//下边判断是否结束会用到 得留着
        } else {
            record.inTime = new Date();
            record.inLineTime = new Date();
@@ -276,7 +277,7 @@
     * @return 状态
     */
    private Integer getStatus(String status, boolean isEnd, String workType) {
        //组装   2024/07/17 目前组装workType 1 只有MarkOk     //测试    //品检  //维修
        //组装   2024/07/17 目前组装workType 1 只有MarkOk     //测试    //品检
        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();
@@ -285,6 +286,7 @@
                default -> throw new RuntimeException("状态错误");
            };
        }
        //维修
        throw new RuntimeException("状态错误,无效的节点类型: " + workType);
    }
    /**