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

wtt

2024-11-13 12fb8792c9743187e0592d0b6a26e65e06d27fc7

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

@@ -707,6 +707,7 @@
                        a = 0;
                        return false;
                    }

                    var HProcExchBillNo = $("#HProcExchBillNo").val();
                    //判断条码之前的工序是否出站
                    $.ajax({
@@ -728,6 +729,28 @@
                        a = 0;
                        return false;
                    }

                    //判断条码的配件是否符合模具 ç©´å·è¦æ±‚
                    $.ajax({
                        url: GetWEBURL() + "/LEMS/h_p_CJ_SNBarCodeBillMouldBathSelect",
                        type: "GET",
                        async: false,
                        data: { "SubBarcode": SubBarcode, "HProcExchBillNo": HProcExchBillNo, "HBillType": "BZ" },
                        success: function (result) {
                            if (result.count == 0) {
                                a = 1;
                                playSound();
                                layer.alert(result.Message, { icon: 5, btn: ['确认'], time: 100000, offset: 't' });
                                return false;
                            }
                        }
                    })

                    if (a == 1) {
                        a = 0;
                        return false;
                    }


                    $.ajax({//判断总的包装数量是否超过流转卡数量
                        url: GetWEBURL() + "/LEMS/h_p_Sc_ProductionLinePackaging_Checkqty",
@@ -1157,11 +1180,7 @@
                //var ReportViewer = document.getElementById("ReportViewer");
                window.open("../../基础资料/公用基础资料/HBarPlanPrint.html?linterid=" + linterid.toString() + "&Type=" + Type.toString() + "&OpenTmp=" + OpenTmp.toString());

                if (LDM == "DU3" && BBM == "1099081-00-E") {

                } else {
                    $("#Print2").click();
                }
                $("#Print2").click();
            });

            //监听表格中行工具事件