led复位修改

pjb

2024-06-28 0be842a3c8a3063e933f35a8bb1bc9e578f27699

 src/main/java/com/zy/core/thread/LedThread.java

@@ -1,8 +1,5 @@
package com.zy.core.thread;

import com.alibaba.fastjson.JSON;
import com.core.common.Cools;
import com.zy.common.entity.Parameter;
import com.zy.common.model.MatDto;
import com.zy.common.utils.News;
import com.zy.core.Slave;
@@ -53,11 +50,11 @@
    public LedThread(Slave slave) {
        this.slave = slave;
        try {
//            Bx5GEnv.initial(3000);
//            screen = new Bx5GScreenClient("my");
            Bx5GEnv.initial(3000);
            screen = new Bx5GScreenClient("my");
        } catch (Exception e) {
            e.printStackTrace();
            News.info("Led"+" - 1"+" - led连接构造器错误 ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
            log.info("led连接构造器错误 ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
        }
    }

@@ -116,24 +113,31 @@
        // 创建一个数据页
        TextBxPage page = new TextBxPage();
        for (LedCommand command : list) {
            page.newLine(command.getTitle() +"（"+command.getWorkNo()+")");
            page.newLine("库位："+ (command.getIoType() < 100 ? command.getLocNo() : command.getSourceLocNo()));
            page.newLine("目标站："+command.getStaNo());
            if (!command.isEmptyMk()) {
                for (MatDto matDto : command.getMatDtos()) {
                    //去掉小数点
                    String strQty = matDto.getCount().toString();
                    int idx = strQty.lastIndexOf(".");
                    if(idx >= 0){
                        strQty.substring(0,idx);
                    }
                    page.newLine(matDto.getMaknx() + "[数量" + strQty +"]");
            if (command.getIoType() < 100) {
                page.newLine(command.getTitle());
                page.newLine("任务号：" + command.getWorkNo());
                page.newLine("库位号：" + command.getLocNo());
                page.newLine("条码：" + command.getBarcode());
            } else {
                page.newLine(command.getTitle() + "(" + command.getWorkNo() + ")");
                if (!command.isEmptyMk()) {
                    for (MatDto matDto : command.getMatDtos()) {
                        //去掉小数点
                        String strQty = matDto.getCount().toString();
                        int idx = strQty.lastIndexOf(".");
                        if (idx >= 0) {
                            strQty = strQty.substring(0, idx);
                        }
                        page.newLine(matDto.getMatnr());
                        page.newLine(matDto.getMaknx());
                        page.newLine("[数量：" + strQty + "/" + matDto.getTotal().intValue() + "]");
//                    page.newLine(matDto.getMaknx() + "[数量" + strQty +"]");
//                    page.newLine(matDto.getMaknx() + "【数量" + matDto.getCount() +"】");
                    }
                }
                page.newLine("\n");
            }
            page.newLine("\n");
        }

        // 设置字体
        page.setFont(new Font("宋体",Font.PLAIN,12));
        // 设置文本颜色
@@ -181,7 +185,7 @@
//            page.newLine("自动化立体仓库");
//            page.newLine("西格迈股份有限公司");
//        }
        page.newLine("力源智能仓储");
        page.newLine("捷众智能仓储");

        // 设置字体
        page.setFont(new Font("宋体",Font.PLAIN,13));
@@ -234,9 +238,41 @@
    }


    private void error(String msg) {
        errorMsg.delete(0, errorMsg.length());
        errorMsg.append(msg);
    private void error(String msg) throws Bx5GException {
        if (slave.getId() <= 2) {
            if (!connect()) {
                return;
            }
            pf = new ProgramBxFile( 0, screen.getProfile());
            pf.setFrameShow(false);
            // 分别输入X，Y，width，height
            area = new TextCaptionBxArea( 0,0,96,48, screen.getProfile());
            // 创建一个数据页
            TextBxPage page = new TextBxPage();

            page.newLine(msg);

            // 设置字体
            page.setFont(new Font("宋体",Font.PLAIN,12));
            // 设置文本颜色
            page.setForeground(Color.red);
            // 设置显示特技为快速打出
            page.setDisplayStyle(styles[6]);
            area.clearPages();
            area.addPage(page);
            pf.addArea(area);
            if (pf.validate() != null) {
                News.info("Led"+" - 2"+" - pf out of range");
            } else {
                // 更新节目
                screen.writeProgram(pf);
//            resetStatus = false;
            }
            close();
        } else {
            errorMsg.delete(0, errorMsg.length());
            errorMsg.append(msg);
        }
    }

    public void errorReset() {