提交项目多环境配置

zhoushihao

2024-04-25 3cc6aa69cca0b0d991f8537999c578eaee68e07e

 hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/service/impl/DownWorkstationServiceImpl.java

@@ -25,6 +25,7 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;

@Slf4j
@Service
public class DownWorkstationServiceImpl extends ServiceImpl<DownWorkstationMapper, DownWorkstation> implements DownWorkstationService {
@@ -58,6 +59,7 @@
        DownWorkstation result = baseMapper.selectOne(queryWrapper);
        return result != null ? result.getTotalquantity() : 0;
    }

//工位显示
    @Override
    public List<Map<String, Object>> getTotalGlassDimensionsByWorkstation() {
@@ -66,8 +68,8 @@
                .leftJoin("down_glass_info b on t.flow_card_id = b.flow_card_id")
                .groupBy("t.workstation_id", "t.flow_card_id");

        List<DownWorkstionAndDownGlassinfo> workstationList = downWorkstationMapper.selectJoinList(DownWorkstionAndDownGlassinfo.class, queryWrapper);

//        List<DownWorkstionAndDownGlassinfo> workstationList = downWorkstationMapper.selectJoinList(DownWorkstionAndDownGlassinfo.class, queryWrapper);
        List<DownWorkstionAndDownGlassinfo> workstationList = null;
        List<Map<String, Object>> result = new ArrayList<>();
        for (DownWorkstionAndDownGlassinfo downWorkstionAndDownGlassinfo : workstationList) {
            Map<String, Object> rack = new HashMap<>();
@@ -87,7 +89,6 @@

        return result; // 返回最终结果
    }



//    @Override
@@ -111,6 +112,7 @@
        DownWorkstation result = baseMapper.selectOne(queryWrapper);
        return result != null ? result.getRacksnumber() : 0;
    }

//根据条件获取工位玻璃信息
    @Override
    public List<DownWorkstation> getoneDownWorkstations(int startId, int endId) {
@@ -130,7 +132,6 @@
        updateWrapper.set("racks_number",racksNumber).eq("flow_card_id", flowCardId);
        baseMapper.update(null, updateWrapper);
    }



    @Override
@@ -155,19 +156,12 @@
    }



    public DownWorkstation selectByFlowCardId(String flowcardid) {
        QueryWrapper<DownWorkstation> queryWrapper = new QueryWrapper<>();
        queryWrapper.eq("flow_card_id", flowcardid);

        return baseMapper.selectOne(queryWrapper);
    }








    @Transactional
@@ -181,13 +175,8 @@
    }






    @Override
    public void insertdownglassinfo() {



        List<DownGlassTask> taskdownGlassInf = downGlassTaskService.getUnloadingTaskState();
@@ -231,8 +220,6 @@
        }




        try {
            //查询下片工位表中架子是否绑定了流程卡号 工位表和任务表中状态为1的流程卡号和已落架数量
            List<DownWorkstationTask> taskdownWorkstation = downWorkstationTaskService.getTaskState();
@@ -256,11 +243,6 @@
            // 或者可以进行其他异常处理，比如记录日志或者返回特定的错误信息
        }
    }







}