YL
2022-02-01 8504618273ad3ce337b9593af06173e034f87a95
Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI
27个文件已修改
145 ■■■■ 已修改文件
WebTM/views/index.html 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/基础资料/公用基础资料/Gy_WorkCenter.html 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/基础资料/公用基础资料/Gy_WorkCenter_Add_Edit.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/基础资料/工资基础资料/Gy_Group.html 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/基础资料/工资基础资料/Gy_Group_Add_Edit.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/基础资料/生产基础资料/Add_Edit_Gy_Process.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/基础资料/生产基础资料/Add_Edit_Gy_Source.html 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/基础资料/生产基础资料/Gy_Process.html 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/基础资料/生产基础资料/Gy_Source.html 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/模治具管理/模治具管理/Gy_BarCodeBillList.html 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/生产管理/报工台工序/不良采集/Sc_QualityReportStepBill.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/生产管理/报工台工序/不良采集/Sc_QualityReportStepBillList.html 18 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/生产管理/报工台工序/产量汇报/Sc_Add_ProductReportStepBillList.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/生产管理/报工台工序/产量汇报/Sc_ProductReportStepBillList_Web.html 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/生产管理/生产任务单/Sc_ICMOBillList.html 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/生产管理/生产包装单/Sc_PackUnionBill.html 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/生产管理/生产投料单/Sc_PPBomBillList.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/生产管理/生产汇报单/Sc_Add_ICMOReportBillList.html 11 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/生产管理/生产汇报单/Sc_ICMOReportBillList.html 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/计划管理/工艺路线/Gy_RoutingBill.html 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/计划管理/工艺路线/Gy_RoutingBillList.html 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/采购管理/收料通知单/Cg_POInStockBillList.html 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/采购管理/退料通知单/Cg_POInStockBackBillList.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/采购管理/采购退料单/Cg_PurchaseReturnList.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/销售管理/退货通知单/Xs_SeOutStockBackBillList.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/验收入库/外购入库/Kf_POStockInBackBillList.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/验收入库/外购入库/Kf_POStockInBillList.html 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/index.html
@@ -224,8 +224,8 @@
                                        <dd><a lay-href="">调拨申请单n</a></dd>
                                        <dd><a lay-href="仓存管理/仓库调拨/Kf_MoveStockRequestBillList.html">调拨申请单维护</a></dd>
                                        <dd><a lay-href="仓存管理/仓库调拨/Kf_MoveStockBillList.html">直接调拨单维护</a></dd>
                                        <dd><a lay-href="">分步式调入单维护n</a></dd>
                                        <dd><a lay-href="">分步式调出单维护n</a></dd>
                                        <dd><a lay-href="仓存管理/分步式调入单/Fb_StepFoldinBillList.html">分步式调入单维护</a></dd>
                                        <dd><a lay-href="领料发货/分步式调出单/Fb_StepFoldOutBillList.html">分步式调出单维护</a></dd>
                                    </dl>
                                </dd>
                                <dd>
WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/Gy_WorkCenter.html
@@ -232,7 +232,7 @@
                    //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
                    url: GetWEBURL() + '/Gy_WorkCenter/list',
                    type: "GET",
                    data: { "sWhere": sWhere },
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
                    success: function (data1) {
                        if (data1.count == 1) {
                            option.data = data1.data;
@@ -320,7 +320,7 @@
                        $.ajax({
                            url: GetWEBURL() + 'DeltetGy_WorkCenter',
                            type: "GET",
                            data: { "HItemID": ItemID },
                            data: { "HItemID": ItemID, "user": sessionStorage["HUserName"] },
                            success: function (result) {
                                console.log('gouba' + result);
                                if (result.count == 1) {
WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/Gy_WorkCenter_Add_Edit.html
@@ -292,7 +292,7 @@
                    layer.msg("请输入设备数量!", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return;
                }
                var sMainStr = JSON.stringify(data.field);
                var sMainStr = JSON.stringify(data.field) + ";" + sessionStorage["HUserName"];
                $.ajax({
                    type: "POST",
                    url: GetWEBURL() + "Gy_WorkCenter/ModifyByID", //方法所在页面和方法名
WebTM/views/»ù´¡×ÊÁÏ/¹¤×Ê»ù´¡×ÊÁÏ/Gy_Group.html
@@ -173,7 +173,7 @@
                    //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
                    url: GetWEBURL() + '/Gy_Group/list',
                    type: "GET",
                    data: { "sWhere": sWhere },
                    data: { "sWhere": sWhere,"user": sessionStorage["HUserName"] },
                    success: function (data1) {
                        if (data1.count == 1) {
                            option.data = data1.data;
@@ -259,9 +259,9 @@
                        var wait = layer.load();
                        //逻辑删除方法
                        $.ajax({
                            url: GetWEBURL() + 'Gy_Group/EditBill',
                            url: GetWEBURL() + 'DeltetGy_Group',
                            type: "GET",
                            data: { "HItemID": ItemID },
                            data: { "HItemID": ItemID, "user": sessionStorage["HUserName"] },
                            success: function (result) {
                                if (result.count == 1) {
                                    layer.msg(result.Message, { icon: 1 }, function () {
@@ -289,7 +289,6 @@
            }
            //#endregion
            //#region åˆ·æ–°
            function get_Refresh() {
WebTM/views/»ù´¡×ÊÁÏ/¹¤×Ê»ù´¡×ÊÁÏ/Gy_Group_Add_Edit.html
@@ -287,7 +287,7 @@
                    layer.msg("请输入人数!", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return;
                }
                var sMainStr = JSON.stringify(data.field);
                var sMainStr = JSON.stringify(data.field) + ";" + sessionStorage["HUserName"];
                $.ajax({
                    type: "POST",
                    url: GetWEBURL() + "Gy_Group/ModifyByID", //方法所在页面和方法名
WebTM/views/»ù´¡×ÊÁÏ/Éú²ú»ù´¡×ÊÁÏ/Add_Edit_Gy_Process.html
@@ -410,7 +410,7 @@
                //    layer.msg("请选择ERP工序!", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                //    return;
                //}
                var sMainStr = JSON.stringify(data.field);
                var sMainStr = JSON.stringify(data.field) + ";" + sessionStorage["HUserName"];
                $.ajax({
                    type: "POST",
                    url: GetWEBURL() + "Gy_Process/ModifyByID", //方法所在页面和方法名
WebTM/views/»ù´¡×ÊÁÏ/Éú²ú»ù´¡×ÊÁÏ/Add_Edit_Gy_Source.html
@@ -62,7 +62,7 @@
                            <div class="layui-col-xs4 layui-inline">
                                <label class="layui-form-label">单班工时</label>
                                <div class="layui-input-inline">
                                    <input type="text" name="HWorkTimes" id="HWorkTimes" lay-verify="" autocomplete="off" class="layui-input">
                                    <input type="text" name="HWorkTimes" id="HWorkTimes" value="0" lay-verify="" autocomplete="off" class="layui-input">
                                </div>
                            </div>
                            <div class="layui-col-xs4 layui-inline">
@@ -83,7 +83,7 @@
                            <div class="layui-col-xs4 layui-inline">
                                <label class="layui-form-label">关联ID</label>
                                <div class="layui-input-inline">
                                    <input type="text" name="HRelationID" id="HRelationID" lay-verify="" autocomplete="off" class="layui-input">
                                    <input type="text" name="HRelationID" id="HRelationID" value="0" lay-verify="" autocomplete="off" class="layui-input">
                                </div>
                            </div>
                        </div>
@@ -91,19 +91,19 @@
                            <div class="layui-col-xs4 layui-inline">
                                <label class="layui-form-label">单班最大工时</label>
                                <div class="layui-input-inline">
                                    <input type="text" name="HMaxWorkTimes" id="HMaxWorkTimes" lay-verify="" autocomplete="off" class="layui-input">
                                    <input type="text" name="HMaxWorkTimes" id="HMaxWorkTimes" value="0" lay-verify="" autocomplete="off" class="layui-input">
                                </div>
                            </div>
                            <div class="layui-col-xs4 layui-inline">
                                <label class="layui-form-label">最小进阶</label>
                                <div class="layui-input-inline">
                                    <input type="text" name="HMinAdd" id="HMinAdd" lay-verify="" autocomplete="off" class="layui-input">
                                    <input type="text" name="HMinAdd" id="HMinAdd" lay-verify="" value="0" autocomplete="off" class="layui-input">
                                </div>
                            </div>
                            <div class="layui-col-xs4 layui-inline">
                                <label class="layui-form-label">每日班次</label>
                                <div class="layui-input-inline">
                                    <input type="text" name="HClassCount" id="HClassCount" lay-verify="" autocomplete="off" class="layui-input">
                                    <input type="text" name="HClassCount" id="HClassCount" value="0" lay-verify="" autocomplete="off" class="layui-input">
                                </div>
                            </div>
                        </div>
@@ -111,7 +111,7 @@
                            <div class="layui-col-xs4 layui-inline">
                                <label class="layui-form-label">加班工时</label>
                                <div class="layui-input-inline">
                                    <input type="text" name="HOverTimes" id="HOverTimes" lay-verify="" autocomplete="off" class="layui-input">
                                    <input type="text" name="HOverTimes" id="HOverTimes" value="0" lay-verify="" autocomplete="off" class="layui-input">
                                </div>
                            </div>
                            <div class="layui-col-xs4 layui-inline">
@@ -348,14 +348,15 @@
            //#region ä¿å­˜æ–¹æ³•
            function set_SaveBill(data) {
                var sMainStr = JSON.stringify(data.field);
                var sMainStr = JSON.stringify(data.field) + ";" +sessionStorage["HUserName"];
                $.ajax({
                    type: "POST",
                    url: GetWEBURL() + "SaveGy_SourceList", //方法所在页面和方法名
                    async: true,
                    data: { "msg": sMainStr },
                    data: {"msg": sMainStr },
                    dataType: "json",
                    success: function (data) {
                        console.log(JSON.stringify(data))
                        if (data.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                            layer.msg(data.Message, { icon: 1 });
                            $('#set_SaveBill').addClass("layui-btn-disabled").attr("disabled", true);
@@ -368,6 +369,7 @@
                        layer.closeAll("loading");
                    },
                    error: function (err) {
                        console.log(JSON.stringify(err))
                        layer.alert("错误:" + err, { icon: 5 });
                        console.log("Reason" + sMainStr);
                    }
WebTM/views/»ù´¡×ÊÁÏ/Éú²ú»ù´¡×ÊÁÏ/Gy_Process.html
@@ -181,7 +181,7 @@
                    //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
                    url: GetWEBURL() + '/Gy_Process/list',
                    type: "GET",
                    data: { "sWhere": sWhere },
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
                    success: function (data1) {
                        if (data1.count == 1) {
                            option.data = data1.data;
@@ -269,7 +269,7 @@
                        $.ajax({
                            url: GetWEBURL() + 'DeltetGy_Process',
                            type: "GET",
                            data: { "HItemID": ItemID },
                            data: { "HItemID": ItemID, "user": sessionStorage["HUserName"]},
                            success: function (result) {
                                console.log('gouba' + result);
                                if (result.count == 1) {
WebTM/views/»ù´¡×ÊÁÏ/Éú²ú»ù´¡×ÊÁÏ/Gy_Source.html
@@ -173,7 +173,7 @@
                $.ajax({
                    url: GetWEBURL() + '/Gy_Source/list',
                    type: "GET",
                    data: { "sWhere": sWhere },
                    data: { "sWhere": sWhere,"user": sessionStorage["HUserName"] },
                    success: function (result) {
                        if (result.count == 1) {
                            option.data = result.data;
@@ -242,7 +242,7 @@
                    $.ajax({
                        url: GetWEBURL() + 'DeltetGy_Source',
                        type: "GET",
                        data: { "HItemID": ItemID },
                        data: { "HItemID": ItemID, "user": sessionStorage["HUserName"]},
                        success: function (result) {
                            if (result.count == 1) {
                                layer.msg(result.Message, { icon: 1 });
WebTM/views/Ä£Öξ߹ÜÀí/Ä£Öξ߹ÜÀí/Gy_BarCodeBillList.html
@@ -173,7 +173,7 @@
                //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
                url: GetWEBURL() + '/Gy_BarCodeBillList/GetBarCodeBillList',
                type: "GET",
                data: { "sWhere": sWhere},
                data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
                success: function (data1) {
                    if (data1.count == 1) {
                        option.data = data1.data;
@@ -224,7 +224,7 @@
                    //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
                    url: GetWEBURL1() + '/Gy_BarCodeBillList/GetBarCodeBillList',
                    type: "GET",
                    data: { "sWhere": sWhere},
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
                    success: function (data1) {
                        if (data1.count == 1) {
                            option.data = data1.data;
WebTM/views/Éú²ú¹ÜÀí/±¨¹¤Ì¨¹¤Ðò/²»Á¼²É¼¯/Sc_QualityReportStepBill.html
@@ -383,7 +383,7 @@
                    type: "GET",
                    data: { "HBillType": '3717' },
                    success: function (d) {
                        //console.log(d.data);
                        //console.log(JSON.stringify(d.data[0].HInterID));
                        $("#HInterID").val(d.data[0].HInterID);
                        $("#HBillNo").val(d.data[0].HBillNo);
                        $("#HDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
WebTM/views/Éú²ú¹ÜÀí/±¨¹¤Ì¨¹¤Ðò/²»Á¼²É¼¯/Sc_QualityReportStepBillList.html
@@ -191,6 +191,8 @@
                };
            }
            //#endregion
            //var index = layer.load(0, { shade: false });
            //进入页面显示的缓存列表
@@ -199,7 +201,7 @@
                $.ajax({
                    url: GetWEBURL() + '/Sc_QualityReportStepBill/list',
                    type: "GET",
                    data: { "sWhere": sWhere },
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
                    success: function (data1) {
                        if (data1.count == 1) {
                            option.data = data1.data;
@@ -261,14 +263,14 @@
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var HItemID = data[0];
                    var HItemID = data[0].hmainid;
                    layer.confirm("确认要删除吗,删除后不能恢复", { title: "删除确认" }, function (index) {
                        var wait = layer.load();
                        //逻辑删除方法
                        $.ajax({
                            url: GetWEBURL() + '/Sc_QualityReportStepBill/DeltetSc_QualityReportBill',
                            type: "GET",
                            data: { "HItemID": HItemID },
                            data: { "HItemID": HItemID, "user": sessionStorage["HUserName"]},
                            success: function (result) {
                                console.log('gouba' + result);
                                if (result.count == 1) {
@@ -317,7 +319,6 @@
                }
            }
            //#endregion
            //#region å¿«é€Ÿè¿‡æ»¤
            function get_FastQuery(table, option) {
@@ -368,15 +369,6 @@
        });
                //#endregion
                //laydate.render({
                //    elem: '#HDate'
                //    , type: 'datetime'
                //    , trigger: 'click'
                //    , format:'yyyy-MM-dd HH:mm'
                //});
                //以上是layui模块
WebTM/views/Éú²ú¹ÜÀí/±¨¹¤Ì¨¹¤Ðò/²úÁ¿»ã±¨/Sc_Add_ProductReportStepBillList.html
@@ -917,7 +917,7 @@
                //    objdata.field.HWasterQty2 = 0;
                //}
                var sMainStr = JSON.stringify(objdata.field);
                var sMainSub = sMainStr + ';'+ refSav;
                var sMainSub = sMainStr + ';' + refSav + ";" + sessionStorage["HUserName"];
                $.ajax({
WebTM/views/Éú²ú¹ÜÀí/±¨¹¤Ì¨¹¤Ðò/²úÁ¿»ã±¨/Sc_ProductReportStepBillList_Web.html
@@ -348,7 +348,7 @@
                    //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
                    url: GetWEBURL() + '/Sc_MESProductReportStepBill/Get_Sc_MESProductReportBillList',
                    type: "GET",
                    data: { "sWhere": sWhere },
                    data: { "sWhere": sWhere,"user": sessionStorage["HUserName"]},
                    success: function (data1) {
                        if (data1.count == 1) {
                            option.data = data1.data;
@@ -515,6 +515,7 @@
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    console.log(JSON.stringify(data))
                    var HBillStatus = data[0].HBillStatus.toString(); //单据状态
                    var HSourceID = data[0].HSourceID.toString();  //生产资源ID
                    var HSourceInterID = data[0].HSourceInterID.toString(); //源单主内码
@@ -523,7 +524,7 @@
                    var HICMOInterID = data[0].HICMOInterID.toString();//生产订单主ID
                    var HICMOEntryID = data[0].HICMOEntryID.toString();//生产订单子ID
                    var HInterID = data[0].HInterID.toString();//产量汇报临时表主ID
                    if (HBillStatus > 0)
                    if (HBillStatus > 1)
                    {
                        layer.msg('单据不为未审核状态!');
                        return false;
@@ -571,7 +572,7 @@
                    var HICMOInterID = data[0].HICMOInterID.toString();//生产订单主ID
                    var HICMOEntryID = data[0].HICMOEntryID.toString();//生产订单子ID
                    var HInterID = data[0].HInterID.toString();//产量汇报临时表主ID
                    if (HBillStatus = 0 || HBillStatus>2) {
                    if (HBillStatus = 1 || HBillStatus>2) {
                        layer.msg('单据未审核,不需要反审核或者单据已生效不允许反审核!');
                        return false;
                    }
WebTM/views/Éú²ú¹ÜÀí/Éú²úÈÎÎñµ¥/Sc_ICMOBillList.html
@@ -226,7 +226,7 @@
                $.ajax({
                    url: GetWEBURL() + '/LEMS/MES_IF_ICMOBillList_Json',
                    type: "GET",
                    data: { "sWhere": sWhere },
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
                    success: function (data1) {
                        if (data1.count == 1) {
                            option.data = data1.data;
@@ -330,7 +330,7 @@
                        $.ajax({
                            url: GetWEBURL() + '/Sc_ICMOBill/DeltetSc_ICMOReportBill',
                            type: "GET",
                            data: { "HInterID": hmainid },
                            data: { "HInterID": hmainid, "user": sessionStorage["HUserName"]},
                            success: function (result) {
                                if (result.count == 1) {
                                    layer.msg(result.Message, { icon: 1 }, function () {
WebTM/views/Éú²ú¹ÜÀí/Éú²ú°ü×°µ¥/Sc_PackUnionBill.html
@@ -203,14 +203,19 @@
                $.ajax({
                    url: GetWEBURL() + '/Sc_PackUnionBill/Get_PackUnionBillList',
                    type: "GET",
                    data: { "page": 1, "limit": 10, "sWhere": sWhere },
                    data: { "page": 1, "limit": 10, "sWhere": sWhere, "user": sessionStorage["HUserName"] },
                    datatype: "json",
                    success: function (data1) {
                        console.log(data1);
                        for (var key in data1.list) {
                            resultTableHead.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
                        if (data1.count != 0) {
                            for (var key in data1.list) {
                                resultTableHead.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
                            }
                            set_InitGrid(sWhere);
                        }
                        set_InitGrid(sWhere);
                        else {
                            layer.alert(data1.Message, { icon: 5 });
                        }
                    }, error: function (err) {
                        layer.alert(err.Message, { icon: 5 });
                    }
@@ -249,7 +254,7 @@
                    title: '组托单列表',
                    cols: cols_arr,    //填充表格头数据,
                    id: 'mainTable', //表格id
                    where: { sWhere: sWhere }, //扩展参数,可以传数据到后台
                    where: { sWhere: sWhere, "user": sessionStorage["HUserName"] }, //扩展参数,可以传数据到后台
                    page: true,   //开启分页
                    totalRow: true, //开启合计
                    limit: 10,     //一页能够显示的最大数目
WebTM/views/Éú²ú¹ÜÀí/Éú²úͶÁϵ¥/Sc_PPBomBillList.html
@@ -249,7 +249,7 @@
                    //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
                    url: GetWEBURL() + '/Sc_PPBomBill/list',
                    type: "GET",
                    data: { "sWhere": sWhere },
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
                    success: function (data1) {
                        if (data1.count == 1) {
                            option.data = data1.data;
WebTM/views/Éú²ú¹ÜÀí/Éú²ú»ã±¨µ¥/Sc_Add_ICMOReportBillList.html
@@ -497,9 +497,16 @@
                    refSav = "Update";
                }
                data.field.HMaker = sessionStorage["HUserName"];//制单人
                //筛选删除之后不为空的数据组
                var row = [];
                for (var i = 0; i < table.cache['mainTable'].length; i++) {
                    if (table.cache['mainTable'][i] != "") {
                        row.push(table.cache['mainTable'][i])
                    }
                }
                var sMainStr = JSON.stringify(data.field);
                var sSubStr = JSON.stringify(table.cache['mainTable']);
                var sMainSub = sMainStr + ';' + sSubStr + ';' + refSav;
                var sSubStr = JSON.stringify(row);
                var sMainSub = sMainStr + ';' + sSubStr + ';' + refSav + ";" + sessionStorage["HUserName"];
                if (!AllowLoadData(sSubStr))//数据验证
                {
                    return false;
WebTM/views/Éú²ú¹ÜÀí/Éú²ú»ã±¨µ¥/Sc_ICMOReportBillList.html
@@ -326,7 +326,7 @@
                $.ajax({
                    url: GetWEBURL() + '/Sc_ICMOReportBill/list',
                    type: "GET",
                    data: { "sWhere": sWhere },
                    data: { "sWhere": sWhere,"user": sessionStorage["HUserName"] },
                    success: function (data1) {
                        if (data1.count == 1) {
                            option.data = data1.data;
@@ -463,7 +463,7 @@
                        $.ajax({
                            type: "GET",
                            url: GetWEBURL() + "Sc_ICMOReportBill/DeltetICMOReportBill", //方法所在页面和方法名
                            data: { "HInterID": InterID },
                            data: { "HInterID": InterID, "user": sessionStorage["HUserName"] },
                            success: function (result) {
                                if (result.count == 1) {
                                    layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
WebTM/views/¼Æ»®¹ÜÀí/¹¤ÒÕ·Ïß/Gy_RoutingBill.html
@@ -1308,7 +1308,7 @@
                $.ajax({
                    url: GetWEBURL() + "/LEMS/MES_Gy_RoutingBillList_Json",
                    type: "GET",
                    data: { "sWhere": sWhere },
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
                    success: function (d) {
                        //alert(JSON.stringify(d.data[0]))
@@ -1405,7 +1405,7 @@
                var sMainStr = JSON.stringify(data.field);
                var sSubStr = JSON.stringify(num);
                var hentryid = linteridSub;//子表 æŽ’序id
                var sMainSub = sMainStr + ';' + sSubStr + ';' + hentryid + ';' + OperationType;
                var sMainSub = sMainStr + ';' + sSubStr + ';' + hentryid + ';' + OperationType + ";" + sessionStorage["HUserName"];
                var index = layer.load();
                $.ajax({
WebTM/views/¼Æ»®¹ÜÀí/¹¤ÒÕ·Ïß/Gy_RoutingBillList.html
@@ -229,7 +229,7 @@
                    //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
                    url: GetWEBURL() + '/LEMS/MES_Gy_RoutingBillList_Json',
                    type: "GET",
                    data: { "sWhere": sWhere },
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
                    success: function (data1) {
                        if (data1.count == 1) {
                            option.data = data1.data;
@@ -323,7 +323,7 @@
                        $.ajax({
                            url: GetWEBURL() + '/LEMS/DeltetGy_RoutingBillSub',
                            type: "GET",
                            data: { "lngBillKey": hmainid },
                            data: { "lngBillKey": hmainid, "user": sessionStorage["HUserName"] },
                            success: function (result) {
                                console.log('gouba' + result);
                                if (result.count == 1) {
WebTM/views/²É¹º¹ÜÀí/ÊÕÁÏ֪ͨµ¥/Cg_POInStockBillList.html
@@ -230,7 +230,7 @@
                $.ajax({
                    url: GetWEBURL() + '/Cg_POInStockBill/list',
                    type: "GET",
                    data: { "sWhere": sWhere },
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
                    success: function (data1) {
                        if (data1.count == 1) {
                            option.data = data1.data;
@@ -310,7 +310,7 @@
                                $.ajax({
                                    type: "GET",
                                    url: GetWEBURL() + "Cg_POInStockBill/DeltetPOInStockBill", //方法所在页面和方法名
                                    data: { "HInterID": InterID },
                                    data: { "HInterID": InterID, "user": sessionStorage["HUserName"] },
                                    success: function (result) {
                                        if (result.count == 1) {
                                            layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
@@ -347,6 +347,7 @@
                };
            });
            //反审核
            function DeAudit(){
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
@@ -357,7 +358,7 @@
                    $.ajax({
                        type: "GET",
                        url: GetWEBURL() + "Cg_POInStockBill/DeAuditPOInStockBill", //方法所在页面和方法名
                        data: { "HInterID": InterID },
                        data: { "HInterID": InterID, "user": sessionStorage["HUserName"] },
                        success: function (result) {
                            if (result.count == 1) {
                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
WebTM/views/²É¹º¹ÜÀí/ÍËÁÏ֪ͨµ¥/Cg_POInStockBackBillList.html
@@ -227,7 +227,7 @@
                $.ajax({
                    url: GetWEBURL() + '/Cg_POInStockBackBill/list',
                    type: "GET",
                    data: { "sWhere": sWhere },
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
                    success: function (data1) {
                        if (data1.count == 1) {
                            option.data = data1.data;
WebTM/views/²É¹º¹ÜÀí/²É¹ºÍËÁϵ¥/Cg_PurchaseReturnList.html
@@ -297,7 +297,7 @@
                $.ajax({
                    url: GetWEBURL() + '/Cg_PurchaseReturn/list',
                    type: "GET",
                    data: { "sWhere": sWhere },
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
                    success: function (data1) {
                        if (data1.count == 1) {
                            option.data = data1.data;
WebTM/views/ÏúÊÛ¹ÜÀí/ÍË»õ֪ͨµ¥/Xs_SeOutStockBackBillList.html
@@ -224,7 +224,7 @@
                $.ajax({
                    url: GetWEBURL() + '/Xs_SeOutStockBackBill/list',
                    type: "GET",
                    data: { "sWhere": sWhere },
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
                    success: function (data1) {
                        if (data1.count == 1) {
                            option.data = data1.data;
WebTM/views/ÑéÊÕÈë¿â/Í⹺Èë¿â/Kf_POStockInBackBillList.html
@@ -285,7 +285,7 @@
                $.ajax({
                    url: GetWEBURL() + '/Kf_POStockInBackBill/Get_POStockInBackBillList',
                    type: "GET",
                    data: { "sWhere": sWhere },
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
                    success: function (data1) {
                        if (data1.count == 1) {
                            DataList = data1.data;
WebTM/views/ÑéÊÕÈë¿â/Í⹺Èë¿â/Kf_POStockInBillList.html
@@ -211,7 +211,7 @@
                $.ajax({
                    url: GetWEBURL() + '/Kf_POStockInBill/list',
                    type: "GET",
                    data: { "sWhere": sWhere },
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
                    success: function (data1) {
                        if (data1.count == 1) {
                            option.data = data1.data;
@@ -241,7 +241,7 @@
                            shift: 2,
                            area: ['100%', '100%'],
                            maxmin: true,
                            content: '../../验收入库/外购入库/Add_Edit_Cg_POInStockBillList.html?OperationType=1&linterid=0&HSouceBillType=0&closeType=1',
                            content: '../../验收入库/外购入库/Add_Edit_Kf_POStockInBillList.html?OperationType=1&linterid=0&HSouceBillType=0&closeType=1',
                            end: function () {
                                //刷新页面,
                                location.reload();
@@ -265,7 +265,7 @@
                                , shade: 0.6 //遮罩透明度
                                , maxmin: true //允许全屏最小化
                                , anim: 0 //0-6的动画形式,-1不开启
                                , content: '../../验收入库/外购入库/Add_Edit_Cg_POInStockBillList.html?OperationType=3&linterid=' + hID + '&HSouceBillType=0&closeType=1'
                                , content: '../../验收入库/外购入库/Add_Edit_Kf_POStockInBillList.html?OperationType=3&linterid=' + hID + '&HSouceBillType=0&closeType=1'
                                , resize: false,
                                end: function () {
                                    //刷新页面,