zzr99
2022-06-13 49b3d32e375ce994f793a231f17e5603982c5ec1
Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI
2个文件已添加
8个文件已修改
598 ■■■■■ 已修改文件
WebTM/WebTM.csproj 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/layuiadmin/Scripts/webConfig.js 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/Baseset/基础资料/Gy_RoutingBillList.html 130 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/index.html 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/生产管理/日计划报表/ReportPODemandPlanBillList.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/计划管理/工艺路线/Gy_RoutingBill.html 38 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/计划管理/工艺路线/Gy_RoutingBillList.html 52 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/计划管理/工艺路线/Gy_RoutingBillimport.html 292 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBillList.html 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBill.html 76 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/WebTM.csproj
@@ -97,6 +97,7 @@
    <Content Include="views\Baseset\基础资料\Gy_LineCenter.html" />
    <Content Include="views\Baseset\基础资料\Gy_OrganizationtList.html" />
    <Content Include="views\Baseset\基础资料\Gy_QCCheckProjectListView.html" />
    <Content Include="views\Baseset\基础资料\Gy_RoutingBillList.html" />
    <Content Include="views\Baseset\基础资料\Gy_RoutingGroup.html" />
    <Content Include="views\Baseset\基础资料\Gy_WarehouseListNew.html" />
    <Content Include="views\Baseset\基础资料\Sc_ICMOBillListView2.html" />
@@ -894,6 +895,7 @@
    <Content Include="views\系统管理\系统参数管理\Xt_SystemParameter_Edit.html" />
    <Content Include="views\系统管理\系统参数管理\Xt_SystemParameterList.html" />
    <Content Include="views\计划管理\工艺路线\Gy_RoutingBill.html" />
    <Content Include="views\计划管理\工艺路线\Gy_RoutingBillimport.html" />
    <Content Include="views\计划管理\工艺路线大类\Gy_RoutingGroupList.html" />
    <Content Include="views\设备管理\Sb_Add_EqpConkBookBillList.html" />
    <Content Include="views\设备管理\Sb_Add_EqpMaintenanceBillList.html" />
WebTM/layuiadmin/Scripts/webConfig.js
@@ -15,6 +15,7 @@
    //var WEBURL = "http://192.168.1.253:8080/API/";   //凯贝奈特客户服务器内网
    //var WEBURL = "http://220.189.218.154:8092/API/";   //丸井四维尔服务器
    //var WEBURL = "http://192.168.0.214/API/";   //瑞与祺服务器
    //var WEBURL = "http://192.168.10.66/API/";   //森楷服务器
    //var WEBURL = "http://localhost/API/";
    return WEBURL
}
WebTM/views/Baseset/»ù´¡×ÊÁÏ/Gy_RoutingBillList.html
New file
@@ -0,0 +1,130 @@
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
    <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.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
</head>
<body>
    <div class="layui-fluid">
        <div class="layui-card">
            <!--<div class="layui-card-header"></div>-->
            <div class="layui-card-body" style="padding: 15px;">
                <form class="layui-form" action="" lay-filter="component-form-group">
                    <div class="layui-form-item">
                        <div class="layui-inline">
                            <label class="layui-form-label">单据号</label>
                            <div class="layui-input-block">
                                <input type="text" class="layui-input" name="Value" id="Value">
                            </div>
                        </div>
                        <div class="layui-inline">
                            <button type="button" lay-submit="" class="layui-btn" lay-filter="HQuery">快速查询</button>
                            <button type="button" lay-submit="" class="layui-btn" lay-filter="FH">返回</button>
                        </div>
                    </div>
                </form>
            </div>
        </div>
    </div>
    <table class="layui-hide" id="mainTable"></table>
    <script src="../../../layuiadmin/layui/layui.js"></script>
    <script src="../../../layuiadmin/Scripts/json2.js" type="text/javascript"></script>
    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js" type="text/javascript"></script>
    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
    <script>
        layui.use(['table', 'form', 'layer'], function () {
            var table = layui.table
                , form = layui.form
                , layer = layui.layer;
            form.on('submit(HQuery)', function () {
                RoadQuery($('#Value').val());
            });
            form.on('submit(FH)', function () {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                parent.GetHMaterNameValue(data);
                var index = parent.layer.getFrameIndex(window.name);
                parent.layer.close(index);
            });
            //获取参数
            function getUrlVars() {
                var vars = [], hash;
                var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
                for (var i = 0; i < hashes.length; i++) {
                    hash = hashes[i].split('=');
                    vars.push(hash[0]);
                    vars[hash[0]] = hash[1];
                }
                return vars;
            }
            var HMaterID = "";
            var params = getUrlVars();
            if (params[params[0]] != "undefined") {
                HMaterID = params[params[0]]; //从参数中获取
            }
            RoadQuery($('#Value').val());
            table.render({
                elem: '#mainTable'
                // , url: '/demo/table/user/'
                , data: []
                , cellMinWidth: 80 //全局定义常规单元格的最小宽度,layui 2.2.1 æ–°å¢ž
                , cols: [[
                    { type: 'radio' }
                    , { field: 'hmainid', title: '工艺路线ID', hide: true }
                    , { field: '单据号', title: '单据号' }
                    , { field: '物料代码', title: '物料代码' }
                    , { field: '物料名称', title: '物料名称', sort: true }
                    , { field: '规格型号', title: '规格型号' }
                    , { field: '组织', title: '组织' }
                ]]
                , page: true
            });
            ///加载显示数据
            function RoadQuery(Where) {
                var Value = Where;
                if (Value == null) {
                    Value = " and HMaterID=" + HMaterID + " and HOrgID = " + sessionStorage["OrganizationID"];
                } else {
                    Value = " and HMaterID=" + HMaterID + " and HOrgID = " + sessionStorage["OrganizationID"] + " and ( å•据号 like '%" + Where + "%' or å•据号 like '%" + Where + "%' ) "
                }
                var index = layer.load();
                $.ajax({
                    type: "get",
                    url: GetWEBURL() + "LEMS/Gy_RoutingBillList",
                    async: true,
                    data: { "sWhere": Value, "user": sessionStorage["HUserName"] },
                    success: function (result) {
                        ajaxReturnData = JSON.parse(JSON.stringify(result)).data;
                        table.reload('mainTable', {
                            data: ajaxReturnData
                            , height: 'full-10'
                            , loading: false
                            , done: function (index, res) {
                            }
                        });
                        layer.close(index);
                    },
                    error: function (result) {
                        layer.close(index);
                        console.log(result);
                        //layer.msg('获取采购订单出现异常', { icon: 2, time: 2000 });
                    }
                });
            };
        });
    </script>
</body>
</html>
WebTM/views/index.html
@@ -285,6 +285,7 @@
                                    <dl class="layui-nav-child">
                                        <dd><a lay-href="计划管理/工艺路线/Gy_RoutingBillList.html">工艺路线维护</a></dd>
                                        <dd><a lay-href="计划管理/工艺路线/Gy_RoutingBill.html">工艺路线</a></dd>
                                        <dd><a lay-href="计划管理/工艺路线/Gy_RoutingBillimport.html">工艺路线数据导入</a></dd>
                                    </dl>
                                <dd>
                                <dd><a lay-href="计划管理/工艺路线大类/Gy_RoutingGroupList.html">工艺路线大类</a></dd>
WebTM/views/Éú²ú¹ÜÀí/Èռƻ®±¨±í/ReportPODemandPlanBillList.html
@@ -245,7 +245,7 @@
        function get_Display(sWhere) {
            var ajaxLoad = layer.load();
            $.ajax({
                url: GetWEBURL() + '/Sc_WorkBillSortBill/Sc_WorkBillSortBillList',
                url: GetWEBURL() + '/JIT_Cg_PODemandPlanBill/ReportPODemandPlanBillList',
                type: "GET",
                data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
                success: function (result) {
WebTM/views/¼Æ»®¹ÜÀí/¹¤ÒÕ·Ïß/Gy_RoutingBill.html
@@ -79,7 +79,7 @@
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">日期</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="date" class="layui-input" lay-verify="HDate" name="HDate" id="HDate" style="padding-left: 48px;">
                                                <input type="date" class="layui-input" lay-verify="HDate" name="HDate" id="HDate" style="padding-left: 80px;">
                                            </div>
                                        </div>
                                        <div class="layui-inline">
@@ -244,6 +244,14 @@
                                            <label class="layui-form-label" style="width: 85px;">减资源减量</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" lay-verify="HDelSourceRate" name="HDelSourceRate" id="HDelSourceRate" value="0"> <!--style="background-color:#efefef4d;"-->
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">组织</label>
                                            <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
                                                <select name="HOrgID" id="HOrgID" lay-verify="HOrgID">
                                                    <!--动态渲染组织-->
                                                </select>
                                            </div>
                                        </div>
                                    </div>
@@ -457,6 +465,8 @@
            //制单人
            $("#HMaker").val(sessionStorage["HUserName"]);
            //组织
            Organ();
            //判断是否登录 æœªç™»å½•则跳到登录页
            //if (sessionStorage.login != "login") {
@@ -488,10 +498,11 @@
                });
            }
            else {//如果修改则走下面 new
                //禁用组织选项
                $("#HOrgID").attr("disabled", true);
                RoadBillMain(linterid, linteridSub);
                //RoadBillSub(linterid);
            }
            var option = {
                elem: '#mainTable'
@@ -971,6 +982,28 @@
            //#region æ­¤é¡µé¢æ‰€æœ‰çš„æ–¹æ³•
            //获取组织
            function Organ() {
                //获取登录页组织列
                var Organization = '';
                $.ajax({
                    type: "get",
                    url: GetWEBURL() + "/Web/GetOrganizations",
                    success: function (result) {
                        if (result.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                            var data = result.data;
                            for (var i = 0; i < data.length; i++) {
                                Organization += '<option  style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
                            }
                            $("#HOrgID").append(Organization);
                            $("#HOrgID").val(sessionStorage["OrganizationID"])
                            form.render('select');
                        }
                        layer.closeAll("loading");
                    }
                })
            }
            //产品选择页面
            function get_checkSearchMater() {
                layer.open({
@@ -1341,6 +1374,7 @@
                            , "HMaterTexture": d.data[0].材质
                            , "HProductNum": d.data[0].成品编号
                            , "HVerNum": d.data[0].版本
                            , "HOrgID": d.data[0].HOrgID
                        });
                        //子表  èµ‹å€¼
WebTM/views/¼Æ»®¹ÜÀí/¹¤ÒÕ·Ïß/Gy_RoutingBillList.html
@@ -41,6 +41,14 @@
                                        <input type="text" class="layui-input" name="HOrderProcNO" id="HOrderProcNO">
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label" style="width: 85px;">生产订单组织</label>
                                    <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
                                        <select name="HOrgID" id="HOrgID" lay-verify="HOrgID">
                                            <!--动态渲染组织-->
                                        </select>
                                    </div>
                                </div>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                </button>
@@ -127,7 +135,7 @@
            //#region æŸ¥è¯¢æŒ‰é’®
            form.on('submit(btnSearch)', function (data) {//选择仓位
                get_FastQuery();
                get_FastQuery(2);
            });
            //#endregion
@@ -139,12 +147,37 @@
            //#endregion
           
            //#region æ­¤é¡µé¢æ‰€æœ‰çš„æ–¹æ³•
            //获取组织
            function Organ() {
                //获取登录页组织列
                $.ajax({
                    type: "get",
                    url: GetWEBURL() + "/Web/GetOrganizations",
                    success: function (result) {
                        var Organization = "";
                        if (result.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                            var data = result.data;
                            for (var i = 0; i < data.length; i++) {
                                Organization += '<option  style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
                            }
                            $("#HOrgID").append(Organization);
                            $("#HOrgID").val(sessionStorage["OrganizationID"])
                            form.render('select');
                        }
                        layer.closeAll("loading");
                    }
                })
            }
            //#region åˆå§‹åŒ–界面
            function set_ClearBill() {
                //初始化表格
                set_InitGrid();
                Organ();
                //查询
                get_Display(sWhere);
                get_FastQuery(1);
            }
            //#endregion
@@ -171,6 +204,7 @@
                        , { field: '计量单位', title: '计量单位' }
                        , { field: '默认工艺', title: '默认工艺' }
                        , { field: '表头备注', title: '表头备注' }
                        , { field: '组织', title: '组织' }
                        //, { field: 'hsubid', title: 'hsubid', width: 80 }
                        , { field: '工序号', title: '工序号' }
                        , { field: '委外标记', title: '委外标记' }
@@ -251,11 +285,20 @@
            //#endregion
            //#region å¿«é€Ÿè¿‡æ»¤
            function get_FastQuery() {
            function get_FastQuery(number) {
                var HOrgID = "";
                var HOrderProcNO = $("#HOrderProcNO").val();//单据类型
                var hnumber = $("#hnumber").val();
                //var HName = $("#HName").val();
                var WorkCenter = $("#WorkCenter").val();//单据号
                if (number == 1) {
                    HOrgID = sessionStorage["OrganizationID"];
                }
                else {
                    HOrgID = $("#HOrgID").val();//组织
                }
                if (HOrderProcNO) {
                    sWhere += " and å•据类型 like '%" + HOrderProcNO + "%'";
                }
@@ -265,6 +308,9 @@
                if (WorkCenter) {
                    sWhere += " and å•据号 like '%" + WorkCenter + "%'";
                }
                if (HOrgID) {
                    sWhere += " and HOrgID = '" + HOrgID + "'";
                }
                get_Display(sWhere);
                sWhere = "";//调用接口后清空sWhere缓存
            }
WebTM/views/¼Æ»®¹ÜÀí/¹¤ÒÕ·Ïß/Gy_RoutingBillimport.html
New file
@@ -0,0 +1,292 @@
<!DOCTYPE html>
<html>
<head>
    <meta charset="utf-8" />
    <title>工艺路线数据导入</title>
    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
    <script src="../../../layuiadmin/layui/layui.js"></script>
    <script src="../../../layuiadmin/Scripts/json2.js"></script>
    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
    <script src="../../../layuiadmin/PubCustom.js"></script>
</head>
<body>
    <div class="layui-fluid">
        <div class="layui-col-md12">
            <div class="layui-card" style="padding: 1px">
                <div class="layui-card-body" style="padding: 1px;">
                    <form class="layui-form" action="" lay-filter="component-form-group">
                        <div style="padding: 10px; ">
                            <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSave" id="btnSave">导入数据</button>
                            <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Cancel" id="Cancel">退出</button>
                            <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="UpLoad" id="UpLoad">文件上传</button>
                        </div>
                        <div class="layui-collapse">
                            <div class="layui-colla-item">
                                <div class="layui-inline">
                                    <label class="layui-form-label" style="width: 85px;">会计年</label>
                                    <div class="layui-input-block" style="margin-left: 120px; width: 85px;">
                                        <select name="HYear" id="HYear" lay-verify="HYear">
                                            <!--动态渲染组织-->
                                        </select>
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label" style="width: 85px;">会计月</label>
                                    <div class="layui-input-block" style="margin-left: 120px; width: 85px;">
                                        <select name="HPeriod" id="HPeriod" lay-verify="HPeriod">
                                            <!--动态渲染组织-->
                                        </select>
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label" style="width: 85px;">工作簿</label>
                                    <div class="layui-input-block" style="margin-left: 120px;">
                                        <input type="text" class="layui-input" name="WorkBookName" id="WorkBookName" value="Sheet1">
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <div class="layui-input-block" style="margin-left: 10px;min-height:0px">
                                        <input type="checkbox" name="DataAppend" id="DataAppend" lay-skin="primary" lay-filter="DataAppend" title="追加">
                                        <input type="hidden" name="HOrgID" id="HOrgID" lay-verify="HOrgID">
                                    </div>
                                </div>
                            </div>
                        </div>
                        <table class="" id="mainTable" lay-filter="mainTable"></table>
                        <script type="text/html" id="toolbarDemo">
                            <div class="layui-btn-container">
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>删除</button>
                            </div>
                        </script>
                    </form>
                </div>
            </div>
        </div>
    </div>
</body>
</html>
<script>
    var treeCkData = { id: 0 };
    var TagId = "";
    var TagParentId = "";
    layui.config({
        base: '../../../layuiadmin/' //静态资源所在路径
    }).extend({
        index: 'lib/index', //主入口模块
    }).use(['tree', 'index', 'form', 'table', 'element', 'laypage', 'laydate', 'util','upload'], function () {
        //#region å…¬ç”¨å˜é‡
        var $ = layui.$
            , admin = layui.admin
            , layer = layui.layer
            , table = layui.table
            , form = layui.form
            , element = layui.element
            , laypage = layui.laypage
            , laydate = layui.laydate
            , util = layui.util
            , tree = layui.tree
            , util = layui.util
            , upload = layui.upload
        //#endregion
        //#region è¿›å…¥é¡µé¢å³åŠ è½½
        //初始化界面
        set_ClearBill();
        //#endregion
        //#region è§¦å‘事件:包括form.on(){}格式的所有点击事件、选择事件等
        //文件上传
        upload.render({
            elem: '#UpLoad',
            url: GetWEBURL() + '/Gy_RoutingBill/Gy_RoutingBillimport',
            contentType: 'application/json',
            exts: 'xls|xlsx', //允许上传的类型
            data: {
                "WorkBookName": function () {
                    return $("#WorkBookName").val();
                },
                "HOrgID": function () {
                    return sessionStorage["OrganizationID"];
                }
            },
            before: function (data) {
                loadIndex = layer.load(2);
                this.data = {
                    "WorkBookName": $("#WorkBookName").val(),
                    "HOrgID": sessionStorage["OrganizationID"]
                }
            },
            done: function (data1) {
                if (data1.count == 1) {
                    option.data = data1.data;
                    table.render(option);
                    layer.close(loadIndex);
                } else {
                    layer.close(loadIndex);
                    layer.alert(data1.code + data1.Message, { icon: 5 });
                }
            },
            error: function (err) {
                debugger
                layer.alert('导入出现异常', { icon: 2 });
            }
        });
        //退出
        form.on('submit(Cancel)', function () {
            Pub_Close(2);
        })
        //导入  ä¿å­˜æ•°æ®
        form.on('submit(btnSave)', function (data) {
            if (table.cache["mainTable"] != null) {
                set_AddNew(data);
            }
            else {
                layer.msg("无数据,请先导入数据!");
            }
        })
        //#endregion
        //#region æœ¬é¡µé¢è¢«è°ƒç”¨çš„æ‰€æœ‰æ–¹æ³•
        //会计年
        function Year() {
            var yyyy = new Date().getFullYear();
            var YearOption = "";
            for (var i = 0; i <= 10; i++) {
                YearOption += '<option  style="color:blue;" value="' + (yyyy - 5 + i) + '">' + (yyyy - 5 + i) + '</option>';
            }
            $("#HYear").append(YearOption);
            $("#HYear").val(yyyy)
            form.render('select');
        }
        //会计月
        function Month() {
            var MM = new Date().getMonth() + 1;
            var MonthOption = "";
            for (var i = 1; i <= 12; i++) {
                MonthOption += '<option  style="color:blue;" value="' + i + '">' + i + '</option>';
            }
            $("#HPeriod").append(MonthOption);
            $("#HPeriod").val(MM)
            form.render('select');
        }
        //#region åˆå§‹åŒ–界面
        function set_ClearBill() {
            Year();
            Month();
            //初始化表格
            set_InitGrid();
        }
        //#endregion
        //初始化表格
        function set_InitGrid() {
            option = {
                elem: '#mainTable'
                , toolbar: '#toolbarDemo'
                , height: 'full-120'
                , page: true
                , cellMinWidth: 90
                , limit: 50
                , limits: [50, 500, 5000, 20000]
                , loading: false
                , cols: [[
                    { type: 'checkbox', fixed: 'left' }
                    , { field: '产品代码', title: '产品代码', width: 120 }
                    , { field: '产品名称', title: '产品名称', width: 120 }
                    , { field: '规格型号', title: '规格型号', width: 120 }
                    , { field: '单位', title: '单位', width: 120 }
                    , { field: '工艺路线名称', title: '工艺路线名称', width: 120 }
                    , { field: '物料分类', title: '物料分类', width: 120 }
                    , { field: '工序序号', title: '工序序号', width: 120 }
                    , { field: '工序代码', title: '工序代码', width: 120 }
                    , { field: '工序', title: '工序', width: 120 }
                    , { field: '工作中心代码', title: '工作中心代码', width: 120 }
                    , { field: '工作中心', title: '工作中心', width: 120 }
                    , { field: '时间单位', title: '时间单位', width: 120 }
                    , { field: '加工数量', title: '加工数量', width: 120 }
                    , { field: '班产定额', title: '班产定额', width: 120 }
                    , { field: '工序工价', title: '工序工价', width: 120 }
                    , { field: '不合格单价', title: '不合格单价', width: 120 }
                    , { field: '报废单价', title: '报废单价', width: 120 }
                    , { field: '本道固定开工天数', title: '本道固定开工天数', width: 120 }
                    , { field: '本道开工余量', title: '本道开工余量', width: 120 }
                    , { field: '上道等待天数', title: '上道等待天数', width: 120 }
                    , { field: '上道循环周期', title: '上道循环周期', width: 120 }
                    , { field: '自动转移', title: '自动转移', width: 120 }
                    , { field: '外协标记', title: '外协标记', width: 120 }
                    , { field: '供应商代码', title: '供应商代码', width: 120 }
                    , { field: '供应商', title: '供应商', width: 120 }
                    , { field: '工艺参数', title: '工艺参数', width: 120 }
                    , { field: '图纸编号', title: '图纸编号', width: 120 }
                    , { field: '本工序确认记录', title: '本工序确认记录', width: 120 }
                    , { field: '良率', title: '良率', width: 120 }
                    , { field: '备注', title: '备注', width: 120 }
                    , { field: '图号版本', title: '图号版本', width: 120 }
                    , { field: '总装图号', title: '总装图号', width: 120 }
                    , { field: '材质', title: '材质', width: 120 }
                    , { field: '成品编号', title: '成品编号', width: 120 }
                    , { field: '版本', title: '版本', width: 120 }
                    , { field: '模具编号', title: '模具编号', width: 120 }
                    , { field: '程序号', title: '程序号', width: 120 }
                ]]
            };
            //渲染页面
            table.render(option);
        }
        //导入(保存)
        function set_AddNew(data) {
            var num = [];
            for (var i = 0; i < table.cache["mainTable"].length; i++) {
                if (table.cache["mainTable"][i] != "") {
                    table.cache["mainTable"][i].LAY_TABLE_INDEX = i;
                    num.push(table.cache["mainTable"][i])
                }
            }
            data.field.HOrgID = sessionStorage["OrganizationID"];//组织
            var sMainStr = JSON.stringify(data.field);
            var sSubStr = JSON.stringify(num);
            var sMainSub = sMainStr + ';' + sSubStr + ';' + sessionStorage["HUserName"];
            var index = layer.load();
            $.ajax({
                type: "POST",
                url: GetWEBURL() + "/Gy_RoutingBill/Gy_RoutingBill_btnSave",
                async: true,
                data: { "sMainSub": sMainSub },
                dataType: "json",
                success: function (data) {
                    if (data.count == 1) {
                        layer.close(index);
                        layer.msg(data.Message);
                    }
                    else {
                        layer.close(index);
                        layer.msg(data.Message, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    }
                },
                error: function (err) {
                    layer.close(index);
                    layer.msg("错误:" + err, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                }
            });
        }
        //#endregion
        //以上是layui模块
    });
</script>
WebTM/views/³µ¼ä¹ÜÀí/¹¤Ðò³öÕ¾»ã±¨µ¥/Cj_StationOutBillList.html
@@ -405,7 +405,7 @@
                    , shade: 0.6
                    , maxmin: false
                    , anim: 0
                    , content: ['Cj_StationOutBill.html?OperationType=4&linterid=' + data[0].HInterID + '&HSouceBillType=&HBillNo=' + data[0].单据号, 'yes']
                    , content: ['Cj_StationOutBill.html?OperationType=4&linterid=' + data[0].hmainid + '&HSouceBillType=&HBillNo=' + data[0].单据号, 'yes']
                    , resize: false
                    , cancel: function () {
                        btnIs();
@@ -505,7 +505,7 @@
                        $.ajax({
                            url: GetWEBURL() + '/Cj_StationOutBill/del_StationOutBill',
                            type: "GET",
                            data: { "HInterID": data[0].HInterID, "HDeleteMan": sessionStorage["HUserName"] },
                            data: { "HInterID": data[0].hmainid, "HDeleteMan": sessionStorage["HUserName"] },
                            success: function (result) {
                                if (result.count == 1) {
                                    get_FastQuery();
WebTM/views/³µ¼ä¹ÜÀí/¹¤ÐòÁ÷ת¿¨/Sc_ProcessExchangeBill.html
@@ -337,6 +337,17 @@
                                            </div>
                                        </div>-->
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-col-xs3 layui-inline">
                                            <label class="layui-form-label">工艺路线</label>
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" name="RoutingBill" id="RoutingBill" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnRoutingBill" id="btnRoutingBill" style="width: 40px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                </button>
                                            </div>
                                        </div>
                                    </div>
                                </div>
                            </div>
                            <!--检移票信息-->
@@ -550,6 +561,7 @@
                        </div>
                    </div>
                    <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
                    <script type="text/html" id="toolbarDemo">
                        <div class="layui-btn-container">
                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>增加一行</button>
@@ -562,7 +574,6 @@
            </div>
        </div>
    </div>
    <script type="text/html" id="barDemo">
        <!--<a class="layui-btn layui-btn-xs" lay-event="edit">编辑</a>-->
        <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">删除</a>
@@ -589,6 +600,7 @@
                , laydate = layui.laydate
                , element = layui.element;
            var option;
            var btnHMaterID="";
            //判断是否登录 æœªç™»å½•则跳到登录页
            //if (sessionStorage.login != "login") {
            //    layer.confirm("登录失效,请重新登录!", {
@@ -758,7 +770,6 @@
            }
            //头工具栏事件
            table.on('toolbar(mainTable)', function (obj) {
                var checkStatus = table.checkStatus('mainTable')
@@ -812,7 +823,6 @@
                var rowIndex = $(obj.tr).attr("data-index");
                if (obj.event === 'del') {
                    layer.confirm('真的删除行吗?', function (index) {
                        console.log("索引为:" + rowIndex);
                        if (rowIndex === '0') {
                            layer.msg('首行无法删除!!!');
                        } else {
@@ -1226,6 +1236,63 @@
                })
            });
            //选择工艺路线
            form.on('submit(btnRoutingBill)', function () {
                layer.open({
                    type: 2//弹窗类型
                    , skin: 'layui-layer-rim' //加上边框
                    , area: ['90%', '70%']//大小
                    , title: '工艺路线列表'//标题
                    , shift: 2//弹出动画
                    , content: ['../../Baseset/基础资料/Gy_RoutingBillList.html?HMaterID=' + btnHMaterID, 'yes']
                    , btn: ['确定', '取消']
                    , btn1: function (index, layero) {//按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//获取table的elem:"#test"
                        if (checkStatus.data.length === 0) {
                            return layer.msg('请选择数据');
                        }
                        $.ajax({
                            type: "get",
                            url: GetWEBURL() + "LEMS/MES_Gy_RoutingBillList_Json",
                            async: true,
                            data: { "sWhere": " and å•据号='" + checkStatus.data[0].单据号 + "'", "user": sessionStorage["HUserName"] },
                            success: function (result) {
                                var data = result.data;
                                var Tablerow = [];
                                $("#RoutingBill").val(data[0].单据号)
                                for (var i = 0; i < data.length; i++) {
                                    Tablerow.push({
                                        "HProcNo": data[i].工序号, "HProcID": data[i].hprocid, "HProcNumber": data[i].工序代码, "HProcName": data[i].工序, "HWorkRemark": data[i].表体备注,
                                        "HCenterID": data[i].HCenterID, "HCenterNumber": data[i].工作中心代码, "HCenterName": data[i].工作中心名称,
                                        "HDeptID": 0, "HDeptNumber": "", "HDeptName": "",
                                        "HSupID": data[i].HSupID, "HSupNumber": data[i].供应商代码, "HSupName": data[i].供应商, "isEntrust": data[i].委外标记 == 0 ? "false" : "true",
                                        "HQty": data[i].加工数量, "HOutPrice": 0, "HRemark": "", "HRelationQty_In": 0, "HRelationQty_Out": 0,
                                        "HRelationQty_WWOrder": 0, "HRelationQty_Bad": 0, "HOverRate": 0, "HMaxQty": 0,
                                        "HPassRate": "", "HSumPassRate": "", "HTechnologyParameter": data[i].工艺参数, "HPicNum": data[i].图纸编号, "HProcCheckNote": data[i].本工序确认记录
                                    });
                                }
                                option.data = Tablerow;
                                table.render(option);
                                for (var i = 1; i <= data.length; i++) {
                                    $('#isEntrust' + i + '').find("option[value='" + (checkStatus.data[i - 1].委外标记 == 0 ? "false" : "true") + "']").attr("selected", true);
                                }
                                form.render('select');
                            },
                            error: function (result) {
                                layer.close(index);
                                console.log(result);
                                //layer.msg('获取采购订单出现异常', { icon: 2, time: 2000 });
                            }
                        })
                        layer.close(index); //它获取的始终是最新弹出的某个层,值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) { }
                })
            });
            //保存提交
@@ -1499,7 +1566,7 @@
                            $("#HOrderProcNO").val(data.订单跟踪号);
                            $("#HMaterID").val(data.hmaterid);
                            $("#HMaterName").val(data.物料名称);
                            $("#HMaterID2").val(data.hmaterid);
                            $("#HMaterID2").val(data.HMaterID);
                            $("#HMaterName2").val(data.物料名称);
                            $("#HMaterNumber").val(data.物料代码);
                            $("#HMaterNumber2").val(data.物料代码);
@@ -1530,6 +1597,7 @@
                            $("#HProductNum").val(data.成品编号);
                            $("#HVerNum").val(data.版本);
                            $("input[name='HBLFlag']").prop("checked", result.data[0].HBLFlag == 0 ? false : true);//true:选中 false:不选中
                            btnHMaterID= data.hmaterid;
                        }
                        else {
                            layer.msg(result.Message, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });