pang.jiabao
昨天 96437322dc7ebdf4bdd5dbf6723f0cfdbbcafa9e
成品灌装完成后采集plc反馈的是否贴标信息随工作任务存入数据库中
4个文件已修改
20 ■■■■■ 已修改文件
src/main/java/com/zy/common/model/CanningLineInLocParam.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/core/model/protocol/StaProtocol.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/core/thread/SiemensDevpThread.java 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/service/impl/MainServiceImpl.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/common/model/CanningLineInLocParam.java
@@ -40,4 +40,7 @@
    // 贴标成功否
    private boolean tbFlag;
    // 是否贴标 false 贴标,true 不贴标
    private boolean labeling;
}
src/main/java/com/zy/core/model/protocol/StaProtocol.java
@@ -120,6 +120,9 @@
    // 出罐装线任务完成,给罐装线写可放信号 1可放,2不可放-------------------------------------
    private int placeableFlag;
    // 是否贴标 false 贴标,true 不贴标
    private boolean labeling;
    // 外形检测 ------------------------------------------------------------------------
    // 前超限
src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -444,6 +444,19 @@
            }
        }
        // 读是否贴标
        if(slave.getId() == 2) {
            ArrayList<Integer> staNosErrList2 = getStaNosErrList();
            OperateResultExOne<byte[]> resultErr3 = siemensS7Net.Read("DB101.838", (short) 1);
            if (resultErr3.IsSuccess){
                boolean[] status = siemensS7Net.getByteTransform().TransBool(resultErr3.Content, 0, 1);
                for (int i = 0;i<staNosErrList2.size();i++){
                    StaProtocol staProtocol = station.get(staNosErrList2.get(i));
                    staProtocol.setLabeling(status[i]); // 是否贴标 false 贴标,true 不贴标
                }
            }
        }
        if (result.IsSuccess) {
            OutputQueue.DEVP.offer(MessageFormat.format("【{0}】[id:{1}] <<<<< 实时数据更新成功",DateUtils.convert(new Date()), slave.getId()));
src/main/java/com/zy/service/impl/MainServiceImpl.java
@@ -2714,6 +2714,7 @@
                    param.setReinspection(staProtocol.isReinspection());
                    param.setSourceStaNo(site + 2);
                    param.setTbFlag(staProtocol2.isBarcodeErr());
                    param.setLabeling(staProtocol2.isLabeling());
                    param.setCannedVolume(Math.round(staProtocol.getCannedVolume() * 100.0) / 100.0);
                    String response = new HttpHandler.Builder()