#

whycq

2023-02-25 652e68d1b40191035f182c12b7ed253225c6b253

#

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

@@ -109,14 +109,13 @@
                String barcode = barcodeThread.getBarcode();



                //101站有3个扫码器，当0扫码器没有数据时，获取9、10两个扫码器数据
                if((inSta.getStaNo().equals(101) || inSta.getStaNo().equals(104)) && ( "NoRead".equals(barcode) || Cools.isEmpty(barcode) )){
                    BarcodeThread barcodeThread1 = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, inSta.getBarcode1());
                    if (barcodeThread1 != null) {
                        barcode = barcodeThread1.getBarcode();
                        continue;
                    }

                    barcode = barcodeThread1.getBarcode();
                    if("NoRead".equals(barcode) || Cools.isEmpty(barcode)) {
                        BarcodeThread barcodeThread2 = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, inSta.getBarcode2());
                        if (barcodeThread2 != null) {
@@ -215,7 +214,7 @@
                        param.setIoType(1);
                        param.setSourceStaNo(inSta.getStaNo());
                        param.setLocType1(locTypeDto.getLocType1());
//                        param.setFull(staProtocol.isFull());
                        param.setFull(staProtocol.isFull());
                        String response = new HttpHandler.Builder()
                                .setUri(wmsUrl)
                                .setPath("/rpc/pakin/loc/v1")

 src/main/java/com/zy/common/model/SearchLocParam.java

@@ -15,6 +15,9 @@

    private String barcode;

    // 托盘是可否整垛
    private boolean full;

    // 库位规格（ 0:未知, 1:低库位, 2:中库位, 3:高库位 ）
    private Short locType1;


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

@@ -45,27 +45,39 @@

                    // 演示
                    mainService.crnDemoOfLocMove1();

                    // 入出库模式切换函数
//                    mainService.ioConvert();

                    // 入库  ===>> 入库站到堆垛机站，根据条码扫描生成入库工作档
                    mainService.generateStoreWrkFile(); // 组托

                    mainService.generateStoreWrkFile0(); // WMS入库

                    // 拣料、并板、盘点再入库
                    mainService.stnToCrnStnPick();

                    // 出库  ===>>  堆垛机出库站到出库站
                    mainService.crnStnToOutStn();

                    // 入出库  ===>>  堆垛机入出库作业下发
                    mainService.crnIoExecute();

                    // 入出库增强 ===>> 堆垛机命令下发后，异步修改工作档状态
//                    mainService.crnIoWrkMast();

                    // 入库  ===>> 执行对工作档的完成操作
                    mainService.storeFinished();

                    // 堆垛机异常信息记录
                    mainService.recCrnErr();

                    // 入库  ===>> 空栈板初始化入库,叉车入库站放货
                    mainService.storeEmptyPlt();  // 空板入库

                    // 出库  ===>> 工作档信息写入led显示器
                    mainService.ledExecute();

                    // 其他  ===>> LED显示器复位，显示默认信息
                    mainService.ledReset();