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

Administrator

2 天以前 f18dee1034da10cdd537f4cef94a6bcbe141c6a8

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

# Conflicts:
#	src/main/java/com/zy/core/thread/SiemensDevpThread.java

 src/main/java/com/zy/asrs/entity/TaskWrk.java

@@ -177,6 +177,10 @@
    @TableField("mark_start")
    private Integer markStart;

    @TableField("type")
    private String type;


    public TaskWrk() {
    }


 src/main/java/com/zy/asrs/entity/TaskWrkLog.java

@@ -167,6 +167,10 @@
    @TableField("transfer_mark")
    private Integer transferMark;


    @TableField("type")
    private String type;

    public TaskWrkLog() {
    }


 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java

@@ -237,6 +237,9 @@
                                log.info("下发输送线任务：taskWrk:" + JSON.toJSONString(taskWrk));
                                staProtocol.setWorkNo(taskWrk.getWrkNo().shortValue());
                                staProtocol.setStaNo(Short.valueOf(taskWrk.getTargetPoint()));
                        if (!Cools.isEmpty(taskWrk.getType())) {
                            staProtocol.setHeight(taskWrk.getType());
                        }
                                boolean offer = false;
                                try {
                                    offer = MessageQueue.offer(SlaveType.Devp, 1, new Task(2, staProtocol));

 src/main/java/com/zy/core/model/protocol/StaProtocol.java

@@ -67,6 +67,9 @@
    // 物料号列表
    private List<String> matIdList;

    // 高度
    private String height;

    // 外形检测 ------------------------------------------------------------------------

    // 前超限

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

@@ -252,14 +252,14 @@
            }

            // 读取正面条码
            OperateResultExOne<byte[]> result3 = siemensS7Net.Read("DB103.0", (short) (5 * 40));
            if (result3.IsSuccess) {
            OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB103.0", (short) (5 * 40));
            if (result2.IsSuccess) {
                for (int i = 0; i < 5; i++) {
                    String barcode = siemensS7Net.getByteTransform().TransString(result3.Content, i * 40, 40, "UTF-8");
                    String barcode = siemensS7Net.getByteTransform().TransString(result2.Content, i * 40, 40, "UTF-8");
                    if(!Cools.isEmpty()){
                        barcode = barcode.trim();
                    }
                    List<String> barcodeList = Arrays.stream(barcode.split(";")).collect(Collectors.toList());
                    List<String> barcodeList = Arrays.stream(barcode.split(",")).collect(Collectors.toList());
                    Iterator<String> iterator = barcodeList.iterator();
                    while (iterator.hasNext()){
                        String next = iterator.next();
@@ -270,7 +270,7 @@
                        }
                    }

                    BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, i+1);
                    BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, i);
                    if (!Cools.isEmpty(barcodeThread) && !barcodeThread.getBarcode().equals(barcode)) {
                        barcodeThread.setBarcode(barcode);
                    }
@@ -482,11 +482,11 @@
        // 目标站地址
        String staNoAddress;
        // 高度类型地址
        String heightAddress;
        String heightAddress = null;
        if (index < 16) {
            workNoAddress = "DB100." + index * 4;
            staNoAddress = "DB100." + (index * 4 + 2);
            heightAddress = "DB104." + (index * 4 + 2);
            heightAddress = "DB104." + (index * 4);
        } else {
            workNoAddress = "DB100." + (400 + (index-16) * 4);
            staNoAddress = "DB100." + (400 + (index-16) * 4 + 2);
@@ -500,6 +500,13 @@
        while (writeCount < 5) {
            OperateResult writeResult1 = siemensS7Net.Write(workNoAddress, staProtocol.getWorkNo());    // 工作号
            OperateResult writeResult2 = siemensS7Net.Write(staNoAddress, staProtocol.getStaNo());    // 目标站
            if (!Cools.isEmpty(staProtocol.getHeight()) && heightAddress != null) {
                OperateResult writeResult3 = siemensS7Net.Write(heightAddress, Short.valueOf(staProtocol.getHeight()));    // 高度类型
                if (!writeResult3.IsSuccess) {
                    log.error("写入输送线命令失败，尝试重新写入，输入参数={}，输出参数={}", JSON.toJSON(staProtocol), writeResult3);// 写入输送线命令失败，尝试重新写入，输入参数={}，输出参数={}", JSON.toJSON(staProtocol), writeResult3);
                    writeResult3 = siemensS7Net.Write(heightAddress, staProtocol.getHeight());    // 高度类型
                }
            }
            if (writeResult1.IsSuccess && writeResult2.IsSuccess) {
                Thread.sleep(200);
                OperateResultExOne<byte[]> readResult = siemensS7Net.Read("DB100." + index * 4, (short) 2);