Merge remote-tracking branch 'origin/sxjzwcs' into sxjzwcs

whycq

2024-06-30 f884d266dce2295e75462e931f7fb60eb2c23c80

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

@@ -113,7 +113,13 @@
        // 创建一个数据页
        TextBxPage page = new TextBxPage();
        for (LedCommand command : list) {
            page.newLine(command.getTitle() +"（"+command.getWorkNo()+")");
            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()) {
                    //去掉小数点
@@ -131,7 +137,7 @@
            }
            page.newLine("\n");
        }

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

        // 设置字体
        page.setFont(new Font("宋体",Font.PLAIN,13));
@@ -232,10 +238,42 @@
    }


    private void error(String 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() {
        this.errorMsg.delete(0, errorMsg.length());