yangle
2022-09-05 cebd21645abb2337ea1ef7a17aa0823a3f8627b7
Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI
2个文件已修改
1 文件已重命名
157 ■■■■■ 已修改文件
WebTM/WebTM.csproj 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/index.html 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeIssueBillList.html 154 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/WebTM.csproj
@@ -990,7 +990,7 @@
    <Content Include="views\车间管理\工序出站汇报单\Sc_StationOutBill_Mul.html" />
    <Content Include="views\车间管理\工序出站汇报单\Cj_StationOutBillList.html" />
    <Content Include="views\车间管理\工序流转卡\Sc_ProcessExchangeBill.html" />
    <Content Include="views\车间管理\工序流转卡\Sc_ProcessExchangexdBillList.html" />
    <Content Include="views\车间管理\工序流转卡\Sc_ProcessExchangeIssueBillList.html" />
    <Content Include="views\车间管理\工序进站接收单\Cj_StationInBill.html" />
    <Content Include="views\车间管理\工序进站接收单\Cj_StationInBillList.html" />
    <Content Include="views\车间管理\工序进站接收单\Cj_StationQty.html" />
WebTM/views/index.html
@@ -438,6 +438,7 @@
                                    <dl class="layui-nav-child">
                                        <dd><a lay-href="车间管理/工序流转卡/Sc_ProcessExchangeBill.html">工序流转卡</a></dd>
                                        <dd><a lay-href="车间管理/工序流转卡/Sc_ProcessExchangeBillList.html">工序流转卡维护</a></dd>
                                        <dd><a lay-href="车间管理/工序流转卡/Sc_ProcessExchangeIssueBillList.html">工序流转卡(下达)</a></dd>
                                        <dd><a lay-href="">工序委外工单n</a></dd>
                                        <dd><a lay-href="">工序委外工单维护n</a></dd>
                                        <dd><a lay-href="车间管理/工序进站接收单/Cj_StationInBill.html">工序进站接收单</a></dd>
WebTM/views/³µ¼ä¹ÜÀí/¹¤ÐòÁ÷ת¿¨/Sc_ProcessExchangeIssueBillList.html
File was renamed from WebTM/views/³µ¼ä¹ÜÀí/¹¤ÐòÁ÷ת¿¨/Sc_ProcessExchangexdBillList.html
@@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
    <title>工序流转卡列表</title>
    <title>工序流转卡列表(下达)</title>
    <meta name="renderer" content="webkit">
    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
@@ -89,18 +89,13 @@
                            </div>
                        </div>
                        <table class="" id="mainTable" lay-filter="mainTable"></table>
                        <table class="" id="mainTable2" lay-filter="mainTable2"></table>
                        <script type="text/html" id="toolbarDemo">
                            <div class="layui-btn-container">
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>新增</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>编辑</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>删除</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_view"><i class="layui-icon layui-icon-tips"></i>预览</button>
                                <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="set_Issue"><i class="layui-icon layui-icon-file-b"></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="set_StationOut"><i class="layui-icon layui-icon-form"></i>工序出站汇报单</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_StationIn"><i class="layui-icon layui-icon-form"></i>工序进站接收单</button>
                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="set_StationOut"><i class="layui-icon layui-icon-form"></i>工序出站汇报单</button>-->
                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="get_StationIn"><i class="layui-icon layui-icon-form"></i>工序进站接收单</button>-->
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_HideColumn1"><i class="layui-icon layui-icon-file-b"></i>列设置</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_HideColumn2"><i class="layui-icon layui-icon-file-b"></i>明细列设置</button>
                            </div>
@@ -143,7 +138,7 @@
            //#region è¿›å…¥é¡µé¢å³åŠ è½½
            //
            var HModName = "Sc_ProcessExchangeBillList";
            var HModName = "Sc_ProcessExchangeIssueBillList";
            //初始化界面
            set_ClearBill();
@@ -210,8 +205,6 @@
                $("#HDate1").val(Format(new Date(), "yyyy-MM-dd"));//结束日期
                //初始化主表列表
                set_InitGrid();
                //初始化从表列表
                set_InitGrid2();
                //查询
                get_Display(sWhere);
            }
@@ -285,36 +278,7 @@
            form.on('checkbox(wybj)', function (data) {
                wybj = data.elem.checked; //是否被选中,true或者false
            });
            //点击主表带出从表数据
            table.on('row(mainTable)', function (obj) { //注:tool æ˜¯å·¥å…·æ¡äº‹ä»¶åï¼Œtest æ˜¯ table åŽŸå§‹å®¹å™¨çš„å±žæ€§ lay-filter="对应的值"
                var datas = obj.data; //获得当前行数据
                HBillNo = datas["单据号"].toString();
                var HMainID = datas.hmainid;
                var wait = layer.load();
                $.ajax({
                    url: GetWEBURL() + '/LEMS/MES_Sc_ProcessExchangeBillQuerySub_Json',
                    type: "GET",
                    data: { "sWhere": HMainID },
                    success: function (data1) {
                        if (data1.count == 1) {
                            option2.data = data1.data;
                            table.render(option2);
                            layer.close(wait);
                        } else {
                            layer.alert(data1.code + data1.Message, { icon: 5 });
                            layer.close(wait);
                        }
                    }, error: function () {
                        layer.close(wait);
                        layer.alert("接口失效!", { icon: 5 });
                    }
                });
                DisPlay_HideColumn_Sec();
            });
            //#endregion
            //初始化主表列表
            function set_InitGrid() {
@@ -322,7 +286,7 @@
                    elem: '#mainTable'
                    , toolbar: '#toolbarDemo'
                    , page: true
                    , height: 300
                    , height: 'full-50'
                    , cellMinWidth: 90
                    , limit: 50
                    , limits: [50, 500, 5000, 20000]
@@ -347,6 +311,11 @@
                        , { field: 'HDeptID', title: 'HDeptID', width: 80, hide: true}
                        , { field: '生产车间代码', title: '生产车间代码', width: 115 }
                        , { field: '生产车间', title: '生产车间' }
                        , { field: '流水号', title: '流水号' }
                        , { field: 'HProcID', title: 'HProcID', hide: true }
                        , { field: '工序代码', title: '工序代码' }
                        , { field: '工序名称', title: '工序名称' }
                        , { field: '流转卡数量', title: '流转卡数量', width: 100 }
                        , { field: '委外标记', title: '委外标记' }
                        , { field: 'HMaterID', title: 'HMaterID', width: 80, hide: true}
                        , { field: '子件代码', title: '子件代码' }
@@ -390,82 +359,12 @@
                };
                table.render(option);
            }
            //初始化从表列表
            function set_InitGrid2() {
                option2 = {
                    elem: '#mainTable2'
                    //, toolbar: '#toolbarDemo'
                    , page: false
                    , height: 500
                    , cellMinWidth: 90
                    , limit: Number.MAX_VALUE//默认显示全部
                    , cols: [[
                        { type: 'checkbox', fixed: 'left' }
                        , { field: 'hsubid', title: 'hsubid', hide: true }
                        , { field: '流水号', title: '流水号' }
                        , { field: 'HProcID', title: 'HProcID', hide: true }
                        , { field: '工序代码', title: '工序代码' }
                        , { field: '工序名称', title: '工序名称' }
                        , { field: '流转卡数量', title: '流转卡数量', width: 100 }
                        , { field: '进站关联数量', title: '进站关联数量', width: 120 }
                        , { field: '出站关联数量', title: '出站关联数量', width: 120 }
                        , { field: '出站报废关联数量', title: '出站报废关联数量', width: 150 }
                        , { field: '返工标记', title: '返工标记' }
                        , { field: '加工说明', title: '加工说明' }
                        , { field: '工作中心代码', title: '工作中心代码', width: 115 }
                        , { field: '工作中心', title: '工作中心' }
                        , { field: '计划数量', title: '计划数量' }
                        , { field: 'hmainid', title: 'hmainid', hide: true}
                        , { field: '日期', title: '日期', sort: true }
                        , { field: '单据号', title: '单据号', width: 150 }
                        , { field: 'hicmointerid', title: 'hicmointerid', hide: true}
                        , { field: '任务单号', title: '任务单号', width: 100}
                        , { field: 'HWorkShopID', title: 'HWorkShopID', hide: true}
                        , { field: '生产车间代码', title: '生产车间代码', width: 115 }
                        , { field: '生产车间', title: '生产车间' }
                        , { field: 'HMaterID', title: 'HMaterID', hide: true}
                        , { field: '产品代码', title: '产品代码' }
                        , { field: '产品名称', title: '产品名称' }
                        , { field: '规格型号', title: '规格型号' }
                        , { field: '批号', title: '批号' }
                        , { field: 'HUnitID', title: 'HUnitID', hide: true}
                        , { field: '单位代码', title: '单位代码' }
                        , { field: '单位', title: '单位' }
                        , { field: '生产数量', title: '生产数量' }
                        , { field: '计划开工日期', title: '计划开工日期' }
                        , { field: '计划完工日期', title: '计划完工日期' }
                        , { field: '摘要', title: '摘要' }
                        , { field: '内部单据号', title: '内部单据号' }
                        , { field: 'HSupID', title: 'HSupID', hide: true}
                        , { field: '委外加工单位代码', title: '委外加工单位代码' }
                        , { field: '委外加工单位', title: '委外加工单位' }
                        , { field: '表头备注', title: '表头备注' }
                        , { field: 'HBillType', title: 'HBillType', hide: true}
                        , { field: '行关闭人', title: '行关闭人' }
                        , { field: '关闭类型', title: '关闭类型' }
                        , { field: '表体备注', title: '表体备注' }
                        , { field: '源单主内码', title: '源单主内码' }
                        , { field: '源单子内码', title: '源单子内码' }
                        , { field: '源单单号', title: '源单单号' }
                        , { field: '源单类型', title: '源单类型' }
                        , { field: '汇报数量', title: '汇报数量' }
                        , { field: '流转工序', title: '流转工序' }
                        , { field: '出站流转工序', title: '出站流转工序' }
                        , { field: '首道工序', title: '首道工序' }
                        , { field: '末道工序', title: '末道工序' }
                        , { field: '下道工序号', title: '下道工序号' }
                        , { field: '不良品关联数量', title: '不良品关联数量' }
                    ]]
                };
                table.render(option2);
            }
            //#region æŸ¥è¯¢
            function get_Display(sWhere) {
                sWhere += " and HPRDORGID=" + sessionStorage["OrganizationID"] + " ";
                var ajaxLoad = layer.load();
                $.ajax({ 
                    url: GetWEBURL() + '/LEMS/MES_Sc_ProcessExchangeBillQuery_Json',
                    url: GetWEBURL() + '/LEMS/MES_Sc_ProcessExchangeIssueBillList_Json',
                    type: "GET",
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
                    success: function (data1) {
@@ -513,34 +412,6 @@
                    }
                })
            }
            //隐藏列设置
            function get_HideColumn2() {
                var colName = "";
                for (var i = 1; i < option2.cols[0].length - 1; i++) {
                    colName += option2.cols[0][i]["title"] + ",";
                }
                colName = encodeURI(colName.substring(0, colName.length - 1));//对 URI è¿›è¡Œç¼–码
                layer.open({
                    type: 2
                    , skin: "layui-layer-rim" //加上边框
                    , title: "隐藏列设置"  //标题
                    , closeBtn: 1  //窗体右上角关闭 çš„ æ ·å¼
                    , shift: 2 //弹出动画
                    , area: ["50%", "90%"] //窗体大小
                    , maxmin: true //设置最大最小按钮是否显示
                    , content: ['../../基础资料/隐藏列设置/Gy_GridView_Hide.html?HModName=' + HModName + "_Sec" + '&colName=' + colName, "yes"]
                    , btn: ["确定", "取消"]
                    , btn1: function (index, laero) {
                        //刷新表格数据
                        DisPlay_HideColumn_Sec();
                        //更新表格缓存的数据
                        layer.close(index);//关闭弹窗
                    }
                })
            }
            //显示列数据
            function DisPlay_HideColumn() {
@@ -624,7 +495,6 @@
                    }
                })
            }
            //显示列数据
            function DisPlay_HideColumn_Sec() {