#

yxFwq

2024-10-21 9bc7d5848d188e228fc1b01a51b9207c38b1e264

#

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

@@ -235,7 +235,7 @@
                        staProtocol.setWorkNo(wrkMast.getWrkNo());
                        staProtocol.setStaNo(wrkMast.getStaNo());

                        devpThread.setPakMk(staProtocol.getSiteId(), false);
                        devpThread.setPakMk(staProtocol.getSiteId(), false,238);
                        boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
                        if (!result) {
                            throw new CoolException("更新plc站点信息失败");
@@ -280,7 +280,7 @@
                                staProtocol.setStaNo(dto.getRgvSstaNo());
                            }

                            devpThread.setPakMk(staProtocol.getSiteId(), false);
                            devpThread.setPakMk(staProtocol.getSiteId(), false,283);
                            boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
                            if (!result) {
                                throw new CoolException("更新plc站点信息失败");
@@ -419,7 +419,7 @@
                        staProtocol.setWorkNo(wrkMast.getWrkNo());
                        staProtocol.setStaNo(wrkMast.getStaNo());

                        devpThread.setPakMk(staProtocol.getSiteId(), false);
                        devpThread.setPakMk(staProtocol.getSiteId(), false,422);
                        boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
                        if (!result) {
                            throw new CoolException("更新plc站点信息失败");
@@ -464,7 +464,7 @@
                                staProtocol.setStaNo(dto.getRgvSstaNo());
                            }

                            devpThread.setPakMk(staProtocol.getSiteId(), false);
                            devpThread.setPakMk(staProtocol.getSiteId(), false,467);
                            boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
                            if (!result) {
                                throw new CoolException("更新plc站点信息失败");
@@ -634,7 +634,7 @@
                        staProtocol.setWorkNo(wrkMast111.getWrkNo());
                        staProtocol.setStaNo(wrkMast111.getStaNo());

                        devpThread.setPakMk(staProtocol.getSiteId(), false);
                        devpThread.setPakMk(staProtocol.getSiteId(), false,637);
                        boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
                        if (!result) {
                            if (ledThread != null) {
@@ -692,7 +692,7 @@
                                staProtocol.setStaNo(dto.getRgvSstaNo());
                            }

                            devpThread.setPakMk(staProtocol.getSiteId(), false);
                            devpThread.setPakMk(staProtocol.getSiteId(), false,695);
                            boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
                            if (!result) {
                                if (ledThread != null) {
@@ -840,8 +840,8 @@
                        staProtocol.setWorkNo(wrkMast.getWrkNo());
                        staProtocol.setStaNo(wrkMast.getStaNo());

                        devpThread.setPakMk(staProtocol.getSiteId(), false);
                        log.info("锁定标记flase===》N===》站点号：{}，工作号：{}，条码:{}",staProtocol.getStaNo(),staProtocol.getWorkNo(),barcode);
                        devpThread.setPakMk(staProtocol.getSiteId(), false,843);
                        log.info("锁定标记flase===》N===》站点号：{}，工作号：{}，条码:{}",staProtocol.getSiteId(),staProtocol.getWorkNo(),barcode);
                        boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
                        if (!result) {
                            if (ledThread != null) {
@@ -889,7 +889,7 @@
                                staProtocol.setStaNo(dto.getRgvSstaNo());
                            }

                            devpThread.setPakMk(staProtocol.getSiteId(), false);
                            devpThread.setPakMk(staProtocol.getSiteId(), false,892);
                            log.info("锁定标记flase===》N===》站点号：{}，工作号：{}，条码:{}",staProtocol.getStaNo(),staProtocol.getWorkNo(),barcode);
                            boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
                            if (!result) {
@@ -985,7 +985,7 @@
                        staNo = 147;
                    }
                    staProtocol.setStaNo(staNo);
                    devpThread.setPakMk(staProtocol.getSiteId(), false);
                    devpThread.setPakMk(staProtocol.getSiteId(), false,988);
                    boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
                    if (result) {
                        // 更新工作主档
@@ -1093,7 +1093,7 @@
                                    // 更新站点信息 且 下发plc命令
                                    staProtocol.setWorkNo(wrkMast.getWrkNo());
                                    staProtocol.setStaNo(dto.getStaNo());
                                    devpThread.setPakMk(staProtocol.getSiteId(), false);
                                    devpThread.setPakMk(staProtocol.getSiteId(), false,1096);
//                                    ledThread.errorReset();
                                    boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
                                    if (!result) {
@@ -1208,7 +1208,7 @@
                                    // 更新站点信息 且 下发plc命令
                                    staProtocol.setWorkNo(wrkMast.getWrkNo());
                                    staProtocol.setStaNo(dto.getStaNo());
                                    devpThread.setPakMk(staProtocol.getSiteId(), false);
                                    devpThread.setPakMk(staProtocol.getSiteId(), false,1211);
//                                    ledThread.errorReset();
                                    boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
                                    if (!result) {
@@ -2322,7 +2322,7 @@
            staProtocol.setWorkNo(wrkMast.getWrkNo());
            staProtocol.setStaNo(wrkMast.getStaNo());

            devpThread.setPakMk(staProtocol.getSiteId(), false);
            devpThread.setPakMk(staProtocol.getSiteId(), false,2325);

            if (!MessageQueue.offer(SlaveType.Devp, crnStn.getDevpPlcId(), new Task(99, crnCommand.getCrnNo()-2))) {
                log.error("输送线锁定命令下发失败，堆垛机号={}，任务数据={}", wrkMast.getCrnNo(), crnCommand.getCrnNo()-2);
@@ -4084,7 +4084,7 @@
                            // 更新站点信息 且 下发plc命令
                            staProtocol.setWorkNo(dto.getWorkNo());
                            staProtocol.setStaNo(dto.getStaNo());
                            devpThread.setPakMk(staProtocol.getSiteId(), false);
                            devpThread.setPakMk(staProtocol.getSiteId(), false,4087);
                            boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
                            if (!result) {
                                throw new CoolException("更新plc站点信息失败");
@@ -4147,7 +4147,7 @@
                            // 更新站点信息 且 下发plc命令
                            staProtocol.setWorkNo(dto.getWorkNo());
                            staProtocol.setStaNo(dto.getStaNo());
                            devpThread.setPakMk(staProtocol.getSiteId(), false);
                            devpThread.setPakMk(staProtocol.getSiteId(), false,4150);
                            boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
                            if (!result) {
                                throw new CoolException("更新plc站点信息失败");
@@ -4210,7 +4210,7 @@
                            // 更新站点信息 且 下发plc命令
                            staProtocol.setWorkNo(dto.getWorkNo());
                            staProtocol.setStaNo(dto.getStaNo());
                            devpThread.setPakMk(staProtocol.getSiteId(), false);
                            devpThread.setPakMk(staProtocol.getSiteId(), false,4213);
                            boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
                            if (!result) {
                                throw new CoolException("更新plc站点信息失败");

 src/main/java/com/zy/core/DevpThread.java

@@ -8,6 +8,6 @@

    Map<Integer, StaProtocol> getStation();

    void setPakMk(Integer siteId, boolean pakMk);
    void setPakMk(Integer siteId, boolean pakMk,Integer i);

}

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

@@ -1040,10 +1040,10 @@
     * 设置入库标记
     */
    @Override
    public void setPakMk(Integer siteId, boolean pakMk) {
    public void setPakMk(Integer siteId, boolean pakMk,Integer i) {
        StaProtocol staProtocol = station.get(siteId);
        if (null != staProtocol) {
            log.info("锁定入库标记，站点号={};pakMk={};时间={}",siteId,pakMk,new Date());
            log.info("锁定入库标记，站点号={};pakMk={};时间={};标记={}",siteId,pakMk,new Date(),i);
            staProtocol.setPakMk(pakMk);
        }
    }