Merge branch 'master' of http://10.153.19.25:10105/r/YiWuProject

wangfei

2025-02-28 b31b4776f50e1ef0cfeeb95f5aac175a624086e4

 hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/impl/DamageServiceImpl.java

@@ -55,7 +55,7 @@
    WorkAssignmentMapper workAssignmentMapper;


        private final static String ERP_URL = "http://192.168.2.100:8086";
    private final static String ERP_URL = "http://192.168.2.100:8086";
//    private final static String ERP_URL = "http://10.153.19.174:8086";


@@ -74,6 +74,11 @@
        }
        if (!"0".equals(workingProcedure)) {
            damageSelectWrapper.eq(Damage::getWorkingProcedure, workingProcedure);
        }
        List<Damage> damageList = baseMapper.selectList(damageSelectWrapper);

        for (Damage damage : damageList) {
            damage.setStatus(2);
        }
        return baseMapper.selectList(damageSelectWrapper);
    }
@@ -181,7 +186,6 @@
        damage.setLine(deviceId);
        damage.setType(type);
        damage.setRemark(remark);
        damage.setStatus(0);
        this.insertDamage(damage);
    }

@@ -228,12 +232,10 @@
            if (damage.getType() == null) {
                damage.setType(1);
            }
            if (damage.getType() == 1) {
                if (submitReport(damage)) {
                    damage.setStatus(3);
                } else {
                    damage.setStatus(1);
                }
            if (damage.getType() == 1 && submitReport(damage)) {
                damage.setStatus(3);
            } else {
                damage.setStatus(1);
            }
            baseMapper.insert(damage);
        }