下片：人工下片表字段改为其他 大理片：新增读取plc数据计时功能

zhoushihao

2024-07-11 a4cc855f17c36f6ceda20100bc491bc6a0071c27

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

@@ -34,7 +34,7 @@

    @Autowired
    private DownWorkstationMapper downWorkstationMapper;
    @Autowired(required=false)
    @Autowired(required = false)
    private DownWorkstationTaskMapper downWorkstationTaskMapper;
    @Autowired
    private DownGlassInfoService downGlassInfoService;
@@ -67,7 +67,7 @@

    //工位显示
    @Override
    public List<Map<String, Object>> getTotalGlassDimensionsByWorkstation(int start,int end) {
    public List<Map<String, Object>> getTotalGlassDimensionsByWorkstation(int start, int end) {
        MPJQueryWrapper<DownWorkstation> queryWrapper = new MPJQueryWrapper<>();
        queryWrapper.select("t.workstation_id", "t.flow_card_id", "COALESCE(SUM(b.width), 0) AS totalwidth", "COALESCE(SUM(b.height), 0) AS totalheight")
                .leftJoin("down_glass_info b on t.flow_card_id = b.flow_card_id")
@@ -76,8 +76,8 @@

        ;

    List<DownWorkstionAndDownGlassinfo> workstationList = downWorkstationMapper.selectJoinList(DownWorkstionAndDownGlassinfo.class, queryWrapper);
       // List<DownWorkstionAndDownGlassinfo> workstationList = null;
        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<>();
@@ -94,7 +94,7 @@
            List<DownGlassInfo> downGlassInfoList = downGlassInfoMapper.selectList(glassInfoQueryWrapper);


         if (!downGlassInfoList.isEmpty()) {
            if (!downGlassInfoList.isEmpty()) {

                item.put("downGlassInfoList", downGlassInfoList);

@@ -103,7 +103,7 @@
            rack.put("item", item);
            result.add(rack);
        }
        log.info("result"+(result));
        log.info("result" + (result));
        return result; // 返回最终结果
    }

@@ -141,21 +141,21 @@


    @Override
    public int updateFlowCardIdAndCount(String flowCardId,  int workstationId,int layer) {
        int glassInfoCount = glassInfoService.getGlassInfoCountByFlowCardId(flowCardId,layer);
    public int updateFlowCardIdAndCount(String flowCardId, int workstationId, int layer) {
        int glassInfoCount = glassInfoService.getGlassInfoCountByFlowCardId(flowCardId, layer);
        QueryWrapper<Damage> queryWrapper = new QueryWrapper<>();
        queryWrapper.eq("process_id", flowCardId);
        queryWrapper.eq("technology_number", layer);

       int artificialnumber=damageservice.count(queryWrapper);
        int otherNumber = damageservice.count(queryWrapper);
        UpdateWrapper<DownWorkstation> updateWrapper = new UpdateWrapper<>();
        updateWrapper.set("total_quantity", glassInfoCount)
                .set("flow_card_id", flowCardId)
                .set("layer", layer)
                .set("artificial_number", artificialnumber)
                .set("other_number", otherNumber)
                .eq("workstation_id", workstationId);

        return baseMapper.update(new DownWorkstation(), updateWrapper);
        this.update(updateWrapper);
        return 1;
    }

    @Override
@@ -168,9 +168,6 @@

        baseMapper.update(new DownWorkstation(), updateWrapper);
    }





    @Override
@@ -191,8 +188,6 @@
        List<DownWorkstationTask> downWorkstationTasks = downWorkstationTaskMapper.selectList();

    }




}