#

whycq

2023-02-25 132db34b1ae71bf985d306ab38b8db37fac2e1eb

#

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

@@ -111,25 +111,30 @@


                //101站有3个扫码器，当0扫码器没有数据时，获取9、10两个扫码器数据
                if((inSta.getStaNo().equals(101) || inSta.getStaNo().equals(104)) && Cools.isEmpty(barcode)){
                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();
                    }

                    if(Cools.isEmpty(barcode)) {
                    if("NoRead".equals(barcode) || Cools.isEmpty(barcode)) {
                        BarcodeThread barcodeThread2 = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, inSta.getBarcode2());
                        if (barcodeThread2 != null) {
                            barcode = barcodeThread2.getBarcode();

                        }
                    }
//                    if("NoRead".equals(barcode) || Cools.isEmpty(barcode)) {
//                        barcode = "";
//                        continue;
//                    }
                }

                if (!Cools.isEmpty(barcode)) {
                if (!Cools.isEmpty(barcode) && !"NoRead".equals(barcode)) {
                    log.info("{}号条码扫描器检测条码信息：{}", inSta.getBarcode(), barcode);
                    if ("NG".endsWith(barcode) || "NoRead".equals(barcode)) {
                        continue;
                    }
//                    if ("NG".endsWith(barcode) || "NoRead".equals(barcode)) {
//                        continue;
//                    }
                } else {
                    continue;
                }
@@ -210,6 +215,7 @@
                        param.setIoType(1);
                        param.setSourceStaNo(inSta.getStaNo());
                        param.setLocType1(locTypeDto.getLocType1());
//                        param.setFull(staProtocol.isFull());
                        String response = new HttpHandler.Builder()
                                .setUri(wmsUrl)
                                .setPath("/rpc/pakin/loc/v1")

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

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

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

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

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

@@ -65,7 +65,7 @@
        connect();
        while (true) {
            try {
                byte[] read = read(8, 200);
                byte[] read = read(16, 200);
                if (null != read) {
                    String s = new String(read);
                    if (!Cools.isEmpty(s)) {

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

@@ -185,7 +185,7 @@
        if (result1.IsSuccess) {
            for (int i = 0; i < staNoSize; i++) {
                Integer siteId = staNos.get(i); // 站点编号
                boolean[] status = siemensS7Net.getByteTransform().TransBool(result1.Content, i*2, 1);
                boolean[] status = siemensS7Net.getByteTransform().TransBool(result1.Content, i*2, 2);
                StaProtocol staProtocol = station.get(siteId);
                staProtocol.setAutoing(status[0]);  // 自动
                staProtocol.setLoading(status[1]);  // 有物
@@ -195,6 +195,7 @@
                staProtocol.setFullPlt(status[5]);  // 满托盘
                staProtocol.setHigh(status[6]);     // 高库位  捷丰大托盘
                staProtocol.setLow(status[7]);      // 低库位  捷丰小托盘
                staProtocol.setFull(status[8]);      // 托盘是可否整垛

                if (!staProtocol.isPakMk() && !staProtocol.isLoading()) {
                    staProtocol.setPakMk(true);