1

zhang

5 天以前 d76e49df4314ae1442f592fbf27e0bcbd9506944

1

 src/main/java/com/zy/asrs/controller/OpenController.java

@@ -211,11 +211,17 @@
                       @RequestParam String taskNo,
                       HttpServletRequest request) {
        auth(appkey, taskNo, request);
        List<TaskWrk> taskWrks = new ArrayList<>();
        if (Cools.isEmpty(taskNo)) {
            taskWrks = taskWrkService.selectList(new EntityWrapper<>());
            return R.ok().add(taskWrks);
        }
        TaskWrk taskWrk = taskWrkService.selectByTaskNo(taskNo);
        if (taskWrk == null) {
            return R.error("任务不存在");
        }
        return R.ok().add(taskWrk);
        taskWrks.add(taskWrk);
        return R.ok().add(taskWrks);
    }

    //查询任务指令集合

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

@@ -316,6 +316,12 @@
                    }
                    StaProtocol staProtocol = station.get(barcodeSite2.get(i));
                    if (staProtocol != null) {
                        while (iterator.hasNext()) {
                            String next = iterator.next();
                            if (next.length() < 7 || next.length() > 10) {
                                iterator.remove();
                            }
                        }
                        staProtocol.setMatIdList(barcodeList);
                    }
                }
@@ -546,7 +552,7 @@
                writeResult3 = siemensS7Net.Write(heightAddress, Short.parseShort(staProtocol.getHeight()));
                writeResult3 = siemensS7Net.Write(heightAddress, Short.parseShort(staProtocol.getHeight()));
                writeResult3 = siemensS7Net.Write(heightAddress, Short.parseShort(staProtocol.getHeight()));
                log.info("写入高度地址：{},{}", heightAddress,  writeResult3);
                log.info("写入高度地址：{},{}", heightAddress, writeResult3);
                if (!writeResult3.IsSuccess) {
                    //fangzhi xierukushibai,jiu duoxiejici,meixunhuan
                    writeResult3 = siemensS7Net.Write(heightAddress, Short.parseShort(staProtocol.getHeight()));