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

chenhaozhe

2025-09-09 056bab2536075cc867baf963523a02ce9cd3912b

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

@@ -813,53 +813,52 @@
                        return;
                    }
                });

                var HItemID = "";
                var AllHItemID = "";
                var HRemark = $("#HRemark").val() || "无";

                for (var i = 0; i < datas.length; i++) {
                    var HitemID = datas[i].HitemID;
                    var HBillType = datas[i].HBillType;
                    if (HBillType != 3772) {
                        var HRemark = $("#HRemark").val();
                        if (!HRemark) {
                            HRemark = "无";
                        }
                        $.ajax({//插入子表
                            url: GetWEBURL() + "/LEMS/SaveToSc_PackUnionBillSub",
                            type: "GET",
                            async: false,
                            data: {
                                "HitemID": HitemID
                                , "HRemark": HRemark
                            },
                            success: function (result) {
                                var data = result.data;
                                if (result.count == 1) {
                                    //layer.msg("扫描成功", { time: 5000, icon: 6 });
                                } else {
                                    playSound();
                                    // $("#verifycode").click();
                                    //layer.msg(result.Message, { icon: 5 });
                                    layer.alert("插入子表失败", { icon: 5, btn: ['退出'], time: 100000, offset: 't' });
                                    return;
                                }
                            }, error: function () {
                                playSound();
                                layer.alert("插入子表方法发生错误!", { icon: 5 });
                            }
                        });
                    AllHItemID += (AllHItemID ? "," : "") + datas[i].HitemID;
                    if (datas[i].HBillType != 3772) {
                        HItemID += (HItemID ? "," : "") + datas[i].HitemID;
                    }
                }
                for (var i = 0; i < datas.length; i++) {
                    var HitemID = datas[i].HitemID
                    $.ajax({//更新temp表标记字段
                        url: GetWEBURL() + "/LEMS/Update_Flag_HRelationInterID",

                // === æ‰¹é‡è¯·æ±‚1：插入子表 ===
                if (HItemID.length > 0) {
                    $.ajax({
                        url: GetWEBURL() + "/LEMS/SaveToSc_PackUnionBillSub_Batch",
                        type: "GET",
                        async: false,
                        data: {
                            "HitemID": HitemID
                        },
                        data: { HitemID: HItemID, HRemark: HRemark },
                        success: function (result) {
                            var data = result.data;
                            if (result.count == 1) {
                                //layer.msg("扫描成功", { time: 5000, icon: 6 });
                            } else {
                                playSound();
                              
                                layer.alert("插入子表失败", { icon: 5, btn: ['退出'], time: 100000, offset: 't' });
                                return;
                            }
                        }, error: function () {
                            playSound();
                            layer.alert("插入子表方法发生错误!", { icon: 5 });
                        }
                    });
                }

                // === æ‰¹é‡è¯·æ±‚2：更新标记 ===
                if (AllHItemID.length > 0) {
                    $.ajax({
                        url: GetWEBURL() + "/LEMS/Update_Flag_HRelationInterID_Batch",
                        type: "GET",
                        async: false,
                        data: { HitemID: AllHItemID },
                        success: function (result) {
                            var data = result.data;
                            if (result.count == 1) {                               
                            } else {
                                playSound();
                                layer.alert("插入主表失败", { icon: 5, btn: ['退出'], time: 100000, offset: 't' });
@@ -870,6 +869,64 @@
                        }
                    });
                }
                
                //for (var i = 0; i < datas.length; i++) {
                //    var HitemID = datas[i].HitemID;
                //    var HBillType = datas[i].HBillType;
                //    if (HBillType != 3772) {
                //        var HRemark = $("#HRemark").val();
                //        if (!HRemark) {
                //            HRemark = "无";
                //        }
                //        $.ajax({//插入子表
                //            url: GetWEBURL() + "/LEMS/SaveToSc_PackUnionBillSub",
                //            type: "GET",
                //            async: false,
                //            data: {
                //                "HitemID": HitemID
                //                , "HRemark": HRemark
                //            },
                //            success: function (result) {
                //                var data = result.data;
                //                if (result.count == 1) {
                //                    //layer.msg("扫描成功", { time: 5000, icon: 6 });
                //                } else {
                //                    playSound();
                //                    // $("#verifycode").click();
                //                    //layer.msg(result.Message, { icon: 5 });
                //                    layer.alert("插入子表失败", { icon: 5, btn: ['退出'], time: 100000, offset: 't' });
                //                    return;
                //                }
                //            }, error: function () {
                //                playSound();
                //                layer.alert("插入子表方法发生错误!", { icon: 5 });
                //            }
                //        });
                //    }
                //}
                //for (var i = 0; i < datas.length; i++) {
                //    var HitemID = datas[i].HitemID
                //    $.ajax({//更新temp表标记字段
                //        url: GetWEBURL() + "/LEMS/Update_Flag_HRelationInterID",
                //        type: "GET",
                //        async: false,
                //        data: {
                //            "HitemID": HitemID
                //        },
                //        success: function (result) {
                //            var data = result.data;
                //            if (result.count == 1) {
                //                //layer.msg("扫描成功", { time: 5000, icon: 6 });
                //            } else {
                //                playSound();
                //                layer.alert("插入主表失败", { icon: 5, btn: ['退出'], time: 100000, offset: 't' });
                //            }
                //        }, error: function () {
                //            playSound();
                //            layer.alert("更新标记方法发生错误!", { icon: 5 });
                //        }
                //    });
                //}
                if (LDM == "AAA") {
                    $("#Print2").click();
                } else {
@@ -996,11 +1053,7 @@
                                    showOptionDlg: false, //如果不显示打印对话框而直接打印，将此行注释去掉即可
                                    report: report1,
                                    data: Customer
                                };
                                //var args = {
                                //    report: urlAddRandomNo("../../views/grf/包装单物料标识卡(网页版).grf"),
                                //    data: Customer
                                //};
                                };                              
                                webapp_ws_ajax_run(args);
                            } else {
                                layer.msg("查无数据!");