1

yangle

2022-10-29 ebe78eae552a990d5e5568ac607e402482408b92

1

 WebTM/App_Data/MssqlReportData.cs

@@ -19,11 +19,10 @@
    //public const string SqlConnStr = "Data Source=.;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";
    //public const string SqlConnStr = "Data Source=.;Initial Catalog=HX_LimsSys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//ch测试
    //public const string SqlConnStr = "Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//YL测试
    //public const string SqlConnStr = "Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//丸井
    //public const string SqlConnStr = "Data Source=192.168.0.200;Initial Catalog=HX_LimsSys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//丸井地址
    public const string SqlConnStr = @"Data Source=192.168.0.193\SWE2014;Initial Catalog=HX_LimsSys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//丸井地址
    //public const string SqlConnStr = "Data Source=192.168.0.175;Initial Catalog=HX_LimsSys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//雅琪诺测试
    //public const string SqlConnStr = "Data Source=.;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//凯贝奈特
    public const string SqlConnStr = "Data Source=192.168.0.199;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//瑞琪
    //public const string SqlConnStr = "Data Source=192.168.0.199;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//瑞琪

    //public string sServer;
    //public string sDataBase;

 WebTM/WebTM.csproj

@@ -906,6 +906,7 @@
    <Content Include="views\生产管理\生产包装单\Sc_PackUnionBill.html" />
    <Content Include="views\生产管理\生产包装单\Sc_PackUnionBillEdit.html" />
    <Content Include="views\生产管理\生产叫料平台\JIT_ComplementGoodBillMain.html" />
    <Content Include="views\生产管理\生产叫料平台\JIT_ComplementGoodBillMain_ZXBZ.html" />
    <Content Include="views\生产管理\生产叫料平台\JIT_ComplementGoodPT.html" />
    <Content Include="views\生产管理\生产叫料平台\JIT_HlpBillList.html" />
    <Content Include="views\生产管理\生产完工单\Sc_Add_MESEndWorkBillList - å¤åˆ¶.html" />

 WebTM/views/index.html

@@ -497,7 +497,8 @@
                                <dd>
                                    <a>叫料管理</a>
                                    <dl class="layui-nav-child append" id="append">
                                        <dd><a lay-href="生产管理/生产叫料平台/JIT_ComplementGoodBillMain.html">生产叫料平台(生产订单)</a></dd>
                                        <dd><a lay-href="生产管理/生产叫料平台/JIT_ComplementGoodBillMain.html">生产叫料平台(按订单叫料)</a></dd>
                                        <dd><a lay-href="生产管理/生产叫料平台/JIT_ComplementGoodBillMain_ZXBZ.html">生产叫料平台(最小包装叫料)</a></dd>
                                        <dd><a lay-href="车间管理/叫料管理/Jl_CallGoodsBillMain.html">叫料单列表</a></dd>
                                        <dd><a lay-href="生产管理/拣料配送单/JIT_ComplementGoodsList.html">拣料配送单列表</a></dd>
                                        <dd><a lay-href="生产管理/退料申请单/JIT_CallGoodsBackRequestBillList.html">退料申请单列表</a></dd>
@@ -847,83 +848,38 @@
                                    </a>
                                </dd>
                                <dd>
                                    <a href="http://localhost:64484/KB_ProductionEquipmentOutputAnalysis.html" target="_blank">
                                    <a href="http://183.129.128.86:9090/newKanban/KB_ProductionEquipmentOutputAnalysis.html" target="_blank">
                                        <i class="layui-icon layui-icon-layer"></i>生产设备产量分析看板
                                    </a>
                                </dd>
                                <dd>
                                    <a href="http://localhost:64484/KB_EquipmentUtilizationRate.html" target="_blank">
                                    <a href="http://183.129.128.86:9090/newKanban/KB_EquipmentUtilizationRate.html" target="_blank">
                                        <i class="layui-icon layui-icon-layer"></i>设备稼动率看板
                                    </a>
                                </dd>
                                <dd>
                                    <a href="http://localhost:64484/KB_EquipmentStatus.html" target="_blank">
                                    <a href="http://183.129.128.86:9090/newKanban/KB_EquipmentStatus.html" target="_blank">
                                        <i class="layui-icon layui-icon-layer"></i>设备状态看板
                                    </a>
                                </dd>
                                <dd>
                                    <a href="" target="_blank">
                                    <a href="http://122.227.199.62:5058/HDKanBanUi/SalesDelivery.html" target="_blank">
                                        <i class="layui-icon layui-icon-layer"></i>销售发货看板
                                    </a>
                                </dd>
                                <dd>
                                    <a href="" target="_blank">
                                        <i class="layui-icon layui-icon-layer"></i>生产状态看板
                                    </a>
                                </dd>
                                <dd>
                                    <a href="" target="_blank">
                                        <i class="layui-icon layui-icon-layer"></i>缺料预警看板
                                    </a>
                                </dd>
                                <dd>
                                    <a href="" target="_blank">
                                        <i class="layui-icon layui-icon-layer"></i>采购逾期看板
                                    </a>
                                </dd>
                                <dd>
                                    <a href="" target="_blank">
                                        <i class="layui-icon layui-icon-layer"></i>订单跟踪看板
                                    </a>
                                </dd>
                                <dd>
                                    <a href="" target="_blank">
                                    <a href="http://122.227.199.62:5058/HDKanBanUi/HDHouse.html" target="_blank">
                                        <i class="layui-icon layui-icon-layer"></i>仓库状态看板
                                    </a>
                                </dd>
                                <dd>
                                    <a href="" target="_blank">
                                        <i class="layui-icon layui-icon-layer"></i>仓库发料看板
                                    <a href="http://47.96.97.237/kanbanUi/HDLackMats.html" target="_blank">
                                        <i class="layui-icon layui-icon-layer"></i>缺料预警看板
                                    </a>
                                </dd>
                                <dd>
                                    <a href="" target="_blank">
                                        <i class="layui-icon layui-icon-layer"></i>产线看板
                                    </a>
                                </dd>
                                <dd>
                                    <a href="" target="_blank">
                                    <a href="http://122.227.199.62:5058/HDKanBanUi/HDCALL.html" target="_blank">
                                        <i class="layui-icon layui-icon-layer"></i>叫料看板
                                    </a>
                                </dd>
                                <dd>
                                    <a href="" target="_blank">
                                        <i class="layui-icon layui-icon-layer"></i>品质看板
                                    </a>
                                </dd>
                                <dd>
                                    <a href="" target="_blank">
                                        <i class="layui-icon layui-icon-layer"></i>销售分布看板
                                    </a>
                                </dd>
                                <dd>
                                    <a href="" target="_blank">
                                        <i class="layui-icon layui-icon-layer"></i>设备状态看板
                                    </a>
                                </dd>
                                <dd>
                                    <a href="" target="_blank">
                                        <i class="layui-icon layui-icon-layer"></i>器具状态看板
                                    </a>
                                </dd>
                            </dl>

 WebTM/views/»ù´¡×ÊÁÏ/»ù´¡×ÊÁÏ/InventoryAnalysis.html

@@ -46,6 +46,9 @@
                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch1" id="btnReSearch1">
                                                    é‡ç½®
                                                </button>
                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnDel" id="btnDel">
                                                    åˆ é™¤
                                                </button>
                                            </div>
                                        </div>
                                    </div>
@@ -401,6 +404,39 @@
                });
            });

            //删除按钮
            form.on('submit(btnDel)', function (data) {
                var HItemID = $("#HItemID").val();//盘点
                if (HItemID) {
                    layer.confirm('是否删除其他无用的库存？', {
                        icon: 3,
                        title: "提示",
                        btn: ['确定', '取消'],
                        btn1: function (index) {
                            $.ajax({
                                url: GetWEBURL() + 'Gy_StockCheckItemBill/StockItemSubDel',
                                type: "GET",
                                anysc: false,
                                data: { "sID": HItemID },
                                success: function (data1) {
                                    if (data1.count == 1) {
                                        layer.msg(data1.Message, { icon: 1 });
                                    } else {
                                        layer.alert(data1.code + data1.Message, { icon: 5 });
                                    }
                                }, error: function () {
                                    layer.alert("接口失效!", { icon: 5 });
                                }
                            })
                        }
                    })
                }
                else {
                    layer.msg("请选择盘点方案");
                    return;
                }
            });

            //盘点方案弹窗
            form.on('submit(HSourceInterList)', function () {
                //页面层-自定义

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

@@ -112,9 +112,10 @@
                                            <div class="layui-input-block">
                                                <select name="HSF" id="HSF" lay-verify="required" lay-search class="layui-input">
                                                    <!--  <option value="全部">全部</option>-->
                                                    <option value="全部" selected="selected">全部</option>
                                                    <option value="已下推">已下推</option>
                                                    <option value="未下推">未下推</option>
                                                    <option value="全部">全部</option>

                                                </select>
                                            </div>
                                        </div>
@@ -189,6 +190,13 @@
            var sWhere = "";
            var sWhere = "";
            var HModName = "Sc_ICMOBillList";
            var HDeptID = 0;

            var params = getUrlVars();
            var HDeptID = params[params[0]];

            //判断是否有参数传递
           

            //初始化表格
            DisPlay_HideColumn();
@@ -210,6 +218,9 @@

                        }
                        $("#HDeptName").append(HDeptName);
                        if (!isNaN(HDeptID)) {
                            $("#HDeptName").val(HDeptID);
                        }
                        form.render('select');
                    }
                    layer.closeAll("loading");
@@ -511,6 +522,14 @@
                            break;
                    }
                    sWhere += " and " + ColName + " " + com;
                }

                //传递的参数不为NAN
                if (!isNaN(HDeptID) && HDeptName==0) {
                    HDeptName = HDeptID;
                }
                if (!isNaN(HDeptID)) {
                    HStatus = "开工";
                }

                if (HSF) {//判断打印状态
@@ -877,6 +896,19 @@
                $("#ColName").append(Organization);
                form.render('select');
            }


            //获取参数
            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;
            }
            //#endregion

            //以上是layui模块

 WebTM/views/Éú²ú¹ÜÀí/Éú²ú½ÐÁÏƽ̨/JIT_ComplementGoodBillMain.html

@@ -28,7 +28,7 @@
                    <div style="padding: 10px; ">
                        <!--<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Bzjjl" id="Bzjjl">标准件叫料</button>-->
                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Ptjl" id="Ptjl">配套叫料</button>
                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Zxbzjl" id="Zxbzjl">最小包装叫料</button>
                        <!--<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Zxbzjl" id="Zxbzjl">最小包装叫料</button>-->
                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Yce" id="Yce">引出Excel</button>
                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Xc" id="Xc">下查</button>
                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Cx" id="Cx">查询</button>
@@ -49,9 +49,12 @@
                                </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="HSeOrderBillNo" lay-verify="HSeOrderBillNo" id="HSeOrderBillNo">
                                <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">生产订单</label>
                                <div class="layui-input-block" style="margin-left: 77px;">
                                    <input type="text" class="layui-input" name="HICMOBillNo" lay-verify="HICMOBillNo" id="HICMOBillNo" style="width: 60%;display: inline-block;" >
                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnICMOBill" id="btnICMOBill" style="padding: 0 10px;float: right;margin-right: 3px;">
                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                    </button>
                                </div>
                            </div>
                            <div class="layui-inline">
@@ -129,12 +132,9 @@
                                </div>
                                <div class="layui-row" style="margin-top:10px;">
                                    <div class="layui-inline">
                                        <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">生产订单</label>
                                        <div class="layui-input-block" style="margin-left: 77px;">
                                            <input type="text" class="layui-input" name="HICMOBillNo" lay-verify="HICMOBillNo" id="HICMOBillNo" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                            <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnICMOBill" id="btnICMOBill" style="padding: 0 10px;float: right;margin-right: 3px;">
                                                <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                            </button>
                                        <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="HSeOrderBillNo" lay-verify="HSeOrderBillNo" id="HSeOrderBillNo">
                                        </div>
                                    </div>
                                </div>
@@ -191,7 +191,7 @@
            var HICMOBillNo = $("#HICMOBillNo").val();
            if (HICMOBillNo == "") {
                $("#Ptjl").hide();
                $("#Zxbzjl").hide();
                //$("#Zxbzjl").hide();
                $("#Jl").hide();
                $("#Scjld").hide();
                $("#Yltl").hide();
@@ -200,7 +200,7 @@
                $("#Sctld").hide();
            } else {
                $("#Ptjl").show();
                $("#Zxbzjl").show();
                //$("#Zxbzjl").show();
                $("#Jl").show();
                $("#Scjld").show();
                $("#Yltl").show();
@@ -294,13 +294,14 @@
        function set_ClearBill()
        {
            NotGeneratedMaterial();
            set_InitGrid();
            get_Display(sWhere);
            Organ();
            DisPlay_HideColumn();
            //读取过滤条件
            get_ReadConfigFile();
            set_InitGrid();
            get_Display(sWhere);
            DisPlay_HideColumn();
        }

        //获取组织
        function Organ() {
            //获取登录页组织列
@@ -308,6 +309,7 @@
            $.ajax({
                type: "get",
                url: GetWEBURL() + "/Web/GetOrganizations",
                async: false,
                success: function (result) {
                    if (result.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                        var data = result.data;
@@ -322,7 +324,9 @@
                        if (dataG != null) {
                            var data2 = JSON.parse(dataG);
                            $("#Organization").val(data2["Organization"]);
                        } 
                        } else {
                            $("#Organization").val(sessionStorage["OrganizationID"]);
                        }
                        form.render('select');
                      
                    }
@@ -392,6 +396,7 @@
            $.ajax({
                url: GetWEBURL() + '/Sc_ComplementGoodBill/ComplementGoodBillList',
                type: "GET",
                async: false,
                data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
                success: function (data1) {
                    if (data1.count == 1) {
@@ -994,6 +999,7 @@
            $.ajax({
                url: GetWEBURL() + '/Sc_ComplementGoodBill/NotGeneratedMaterialList',
                type: "GET",
                async: false,
                data: { "sWhere": sessionStorage["OrganizationID"], "user": sessionStorage["HUserName"] },
                success: function (data1) {
                    if (data1.count == 1) {
@@ -1021,7 +1027,7 @@
                , area: ['90%', '90%']//大小
                , title: '生产订单列表'//标题
                , shift: 2//弹出动画
                , content: ['../../生产管理/生产任务单/Sc_ICMOBillList.html', 'yes']
                , content: ['../../生产管理/生产任务单/Sc_ICMOBillList.html?HDeptID='+ $("#DepartmentID").val(), 'yes']
                , btn: ['确定', '取消']
                , btn1: function (index, layero) {//按钮【按钮一】的回调
                    var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面

 WebTM/views/Éú²ú¹ÜÀí/Éú²ú½ÐÁÏƽ̨/JIT_ComplementGoodBillMain_ZXBZ.html

New file
@@ -0,0 +1,611 @@
<!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>
    <style>
        .layui-row .layui-btn layui-btn-normal {
            margin: 0px 10px;
        }
        /* .layui-inline {
            margin: 0px 80px;
        }*/
    </style>
</head>
<body>
    <div class="layui-fluid" style="padding: 0;">
        <div class="layui-card" style="padding: 2px;background-color: #efefef;">
            <div class="layui-card-body" style="padding: 1px;">
                <form class="layui-form" action="" lay-filter="formData" style="background-color:white;">
                    <div style="padding: 10px; ">
                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Cx" id="Cx">查询</button>
                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Jl" id="Jl">叫料</button>
                        <!--<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Scjld" id="Scjld">生成拣料单</button>
                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Blptl" id="Blptl">不良品退料申请单</button>
                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Yltl" id="Yltl">余量退料申请单</button>
                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Bftl" id="Bftl">报废退料申请单</button>
                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Sctld" id="Sctld">生成退料单</button>-->
                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="HideColumn" id="HideColumn">隐藏列设置</button>
                        <button class="layui-btn layui-btn-normal" type="button" lay-submit="" style="margin-left: 0px;" lay-filter="btnReSearch" id="btnReSearch">重置</button>
                    </div>
                    <div class="layui-collapse">
                        <div class="layui-colla-item">
                            <div class="layui-colla-title layui-inline">
                                <div class="layui-inline">
                                    <span>更多</span>
                                </div>
                            </div>
                            <div class="layui-inline">
                                <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">生产车间</label>
                                <div class="layui-input-block" style="margin-left: 77px;">
                                    <input type="hidden" class="layui-input" lay-verify="DepartmentID" name="DepartmentID" id="DepartmentID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                    <input type="text" class="layui-input" lay-verify="DepartmentName" name="DepartmentName" id="DepartmentName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnDepartment" id="btnDepartment" style="padding: 0 10px;float: right;margin-right: 3px;">
                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                    </button>
                                </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="Organization" id="Organization" lay-verify="Organization">
                                        <!--动态渲染组织-->
                                    </select>
                                </div>
                            </div>
                            <div class="layui-inline">
                                <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">物料代码</label>
                                <div class="layui-input-block" style="margin-left: 77px;">
                                    <input type="text" class="layui-input" lay-verify="MaterialNumber" name="MaterialNumber" id="MaterialNumber" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnMaterial" id="btnMaterial" style="padding: 0 10px;float: right;margin-right: 3px;">
                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                    </button>
                                </div>
                            </div>
                            <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
                                <div class="layui-row" style="margin-top:10px;">
                                    <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="MaterialName" lay-verify="MaterialName" id="MaterialName" style="background-color:#efefef4d;" readonly>
                                            <input type="hidden" name="MaterialID" id="MaterialID" lay-verify="MaterialID" value="0">
                                        </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="MaterialModel" id="MaterialModel" style="background-color:#efefef4d;" readonly>
                                        </div>
                                    </div>
                                </div>
                            </div>
                        </div>
                    </div>
                    <div class="layui-collapse">
                        <div class="layui-colla-item">
                            <div class="layui-form-item" style="padding-top: 10px;">
                                <table class="" id="mainTable" lay-filter="mainTable"></table>
                            </div>
                        </div>
                    </div>
                </form>
            </div>
        </div>
    </div>
</body>
</html>
<script>

    layui.config({
        base: '../../../layuiadmin/' //静态资源所在路径
    }).extend({
        index: 'lib/index' //主入口模块
    }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
        //#region å…¬å…±å˜é‡
        var $ = layui.$
            , admin = layui.admin
            , layer = layui.layer
            , table = layui.table
            , form = layui.form
            , element = layui.element;
        //查询条件
        var sWhere = "";
        var option = [];
        var HModName = "JIT_ComplementGoodBillMain_ZXBZ";
        //#endregion

        //#region è¿›å…¥é¡µé¢å³åŠ è½½

        //初始化界面
        set_ClearBill();
      
        //#endregion

        //#region è§¦å‘事件：包括form.on(){}格式的所有点击事件、选择事件等

        //选择物料
        form.on('submit(btnMaterial)', function () {
            btnMaterial();
        })

        //过滤查询
        form.on('submit(Cx)', function () {
            get_FastQuery();
        })

        //行内事件
        table.on('tool(mainTable)', function (obj) {
            set_GridCellCheck(obj); //行内快捷键筛选
        })

        //重置按钮
        form.on('submit(btnReSearch)', function (data) {
            set_ClearQuery();
        });

        //隐藏列设置
        form.on('submit(HideColumn)', function () {
            get_HideColumn();
        })

        //选择生产车间
        form.on('submit(btnDepartment)', function () {
            btnDepartment();
        })

        //新增叫料单
        form.on('submit(Jl)', function () {
            set_AddNew_Jl();
        })
     
        //#endregion

        //#region æ­¤é¡µé¢æ‰€æœ‰çš„方法

        //初始化界面
        function set_ClearBill()
        {
            set_InitGrid();
            Organ();
            //读取过滤条件
            get_ReadConfigFile();
            get_Display(sWhere);
            DisPlay_HideColumn();
          
        }


        //获取组织
        function Organ() {
            //获取登录页组织列
            var Organization = '';
            $.ajax({
                type: "get",
                async: false,
                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>';
                        }
                        $("#Organization").append(Organization);
                      
                        //获取存储数据
                        var dataG = localStorage.getItem("dataJLBZ");
                        if (dataG != null) {
                            var data2 = JSON.parse(dataG);
                            $("#Organization").val(data2["Organization"]);
                        } else {
                            $("#Organization").val(sessionStorage["OrganizationID"]);
                        }
                        form.render('select');
                    }
                    layer.closeAll("loading");
                }
            })
        }

        //表格数据
        function set_InitGrid() {
            option = {
                elem: '#mainTable'
                //, toolbar: '#toolbarDemo'
                , height: 'full-150'
                , cellMinWidth: 90
                , limit: 500
                , cols: [[
                    { type: 'checkbox', fixed: 'left' }
                    , { field: '序号', title: '序号' }
                    , { field: '物料代码', title: '物料代码', width: 160 }
                    , { field: '物料名称', title: '物料名称', width: 160 }
                    , { field: '规格型号', title: '规格型号'}
                    , { field: '调出仓库', title: '调出仓库', width: 160, edit: 'text', event: 'OutWarehouse' }
                    , { field: '调出仓库ID', title: '调出仓库ID', width: 160, hide: true }
                    , { field: '调入仓库', title: '调入仓库', width: 160, edit: 'text', event: 'InWarehouse' }
                    , { field: '调入仓库id', title: '调入仓库id', width: 160, hide: true }
                    , { field: '调出仓库库存数量', title: '调出仓库库存数量', width: 120 }
                    , { field: '调出仓库可用库存数量', title: '调出仓库可用库存数量', width: 120 }
                    , { field: '库存数量', title: '库存数量', width: 120 }
                    , { field: '可用库存', title: '可用库存', width: 120 }
                    , { field: '叫料数量', title: '叫料数量', width: 120, edit: 'text' }
                    , { field: '可发数量', title: '可发数量', width: 120 }
                    , { field: '可发包数', title: '可发包数', width: 120 }
                    , { field: '用料清单总量', title: '用料清单总量', width: 120 }
                    , { field: '车间仓库库存', title: '车间仓库库存', width: 120 }
                    , { field: '退料数量', title: '退料数量', width: 120, edit: 'text' }
                    , { field: '退料原因', title: '退料原因', width: 160, edit: 'text' }
                    , { field: '车间仓库', title: '车间仓库', width: 160 }
                    , { field: '最小发料数量', title: '最小发料数量', width: 160 }
                    , { field: '计量单位', title: '计量单位', width: 160 }
                    , { field: '工段', title: '工段', width: 160 }
                    , { field: '生产车间', title: '生产车间', width: 160 }
                    , { field: 'HOutOrgID', title: 'HOutOrgID', width: 160, hide: true }
                    , { field: '调出组织', title: '调出组织', width: 160 }
                ]]
            };
        }

        //查询加载数据
        function get_Display(sWhere) {
            var ajaxLoad = layer.load();
            $.ajax({
                url: GetWEBURL() + '/Sc_ComplementGoodBill_ZXBZ/JIT_ComplementGoodBill_ZXBZ_List',
                type: "GET",
                async: false,
                data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
                success: function (data1) {
                    if (data1.count == 1) {
                        option.data = data1.data;
                        table.render(option);
                        layer.close(ajaxLoad);
                      
                        //存储过滤条件
                        get_WriteConfigFile();
                      
                        //layer.alert("查询成功", { icon: 1 });
                    } else {
                        layer.close(ajaxLoad);
                        layer.alert(data1.code + data1.Message, { icon: 5 });
                    }
                }, error: function () {
                    layer.close(ajaxLoad);
                    layer.alert("接口请求失败!", { icon: 5 });
                }
            });
        }

        //物料
        function btnMaterial() {
            layer.open({
                type: 2 //类型
                , skin: 'layui-layer-rim'//加上边框
                , area: ['90%', '90%']//大小
                , title: '物料列表'//标题
                , shift: 2//弹出动画
                , content: ['../../Baseset/基础资料/Gy_MaterialList.html', '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('请选择数据');
                    }
                    //获取数据
                    $("#MaterialID").val(checkStatus.data[0].HItemID);//物料id
                    $("#MaterialName").val(checkStatus.data[0].HName);//物料名称
                    $("#MaterialModel").val(checkStatus.data[0].HModel);//物料规格型号
                    $("#MaterialNumber").val(checkStatus.data[0].HNumber);//物料代码
                    layer.close(index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                }
                , btn2: function (index, layero) { }
            })
        }

        //快速过滤
        function get_FastQuery() {
            var MaterialNumber = $("#MaterialNumber").val(); //物料代码
            var MaterialName = $("#MaterialName").val(); //物料名称
            var MaterialModel = $("#MaterialModel").val(); //物料规格型号
            var HORGID = $("#Organization").val(); //组织
            var HDeptID = $("#DepartmentID").val(); //生产车间
            var user = sessionStorage["Czybm"]; //制单人

            if (HDeptID == 0) {
                return layer.msg("请选择生产车间!");
            }
            sWhere = "'" + MaterialNumber + "','" + MaterialName + "','" + MaterialModel + "','" + HORGID + "'," + HDeptID+",'" + user +"'"
            get_Display(sWhere);
            sWhere = "";
        }

        //行内快捷键
        function set_GridCellCheck(obj) {
            $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
                if (event.key == "F7") {
                    if (obj.event == "OutWarehouse") {
                        var MaterNum = obj.data["物料代码"];
                        var HOrgID = sessionStorage["OrganizationID"];
                        //打开维修项目小窗体
                        layer.open({
                            type: 2
                            , skin: "layui-layer-rim" //加上边框
                            , title: "仓库列表"  //标题
                            , closeBtn: 1  //窗体右上角关闭 çš„ æ ·å¼
                            , shift: 2 //弹出动画
                            , area: ["90%", "90%"] //窗体大小
                            , maxmin: true //设置最大最小按钮是否显示
                            , content: ["../../Baseset/基础资料/Gy_WarehouseList_JIT.html?MaterNum=" + MaterNum + "&HOrgID=" + HOrgID, "yes"]
                            , btn: ["确定", "取消"]
                            , btn1: function (index, laero) {
                                //按钮一  çš„回调
                                var iframeWindow = window["layui-layer-iframe" + index];//获取弹框页面
                                var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//获取选中的数据

                                if (checkStatus.data.length != 1) {
                                    return layer.msg("请选择一条数据");
                                }
                                //更新表格缓存的数据
                                obj.update({
                                    "调出仓库": checkStatus.data[0].仓库名称
                                    , "调出仓库ID": checkStatus.data[0].仓库ID
                                    , "调出仓库库存数量": checkStatus.data[0].调出仓库库存数量
                                    , "调出仓库可用库存数量": checkStatus.data[0].调出仓库可用库存数量
                                    , "HOutOrgID": checkStatus.data[0].库存组织
                                    , "调出组织": checkStatus.data[0].组织名称

                                })
                                layer.close(index);//关闭弹窗
                            }
                        })
                    }

                    if (obj.event == "InWarehouse") {
                        //打开维修项目小窗体
                        layer.open({
                            type: 2
                            , skin: "layui-layer-rim" //加上边框
                            , title: "仓库列表"  //标题
                            , closeBtn: 1  //窗体右上角关闭 çš„ æ ·å¼
                            , shift: 2 //弹出动画
                            , area: ["90%", "90%"] //窗体大小
                            , maxmin: true //设置最大最小按钮是否显示
                            , content: ["../../Baseset/基础资料/Gy_WarehouseList.html", "yes"]
                            , btn: ["确定", "取消"]
                            , btn1: function (index, laero) {
                                //按钮一  çš„回调
                                var iframeWindow = window["layui-layer-iframe" + index];//获取弹框页面
                                var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//获取选中的数据

                                if (checkStatus.data.length != 1) {
                                    return layer.msg("请选择一条数据");
                                }
                                //更新表格缓存的数据
                                obj.update({
                                    "调入仓库": checkStatus.data[0].HName
                                    , "调入仓库id": checkStatus.data[0].HItemID
                                })
                                layer.close(index);//关闭弹窗
                            }
                        })
                    }
                }
            })
        }

        //重置过滤条件
        function set_ClearQuery() {
            $("#MaterialNumber").val("");
            $("#MaterialName").val("");
            $("#MaterialModel").val("");
            sWhere = "";
        }

        //生产车间
        function btnDepartment() {
            layer.open({
                type: 2 //类型
                , skin: 'layui-layer-rim'//加上边框
                , area: ['90%', '90%']//大小
                , title: '生产车间列表'//标题
                , shift: 2//弹出动画
                , content: ['../../Baseset/基础资料/Gy_DepartmentList.html', '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('请选择数据');
                    }
                    //获取数据
                    $("#DepartmentID").val(checkStatus.data[0].HItemID);//部门id
                    $("#DepartmentName").val(checkStatus.data[0].HName);//部门名称
                    layer.close(index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                }
                , btn2: function (index, layero) { }
            })
        }

        //新增叫料单
        function set_AddNew_Jl() {
            var data = table.cache['mainTable'];
            if (data.length == 0) {
                return layer.msg("无数据,无法叫料!");
            }
            else {

                var sMainStr = JSON.stringify(table.cache['mainTable']) + ";" + sessionStorage["HUserName"] + ";" + sessionStorage["OrganizationID"];//sessionStorage["HUserName"]

                $.ajax(
                    {
                        type: "POST",
                        url: GetWEBURL() + "/Sc_ComplementGoodBill_ZXBZ/InsertCallGoodsBill", //方法所在页面和方法名
                        async: true,
                        data: { "msg": sMainStr },
                        dataType: "json",
                        success: function (data) {
                            if (data.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                                layer.msg(data.Message, { icon: 1 });
                                //刷新页面
                                get_FastQuery();
                            }
                            else {
                                layer.alert(data.Message, { icon: 5 });
                            }
                            layer.closeAll("loading");
                        },
                        error: function (err) {
                            layer.alert("错误:" + err, { icon: 5 });
                        }
                    });
            }
        }

        //隐藏列设置
        function get_HideColumn() {
            var colName = "";
            for (var i = 1; i < option.cols[0].length - 1; i++) {
                colName += option.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 + '&colName=' + colName, "yes"]
                , btn: ["确定", "取消"]
                , btn1: function (index, laero) {
                    //刷新表格数据
                    DisPlay_HideColumn();
                    //更新表格缓存的数据
                    layer.close(index);//关闭弹窗
                }
            })
        }

        //显示列数据
        function DisPlay_HideColumn() {
            $.ajax({
                url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
                type: "GET",
                async: false,
                data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
                success: function (data1) {
                    if (data1.data.length != 0) {

                        var dataCol = [];//数据库查询出的列数据
                        var titleData = ["调出仓库ID", "HOutOrgID","调入仓库id"];//不需要显示的字段 å¯æ‰©å±•

                        dataCol = data1.data[0].HGridString.split(',');

                        for (var i = 0; i < option.cols[0].length - 2; i++) {
                            var dataCols = dataCol[i].split('|');
                            //隐藏列
                            if (dataCols[1] == 1) {
                                option.cols[0][i + 1]["hide"] = true;
                            }
                            //设置内容字体大小
                            if (data1.data[0].HFontSize != 0) {
                                option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
                            } else {
                                option.cols[0][i + 1]["style"] = "font-size:100%";
                            }
                            //设置列宽
                            if (dataCols[3] > 0) {
                                option.cols[0][i + 1]["width"] = dataCols[3];
                            }
                            //显示列
                            if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["field"], titleData) == -1) {
                                option.cols[0][i + 1]["hide"] = false;
                            }
                            //字体所在位置(å·¦ å±…中 å³)
                            switch (dataCols[2]) {
                                case "L":
                                    option.cols[0][i + 1]["align"] = "left";
                                    break;
                                case "M":
                                    option.cols[0][i + 1]["align"] = "center";
                                    break;
                                case "R":
                                    option.cols[0][i + 1]["align"] = "right";
                                    break;
                            }
                        }

                        //取消冻结列
                        for (var i = 1; i < option.cols[0].length - 1; i++) {
                            if (option.cols[0][i]["fixed"] != null) {
                                option.cols[0][i]["fixed"] = null;
                            }
                            else {
                                break;
                            }
                        }
                        //冻结列
                        if (data1.data[0].HFixCols != 0) {
                            for (var i = 0; i < data1.data[0].HFixCols; i++) {
                                if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
                                    data1.data[0].HFixCols += 1;
                                }
                                option.cols[0][i + 1]["fixed"] = "left";
                            }
                        }
                        table.render(option);
                    } else {
                        table.render(option);
                    }
                }, error: function () {
                    layer.alert("接口请求失败!", { icon: 5 });
                }
            })
        }

        //读取配置文件
        function get_ReadConfigFile() {
            //获取本地存储的数据
            var data = localStorage.getItem("dataJLBZ");
            if (data != null) {
                var data2 = JSON.parse(data);
                $("#DepartmentID").val(data2["DepartmentID"]);
                $("#DepartmentName").val(data2["DepartmentName"]);
                $("#MaterialNumber").val(data2["MaterialNumber"]);
                $("#MaterialName").val(data2["MaterialName"]);
                $("#MaterialModel").val(data2["MaterialModel"]);
            }
        }

        //存储配置文件
        function get_WriteConfigFile() {
            //清空本地存储的数据
            localStorage.removeItem("dataJLBZ");
            var data = {
                 DepartmentID: $("#DepartmentID").val()
                , DepartmentName: $("#DepartmentName").val()
                , Organization: $("#Organization").val()
                , MaterialNumber: $("#MaterialNumber").val()
                , MaterialName: $("#MaterialName").val()
                , MaterialModel: $("#MaterialModel").val()
            }
            //本地存储
            localStorage.setItem("dataJLBZ", JSON.stringify(data));
        }

        //#endregion

    });


</script>

 WebTM/views/Éú²ú¹ÜÀí/Éú²ú½ÐÁÏƽ̨/JIT_ComplementGoodPT.html

@@ -231,7 +231,7 @@
                    , { field: '调出仓库id', title: '调出仓库id', width: 120, hide: true }
                    , { field: '调入仓库', title: '调入仓库', width: 120, edit: 'text', event: 'InWarehouse' }
                    , { field: '调入仓库id', title: '调入仓库id', width: 120, hide: true }
                    , { field: '配套数量', title: '配套数量', width: 120 }
                    , { field: '配套数量', title: '配套数量', width: 120, edit: 'text' }
                    , { field: '调出仓库可用库存数量', title: '调出仓库可用库存数量', width: 120 }
                    , { field: '调出仓库库存数量', title: '调出仓库库存数量', width: 120 }
                    , { field: '已叫料数量', title: '已叫料数量', width: 160}
@@ -575,8 +575,9 @@
        function set_ptjl() {
            for (var item in table.cache["mainTable"]) {
                if (table.cache["mainTable"][item]["配套数量"] > table.cache["mainTable"][item]["调出仓库可用库存数量"] || table.cache["mainTable"][item]["配套数量"] == 0) {
                    return layer.msg("第" + (parseInt(item)  + 1) + "行的配套数量大于调出仓库可用库存数量!");
                    return layer.msg("第" + (parseInt(item)  + 1) + "行的配套数量大于调出仓库可用库存数量!或者配套数量为0!");
                }

            }

            var sMainStr = JSON.stringify(table.cache['mainTable']) + ";" + sessionStorage["HUserName"] + ";" + sessionStorage["OrganizationID"];