add a inputQty and outputQty

Fancy

2024-07-10 c64161f9e685b4a2c74dcc7e6cd7ba75a35c8351

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

@@ -131,7 +131,7 @@
        }
        PrAssemblyPlan plan = assemblyPlanDao.selectByPrimaryKey(workLast.getPlanId());
        // 验证并处理设备号和物料号
        Set<String> deviceSet = new HashSet<>(Arrays.asList(params.deviceNo.split(",")));
        Set<String> deviceSet = new HashSet<>(Arrays.asList(params.deviceNo));
        // 分类设备号和物料号
        List<String> deviceList = new ArrayList<>();
        List<String> materialList = new ArrayList<>();
@@ -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;
    }
@@ -266,17 +273,17 @@
        if (workLast == null) {
            throw new RuntimeException("系统中没有该条登录信息");
        }
        StaDeviceLast preDeviceRecord = deviceLastDao.selectByDeviceNo(vo.deviceNo);
        StaDeviceLast preDeviceRecord = deviceLastDao.selectByDeviceNo(vo.deviceNo[0]);
        StaRepairInfo repairInfo = new StaRepairInfo();
        repairInfo.workId = workId;
        repairInfo.deviceNo = vo.deviceNo;
        repairInfo.deviceNo = vo.deviceNo[0];
        repairInfo.repairTime = new Date();
        repairInfo.repairBy = workLast.userId;
        repairInfo.repairReason = vo.errorMsg;
        repairInfo.fromNode = preDeviceRecord.currNode;
        repairInfoDao.insertSelective(repairInfo);

        StaDeviceLast deviceLast = buildDeviceLast(vo, workLast, vo.deviceNo);
        StaDeviceLast deviceLast = buildDeviceLast(vo, workLast, vo.deviceNo[0]);

        int count = deviceLast.id == null ? deviceLastDao.insertSelective(deviceLast) :
                deviceLastDao.updateByPrimaryKeySelective(deviceLast);
@@ -295,7 +302,7 @@
            throw new RuntimeException("系统中没有该条登录信息");
        }

        StaDeviceLast deviceLast = buildDeviceLast(vo, workLast, vo.deviceNo);
        StaDeviceLast deviceLast = buildDeviceLast(vo, workLast, vo.deviceNo[0]);
        int count = deviceLast.id == null ? deviceLastDao.insertSelective(deviceLast) :
                deviceLastDao.updateByPrimaryKeySelective(deviceLast);
        saveDeviceProductionLog(deviceLast);