Merge remote-tracking branch 'origin/sxjzwcs-3' into sxjzwcs-3

zhang

2025-08-02 3e5358a4aba7a024509dcd601070001a6f3bcb55

Merge remote-tracking branch 'origin/sxjzwcs-3' into sxjzwcs-3

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

@@ -190,8 +190,6 @@
                return barcode1;
            case 2:
                return barcode2;
            case 3:
                return barcode3;
            default:
                throw new CoolException("获取条码扫描器失败！");
        }
@@ -416,8 +414,8 @@

        //条码扫描器 三期
        Thread.sleep(200);
        ArrayList<Integer> barcodeListsanqi = getBarcodeList();
        OperateResultExOne<byte[]> result2siqi = siemensS7Net.Read("DB101.60", (short) (barcodeListsanqi.size() * 8));
        ArrayList<Integer> barcodeListsanqi = barcode3;
        OperateResultExOne<byte[]> result2siqi = siemensS7Net.Read("DB101.180", (short) (barcodeListsanqi.size() * 8));
        if (result2siqi.IsSuccess) {
            for (int i = 0; i < barcodeListsanqi.size(); i++) {
                Integer barcodeId = barcodeListsanqi.get(i);

 src/main/webapp/views/console.html

@@ -612,12 +612,12 @@
                            case 0:
                            case 1:
                                unit = 30;
                                offSet = 720;
                                offSet = 380;
                                break;
                            case 2:
                            case 3:
                                unit = 22;
                                offSet = 1100;
                                offSet = 600;
                                break;

                        }