更改暂停数据更改逻辑，更改预览工程条件逻辑,增加新拿走破损方法

wu

2025-02-17 0b66b6df1df5118d1e31a3d9d33de344b2a6fafc

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

@@ -19,6 +19,7 @@
import com.mes.work_assignment.entity.WorkAssignment;
import com.mes.work_assignment.mapper.WorkAssignmentMapper;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;

@@ -52,6 +53,10 @@
    GlassInfoMapper glassInfoMapper;
    @Resource
    WorkAssignmentMapper workAssignmentMapper;


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


    /**
     * 查询报工信息
@@ -92,7 +97,12 @@
            reportingWork.setOrderId(damages.get(0).getProcessId().substring(0, 10));
            reportingWork.setProductionId(damages.get(0).getProcessId().substring(0, 11));
            reportingWork.setProcessId(damages.get(0).getProcessId() + "/" + damages.get(0).getTechnologyNumber());
            reportingWork.setDeviceName(damages.get(0).getDeviceName());
//            reportingWork.setDeviceName(damages.get(0).getDeviceName());
            if (StringUtils.isBlank(damages.get(0).getDeviceName())){
                reportingWork.setDeviceName("auto");
            }else{
                reportingWork.setDeviceName(damages.get(0).getDeviceName());
            }
            reportingWork.setThisProcess(damages.get(0).getWorkingProcedure());
            reportingWork.setThisCompletedQuantity(0);
            reportingWork.setThisWornQuantity(0);
@@ -144,9 +154,12 @@
        reportingWork.setOrderId(damage.getProcessId().substring(0, 10));
        reportingWork.setProductionId(damage.getProcessId().substring(0, 11));
        reportingWork.setProcessId(damage.getProcessId() + "/" + damage.getTechnologyNumber());
        reportingWork.setDeviceName(damage.getDeviceName());
        if (StringUtils.isBlank(damage.getDeviceName())){
            reportingWork.setDeviceName("auto");
        }else{
            reportingWork.setDeviceName(damage.getDeviceName());
        }
        reportingWork.setThisProcess(damage.getWorkingProcedure());
//        reportingWork.setNextProcess("磨边");
        reportingWork.setThisCompletedQuantity(1);
        reportingWork.setThisWornQuantity(0);
        reportingWork.setClasses("早班");
@@ -164,19 +177,39 @@
        return sendToERP(reportingWork, reportingWorkDetails);
    }

    @Override
    public void autoSubmitReport(String glassId, int deviceId, String workingProcedure, String remark, int type) {
        Damage damage = new Damage();
        damage.setGlassId(glassId);
        damage.setWorkingProcedure(workingProcedure);
        damage.setLine(deviceId);
        damage.setType(type);
        damage.setRemark(remark);
        damage.setStatus(0);
        this.insertDamage(damage);
    }

    /**
     * 添加报工信息
     */
    @Override
    public void insertDamage(Damage damage) {
        List<Damage> damage1 = baseMapper.selectList(
                new LambdaQueryWrapper<Damage>()
                        .ne(Damage::getType, Const.GLASS_STATE_DAMAGE)
                        .ne(Damage::getType, Const.GLASS_STATE_TAKE)
                        .eq(Damage::getLine, damage.getLine())
                        .eq(Damage::getWorkingProcedure, damage.getWorkingProcedure())
                        .eq(Damage::getGlassId, damage.getGlassId())
        );
        List<Damage> damage1 = null;
        if (Const.GLASS_STATE_DAMAGE.equals(damage.getType()) || Const.GLASS_STATE_TAKE.equals(damage.getType())) {
            damage1 = baseMapper.selectList(
                    new LambdaQueryWrapper<Damage>()
                            .in(Damage::getType, Const.GLASS_STATE_DAMAGE, Const.GLASS_STATE_TAKE)
                            .eq(Damage::getGlassId, damage.getGlassId())
            );
        } else {
            damage1 = baseMapper.selectList(
                    new LambdaQueryWrapper<Damage>()
                            .notIn(Damage::getType, Const.GLASS_STATE_DAMAGE, Const.GLASS_STATE_TAKE)
                            .eq(Damage::getLine, damage.getLine())
                            .eq(Damage::getWorkingProcedure, damage.getWorkingProcedure())
                            .eq(Damage::getGlassId, damage.getGlassId())
            );
        }
        if (damage1 == null || damage1.size() == 0) {
            LambdaQueryWrapper<GlassInfo> glassInfoSelectWrapper = new LambdaQueryWrapper<>();
            glassInfoSelectWrapper.eq(GlassInfo::getGlassId, damage.getGlassId());
@@ -201,7 +234,7 @@
            }
            if (damage.getType() == 1) {
                if (submitReport(damage)) {
                    damage.setStatus(2);
                    damage.setStatus(3);
                } else {
                    damage.setStatus(1);
                }
@@ -274,7 +307,7 @@
        baseMapper.delete(
                new LambdaQueryWrapper<Damage>()
                        .eq(Damage::getGlassId, glassId)
                        .in(Damage::getType, Const.GLASS_STATE_DAMAGE, Const.GLASS_STATE_TAKE)
                        .in(Damage::getType, Const.GLASS_STATE_DAMAGE_TAKE)
        );
    }

@@ -283,7 +316,8 @@
        log.info("报工数据reportingWork：{}，reportingWorkDetails：{}", reportingWork, reportingWorkDetails);
        try {
            // 目标系统的API URL
            String url = "http://192.168.1.199:8086/reportingWork/mesSaveReportingWorkWorn";
//            String url = ERP_URL + "/reportingWork/mesReportingWork";
            String url = ERP_URL + "/reportingWork/mesSaveReportingWorkWorn";
            URL obj = new URL(url);
            HttpURLConnection con = (HttpURLConnection) obj.openConnection();

@@ -345,7 +379,6 @@
                    return false;
                }
            }

        } catch (Exception e) {
            e.printStackTrace();
            return false;