5f9d57b377e2784086648a4750177a910b8a0468..03a70a1bf1f830b30c71b882d3806b4c21838719
5 天以前 chen.llin
入库增加注释
03a70a 对比 | 目录
5 天以前 chen.llin
配置文件更新
f1de37 对比 | 目录
3个文件已修改
43 ■■■■ 已修改文件
src/main/java/com/zy/core/MainProcess.java 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/core/thread/SiemensDevpThread.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/service/impl/MainServiceImpl.java 27 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/core/MainProcess.java
@@ -44,13 +44,13 @@
                    mainService.stnToCrnStnPick(3);
                    // 入库  ===>> 入库站到堆垛机站,根据条码扫描生成入库工作档
                    mainService.generateStoreWrkFile(); // 组托
                    mainService.generateStoreWrkFile(); //                          全版组托
                    // 出库  ===>>  堆垛机出库站到出库站
                    mainService.crnStnToOutStn(4);
                    // 入出库  ===>>  堆垛机入出库作业下发
                    mainService.crnIoExecute(5);
                    //  入出库  ===>>  堆垛机入出库作业下发
                    mainService.crnIoExecute(5);                             //出库
                    // 入库  ===>> 执行对工作档的完成操作
                    mainService.storeFinished(6);
@@ -61,7 +61,7 @@
                    // 输送线异常信息记录
                    mainService.recDevpErr();
                    // 入库  ===>> 空栈板初始化入库,叉车入库站放货
                    // 入库  ===>>                                          空栈板初始化入库,叉车入库站放货
                    mainService.storeEmptyPlt(8);
                    // 出库  ===>> 工作档信息写入led显示器
@@ -76,7 +76,7 @@
                    mainService.outOfDevp(11);
                    // 堆垛机回原点
                    mainService.originGo();
//                    mainService.originGo();
                } catch (Exception e) {
                    e.printStackTrace();
src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -51,8 +51,8 @@
    }};
    public static final ArrayList<Integer> staNos2= new ArrayList<Integer>() {{
        add(1025);add(1026);add(1027);add(1028);add(1029);add(1030);add(1031);add(1032);add(1033);
        add(1034);add(1035);add(1036);add(1037);add(1039);add(1040);add(1041);add(1042);add(1043);
        add(1044);add(1045);add(1046);add(1047);add(1048);
        add(1034);add(1035);add(1036);add(1037);add(1038);add(1039);add(1040);add(1041);add(1042);add(1043);
        add(1044);add(1045);add(1046);add(1047);add(1048);add(1072);
    }};
@@ -330,7 +330,7 @@
        int writeCount = 0;
        do {
            write = siemensS7Net.Write("DB100." + address, staProtocol.getWorkNo());    // 工作号
            write1 = siemensS7Net.Write("DB100." + (address + 2), staProtocol.getStaNo());    // 目标站
            write1 = siemensS7Net.Write("DB100." + (address + 4), staProtocol.getStaNo());    // 目标站
            Thread.sleep(200);
            if(write.IsSuccess && write1.IsSuccess){
                break;
src/main/java/com/zy/service/impl/MainServiceImpl.java
@@ -159,7 +159,7 @@
                    back = true;
                }
                // 退回
                if (back && (staProtocol.getWorkNo() == 9999 || staProtocol.getWorkNo() == 9998)  && staProtocol.isInEnable() && staProtocol.isLoading() && staProtocol.isPakMk()) {
                if (back   && staProtocol.isInEnable() && staProtocol.isLoading() && staProtocol.isPakMk()) {
                    MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(3, errMsg));
                    staProtocol.setWorkNo(wrkNo);
                    wrkNo++;
@@ -172,11 +172,12 @@
                }
                // 判断是否满足入库条件
                if (staProtocol.isAutoing()
                        && staProtocol.isLoading()
                        && staProtocol.isInEnable()
                        && !staProtocol.isEmptyMk()
                        && staProtocol.isPakMk() && staProtocol.getWorkNo() == 9999) {
                if (staProtocol.isAutoing() //自动
                        && staProtocol.isLoading() //有物
                        && staProtocol.isInEnable() //可入
                        && !staProtocol.isEmptyMk() // 非空板
                        && staProtocol.isPakMk() //防止重复下发信号 站点无物 无任务号会自动变成true
                ) {
                    if(Cools.isEmpty(barcode) || "NG".endsWith(barcode) || "NoRead".equals(barcode) || "00000000".equals(barcode)) {
                        News.info("{}条码扫描错误:{}",barcodeThread.getSlave().getId(),barcode);
                        continue;
@@ -1047,13 +1048,13 @@
                }
                // 站点条件判断
                if (staProtocol.isAutoing()
                        && staProtocol.isLoading()
                        && staProtocol.isInEnable()
                        && staProtocol.isEmptyMk()
                        && staProtocol.isPakMk()
                        && staProtocol.getWorkNo() == 9998 // 9997 回退 9998 空 9999 满
                        ) {
                if (staProtocol.isAutoing()  //自动
                        && staProtocol.isLoading() //有物
                        && staProtocol.isInEnable() //可入
                        && staProtocol.isEmptyMk()// 空板
                        && staProtocol.isPakMk() //防止重复下发信号 站点无物 无任务号会自动变成true
                ) {
                    News.warnNoLog(""+mark+" - 0"+" - 开始执行:空栈板初始化入库,叉车入库站放货");
                    try {