#

mrzhssss

2022-12-01 ecc6c94c7d9eeb45f267afcaa9bae35a40f375c7

#

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

@@ -1,5 +1,7 @@
package com.zy.asrs.controller;

import HslCommunication.Core.Types.OperateResultExOne;
import HslCommunication.Profinet.Siemens.SiemensS7Net;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.annotations.ManagerAuth;
import com.core.common.R;
@@ -38,6 +40,7 @@
    @Autowired
    private BasDevpService basDevpService;


    @GetMapping("/io/mode/info/site")
    @ManagerAuth(memo = "入出库模式")
    public R ioMode(){
@@ -70,7 +73,9 @@
            vo.setDevNo(devp.getDevNo());    // 站点编号
            list.add(vo);
            StaProtocol staProtocol = station.get(devp.getDevNo());
            if (null == staProtocol) { continue; }
            if (null == staProtocol) {
                continue;
            }
            vo.setWorkNo(staProtocol.getWorkNo());   //  工作号
            vo.setAutoing(staProtocol.isAutoing()?"Y":"N");     //  自动
            vo.setLoading(staProtocol.isLoading()?"Y":"N");     // 有物
@@ -203,13 +208,18 @@

    /**
     * 母托盘出库
     *
     * @return
     */
    @PostMapping("/motherPallet")
    public R motherPalletOut(){
        SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, 1);
        StaProtocol staProtocol = devpThread.getStation().get(12);
        if (staProtocol.getAllowEmptyOut().equals("1")) {
        boolean result = MessageQueue.offer(SlaveType.Devp, 1, new Task(3, null));
        return R.ok("母托盘出库成功");
        } else {
            return R.error("母托盘出库失败，12站无空托盘或13站有物");
    }


    }
}

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

@@ -1536,26 +1536,26 @@
                    break;
                }
            }
            // 获取led线程
            LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, led.getId());
            // led显示默认内容
            if (reset && !ledThread.isLedMk()) {
                if (led.getId() == 7) {
                    ledThread.setLedMk(true);
                    if (!MessageQueue.offer(SlaveType.Led, led.getId(), new Task(4, new ArrayList<>()))) {
                        log.error("{}号LED命令下发失败！！！[ip：{}] [port：{}]", led.getId(), led.getIp(), led.getPort());
                    } else {

                    }
                } else {
                    ledThread.setLedMk(true);
                    if (!MessageQueue.offer(SlaveType.Led, led.getId(), new Task(2, new ArrayList<>()))) {
                        log.error("{}号LED命令下发失败！！！[ip：{}] [port：{}]", led.getId(), led.getIp(), led.getPort());
                    } else {

                    }
                }
            }
//            // 获取led线程
//            LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, led.getId());
//            // led显示默认内容
//            if (reset && !ledThread.isLedMk()) {
//                if (led.getId() == 7) {
//                    ledThread.setLedMk(true);
//                    if (!MessageQueue.offer(SlaveType.Led, led.getId(), new Task(4, new ArrayList<>()))) {
//                        log.error("{}号LED命令下发失败！！！[ip：{}] [port：{}]", led.getId(), led.getIp(), led.getPort());
//                    } else {
//
//                    }
//                } else {
//                    ledThread.setLedMk(true);
//                    if (!MessageQueue.offer(SlaveType.Led, led.getId(), new Task(2, new ArrayList<>()))) {
//                        log.error("{}号LED命令下发失败！！！[ip：{}] [port：{}]", led.getId(), led.getIp(), led.getPort());
//                    } else {
//
//                    }
//                }
//            }
        }
    }


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

@@ -65,7 +65,7 @@
                    // 入库  ===>> 空栈板初始化入库,叉车入库站放货
                    mainService.storeEmptyPlt();
                    // 出库  ===>> 工作档信息写入led显示器
                    mainService.ledExecute();
//                    mainService.ledExecute();
                    // 其他  ===>> LED显示器复位，显示默认信息
                    mainService.ledReset();


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

@@ -96,12 +96,12 @@
            SlaveConnection.put(SlaveType.Barcode, barcode.getId(), barcodeThread);
        }
        // 初始化LED线程
        log.info("初始化LED线程...................................................");
        for (LedSlave led : slaveProperties.getLed()) {
            LedThread ledThread = new LedThread(led);
            new Thread(ledThread).start();
            SlaveConnection.put(SlaveType.Led, led.getId(), ledThread);
        }
//        log.info("初始化LED线程...................................................");
//        for (LedSlave led : slaveProperties.getLed()) {
//            LedThread ledThread = new LedThread(led);
//            new Thread(ledThread).start();
//            SlaveConnection.put(SlaveType.Led, led.getId(), ledThread);
//        }
        // 初始化磅秤线程
//        log.info("初始化磅秤线程...................................................");
//        for (Slave scale : slaveProperties.getScale()) {

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

@@ -55,6 +55,9 @@
    // 隔壁站点（台车位置）
    private String nearbySta;

    //允许空托出库
    private String allowEmptyOut;

    public BasDevp toSqlModel(){
        BasDevp basDevp = new BasDevp();
        basDevp.setDevNo(siteId);

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

@@ -92,7 +92,7 @@
                        break;
                    case 3:
                        OperateResult write = siemensS7Net.Write("DB100.170" , (short) 1);
                        System.out.println("写入成功");
                        log.info("母托出库成功");
                        break;
                    default:
                        break;
@@ -211,6 +211,22 @@
            staProtocol.setNearbySta(String.valueOf(siemensS7Net.getByteTransform().TransInt16(result3.Content, 0)));
        }

        /**
         * 母托盘出库
         */
        Thread.sleep(200);
        OperateResultExOne<byte[]> result4 = siemensS7Net.Read("DB100.172",(short)2);
        if (result4.IsSuccess) {
            Integer siteId = 12;
            StaProtocol staProtocol = station.get(siteId);
            if (null == staProtocol) {
                staProtocol = new StaProtocol();
                staProtocol.setSiteId(siteId);
                station.put(siteId, staProtocol);
            }
            staProtocol.setAllowEmptyOut(String.valueOf(siemensS7Net.getByteTransform().TransInt16(result4.Content, 0)));
        }



        if (result.IsSuccess && result1.IsSuccess) {

 src/main/resources/application.yml

@@ -165,7 +165,7 @@
  # 条码扫描仪
  barcode[0]:
    id: 1
    ip: 10.10.10.52
    ip: 10.10.10.55
    port: 51236
   # LED1
  led[0]:

 src/main/webapp/views/console.html

@@ -569,6 +569,7 @@
                        }

                        if (sites[i].siteId === '16' || sites[i].siteId === '016') {
                            console.log(sites[i].nearbySta);
                            carAnimate(Number(sites[i].siteId), Number(sites[i].nearbySta));
                        }
                    }
@@ -730,7 +731,7 @@
                case 9:
                    targetTop += 183;
                    break;
                case 15:
                case 10:
                    targetTop += 95;
                    break;
                default: