Fancy
2024-07-10 c64161f9e685b4a2c74dcc7e6cd7ba75a35c8351
pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/assemblyStep/AssemblyStepSv.java
@@ -192,11 +192,14 @@
    private StaDeviceLast buildDeviceLast(QueryVo params, StaAssemblyWorkLast workLast,String deviceNo) {
        //组装数据
        StaDeviceLast record = new StaDeviceLast();
        //pr_assembly_plan input_number +1  投入数加1
        PrAssemblyPlan assemblyPlan = assemblyPlanDao.selectByPrimaryKey(workLast.planId);
        StaDeviceLast preRecord = deviceLastDao.selectByDeviceNo(deviceNo);
        if (preRecord != null) {
            record.id = preRecord.id;
            record.inTime = preRecord.outTime;
        }else{
            assemblyPlan.setInputNumber(assemblyPlan.getInputNumber() + 1);
        }
        record.outTime = new Date();
@@ -215,6 +218,10 @@
        if (node.isRecord) {
            record.deviceCycleContent = node.deviceCycleContent;
        }
        if(node.getIsEnd()){
            assemblyPlan.setOutputNumber(assemblyPlan.getOutputNumber() + 1);
        }
        assemblyPlanDao.updateByPrimaryKeySelective(assemblyPlan);
        record.status = getStatus(params.status, node.isEnd,workLast.workType.toString());
        return record;
    }