条码拆码+工时单+器具权限

zzr99

2022-01-19 2f7d6bc1322d1a902f7ba3a5ea7161f56d7b42ef

条码拆码+工时单+器具权限

 WebTM/Properties/PublishProfiles/JFTM.pubxml.user

Diff too large

 WebTM/WebTM.csproj.user

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <NameOfLastUsedPublishProfile>JFTM</NameOfLastUsedPublishProfile>
    <NameOfLastUsedPublishProfile>D:\智云MES\Lay-Ui\MESWMS-LayUI\WebTM\Properties\PublishProfiles\JFTM.pubxml</NameOfLastUsedPublishProfile>
    <ProjectView>ShowAllFiles</ProjectView>
    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
    <UseIISExpress>true</UseIISExpress>

 WebTM/views/Ä£Öξ߹ÜÀí/Ä£Öξֿ߲â¹ÜÀí/Sc_Add_MouldLifeChangeBillList.html

@@ -710,7 +710,7 @@
                data.field.HMaker = sessionStorage["HUserName"];//制单人
                var sMainStr = JSON.stringify(data.field);
                var sSubStr = JSON.stringify(table.cache['mainTable']);
                var sMainSub = sMainStr + ';' + sSubStr;
                var sMainSub = sMainStr + ';' + sSubStr + ";" + sessionStorage["HUserName"];

                if (AllowLoadData(sSubStr)) {
                    $.ajax(

 WebTM/views/Ä£Öξ߹ÜÀí/Ä£Öξֿ߲â¹ÜÀí/Sc_MouldLifeChangeBillList.html

@@ -248,7 +248,7 @@
                                $.ajax({
                                    type: "GET",
                                    url: GetWEBURL() + "Sc_MouldLifeChangeBill/DeltetMouldLifeChangeBill", //方法所在页面和方法名
                                    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 () {
@@ -281,7 +281,7 @@
                //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
                url: GetWEBURL() + '/Sc_MouldLifeChangeBill/GetMouldLifeChangeBill',
                type: "GET",
                data: { "sWhere": sWhere},
                data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
                success: function (data1) {
                    if (data1.count == 1) {
                        option.data = data1.data;
@@ -324,7 +324,7 @@
                    //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
                    url: GetWEBURL() + '/Sc_MouldLifeChangeBill/GetMouldLifeChangeBill',
                    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_MouldDotCheckBillList.html

@@ -392,7 +392,7 @@
            form.on('submit(Saver)', function (data) {
                var sMainStr = JSON.stringify(data.field);
                var sSubStr = JSON.stringify(table.cache['mainTable']);
                var sMainSub = sMainStr + ';' + sSubStr;
                var sMainSub = sMainStr + ';' + sSubStr + ";" + sessionStorage["HUserName"];
                if (!AllowLoadData(sSubStr))//数据验证
                {
                    return false;

 WebTM/views/Ä£Öξ߹ÜÀí/Ä£Öξ߹ÜÀí/Sc_Add_MouldDotCheckPlanBillList.html

@@ -227,7 +227,7 @@
                //debugger;
                var sMainStr = JSON.stringify(data.field);
                var sSubStr = JSON.stringify(table.cache['mainTable']);
                var sMainSub = sMainStr + ';' + sSubStr;
                var sMainSub = sMainStr + ';' + sSubStr + ";" + sessionStorage["HUserName"];
                if (AllowLoadData()) {
                    $.ajax(
                        {

 WebTM/views/Ä£Öξ߹ÜÀí/Ä£Öξ߹ÜÀí/Sc_Add_MouldMaintainBillList.html

@@ -801,7 +801,7 @@
                var sMainStr = JSON.stringify(data.field);
                var sSubStr = JSON.stringify(table.cache['mainTable']);
                var sSubStr1 = JSON.stringify(table.cache['mainTable1']);
                var sMainSub = sMainStr + ';' + sSubStr + ';' + sSubStr1;
                var sMainSub = sMainStr + ';' + sSubStr + ';' + sSubStr1 + ";" + sessionStorage["HUserName"];

                if (!AllowLoadData(sSubStr))//数据验证
                {

 WebTM/views/Ä£Öξ߹ÜÀí/Ä£Öξ߹ÜÀí/Sc_Add_MouldMaintainPlanBillList.html

@@ -309,7 +309,7 @@
            form.on('submit(Saver)', function (data) {//保存
                var sMainStr = JSON.stringify(data.field);
                var sSubStr = JSON.stringify(table.cache['mainTable']);
                var sMainSub = sMainStr + ';' + sSubStr;
                var sMainSub = sMainStr + ';' + sSubStr + ";" +sessionStorage["HUserName"];
                if (AllowLoadData(sSubStr)) {
                    $.ajax(
                        {

 WebTM/views/Ä£Öξ߹ÜÀí/Ä£Öξ߹ÜÀí/Sc_MouldDotCheckBillList.html

@@ -81,13 +81,6 @@
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-print"><i class="layui-icon layui-icon-print"></i>打印</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>刷新</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>退出</button>
                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-getCheckData"><i class="layui-icon layui-icon-tips"></i>预览</button>-->
                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload"><i class="layui-icon layui-icon-refresh"></i>刷新</button>
    <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-confirm" id="btn_confirm"><i class="layui-icon layui-icon-ok-circle"></i>确认</button>
    <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-back" id="btn_back"><i class="layui-icon layui-icon-close-fill"></i>驳回</button>
    <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-details"><i class="layui-icon layui-icon-form"></i>详情</button>
    <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-generate"><i class="layui-icon layui-icon-file"></i>生成送货单</button>
    <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>退出</button>-->

                            </div>
                        </script>
@@ -344,7 +337,7 @@
                        $.ajax({
                            type: "GET",
                            url: GetWEBURL() + "/Sc_MouldDotCheckBill/DeltetSc_MouldDotCheckBill", //方法所在页面和方法名
                            data: { "HInterID": HInterID },
                            data: { "HInterID": HInterID,"user": sessionStorage["HUserName"] },
                            success: function (result) {
                                if (result.count == 1) {
                                    layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
@@ -408,7 +401,7 @@
                    //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
                    url: GetWEBURL() + '/Sc_MouldDotCheckBill/GetMouldDotCheckBillList',
                    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_MouldDotCheckPlanBillList.html

@@ -85,14 +85,7 @@
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-print"><i class="layui-icon layui-icon-print"></i>打印</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>刷新</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>退出</button>
                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-getCheckData"><i class="layui-icon layui-icon-tips"></i>预览</button>-->
                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload"><i class="layui-icon layui-icon-refresh"></i>刷新</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-confirm" id="btn_confirm"><i class="layui-icon layui-icon-ok-circle"></i>确认</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-back" id="btn_back"><i class="layui-icon layui-icon-close-fill"></i>驳回</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-details"><i class="layui-icon layui-icon-form"></i>详情</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-generate"><i class="layui-icon layui-icon-file"></i>生成送货单</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>退出</button>-->

                               
                            </div>
                        </script>
                    </form>
@@ -248,7 +241,7 @@
                $.ajax({
                    url: GetWEBURL() + '/Sc_MouldDotCheckPlanBill/GetMouldDotCheckPlanBillList',
                    type: "GET",
                    data: { "sWhere": sWhere },
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
                    success: function (data1) {
                        if (data1.count == 1) {
                            option.data = data1.data;
@@ -326,7 +319,7 @@
                        $.ajax({
                            type: "GET",
                            url: GetWEBURL() + "/Sc_MouldDotCheckPlanBill/DeltetSc_MouldDotCheckPlanBillBill", //方法所在页面和方法名
                            data: { "HInterID": HInterID },
                            data: { "HInterID": HInterID, "user": sessionStorage["HUserName"]},
                            success: function (result) {
                                if (result.count == 1) {
                                    layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {

 WebTM/views/Ä£Öξ߹ÜÀí/Ä£Öξ߹ÜÀí/Sc_MouldMaintainBillList.html

@@ -93,7 +93,6 @@
                        </div>
                        <script type="text/html" id="toolbarDemo">
                            <div class="layui-btn-container">
                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-getCheckData"><i class="layui-icon layui-icon-tips"></i>预览</button>-->
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add"><i class="layui-icon layui-icon-add-1"></i>新增</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-edit"></i>编辑</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-view"><i class="layui-icon layui-icon-tips"></i>预览</button>
@@ -101,11 +100,7 @@
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-delete"></i>删除</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>刷新</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>退出</button>
                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-confirm" id="btn_confirm"><i class="layui-icon layui-icon-ok-circle"></i>确认</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-back" id="btn_back"><i class="layui-icon layui-icon-close-fill"></i>驳回</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-details"><i class="layui-icon layui-icon-form"></i>详情</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-generate"><i class="layui-icon layui-icon-file"></i>生成送货单</button>-->

                                
                            </div>
                        </script>
                        <script type="text/html" id="xuhao">
@@ -345,7 +340,7 @@
                $.ajax({
                    url: GetWEBURL() + '/Sc_MouldMaintainBill/GetMouldMaintainBillList',
                    type: "GET",
                    data: { "sWhere": sWhere },
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
                    success: function (data1) {
                        if (data1.count == 1) {
                            option.data = data1.data;
@@ -488,7 +483,7 @@
                        $.ajax({
                            type: "GET",
                            url: GetWEBURL() + "/Sc_MouldMaintainBill/DeltetSc_MouldMaintainBill", //方法所在页面和方法名
                            data: { "HInterID": HInterID },
                            data: { "HInterID": HInterID, "user": sessionStorage["HUserName"] },
                            success: function (result) {
                                if (result.count == 1) {
                                    layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {

 WebTM/views/Ä£Öξ߹ÜÀí/Ä£Öξ߹ÜÀí/Sc_MouldMaintainPlanBillList.html

@@ -80,10 +80,7 @@
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-print"><i class="layui-icon layui-icon-print"></i>打印</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-delete"></i>删除</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Refresh"><i class="layui-icon layui-icon-refresh"></i>刷新</button>
                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-confirm" id="btn_confirm"><i class="layui-icon layui-icon-ok-circle"></i>确认</button>
    <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-back" id="btn_back"><i class="layui-icon layui-icon-close-fill"></i>驳回</button>
    <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-details"><i class="layui-icon layui-icon-form"></i>详情</button>
    <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-generate"><i class="layui-icon layui-icon-file"></i>生成送货单</button>-->
                                
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Exit"><i class="layui-icon layui-icon-return"></i>退出</button>

                            </div>
@@ -344,7 +341,7 @@
                        $.ajax({
                            type: "GET",
                            url: GetWEBURL() + "/Sc_MouldMaintainPlanBill/DeltetMouldMaintainPlanBill", //方法所在页面和方法名
                            data: { "HInterID": HInterID },
                            data: { "HInterID": HInterID, "user": sessionStorage["HUserName"]},
                            success: function (result) {
                                if (result.count == 1) {
                                    layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
@@ -377,7 +374,7 @@
                    //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
                    url: GetWEBURL() + '/Sc_MouldMaintainPlanBill/GetMouldMaintainPlanBillList',
                    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_MouldMaintainRuleBillEdit.html

@@ -257,7 +257,7 @@
                var sMainStr = JSON.stringify(data.field);
                var sSubStr = JSON.stringify(table.cache['mainTable']);
                var sSubStr1 = JSON.stringify(table.cache['mainTable1']);
                var sMainSub = sMainStr + ';' + sSubStr + ';' + sSubStr1;
                var sMainSub = sMainStr + ';' + sSubStr + ';' + sSubStr1 + ";" + sessionStorage["HUserName"];
                if (!AllowLoadData(sSubStr))//数据验证
                {
                    return false;
@@ -267,7 +267,7 @@
                        type: "POST",
                        url: GetWEBURL() + "/Sc_MouldMaintainRuleBill/SaveMouldMaintainRuleBillList", //方法所在页面和方法名
                        async: true,
                        data: { "msg": sMainSub },
                        data: { "msg": sMainSub},
                        dataType: "json",
                        success: function (data) {
                            if (data.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ

 WebTM/views/Ä£Öξ߹ÜÀí/Ä£Öξ߹ÜÀí/Sc_MouldMaintainRuleBillList.html

@@ -335,7 +335,7 @@
                    //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
                    url: GetWEBURL() + '/Sc_MouldMaintainRuleBill/GetMouldMaintainRuleList',
                    type: "GET",
                    data: { "sWhere": sWhere },
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
                    success: function (data1) {
                        if (data1.count == 1) {
                            option.data = data1.data;
@@ -415,7 +415,7 @@
                        $.ajax({
                            type: "GET",
                            url: GetWEBURL() + "/Sc_MouldMaintainRuleBill/DeltetMouldMaintainRuleBillList", //方法所在页面和方法名
                            data: { "HInterID": HInterID },
                            data: { "HInterID": HInterID, "user": sessionStorage["HUserName"] },
                            success: function (result) {
                                if (result.count == 1) {
                                    layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {

 WebTM/views/³µ¼ä¹ÜÀí/±¨±í·ÖÎö/Sc_StationInBillList.html

@@ -37,7 +37,7 @@
                                <div class="layui-inline">
                                    <label class="layui-form-label">工序名</label>
                                    <div class="layui-input-block">
                                        <input type="date" class="layui-input" id="HName" style="width:190px;">
                                        <input type="text" class="layui-input" id="HName" style="width:190px;">
                                    </div>
                                </div>
                                <div class="layui-inline">
@@ -161,8 +161,8 @@
            });
            //初始化表格
            function set_InitGrid() {
                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
                //$("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
                //$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
                var columns = [
                    { type: 'checkbox', fixed: 'left', totalRowText: '合计' }
                    , { field: 'hmainid', title: '单据ID', hide: true }
@@ -309,31 +309,32 @@
            //Excel表格导出
            function SetExcel() {
                layer.confirm("确定导出所有数据吗", { title: "导出确认" }, function (index) {
                    var wait = layer.load();
                    $.ajax({
                        type: "GET",
                        url: GetWEBURL() + "/Sc_PackUnionBill/Sc_StationInBillSetExcel",
                        success: function (result) {
                            window.location.reload();
                            //if (result.count == 1) {
                            //    layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
                            //        // å¾—到frame索引
                            //        var index = layer.getFrameIndex(window.name);
                            //        //关闭当前frame
                            //        layer.close(index);
                            //        //修改为功后刷新界面
                            //        window.location.reload();
                            //    });
                    window.location.href = GetWEBURL() + "/Sc_PackUnionBill/Sc_StationInBillSetExcel";
                    //var wait = layer.load();
                    //$.ajax({
                    //    type: "GET",
                    //    url: GetWEBURL() + "/Sc_PackUnionBill/Sc_StationInBillSetExcel",
                    //    success: function (result) {
                    //        window.location.reload();
                    //        //if (result.count == 1) {
                    //        //    layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
                    //        //        // å¾—到frame索引
                    //        //        var index = layer.getFrameIndex(window.name);
                    //        //        //关闭当前frame
                    //        //        layer.close(index);
                    //        //        //修改为功后刷新界面
                    //        //        window.location.reload();
                    //        //    });

                            //} else {
                            //    layer.alert(result.code + result.Message, { icon: 5 });
                            //}
                            //layer.close(wait);
                        }, error: function () {
                            layer.close(wait);
                            layer.alert("接口请求失败!", { icon: 5 });
                        }
                    });
                    //        //} else {
                    //        //    layer.alert(result.code + result.Message, { icon: 5 });
                    //        //}
                    //        //layer.close(wait);
                    //    }, error: function () {
                    //        layer.close(wait);
                    //        layer.alert("接口请求失败!", { icon: 5 });
                    //    }
                    //});
                })
            }

@@ -466,7 +467,7 @@
                    sWhere += " and CONVERT(varchar(100),进站时间, 23) <= '" + HEndDate + "'";
                }
                if (HICMOBillNo) {
                    sWhere += " and ç”Ÿäº§è®¢å•å· like '%" + HICMOBillNo + "%'";
                    sWhere += " and è¿›ç«™ç”Ÿäº§è®¢å•å· like '%" + HICMOBillNo + "%'";
                }
                if (HProcExchBillNo) {
                    sWhere += " and æµè½¬å¡å· like '%" + HProcExchBillNo + "%'";
@@ -480,8 +481,8 @@
            }
            //重置过滤条件
            function set_ClearQuery() {
                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
                $("#HBeginDate").val("");
                $("#HEndDate").val("");
                $("#HICMOBillNo").val("");
                $("#HProcExchBillNo").val("");
                sWhere = " where 1 = 1 ";