名称统一

刘小明

2024-07-09 f4a214473d2f39accb06f5cf98da5e051ce5e895

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

@@ -36,6 +36,7 @@

    private StaDeviceLastMapper deviceLastDao;
    private StaDeviceLifeMapper deviceLifeDao;
    private StaDeviceLifeLastMapper deviceLifeLastDao;
    private StaWipSnExMapper wipSnExDao;
    private StaDeviceProductionLogMapper deviceProductionLogDao;
    private StaAssemblyWorkLastMapper assemblyWorkLastDao;
@@ -52,7 +53,6 @@
    private OthFileMapper othFileMapper;
    @Value("${dy.webFile.fmUrl}")
    private String fmUrl;

    @Autowired
    public void setDeviceLastDao(StaDeviceLastMapper deviceLastDao) {
        this.deviceLastDao = deviceLastDao;
@@ -117,6 +117,10 @@
    public void setOthFileMapper(OthFileMapper othFileMapper) {
        this.othFileMapper = othFileMapper;
    }
    @Autowired
    public void setDeviceLifeLastDao(StaDeviceLifeLastMapper deviceLifeLastDao) {
        this.deviceLifeLastDao = deviceLifeLastDao;
    }

    @Transactional
    public int save(QueryVo params) {
@@ -173,7 +177,16 @@
    private void saveDeviceLife(StaDeviceLast deviceLast) {
        StaDeviceLife life = new StaDeviceLife();
        BeanUtils.copyProperties(deviceLast, life);
        life.setId(null);
        deviceLifeDao.insertSelective(life);

        StaDeviceLifeLast lastLife = new StaDeviceLifeLast();
        BeanUtils.copyProperties(deviceLast, lastLife);
        lastLife.setId(null);
        int count = deviceLifeLastDao.updateByDeviceNo(lastLife);
        if (count == 0){
            deviceLifeLastDao.insertSelective(lastLife);
        }
    }

    private StaDeviceLast buildDeviceLast(QueryVo params, StaAssemblyWorkLast workLast,String deviceNo) {
@@ -200,7 +213,7 @@
        PrProductionNode node = nodeDao.selectByPrimaryKey(workLast.nodeId);
        record.nodeContent = node.content;
        if (node.isRecord) {
            record.deviceCycleContent = node.equipCycleContent;
            record.deviceCycleContent = node.deviceCycleContent;
        }
        record.status = getStatus(params.status, node.isEnd,params.workType);
        return record;