#

ynhfasrs

2025-05-02 6fa0eca8982af6a45b65477a232de3e3e2c972d7

#

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

@@ -183,7 +183,7 @@

    @PostMapping("/detl/update")
    @ManagerAuth(memo = "修改站点数据")
    public R siteDetlUpdate(@RequestParam Integer siteId,
    public R siteDetlUpdate(@RequestParam Integer devNo,
                            @RequestParam Integer workNo,
                            @RequestParam Short staNo,
                            @RequestParam String pakMk){
@@ -191,7 +191,7 @@
            DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
            Map<Integer, StaProtocol> station = devpThread.getStation();
            for (Map.Entry<Integer, StaProtocol> entry : station.entrySet()) {
                if (siteId.equals(entry.getKey())) {
                if (devNo.equals(entry.getKey())) {
                    StaProtocol staProtocol = entry.getValue();
                    if (staProtocol == null) {
                        continue;

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

@@ -295,39 +295,39 @@
                News.info("输送线命令下发[id:"+slave.getId()+"] >>>>>"+"["+1+"]");
                Thread.sleep(100);
                do {
                    OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB100."+(index*66 +6), (short) 2);
                    OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB100." + (index * 66 + 6), (short) 2);
                    short mk = siemensS7Net.getByteTransform().TransInt16(result2.Content, 0);
                    if (mk == 2){
                        OperateResult write5 = siemensS7Net.Write("DB100." + index*66, 0);    // 工作号
                    if (mk == 2) {
                        OperateResult write5 = siemensS7Net.Write("DB100." + index * 66, 0);    // 工作号
                        Thread.sleep(100);
                        OperateResult write6 = siemensS7Net.Write("DB100." + (index*66+4), (short) 0);    // 目标站
                        OperateResult write6 = siemensS7Net.Write("DB100." + (index * 66 + 4), (short) 0);    // 目标站
                        Thread.sleep(100);
                        OperateResult write4 = siemensS7Net.Write("DB100." + (index*66+6), (short) 0);
                        OperateResult write4 = siemensS7Net.Write("DB100." + (index * 66 + 6), (short) 0);
                        reset = false;
                        if (write4.IsSuccess && write5.IsSuccess && write6.IsSuccess){
                            News.info("输送线命令下发[id:"+slave.getId()+"] >>>>>"+"["+"0,0,0"+"]");
                            OperateResultExOne<byte[]> result1 = siemensS7Net.Read("DB100."+(index*66), (short) 8);
                        if (write4.IsSuccess && write5.IsSuccess && write6.IsSuccess) {
                            News.info("输送线命令下发[id:" + slave.getId() + "] >>>>>" + "[" + "0,0,0" + "]");
                            OperateResultExOne<byte[]> result1 = siemensS7Net.Read("DB100." + (index * 66), (short) 8);
                            Integer wrkNo1 = siemensS7Net.getByteTransform().TransInt32(result1.Content, 0);
                            short staNo1 = siemensS7Net.getByteTransform().TransInt16(result1.Content, 4);
                            short mk1 = siemensS7Net.getByteTransform().TransInt16(result1.Content, 6);
                            if (wrkNo1 != 0 || staNo1 !=0 || mk1 !=0){
                            if (wrkNo1 != 0 || staNo1 != 0 || mk1 != 0) {
                                whileCount++;
                                News.info("复位失败,输送线命令下发[id:"+slave.getId()+"] >>>>>"+"["+"0,0,0"+"]");
                            }else {
                                News.info("复位失败,输送线命令下发[id:" + slave.getId() + "] >>>>>" + "[" + "0,0,0" + "]");
                            } else {
                                News.info("输送线复位完成");
                                break;
                            }

                        }
                    }else if (reset && mk == 0 ){
                        OperateResult write7 = siemensS7Net.Write("DB100." + (index*66+6), (short) 1);
                        News.info("回读1失败，输送线命令下发[id:"+slave.getId()+"] >>>>>"+"["+"1"+"]");
                    } else if (reset && mk == 0) {
                        OperateResult write7 = siemensS7Net.Write("DB100." + (index * 66 + 6), (short) 1);
                        News.info("回读1失败，输送线命令下发[id:" + slave.getId() + "] >>>>>" + "[" + "1" + "]");
                        Thread.sleep(100);
                        whileCount++;
                    }else {
                    } else {
                        whileCount++;
                    }
                }while (whileCount <10);
                } while (whileCount < 10);
            }
        }else {
            log.error("输送命令下发失败"+JSON.toJSONString(staProtocol));
@@ -349,7 +349,7 @@
        int index = staNos.indexOf(staProtocol.getSiteId());
        do {
            log.info("输送递归次数:" + count);
            OperateResult write1 = siemensS7Net.Write("DB100." + index * 66, staProtocol.getWorkNo());    // 工作号
            OperateResult write1 = siemensS7Net.Write("DB100." + index * 66, staProtocol.getWorkNo().intValue());    // 工作号
            Thread.sleep(100);
            OperateResult write2 = siemensS7Net.Write("DB100." + (index * 66 + 4), staProtocol.getStaNo());    // 目标站
            if (write1.IsSuccess && write2.IsSuccess) {