Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI

zrg

2024-10-28 15a2eca730d0cb1c4a8b115bd67e52f0b189ea95

 WebTM/views/³µ¼ä¹ÜÀí/²úÏß/MES_ProductionLinePackaging.html

@@ -53,6 +53,7 @@
                                <select name="LDM" lay-verify="required" id="LDM">
                                    <option value="DU3" selected>DU3</option>
                                    <option value="QDR">QDR</option>
                                    <option value="AAA">15车间</option>
                                    <option value="其他">其他</option>
                                </select>
                            </div>
@@ -605,16 +606,30 @@
                        return;
                    }

                    if (LDM == "AAA" && SubBarcode.length != 50) {
                        playSound();
                        layer.alert("子件条码长度不为50位!", { icon: 5, btn: ['退出'], time: 100000, offset: 't' });
                        return;
                    }

                    if (SubBarcode.match(/[^\x00-\xff]/g) != null) {
                        playSound();
                        layer.alert("必须是半角字符!", { icon: 5, btn: ['退出'], time: 100000, offset: 't' });
                        return;
                    }

                    if (LDM != "其他" && BBM != "其他" && reg.test(SubBarcode)) {
                        playSound();
                        layer.alert("请查看子件条码大写是否正确!", { icon: 5, btn: ['退出'], time: 100000, offset: 't' });
                        return;
                    if (SubBarcode.length == 50) {
                        if (LDM != "其他" && reg.test(SubBarcode)) {
                            playSound();
                            layer.alert("请查看子件条码大写是否正确!", { icon: 5, btn: ['退出'], time: 100000, offset: 't' });
                            return;
                        }
                    } else {
                        if (LDM != "其他" && BBM != "其他" && reg.test(SubBarcode)) {
                            playSound();
                            layer.alert("请查看子件条码大写是否正确!", { icon: 5, btn: ['退出'], time: 100000, offset: 't' });
                            return;
                        }
                    }

                    if (LDM != "其他" && BBM != "其他" && SubBarcode.indexOf(BBM) == -1) {
@@ -953,7 +968,11 @@
                        }
                    });
                }
                $("#Print").click();
                if (LDM == "AAA") {
                    $("#Print2").click();
                } else {
                    $("#Print").click();
                }
                $("#HBarCode_White").val("");
                //子件条码数量已扫完 æ¡ç æ‰«å®ŒåŽ
                if (pcmQty == pcmQtyFlag) {