Merge remote-tracking branch 'origin/jxfywcs' into jxfywcs

野心家

2023-07-29 675db903cd534aa16b59f5e9bf87da3e699e5d30

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

@@ -190,12 +190,11 @@
//                        Thread.sleep(300);
//                    }catch (Exception e){}

                    String barcode = barcodeThread.getBarcode();
                    //String barcode = barcodeThread.getBarcode();
                    String barcode = "20000005";
                    if(!Cools.isEmpty(barcode)) {
                        News.info(""+mark+" - 1"+" - {}号条码扫描器检测条码信息：{}", inSta.getBarcode(), barcode);
                        if(staProtocol.getStamp()<2){
                            continue;
                        }

                        if("NG".endsWith(barcode) || "NoRead".equals(barcode) || "empty".equals(barcode)) {
                            staProtocol.setWorkNo((short) 9999);
                            staProtocol.setStaNo(inSta.getBackSta().shortValue());
@@ -211,9 +210,6 @@
                            continue;
                        }
                    } else {
                        if(staProtocol.getStamp()<2){
                            continue;
                        }
                        staProtocol.setWorkNo((short) 9999);
                        staProtocol.setStaNo(inSta.getBackSta().shortValue());
                        devpThread.setPakMk(staProtocol.getSiteId(), false);
@@ -492,7 +488,7 @@
                        wrkMast.setIoTime(now);
                        wrkMast.setIoType(wrkMast.getIoType() - 50); // 入出库类型: 103->53,104->54,107->57
                        wrkMast.setWrkSts(2L); // 工作状态: 2.设备上走
                        wrkMast.setSourceStaNo(wrkMast.getStaNo()); // 源站
                        wrkMast.setSourceStaNo(100); // 源站
                        wrkMast.setStaNo(staNo); // 目标站
                        wrkMast.setLocNo(wrkMast.getSourceLocNo()); // 目标库位 = 出库时的源库位
                        wrkMast.setSourceLocNo(""); // 源库位清空