1

black-goat-me

2023-05-29 28f707af0c4a5dd0ba7a4ba650a66c9930871696

1

 WebTM/Properties/PublishProfiles/JFTM.pubxml

@@ -10,7 +10,7 @@
    <LastUsedBuildConfiguration>Debug</LastUsedBuildConfiguration>
    <LastUsedPlatform>Any CPU</LastUsedPlatform>
    <PublishProvider>FileSystem</PublishProvider>
    <PublishUrl>D:\网站发布\智云MESWMS\LAYUI</PublishUrl>
    <PublishUrl>E:\网站发布\LAYUI</PublishUrl>
    <WebPublishMethod>FileSystem</WebPublishMethod>
    <SiteUrlToLaunchAfterPublish />
  </PropertyGroup>

 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>D:\网站发布\后端代码\MES-WEB-TM\MESWMS-LayUI\WebTM\Properties\PublishProfiles\JFTM.pubxml</NameOfLastUsedPublishProfile>
    <NameOfLastUsedPublishProfile>D:\GIT仓库\MESWMS-LayUI\WebTM\Properties\PublishProfiles\JFTM.pubxml</NameOfLastUsedPublishProfile>
    <ProjectView>ProjectFiles</ProjectView>
    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
    <UseIISExpress>true</UseIISExpress>

 WebTM/views/²Ö´æ¹ÜÀí/²Ö¿âµ÷²¦/Kf_MoveStockOutBill_Fast.html

@@ -958,7 +958,11 @@
                }

                if (HDeleteFlag == "*") {
                    if (sBarCode != "") {
                    if (sBarCode == "") {
                        layer.msg("请扫描要删除的条码", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                        return;
                    }
                    else {
                        $('#HBarCode').val("");
                    }
                    $.ajax(

 WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/Gy_Material.html

@@ -277,6 +277,22 @@
                    //    , { field: 'HParentID', title: 'HParentID', hide: true }
                    //    , { field: 'HUSEORGID', title: 'HUSEORGID', hide: true }
                    //]]
                    , done: function (res, curr, count) {
                        var $data = $('div[lay-id="mainTable"]').find('.layui-table-body').find('tr').eq(0).find('td');
                        var $head = $('div[lay-id="mainTable"]').find('.layui-table-header').find('tr').eq(0).find('th');
                        var $total = $('div[lay-id="mainTable"]').find('.layui-table-total').find('tr').eq(0).find('td');
                        for (var i = 0; i < $data.length; i++) {
                            var l1 = $data.eq(i).find('div').width();
                            var l2 = $head.eq(i).find('div').width();
                            if (l1 > l2) {
                                $head.eq(i).find('div').width(l1);
                                $total.eq(i).find('div').width(l1);
                            } else {
                                $data.eq(i).find('div').width(l2);
                                $total.eq(i).find('div').width(l2);
                            }
                        }
                    }
                };
            }
            //#endregion

 WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/xmlLBM_Gy_SourceList.aspx

@@ -13,7 +13,7 @@
        //不同的数据库应该选用不同的报表XML数据生成类，SQL Server数据库用SqlXMLReportData，Oracle数据库用OracleXMLReportData
        //OledbXMLReportData适合于Access等本地数据库，为了演示方便，这里从Grid++Report的Access例子数据库中获取报表数据

        SqlXMLReportData.GenOneRecordset(this, "select a.HItemID è®¾å¤‡ç¼–号,a.HName è®¾å¤‡åç§°,g.HName æ‰€å±žè½¦é—´,e.HName è´£ä»»äºº from Gy_Source a left join Gy_Department g on a.HDeptID=g.HItemID left join Gy_Employee e on g.HEmpID=e.HItemID where a.HItemID=" + Request.Params["linterid"]);
        SqlXMLReportData.GenOneRecordset(this, "select a.hnumber ç”Ÿäº§èµ„源编码,a.HItemID è®¾å¤‡ç¼–号,a.HName è®¾å¤‡åç§°,g.HName æ‰€å±žè½¦é—´,e.HName è´£ä»»äºº from Gy_Source a left join Gy_Department g on a.HDeptID=g.HItemID left join Gy_Employee e on a.HEmpID=e.HItemID where a.HItemID in(" + Request.Params["linterid"]+")");
    }
    </script>
</head>

 WebTM/views/»ù´¡×ÊÁÏ/Òþ²ØÁÐÉèÖÃ/Gy_GridView_Hide.html

@@ -34,6 +34,7 @@
                        <button class="layui-btn layui-btn-normal" type="button" lay-submit="" lay-filter="ClearBill" id="ClearBill">全清</button>
                        <button class="layui-btn layui-btn-normal" type="button" lay-submit="" lay-filter="btnSave" id="btnSave">保存</button>
                        <button class="layui-btn layui-btn-normal" type="button" lay-submit="" lay-filter="Exit" id="Exit">退出</button>
                        <button class="layui-btn layui-btn-normal" type="button" lay-submit="" lay-filter="Del" id="Del">删除</button>
                    </div>
                    <div class="layui-collapse">
                        <div class="layui-colla-item">
@@ -195,6 +196,11 @@
            Pub_Close(1);
        })

        //删除
        form.on('submit(Del)', function () {
            get_Del();
        })

        //#endregion

        //#region æ­¤é¡µé¢æ‰€æœ‰çš„方法
@@ -344,6 +350,32 @@
            return vars;
        }

        //删除
        function get_Del() {
            layer.confirm("确认要删除吗，删除后不能恢复", { title: "删除确认" }, function (index) {
                var wait = layer.load();
                //逻辑删除方法
                $.ajax({
                    url: GetWEBURL() + '/Xt_grdAlignment_WMES/DelgrdAlignmentWMES',
                    type: "GET",
                    data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
                    success: function (result) {
                        if (result.count == 1) {
                            layer.msg(result.Message, { icon: 1 }, function () {
                                //关闭当前frame
                                layer.close(wait);
                            });
                        } else {
                            layer.alert(result.code + result.Message, { icon: 5 });
                            layer.close(wait);
                        }
                    }, error: function () {
                        layer.alert("接口请求失败!", { icon: 5 });
                        layer.close(wait);
                    }
                });
            })
        }


        //#endregion

 WebTM/views/Éú²ú¹ÜÀí/Éú²úÈÎÎñµ¥/Sc_ICMOBillList.html

@@ -181,28 +181,30 @@
                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="set_Excel"><i class="layui-icon layui-icon-file-b"></i>Excel导入</button>-->
                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="get-view"><i class="layui-icon layui-icon-tips"></i>预览</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get-print"><i class="layui-icon layui-icon-print"></i>打印</button>-->
                                <div class="layui-btn-container" id="HideButtonList">
                                    <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_ShowBill" id="ShowBill"><i class="layui-icon layui-icon-form"></i>下推</button>
                                    <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get_Refresh" id="Refresh"><i class="layui-icon layui-icon-refresh-3"></i>刷新</button>
                                    <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get_Exit" id="Exits"><i class="layui-icon layui-icon-logout"></i>退出</button>
                                    <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_HideColumn" id="HideColumn"><i class="layui-icon layui-icon-form"></i>列设置</button>
                                    <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_ShowBill_pl" id="ShowBill_pl"><i class="layui-icon layui-icon-form"></i>批量下推</button>
                                    <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_ShowBill_dh"><i class="layui-icon layui-icon-form"></i>多行下推</button>
                                    <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_AddNew" id="AddNew"><i class="layui-icon layui-icon-file-b"></i>新增</button>
                                    <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_Edit" id="Edit"><i class="layui-icon layui-icon-form"></i>编辑</button>
                                    <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_copy" id="copy"><i class="layui-icon layui-icon-form"></i>复制</button>
                                    <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_AddNew_NT" id="AddNew_NT"><i class="layui-icon layui-icon-file-b"></i>新增(无列表)</button>
                                    <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_Edit_NT" id="Edit_NT"><i class="layui-icon layui-icon-form"></i>编辑(无列表)</button>
                                    <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_copy_NT" id="copy_NT"><i class="layui-icon layui-icon-form"></i>复制(无列表)</button>
                                    <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_CheckBill" id="CheckBill"><i class="layui-icon layui-icon-form"></i>审核</button>
                                    <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_AbandonCheck" id="AbandonCheck"><i class="layui-icon layui-icon-form"></i>反审核</button>
                                    <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_DeleteBill" id="DeleteBill"><i class="layui-icon layui-icon-delete"></i>删除</button>
                                    <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_Xc"><i class="layui-icon layui-icon-form"></i>下查</button>
                                    <!--<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_Excel" id="Excel"><i class="layui-icon layui-icon-file-b"></i>Excel导入</button>-->
                                    <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get-view" id="view"><i class="layui-icon layui-icon-tips"></i>预览</button>
                                    <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get-print" id="print"><i class="layui-icon layui-icon-print"></i>打印</button>
                                    <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_HideButton" id="HideButton"><i class="layui-icon layui-icon-form"></i>按钮设置</button>
                                </div>
                            <div class="layui-btn-container" id="HideButtonList">
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_ShowBill" id="ShowBill"><i class="layui-icon layui-icon-form"></i>下推</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get_Refresh" id="Refresh"><i class="layui-icon layui-icon-refresh-3"></i>刷新</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get_Exit" id="Exits"><i class="layui-icon layui-icon-logout"></i>退出</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_HideColumn" id="HideColumn"><i class="layui-icon layui-icon-form"></i>列设置</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_ShowBill_pl" id="ShowBill_pl"><i class="layui-icon layui-icon-form"></i>批量下推</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_ShowBill_dh"><i class="layui-icon layui-icon-form"></i>多行下推</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_AddNew" id="AddNew"><i class="layui-icon layui-icon-file-b"></i>新增</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_Edit" id="Edit"><i class="layui-icon layui-icon-form"></i>编辑</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_copy" id="copy"><i class="layui-icon layui-icon-form"></i>复制</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_AddNew_NT" id="AddNew_NT"><i class="layui-icon layui-icon-file-b"></i>新增(无列表)</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_Edit_NT" id="Edit_NT"><i class="layui-icon layui-icon-form"></i>编辑(无列表)</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_copy_NT" id="copy_NT"><i class="layui-icon layui-icon-form"></i>复制(无列表)</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_CheckBill" id="CheckBill"><i class="layui-icon layui-icon-form"></i>审核</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_AbandonCheck" id="AbandonCheck"><i class="layui-icon layui-icon-form"></i>反审核</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_CloseBill" id="set_CloseBill"><i class="layui-icon layui-icon-form"></i>关闭</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_CancelCloseBill" id="set_CancelCloseBill"><i class="layui-icon layui-icon-form"></i>反关闭</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_DeleteBill" id="DeleteBill"><i class="layui-icon layui-icon-delete"></i>删除</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_Xc"><i class="layui-icon layui-icon-form"></i>下查</button>
                                <!--<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_Excel" id="Excel"><i class="layui-icon layui-icon-file-b"></i>Excel导入</button>-->
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get-view" id="view"><i class="layui-icon layui-icon-tips"></i>预览</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get-print" id="print"><i class="layui-icon layui-icon-print"></i>打印</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_HideButton" id="HideButton"><i class="layui-icon layui-icon-form"></i>按钮设置</button>
                            </div>
                        </script>
                    </form>
                </div>
@@ -307,6 +309,12 @@
                    //反审核
                    case 'set_AbandonCheck': set_AbandonCheck();
                        break;
                    //关闭
                    case 'set_CloseBill': set_CloseBill();
                        break;
                    //反关闭
                    case 'set_CancelCloseBill': set_CancelCloseBill();
                        break;
                    //删除
                    case 'set_DeleteBill': set_DeleteBill(); 
                        break;
@@ -358,6 +366,25 @@
            form.on('submit(btnSearch)', function (data) {//选择仓位

                get_FastQuery();
            });

            //行监听事件
            table.on('row(mainTable)', function (obj) {
                var flag = !obj.tr.find(':checkbox:first').prop('checked');
                obj.tr.find(':checkbox').prop('checked', flag);
                if (flag) {
                    obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked');  //设置复选框选中样式
                    $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//改变当前tr背景颜色和字体颜色
                } else {
                    obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//取消复选框选中样式
                    $(obj.tr.selector).attr({ "style": "background:" });//取消当前tr颜色
                }
                //mainTable ä¸ºè¡¨æ ¼ID   æ³¨æ„æ­¤å¤„如果ID不正确将导致你在监听复选框时获取不到你选择的数据，前面的只是添加或删除选中未选中样式以及设置背景色，字体颜色
                layui.each(table.cache.mainTable, function (i, l) {
                    if (obj.tr.index() == l.LAY_TABLE_INDEX) {
                        l.LAY_CHECKED = flag;
                    }
                });
            });

            //#region åˆå§‹åŒ–界面
@@ -479,6 +506,7 @@
                        , { field: '生产任务单数量', title: '生产订单数量', totalRow: true }
                        , { field: '计量单位', title: '计量单位' }
                        , { field: '是否下推生成流转卡', title: '是否下推生成流转卡', sort: true }
                        , { field: '是否取库存', title: '是否取库存', sort: true }
                        , { field: '制单人', title: '制单人' }
                        , { field: '制单日期', title: '制单日期' }
                        , { field: '状态', title: '状态', sort: true }
@@ -1293,6 +1321,72 @@
                }
            }

            //关闭
            function set_CloseBill() {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;

                if (data.length == 1) {
                    layer.confirm("确认要关闭吗?", function (index) {
                        var wait = layer.load();
                        var HInterID = data[0].hmainid;
                        $.ajax({
                            url: GetWEBURL() + '/Sc_ICMOBill/CloseSc_ICMOReportBill',
                            type: "GET",
                            data: { "HInterID": HInterID, "Type": 1, "user": sessionStorage["HUserName"] },
                            success: function (result) {
                                if (result.count == 1) {
                                    layer.msg(result.Message, { icon: 1 });
                                    layer.close(wait);
                                } else {
                                    layer.alert(result.code + result.Message, { icon: 5 });
                                    layer.close(wait);
                                }
                            }, error: function () {
                                layer.alert("接口请求失败!", { icon: 5 });
                                layer.close(wait);
                            }
                        });
                    })
                }
                else {
                    layer.msg("请选择一条数据!");
                }
            }

            //反关闭
            function set_CancelCloseBill() {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;

                if (data.length == 1) {
                    layer.confirm("确认要反关闭吗?", function (index) {
                        var wait = layer.load();
                        var HInterID = data[0].hmainid;
                        $.ajax({
                            url: GetWEBURL() + '/Sc_ICMOBill/CloseSc_ICMOReportBill',
                            type: "GET",
                            data: { "HInterID": HInterID, "Type": 2, "user": sessionStorage["HUserName"] },
                            success: function (result) {
                                if (result.count == 1) {
                                    layer.msg(result.Message, { icon: 1 });
                                    layer.close(wait);
                                } else {
                                    layer.alert(result.code + result.Message, { icon: 5 });
                                    layer.close(wait);
                                }
                            }, error: function () {
                                layer.alert("接口请求失败!", { icon: 5 });
                                layer.close(wait);
                            }
                        });
                    })
                }
                else {
                    layer.msg("请选择一条数据!");
                }
            }

            //列明显示下拉框
            function ColFilter() {
                var Organization = '<option  value="0" selected="selected" ></option>';

 WebTM/views/ϵͳ¹ÜÀí/ÈÕÖ¾¹ÜÀí/Xt_SystemLogList.html

@@ -200,7 +200,7 @@
                                    switch (data[i].Type) {
                                        //int
                                        case 'DateTime':
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH-mm-ss')}}</div>", width: 200 });
                                            break;
                                        default:
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });

 WebTM/views/¼Æ»®¹ÜÀí/¹¤ÒÕ·Ïß/Gy_RoutingBillListQuery.html

@@ -280,59 +280,6 @@
                    //, cellMinWidth: 90
                    , limit: 50
                    , limits: [50, 500, 5000, 20000]
                    , cols: [[
                        { type: 'checkbox', fixed: 'left' }
                        /*    { field: 'hmainid', title: 'hmainid', width: 110 }*/
                        , { field: '单据号', title: '单据号', sort: true, width: 165 }
                        , { field: '单据类型', title: '单据类型' }
                        , { field: '工艺名称', title: '工艺名称', width: 170 }
                        //, { field: 'hmaterid', title: 'hmaterid', width: 165 }
                        , { field: '物料代码', title: '物料代码', width: 160 }
                        , { field: '物料名称', title: '物料名称', width: 160 }
                        , { field: '规格型号', title: '规格型号', width: 215 }
                        , { field: '计量单位代码', title: '计量单位代码', width: 115 }
                        , { field: '计量单位', title: '计量单位' }
                        , { field: '默认工艺', title: '默认工艺' }
                        , { field: '表头备注', title: '表头备注' }
                        , { field: '组织', title: '组织' }
                        //, { field: 'hsubid', title: 'hsubid', width: 80 }
                        , { field: '工序号', title: '工序号' }
                        , { field: '委外标记', title: '委外标记' }
                        //, { field: 'hprocid', title: 'hprocid', width: 105 }
                        , { field: '工序代码', title: '工序代码' }
                        , { field: '工序', title: '工序' }
                        //, { field: 'HSupID', title: 'HSupID', width: 105 }
                        , { field: '供应商代码', title: '供应商代码' }
                        , { field: '供应商', title: '供应商' }
                        //, { field: 'HCenterID', title: 'HCenterID', width: 105 }
                        , { field: '工作中心代码', title: '工作中心代码', width: 115 }
                        , { field: '工作中心名称', title: '工作中心名称', width: 115 }
                        , { field: '时间单位', title: '时间单位' }
                        , { field: '运行时间', title: '运行时间' }
                        , { field: '加工数量', title: '加工数量' }
                        , { field: '准备时间', title: '准备时间' }
                        , { field: '排队时间', title: '排队时间' }
                        , { field: '转移时间', title: '转移时间' }
                        , { field: '良率', title: '良率' }
                        , { field: '累计良率', title: '累计良率' }
                        , { field: '表体备注', title: '表体备注' }
                        , { field: '制单人', title: '制单人' }
                        , { field: '制单日期', title: '制单日期', width: 195 }
                        , { field: '审核人', title: '审核人' }
                        , { field: '审核日期', title: '审核日期', width: 180 }
                        , { field: '修改人', title: '修改人' }
                        , { field: '修改日期', title: '修改日期', width: 180 }
                        , { field: '作废人', title: '作废人' }
                        , { field: '作废日期', title: '作废日期' }
                        //, { field: 'HDayWorkQty', title: 'HDayWorkQty', width: 105 }
                        //, { field: 'HGroupID', title: 'HGroupID', width: 105 }
                        //, { field: 'HWorkerID', title: 'HWorkerID', width: 105 }
                        //, { field: 'HSourceID', title: 'HSourceID', width: 105 }
                        , { field: '加工单价', title: '加工单价' }
                        //, { field: 'HNextProcFlag', title: 'HNextProcFlag', width: 105 }
                        , { field: '下道流转工序', title: '下道流转工序', width: 150 }
                        , { field: '流转工序', title: '流转工序' }
                    ]]
                };
            }

@@ -410,10 +357,10 @@
                                    switch (data[i].Type) {
                                        //int
                                        case 'DateTime':
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 120 });
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>"});
                                            break;
                                        default:
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120 });
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true });
                                    }
                                }
                            }

 WebTM/views/³µ¼ä¹ÜÀí/¹¤Ðò³öÕ¾»ã±¨µ¥/Cj_StationOutBillList.html

@@ -347,6 +347,25 @@
                };
            });

            //行监听事件
            table.on('row(mainTable)', function (obj) {
                var flag = !obj.tr.find(':checkbox:first').prop('checked');
                obj.tr.find(':checkbox').prop('checked', flag);
                if (flag) {
                    obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked');  //设置复选框选中样式
                    $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//改变当前tr背景颜色和字体颜色
                } else {
                    obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//取消复选框选中样式
                    $(obj.tr.selector).attr({ "style": "background:" });//取消当前tr颜色
                }
                //mainTable ä¸ºè¡¨æ ¼ID   æ³¨æ„æ­¤å¤„如果ID不正确将导致你在监听复选框时获取不到你选择的数据，前面的只是添加或删除选中未选中样式以及设置背景色，字体颜色
                layui.each(table.cache.mainTable, function (i, l) {
                    if (obj.tr.index() == l.LAY_TABLE_INDEX) {
                        l.LAY_CHECKED = flag;
                    }
                });
            });

            //隐藏列设置
            function get_HideColumn() {
                var colName = "";

 WebTM/views/³µ¼ä¹ÜÀí/¹¤ÐòÁ÷ת/MES_StationOutBill_PDA_QiaoYi.html

@@ -771,7 +771,7 @@
                                        "Hzfbsl": data.出站数量,
                                        "lngBillSubKey": data.hsubid,
                                        //"NoOutboundHqty": (data.流转卡数量 - data.出站报废关联数量 - data.出站关联数量),
                                        "HQty": result.data.length > 1 ? (result.data[0].流转卡数量 < result.data[1].进站关联数量 ? data.流转卡数量 : result.data[1].进站关联数量) : data.流转卡数量,
                                        "HQty": result.data.length > 1 ? (result.data[1].进站关联数量 == 0 ? (result.data[0].出站关联数量 == 0 ? result.data[0].流转卡数量 : result.data[0].出站关联数量):result.data[0].流转卡数量 < result.data[1].进站关联数量 ? data.流转卡数量 : result.data[1].进站关联数量) : data.流转卡数量,
                                    });
                                    //$("#HBarCode").attr("readonly", "readonly");//条形码只读
                                    //$("#HBarCode").css("background-color", "#efefef4d");
@@ -1227,28 +1227,28 @@
            }

            //#region é¡µé¢å¿«æ·é”®å¼¹çª——工序流转卡关联数量
            $('body').on('keydown', function (e) {
                var HinteID = $("#HProcExchHinteID").val();
                if (e.key == "F7") {
                    if (HinteID == "" || HinteID == null || HinteID == undefined) {
                        layer.alert("请先输入条形码或扫描条形码", { icon: 5 });
                    }
                    else {
                        layer.open({
                            type: 2,
                            skin: 'layui-layer-rim', //加上边框
                            title: '工序流转卡关联数量',
                            closeBtn: 1,
                            shift: 2,
                            area: ['90%', '90%'],
                            maxmin: true,
                            content: ['../工序进站接收单/Cj_StationQty.html?HInterID=' + HinteID, 'yes'],
                            end: function () {
                            }
                        });
                    }
                }
            })
            //$('body').on('keydown', function (e) {
            //    var HinteID = $("#HProcExchHinteID").val();
            //    if (e.key == "F7") {
            //        if (HinteID == "" || HinteID == null || HinteID == undefined) {
            //            layer.alert("请先输入条形码或扫描条形码", { icon: 5 });
            //        }
            //        else {
            //            layer.open({
            //                type: 2,
            //                skin: 'layui-layer-rim', //加上边框
            //                title: '工序流转卡关联数量',
            //                closeBtn: 1,
            //                shift: 2,
            //                area: ['90%', '90%'],
            //                maxmin: true,
            //                content: ['../工序进站接收单/Cj_StationQty.html?HInterID=' + HinteID, 'yes'],
            //                end: function () {
            //                }
            //            });
            //        }
            //    }
            //})
            //#endregion

            //是否被转下工序

 WebTM/views/³µ¼ä¹ÜÀí/¹¤ÐòÁ÷ת¿¨/Sc_ProcessExchangeBillList.html

@@ -95,6 +95,33 @@
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-row" style="margin-top: 10px; margin-bottom: 10px ">
                                        <div class="layui-inline">
                                            <label class="layui-form-label">过滤</label>
                                            <div class="layui-input-block">
                                                <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
                                                </select>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
                                                <option value="0" selected="selected"></option>
                                                <option value="=">=</option>
                                                <option value=">=">>=</option>
                                                <option value=">">></option>
                                                <option value="<="><=</option>
                                                <option value="<"><</option>
                                                <option value="<>"><></option>
                                                <option value="7">包含</option>
                                                <option value="8">左包含</option>
                                                <option value="9">右包含</option>
                                                <option value="10">不包含</option>
                                            </select>
                                        </div>
                                        <div class="layui-inline">
                                            <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
                                        </div>
                                    </div>
                                </div>
                            </div>
                        </div>
@@ -209,7 +236,7 @@
            //
            var HModName = "Sc_ProcessExchangeBillList";
            //不需要显示的字段 å¯æ‰©å±• ï¼ˆä¸»è¡¨ï¼‰
            var titleData = ["HEntryID", "HWorkShopID", "HMaterID", "HSupID", "HPRDORGID", "HEquipMentID", "hsubid", "HICMOEntryID", "HDeptID", "hmainid", "hicmointerid", "HMaterID2", "HUnitID", "HBillType", "HRoutingBillID", "HAuxUnit", "生产车间代码", "生产车间", "材质", "成品编号", "版本", "总装图号", "图号版本", "子件代码", "子件名称", "子件规格", "批号", "委外加工单位代码", "委外加工单位", "设备名称", "设备代码", "原料批次", "补料标记", "项目编号", "主要材料", "关键材料", "产品CODE", "销售订单号", "客户简称", "客户要求材料成分", "产品名称2", "客户名称", "生产备注", "重要提示", "原材料编号A", "原材料编号B", "原材料编号C", "原材料编号D", "原材料内码A", "原材料内码B", "原材料内码C", "原材料内码D", "日计划工单号", "客户编码", "芯体规格型号", "芯体物料代码", "源单客户代码", "HEmpID","HCusID"];
            var titleData = ["HEntryID", "HWorkShopID", "HMaterID", "HSupID", "HPRDORGID", "HEquipMentID", "hsubid", "HICMOEntryID", "HDeptID", "hmainid", "hicmointerid","HICMOInterID", "HMaterID2", "HUnitID", "HBillType", "HRoutingBillID", "HAuxUnit", "生产车间代码", "生产车间", "材质", "成品编号", "版本", "总装图号", "图号版本", "子件代码", "子件名称", "子件规格", "批号", "委外加工单位代码", "委外加工单位", "设备名称", "设备代码", "原料批次", "补料标记", "项目编号", "主要材料", "关键材料", "产品CODE", "销售订单号", "客户简称", "客户要求材料成分", "产品名称2", "客户名称", "生产备注", "重要提示", "原材料编号A", "原材料编号B", "原材料编号C", "原材料编号D", "原材料内码A", "原材料内码B", "原材料内码C", "原材料内码D", "日计划工单号", "客户编码", "芯体规格型号", "芯体物料代码", "源单客户代码", "HEmpID","HCusID"];
             //不需要显示的字段 å¯æ‰©å±• ï¼ˆå·¥è‰ºæµç¨‹ï¼‰
            var titleData2 = ["工序号", "出站报废关联数量", "HProcID", "工序代码", "HBackProc", "加工说明", "模具编号", "HCenterID", "工作中心代码", "HDeptID", "加工车间代码", "加工车间", "HGroupID", "班组代码", "班组", "HWorkerID", "操作工代码f", "操作工", "HSourceID", "生产资源代码", "生产资源", "计划数量", "hmainid", "单据号", "hicmointerid", "任务单号", "HICMOEntryID", "HWorkShopID", "生产车间代码", "生产车间", "HMaterID", "产品代码", "产品名称", "规格型号", "批号", "HUnitID", "单位代码", "单位", "生产数量", "计划开工日期", "计划完工日期", "摘要", "内部单据号", "委外订单内码", "委外订单子内码", "委外订单号", "HSupID", "供应商", "供应商代码", "表头备注", "HBillType", "isEntrust", "时间单位", "工序计划加工时间", "子计划开工日期", "子计划完工日期", "实际开工日期", "实际完工日期", "开工余量天数", "开工余量固数", "上道固定天数", "生产周期", "加工单价", "最后汇报日期", "加工费用金额", "末道工序", "首道工序", "行关闭人", "关闭类型", "流转卡数量", "委外工单数量", "不合格数量", "超额比例", "良率", "累计良率", "图纸编号", "本工序确认记录", "源单主内码", "源单子内码", "源单单号", "源单类型", "汇报数量", "HEntryID", "hsubid", "HPRDORGID", "组织", "HOrderProcNO"];
            //不需要显示的字段 å¯æ‰©å±• ï¼ˆå™¨å…·æ¸…单）
@@ -386,6 +413,10 @@
                $("#HOrderProcNO").val("");//订单跟踪号
                $("#SHname").val("");//物料|子件名称|子件规格
                $("#HBillNo").val("");//单据号
                $("#ColContent").val("");
                $("#ColName").val("0");
                $("#Comparator").val("0");
                form.render('select');
                //$("#btnSearch").click();
                sWhere = "";
                get_FastQuery();
@@ -402,15 +433,41 @@
                var SHname = $("#SHname").val();//物料|子件名称|子件规格
                var HBillNo = $("#HBillNo").val();//单据号
                var HErpID = $("#HErpID").val();//唯一ID
                var ColName = $("#ColName").val();//复选框
                var Comparator = $("#Comparator").val()
                var ColContent = $("#ColContent").val();

                if (ColName != 0 && Comparator != 0) {
                    var com = "";
                    switch (Comparator) {
                        case "7":
                            com = "like'%" + ColContent + "%'";
                            break;
                        case "8":
                            com = "like'%" + ColContent + "'";
                            break;
                        case "9":
                            com = "like'" + ColContent + "%'";
                            break;
                        case "10":
                            com = "not like'%" + ColContent + "%'";
                            break;
                        default:
                            com = "" + Comparator + "'" + ColContent + "'";
                            break;
                    }
                    sWhere += " and " + ColName + " " + com;
                }

                if (SHPrintQty) {//判断打印状态
                    if (SHPrintQty == "全部") {
                        sWhere = " and æ‰“印次数 >= 0 ";
                        sWhere += " and æ‰“印次数 >= 0 ";
                    }
                    if (SHPrintQty == "已打印") {
                        sWhere = " and æ‰“印次数 > 0 ";
                        sWhere += " and æ‰“印次数 > 0 ";
                    }
                    if (SHPrintQty == "未打印") {
                        sWhere = " and æ‰“印次数 = 0 ";
                        sWhere += " and æ‰“印次数 = 0 ";
                    }
                }
                if (wybj) {
@@ -451,6 +508,10 @@

            //点击主表带出从表数据
            table.on('row(mainTable)', function (obj) { //注：tool æ˜¯å·¥å…·æ¡äº‹ä»¶åï¼Œtest æ˜¯ table åŽŸå§‹å®¹å™¨çš„属性 lay-filter="对应的值"

                //选中行改变颜色
                check_row(obj);

                var datas = obj.data; //获得当前行数据
                HBillNo = datas["单据号"].toString();
                var HMainID = datas.hmainid;
@@ -620,6 +681,24 @@
                DisPlay_HideColumn_Mod();
            }
            //#endregion

            function check_row(obj) {
                var flag = !obj.tr.find(':checkbox:first').prop('checked');
                obj.tr.find(':checkbox').prop('checked', flag);
                if (flag) {
                    obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked');  //设置复选框选中样式
                    $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//改变当前tr背景颜色和字体颜色
                } else {
                    obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//取消复选框选中样式
                    $(obj.tr.selector).attr({ "style": "background:" });//取消当前tr颜色
                }
                //mainTable ä¸ºè¡¨æ ¼ID   æ³¨æ„æ­¤å¤„如果ID不正确将导致你在监听复选框时获取不到你选择的数据，前面的只是添加或删除选中未选中样式以及设置背景色，字体颜色
                layui.each(table.cache.mainTable, function (i, l) {
                    if (obj.tr.index() == l.LAY_TABLE_INDEX) {
                        l.LAY_CHECKED = flag;
                    }
                });
            }

            //#region æŸ¥è¯¢ å·¥è‰ºå‚æ•°
            function get_Display4(HMainID) {
@@ -882,7 +961,7 @@
                                            if (data[i].name == '生产数量' || data[i].name == '流转卡数量' || data[i].name == '入库数量') {
                                                col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, totalRow: true });
                                            } else {
                                                col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
                                                col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200});
                                            }
                                    }
                                }
@@ -897,14 +976,34 @@
                                , height: 550
                                , page: true
                                , totalRow: true
                                //, cellMinWidth: 90
                                , cellMinWidth: 90
                                , limit: 50
                                , limits: [50, 500, 5000, 20000]
                                //, done: function (res, curr, count) {
                                //    var $data = $('div[lay-id="mainTable"]').find('.layui-table-body').find('tr').eq(0).find('td');
                                //    var $head = $('div[lay-id="mainTable"]').find('.layui-table-header').find('tr').eq(0).find('th');
                                //    var $total = $('div[lay-id="mainTable"]').find('.layui-table-total').find('tr').eq(0).find('td');
                                //    for (var i = 0; i < $data.length; i++) {
                                //        var l1 = $data.eq(i).find('div').width();
                                //        var l2 = $head.eq(i).find('div').width();
                                //        if (l1 > l2) {
                                //            $head.eq(i).find('div').width(l1);
                                //            $total.eq(i).find('div').width(l1);
                                //        } else {
                                //            $data.eq(i).find('div').width(l2);
                                //            $total.eq(i).find('div').width(l2);
                                //        }
                                //    }
                                //}
                            }
                            table.render(option);

                            //刷新表格数据
                            DisPlay_HideColumn();

                            if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
                                ColFilter();
                            }

                            layer.close(ajaxLoad);
                            //layer.alert("查询成功", { icon: 1 });
@@ -1710,7 +1809,7 @@
                                var args = {
                                    type: "print",
                                    showOptionDlg: false, //如果不显示打印对话框而直接打印，将此行注释去掉即可
                                    report: urlAddRandomNo("../../grf/cs10.grf"),
                                    report: urlAddRandomNo("../../grf/涤纶.grf"),
                                    data: Customer
                                };
                                //var args = {
@@ -1794,6 +1893,19 @@
                }
            }

            //列明显示下拉框
            function ColFilter() {
                var Organization = '<option  value="0" selected="selected" ></option>';
                for (var i = 1; i < option.cols[0].length; i++) {
                    if (option.cols[0][i].hide != true) {
                        Organization += '<option  style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>';
                    }
                }
                $("#ColName").empty();
                $("#ColName").append(Organization);
                form.render('select');
            }

            //#region åˆ·æ–°
            function get_Refresh() {
                set_ClearQuery();

 WebTM/views/³µ¼ä¹ÜÀí/¹¤Ðò½øÕ¾½ÓÊÕµ¥/Cj_StationInBillList.html

@@ -219,6 +219,25 @@
                }
            });

            //行监听事件
            table.on('row(mainTable)', function (obj) {
                var flag = !obj.tr.find(':checkbox:first').prop('checked');
                obj.tr.find(':checkbox').prop('checked', flag);
                if (flag) {
                    obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked');  //设置复选框选中样式
                    $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//改变当前tr背景颜色和字体颜色
                } else {
                    obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//取消复选框选中样式
                    $(obj.tr.selector).attr({ "style": "background:" });//取消当前tr颜色
                }
                //mainTable ä¸ºè¡¨æ ¼ID   æ³¨æ„æ­¤å¤„如果ID不正确将导致你在监听复选框时获取不到你选择的数据，前面的只是添加或删除选中未选中样式以及设置背景色，字体颜色
                layui.each(table.cache.mainTable, function (i, l) {
                    if (obj.tr.index() == l.LAY_TABLE_INDEX) {
                        l.LAY_CHECKED = flag;
                    }
                });
            });

            //头工具栏事件
            table.on('toolbar(mainTable)', function (obj) {
                switch (obj.event) {

 WebTM/views/ÁìÁÏ·¢»õ/ÏúÊÛ³ö¿â/Kf_SellOutBill_Fast.html

@@ -1316,7 +1316,11 @@
                var HScanStyle = $("#HScanStyle").val();

                if (HDeleteFlag == "*") {
                    if (sBarCode != "") {
                    if (sBarCode == "") {
                        layer.msg("请扫描要删除的条码", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                        return;
                    }
                    else {
                        $('#HBarCode').val("");
                    }
                    $.ajax(
@@ -1334,6 +1338,36 @@
                                    table.reload('wl-table', {
                                        where: { HBillID: sInterID, HBillType: '1205', sWhere: '' }
                                    });

                                    //刷新列表信息
                                    $.ajax({
                                        url: GetWEBURL() + '/OtherInStockBill/DisBillEntryList_Webs_New_Json1',
                                        type: "GET",
                                        data: { HBillID: sInterID, HBillNo: sBillNo, HBillType: sBillType, sMouldManagerCtl: sMouldManagerCtl, sFIFOCtl: sFIFOCtl },
                                        success: function (result) {
                                            if (result.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                                                listOption.data = result.data.list;
                                                table.render(listOption);
                                                listOption1.data = result.data.list2;
                                                table.render(listOption1);

                                                //console.log(result.data.list2);
                                                var count = 0;
                                                var count1 = 0;
                                                for (var i = 0; i < result.data.list.length; i++) {
                                                    count += result.data.list[i].HQty;
                                                    count1 += result.data.list[i].HPieceQty;
                                                }
                                                $("#HSumQtys").val(count);
                                                $("#HBarCodeQtys").val(count1);
                                                //return;
                                            }
                                            else {
                                                layer.msg(result.Message);
                                            }
                                            layer.closeAll("loading");
                                        }
                                    });
                                }
                                else {
                                    playSound();

 WebTM/views/ÑéÊÕÈë¿â/²úÆ·Èë¿â/Kf_ProductInBill_Fast.html

@@ -1214,10 +1214,13 @@
                var sMouldManagerCtl = "N";  //是否启用器具管理
                var sFIFOCtl = "N";          //是否启用先进先出管理
                if (HDeleteFlag == "*") {
                    if (sBarCode != "") {
                    if (sBarCode == "") {
                        layer.msg("请扫描要删除的条码", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                        return;
                    }
                    else {
                        $('#HBarCode').val("");
                    }
                    var sBarCode = sOldBarCode.slice(1);
                    $.ajax(
                        {
                            type: "Get",