线路配置，打标机前端页面

严智鑫

2024-09-13 ef9e8df8f911d53d1ec23bf920f1cd5ba8f18e13

 JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/service/impl/TaskingServiceImpl.java

@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.github.yulichang.base.MPJBaseServiceImpl;
import com.github.yulichang.query.MPJLambdaQueryWrapper;
import com.mes.common.S7object;
import com.mes.device.PlcParameterObject;
import com.mes.md.entity.GlassInfo;
@@ -40,6 +41,10 @@

    }

    /**
     * @param state
     * @return
     */
    @Override
    public boolean updateLoadState(Integer state) {
        //更改联机状态
@@ -108,9 +113,9 @@
    }

    @Override
    public Tasking selectTaskLoad(Tasking tasking) {
    public Tasking selectTasking(Tasking tasking) {
        QueryWrapper<Tasking> queryWrapper = new QueryWrapper<>();
        queryWrapper.eq("current_craft",tasking.getGlassId())
        queryWrapper.eq("current_craft",tasking.getCurrentCraft())
                .eq("state",tasking.getState())
                .eq("work_state",tasking.getWorkState())
                .orderByAsc("glass_id");
@@ -121,4 +126,44 @@
    public Boolean insertTaskingPro(String tasking) {
        return null;
    }


    /**
     * @param tasking
     * 查询当前工艺，线上未完工的任务
     * @return
     */
    @Override
    public List<Tasking> findCraftTasking(Tasking tasking) {
        return baseMapper.selectList(new MPJLambdaQueryWrapper<Tasking>()
                .selectAll(Tasking.class)
                .eq(Tasking::getCurrentCraft,tasking.getCurrentCraft())
                .ne(Tasking::getWorkState,"完工")
                .orderByAsc(Tasking::getGlassId));
    }

    /**
     * @param tasking
     * 修改任务状态 【破损/失败/完工】
     * @return
     */
    @Override
    public int updateCraftTasking(Tasking tasking) {
        Tasking oldTasking=baseMapper.selectById(tasking);
        oldTasking.setWorkState(tasking.getWorkState());
        return baseMapper.updateById(oldTasking);
    }

    /**
     * @param tasking
     * 修改状态 【下线】
     * @return
     */
    @Override
    public int updateDownLine(Tasking tasking) {
        Tasking oldTasking=baseMapper.selectById(tasking);
        oldTasking.setState(tasking.getState());
        return baseMapper.updateById(oldTasking);
    }

}