Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes

wangfei

2024-09-03 e6a25dfa55101ca8b684eea2ae447e6e5c1e59d7

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

@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.github.yulichang.base.MPJBaseServiceImpl;
import com.github.yulichang.query.MPJQueryWrapper;
import com.mes.common.config.Const;
import com.mes.damage.entity.Damage;
import com.mes.damage.entity.DamagePrint;
import com.mes.damage.mapper.DamageMapper;
@@ -145,34 +146,45 @@
        }
        this.saveBatch(damageList);
    }

    /**
     * 拿走打印数据查询
     */
    @Override
    public List<DamagePrint> selectDamagePrint(Damage damage) {
        MPJQueryWrapper<Damage> listDamage=new MPJQueryWrapper<Damage>()
        MPJQueryWrapper<Damage> listDamage = new MPJQueryWrapper<Damage>()
                .select("t.engineer_id,t.glass_id,b.tempering_layout_id,b.tempering_feed_sequence,b.width,b.height,b.thickness")
                .leftJoin("glass_info as b  on t.glass_id=b.glass_id")
                .eq("t.working_procedure",damage.getWorkingProcedure())
                .eq("t.type",damage.getType());
                .eq("t.working_procedure", damage.getWorkingProcedure())
                .eq("t.type", damage.getType());
        // 动态添加条件，当 id 有值时
        if (damage.getEngineerId() != null) {
            listDamage.eq("t.engineer_id", damage.getEngineerId());
        }
        return damageMapper.selectJoinList(DamagePrint.class,listDamage);
        return damageMapper.selectJoinList(DamagePrint.class, listDamage);
    }

    /**
     * 拿走打印打印详情查询
     */
    @Override
    public List<DamagePrint> selectDamagePrintDetails(Damage damage) {
        List<DamagePrint> listDamage=damageMapper.selectJoinList(DamagePrint.class,new MPJQueryWrapper<Damage>()
        List<DamagePrint> listDamage = damageMapper.selectJoinList(DamagePrint.class, new MPJQueryWrapper<Damage>()
                .select("b.flow_card_id,b.layer,t.engineer_id,b.tempering_layout_id,b.tempering_feed_sequence,t.glass_id,b.width,b.height,b.thickness")
                .leftJoin("glass_info as b  on t.glass_id=b.glass_id")
                .eq("t.working_procedure",damage.getWorkingProcedure())
                .eq("t.type",damage.getType())
                .eq("t.engineer_id",damage.getEngineerId())
                .eq("t.working_procedure", damage.getWorkingProcedure())
                .eq("t.type", damage.getType())
                .eq("t.engineer_id", damage.getEngineerId())
        );
        return listDamage;
    }

    @Override
    public void deleteByGlassId(String glassId) {
        baseMapper.delete(
                new LambdaQueryWrapper<Damage>()
                        .eq(Damage::getGlassId, glassId)
                        .in(Damage::getType, Const.GLASS_STATE_DAMAGE, Const.GLASS_STATE_TAKE)
        );
    }
}