repair

Fancy

2024-08-01 f6d277c8c9acafd4ab351632313abc7e76c0cca7

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

@@ -349,7 +349,7 @@
        repairInfo.repairTime = new Date();
        repairInfo.repairBy = workLast.userId;
        repairInfo.repairReason = vo.errorMsg;
        if(preDeviceRecord!=null) {
        if (preDeviceRecord != null) {
            repairInfo.fromNode = preDeviceRecord.currNode;
        }
        repairInfoDao.insertSelective(repairInfo);
@@ -359,11 +359,9 @@
        int count = deviceLast.id == null ? deviceLastDao.insertSelective(deviceLast) :
                deviceLastDao.updateByPrimaryKey(deviceLast);
        saveDeviceProductionLog(deviceLast);
        if(preDeviceRecord.currNode != null){
            boolean isEndNode = nodeDao.isEndNode(preDeviceRecord.currNode);
            if (isEndNode) {
                saveDeviceLife(deviceLast);
            }
        //只要经历过结束节点,就一直记录device life
        if (preDeviceRecord != null && preDeviceRecord.getOutLineTime() != null) {
            saveDeviceLife(deviceLast);
        }
        return count;
    }