增加勤哲分工表展示

yangys

2025-08-15 852ccd15939833f9bae20e4a990c4acfdd6a9922

增加勤哲分工表展示

 blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/producedivision/service/ProduceDivisionService.java

@@ -9,6 +9,7 @@
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.utils.BeanUtil;
import org.springblade.mdm.basesetting.producedivision.entity.ProduceDivision;
import org.springblade.mdm.basesetting.producedivision.entity.QinzheFgb;
import org.springblade.mdm.basesetting.producedivision.mapper.ProduceDivisionMapper;
import org.springblade.mdm.basesetting.producedivision.vo.DivisionExcel;
import org.springblade.mdm.basesetting.producedivision.vo.ImportResult;
@@ -26,15 +27,19 @@
public class ProduceDivisionService extends BizServiceImpl<ProduceDivisionMapper, ProduceDivision> {
    @Autowired
    private MdmUserService tUserService;
    @Autowired
    private QinzheFgbService qinzheFgbService;

    /**
     * 新增分工表
     * @param vo
     */
    @Transactional
    public void saveDivision(ProduceDivisionVO vo){
        if(drawingNoExists(vo.getDrawingNo(),null)){
        /*
        if(drawingNoExists(vo.getpro,null)){
            throw new ServiceException("图号已存在："+vo.getDrawingNo());
        }
        }*/
        ProduceDivision plan = new ProduceDivision();
        BeanUtil.copyProperties(vo, plan);
        this.save(plan);
@@ -46,11 +51,12 @@
     * @param excludeId 排除id
     * @return 是否存在
     */
    /*
    boolean drawingNoExists(String drawingNo,Long excludeId){
        return this.lambdaQuery()
            .eq(ProduceDivision::getDrawingNo, drawingNo)
            .ne(excludeId!=null,ProduceDivision::getId,excludeId).count()>0;
    }
    }*/

    /**
     * 修改分工表
@@ -61,9 +67,10 @@
        if(vo.getId() == null){
            throw new ServiceException("id不能未空");
        }
        /*
        if(drawingNoExists(vo.getDrawingNo(),vo.getId())){
            throw new ServiceException("图号已存在："+vo.getDrawingNo());
        }
        }*/

        ProduceDivision plan = this.getById(vo.getId());

@@ -153,7 +160,7 @@
            .eq(ProduceDivision::getCheckerId,division.getCheckerId()).eq(ProduceDivision::getSeniorId,division.getSeniorId())
            .eq(ProduceDivision::getTeamLeaderId,division.getTeamLeaderId()).count()>0;
    }

    /*
    public ProduceDivision getByDrawingNo(String drawingNo){
        List<ProduceDivision> divs = lambdaQuery().eq(ProduceDivision::getDrawingNo, drawingNo).list();
        if(divs.isEmpty()){
@@ -161,5 +168,33 @@
        }else{
            return divs.get(0);
        }
    }*/

    /**
     * 根据勤哲零件号于主管编制获取分工表数据 图号->勤哲数据（编制） ->  主制分工表数据
     *
     * @param drawingNo
     * @return
     */
    public ProduceDivision getByDrawingNoWithQinzhe(String drawingNo){
        QinzheFgb qinzheFgb = qinzheFgbService.getByLjh(drawingNo);
        if(qinzheFgb == null){
            throw new ServiceException("未找到零组件号");
        }

        Long programmerId = tUserService.getUserIdByName(qinzheFgb.getZggy());
        if(programmerId == null){
            throw new ServiceException("根据"+qinzheFgb.getZggy()+"未找到对应的系统用户，请检查用户是否存在");
        }
        ProduceDivision division = lambdaQuery().eq(ProduceDivision::getProgrammerId, programmerId).list().stream().findFirst().orElse(null);
        if(division == null){
            throw new ServiceException("主制分工表无工艺员"+qinzheFgb.getZggy()+"对应的数据");
        }
        List<ProduceDivision> divs = lambdaQuery().eq(ProduceDivision::getDrawingNo, drawingNo).list();
        if(divs.isEmpty()){
            return null;
        }else{
            return divs.get(0);
        }
    }
}

 blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/producedivision/service/QinzheFgbService.java

@@ -12,6 +12,14 @@

@Service
public class QinzheFgbService extends ServiceImpl<QinzheFgbMapper, QinzheFgb> {
    /**
     * 根据零件号获取数据
     * @param ljh 零件号
     * @return 分工表实体,找不到返回null
     */
    public QinzheFgb getByLjh(String ljh) {
        return lambdaQuery().eq(QinzheFgb::getLjh, ljh).list().stream().findFirst().orElse(null);
    }

    /**
     * 查询分页

 blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/producedivision/vo/ProduceDivisionVO.java

@@ -10,8 +10,8 @@
@Setter
@Getter
public class ProduceDivisionVO extends BaseVO {
    @Schema(description = "零组件号/图号")
    private String drawingNo;
    //@Schema(description = "零组件号/图号")
    //private String drawingNo;

    @Schema(description = "专业组长id")
    private Long teamLeaderId;