MES-WEB-LayUI.git

parent: ab2f1a65 | 补丁 | 提交 | ignore whitespace

yangle

2022-10-18 b099b9ad8901bf8dcbd6df3b876467e285e52b20

功能维护

1个文件已添加

8个文件已修改

	WebTM/WebTM.csproj	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/Baseset/基础资料/Gy_WarehouseList_JIT.html	122 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/user/login.html	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/生产管理/拣料配送单/JIT_ComplementGoodsList.html	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/生产管理/生产叫料平台/JIT_ComplementGoodBillMain.html	265 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/生产管理/生产计划平台/JIT_DayPlanPlatForm.html	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/车间管理/叫料管理/Jl_CallGoodsBillMain.html	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/车间管理/叫料管理/叫料退料单/Jl_CallGoodsBillBackMain.html	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/车间管理/车间收料/JIT_SendGoodsBillList.html	14 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 WebTM/WebTM.csproj

@@ -108,6 +108,7 @@
    <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\åºç¡èµæ\Gy_WarehouseList_JIT.html" />
    <Content Include="views\Baseset\åºç¡èµæ\Sc_ICMOBillListView2.html" />
    <Content Include="views\Baseset\åºç¡èµæ\Sc_ProcessExchangeBillListView.html" />
    <Content Include="views\Baseset\åºç¡èµæ\Gy_QCCheckItemListView.html" />

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

New file
@@ -0,0 +1,122 @@
ï»¿<!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-inline">
                                <input type="text" name="Value" id="Value" lay-verify="Value" autocomplete="off" placeholder="è¯·è¾å¥è¿æ»¤å" class="layui-input">
                            </div>
                            <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>
        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 params = getUrlVars();
        var MaterNum = params[params[0]];
        var HOrgID = params[params[1]];

        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;
              
                var index = parent.layer.getFrameIndex(window.name);
                parent.layer.close(index);
            });
            RoadQuery($('#Value').val());
            table.render({
                elem: '#mainTable'
               , data: []
              , cellMinWidth: 80 //å¨å±å®ä¹å¸¸è§ååæ ¼çæå°å®½åº¦ï¼layui 2.2.1 æ°å¢
              , cols: [[
                  { type: 'radio' }
                  , { field: 'ä»åºID', width: 150, title: 'ID', hide: true}
                  , { field: 'ä»åºåç§°', width: 150, title: 'ä»åºåç§°' }
                  , { field: 'ç©æID', width: 150, title: 'ç©æID', hide: true }
                  , { field: 'è°åºä»åºåºåæ°é', width: 150, title: 'è°åºä»åºåºåæ°é' }
                  , { field: 'è°åºä»åºå¯ç¨åºåæ°é', width: 200, title: 'è°åºä»åºå¯ç¨åºåæ°é' }
                  , { field: 'ç©æç¼ç ', width: 150, title: 'ç©æç¼ç ' }
                  , { field: 'ç©æåç§°', width: 150, title: 'ç©æåç§°' }
                  , { field: 'ç©æè§æ ¼åå·', width: 150, title: 'ç©æè§æ ¼åå·' }
                  , { field: 'ç»ç»åç§°', width: 150, title: 'ç»ç»åç§°' }
                  , { field: 'ç»ç»ç¼ç ', width: 150, title: 'ç»ç»ç¼ç ' }
                  , { field: 'ä»åºç¼ç ', width: 150, title: 'ä»åºç¼ç ' }
              ]]
              , page: true
            });
            ///å è½½æ¾ç¤ºæ°æ®
            function RoadQuery(Where) {
                var Value = "";
                if (Where != null) {
                    Value += " and ( ä»åºç¼ç  like '%" + Where + "%' or ä»åºåç§° like '%" + Where + "%')";
                }
                Value += " and  ç©æç¼ç  = '" + MaterNum + "' and åºåç»ç»=" + HOrgID;
                
                $.ajax({
                    type: "get",
                    url: GetWEBURL() + "/Sc_ComplementGoodBill/GetWarehouseList_JIT",
                    async: true,
                    data: { "sWhere": Value },
                    success: function (result) {
                        ajaxReturnData = JSON.parse(JSON.stringify(result)).data;
                        table.reload('mainTable', {
                            data: ajaxReturnData
                            , height: 'full-10'
                            , loading: false
                            , done: function (index, res) {

                            }
                        });
                    },
                    error: function (result) {
                        console.log(result);
                        //layer.msg('è·åéè´è®¢ååºç°å¼å¸¸', { icon: 2, time: 2000 });
                    }
                });
            };
        });
    </script>

</body>
</html>

 WebTM/views/user/login.html

@@ -174,7 +174,7 @@
            //åå¨éç½®æä»¶
            function get_WriteConfigFile() {
                //æ¸ç©ºæ¬å°åå¨çæ°æ®
                localStorage.clear();
                localStorage.removeItem("data");
                var data = {
                    UserID: sessionStorage["Czybm"]
                    , OrgID: sessionStorage["OrganizationID"]

 WebTM/views/Éú²ú¹ÜÀí/¼ðÁÏÅäËÍµ¥/JIT_ComplementGoodsList.html

@@ -264,7 +264,7 @@
            option = {
                elem: '#mainTable'
                //, toolbar: '#toolbarDemo'
                , height: 'full-190'
                , height: 'full-120'
                , page: true
                , cellMinWidth: 90
                , limit: 50

 WebTM/views/Éú²ú¹ÜÀí/Éú²ú½ÐÁÏÆ½Ì¨/JIT_ComplementGoodBillMain.html

@@ -26,7 +26,7 @@
            <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="Bzjjl" id="Bzjjl">æ åä»¶å«æ</button>
                        <!--<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="Yce" id="Yce">å¼åºExcel</button>
@@ -38,89 +38,97 @@
                        <button class="layui-btn layui-btn-normal" type="button" lay-submit="" lay-filter="Yltl" id="Yltl">ä½ééæç³è¯·å</button>
                        <button class="layui-btn layui-btn-normal" type="button" lay-submit="" lay-filter="Bftl" id="Bftl">æ¥åºéæç³è¯·å</button>
                        <button class="layui-btn layui-btn-normal" type="button" lay-submit="" lay-filter="Sctld" id="Sctld">çæéæå</button>
                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px;margin-top:5px;" type="button" lay-submit="" lay-filter="HideColumn" id="HideColumn">éèåè®¾ç½®</button>
                        <button class="layui-btn layui-btn-normal" type="button" lay-submit="" lay-filter="HideColumn" id="HideColumn">éèåè®¾ç½®</button>
                        <button class="layui-btn layui-btn-normal" type="button" lay-submit="" 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-colla-title layui-inline">
                                <div class="layui-inline">
                                    <span>æ´å¤</span>
                                </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">
                                </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; font-size: 20px;">æ¶æ¯:</label>
                                <div style=" height:50px;">
                                    <p id="wjlCount" style="width: 350px; color: red;"></p>
                                    <p id="wtlCount" style="width: 350px; color: red;"></p>
                                </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">
                                        <span>æ´å¤</span>
                                    </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">
                                    </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-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;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-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" onmouseover="this.title=this.value" readonly>
                                            </div>
                                        <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-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="CPNumber" lay-verify="CPNumber" id="CPNumber" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                <input type="hidden" name="CPID" id="CPID" lay-verify="CPID" value="0">
                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnCP" id="btnCP" style="padding: 0 10px;float: right;margin-right: 3px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                </button>
                                            </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="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 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="CPName" lay-verify="CPName" id="CPName" style="background-color:#efefef4d;" readonly>
                                            </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="CPModel" lay-verify="CPModel" id="CPModel" value="" readonly onmouseover="this.title=this.value">
                                            </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"  readonly>
                                        </div>
                                    </div>
                                </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="CPNumber" lay-verify="CPNumber" id="CPNumber" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                            <input type="hidden" name="CPID" id="CPID" lay-verify="CPID" value="0">
                                            <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnCP" id="btnCP" 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;">
                                            <input type="text" class="layui-input" name="CPName" lay-verify="CPName" id="CPName" style="background-color:#efefef4d;" readonly>
                                        </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="CPModel" lay-verify="CPModel" id="CPModel" value="" readonly>
                                        </div>
                                    </div>
                                </div>
                            </div>
                        </div>
                    </div>
                    <div class="layui-collapse">
@@ -160,7 +168,8 @@

        //åå§åçé¢
        set_ClearBill();

        //å®æ¶æ¥è¯¢ å·æ° æªæ£æ æªéæ æ¾ç¤ºçæ¡æ°
        setInterval(NotGeneratedMaterial, 30000);
        //#endregion

        //#region è§¦åäºä»¶ï¼åæ¬form.on(){}æ ¼å¼çææç¹å»äºä»¶ãéæ©äºä»¶ç
@@ -225,6 +234,11 @@
            getXc();
        })

        //éç½®æé®
        form.on('submit(btnReSearch)', function (data) {
            set_ClearQuery();
        });

        //éèåè®¾ç½®
        form.on('submit(HideColumn)', function () {
            get_HideColumn();
@@ -237,10 +251,13 @@
        //åå§åçé¢
        function set_ClearBill()
        {
            NotGeneratedMaterial();
            set_InitGrid();
            get_Display(sWhere);
            Organ();
            DisPlay_HideColumn();
            //è¯»åè¿æ»¤æ¡ä»¶
            get_ReadConfigFile();
        }
        //è·åç»ç»
        function Organ() {
@@ -255,8 +272,17 @@
                        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("dataJL");
                        if (dataG != null) {
                            var data2 = JSON.parse(dataG);
                            $("#Organization").val(data2["Organization"]);
                        } 
                        form.render('select');
                      
                    }
                    layer.closeAll("loading");
                }
@@ -330,7 +356,8 @@
                        option.data = data1.data;
                        table.render(option);
                        layer.close(ajaxLoad);

                        //åå¨è¿æ»¤æ¡ä»¶
                        get_WriteConfigFile();
                        //layer.alert("æ¥è¯¢æå", { icon: 1 });
                    } else {
                        layer.close(ajaxLoad);
@@ -469,6 +496,8 @@
            $(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 = $("#Organization").val();
                        //æå¼ç»´ä¿®é¡¹ç®å°çªä½
                        layer.open({
                            type: 2
@@ -478,7 +507,7 @@
                            , shift: 2 //å¼¹åºå¨ç»
                            , area: ["90%", "90%"] //çªä½å¤§å°
                            , maxmin: true //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
                            , content: ["../../Baseset/åºç¡èµæ/Gy_WarehouseList.html", "yes"]
                            , content: ["../../Baseset/åºç¡èµæ/Gy_WarehouseList_JIT.html?MaterNum=" + MaterNum + "&HOrgID=" + HOrgID, "yes"]
                            , btn: ["ç¡®å®", "åæ¶"]
                            , btn1: function (index, laero) {
                                //æé®ä¸  çåè°
@@ -490,8 +519,11 @@
                                }
                                //æ´æ°è¡¨æ ¼ç¼åçæ°æ®
                                obj.update({
                                    "è°åºä»åº": checkStatus.data[0].HName
                                    , "è°åºä»åºid": checkStatus.data[0].HItemID
                                    "è°åºä»åº": checkStatus.data[0].ä»åºåç§°
                                    , "è°åºä»åºid": checkStatus.data[0].ä»åºID
                                    , "è°åºä»åºåºåæ°é": checkStatus.data[0].è°åºä»åºåºåæ°é
                                    , "è°åºä»åºå¯ç¨åºåæ°é": checkStatus.data[0].è°åºä»åºå¯ç¨åºåæ°é

                                })
                                layer.close(index);//å³éå¼¹çª
                            }
@@ -877,7 +909,80 @@
            })
        }

    
        //æªçææ£æç³è¯·å  æªçæéæåç  æ°æ®
        function NotGeneratedMaterial() {
            //var ajaxLoad = layer.load();
            $.ajax({
                url: GetWEBURL() + '/Sc_ComplementGoodBill/NotGeneratedMaterialList',
                type: "GET",
                data: { "sWhere": sessionStorage["OrganizationID"], "user": sessionStorage["HUserName"] },
                success: function (data1) {
                    if (data1.count == 1) {
                        $("#wjlCount").text("å·²å«æ,æªæ£æç³è¯· " + data1.data[1]["æªçæ"]+" æ¡åæ®");
                        $("#wtlCount").text("å·²éæç³è¯·,æªéæ " + data1.data[0]["æªçæ"]+" æ¡åæ®");
                        //console.log(data1)
                        //layer.close(ajaxLoad);
                       
                    } else {
                        //layer.close(ajaxLoad);
                        layer.alert(data1.code + data1.Message, { icon: 5 });
                    }
                }, error: function () {
                    //layer.close(ajaxLoad);
                    layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
                }
            });
        }

        //éç½®è¿æ»¤æ¡ä»¶
        function set_ClearQuery() {
            $("#HSeOrderBillNo").val("");
            $("#MaterialNumber").val("");
            $("#MaterialName").val("");
            $("#MaterialModel").val("");
            $("#CPNumber").val("");
            $("#CPName").val("");
            $("#CPModel").val("");
            sWhere = "";
        }

        //è¯»åéç½®æä»¶
        function get_ReadConfigFile() {
            //è·åæ¬å°åå¨çæ°æ®
            var data = localStorage.getItem("dataJL");
            if (data != null) {
                var data2 = JSON.parse(data);
                $("#HSeOrderBillNo").val(data2["HSeOrderBillNo"]);
                $("#DepartmentID").val(data2["DepartmentID"]);
                $("#DepartmentName").val(data2["DepartmentName"]);
                $("#MaterialNumber").val(data2["MaterialNumber"]);
                $("#MaterialName").val(data2["MaterialName"]);
                $("#MaterialModel").val(data2["MaterialModel"]);
                $("#CPNumber").val(data2["CPNumber"]);
                $("#CPName").val(data2["CPName"]);
                $("#CPModel").val(data2["CPModel"]);
            }
        }

        //åå¨éç½®æä»¶
        function get_WriteConfigFile() {
            //æ¸ç©ºæ¬å°åå¨çæ°æ®
            localStorage.removeItem("dataJL");
            var data = {
                HSeOrderBillNo: $("#HSeOrderBillNo").val()
                , DepartmentID: $("#DepartmentID").val()
                , DepartmentName: $("#DepartmentName").val()
                , Organization: $("#Organization").val()
                , MaterialNumber: $("#MaterialNumber").val()
                , MaterialName: $("#MaterialName").val()
                , MaterialModel: $("#MaterialModel").val()
                , CPNumber: $("#CPNumber").val()
                , CPName: $("#CPName").val()
                , CPModel: $("#CPModel").val()
            }
            //æ¬å°åå¨
            localStorage.setItem("dataJL", JSON.stringify(data));
        }

        //#endregion


 WebTM/views/Éú²ú¹ÜÀí/Éú²ú¼Æ»®Æ½Ì¨/JIT_DayPlanPlatForm.html

@@ -372,7 +372,7 @@
            columns.push({ field: 'éå®è®¢åå·', title: 'éå®è®¢åå·', width: 150});
            columns.push({ field: 'çäº§è®¢åå·', title: 'çäº§è®¢åå·', width: 150, style: 'background-color: #f9f9f9;' });
            columns.push({ field: 'çäº§è®¢åæç»è¡å·', title: 'çäº§è®¢åæç»è¡å·', width: 150 });
            columns.push({ field: 'ä¼åçº§', title: 'ä¼åçº§', width:150 });
            columns.push({ field: 'ä¼åçº§', title: 'ä¼åçº§', width: 150, edit: 'text' });
            columns.push({ field: 'HProdORGID', title: 'HProdORGID', hide: true });
            columns.push({ field: 'çäº§ç»ç»', title: 'çäº§ç»ç»', width:150 });
            columns.push({ field: 'HMaterID', title: 'HMaterID', hide: true });

 WebTM/views/³µ¼ä¹ÜÀí/½ÐÁÏ¹ÜÀí/Jl_CallGoodsBillMain.html

@@ -244,10 +244,13 @@
                        , { field: 'ç©æä»£ç ', title: 'ç©æä»£ç ', width: 170 }
                        , { field: 'ç©æåç§°', title: 'ç©æåç§°', width: 170 }
                        , { field: 'è§æ ¼åå·', title: 'è§æ ¼åå·', width: 215 }
                        , { field: 'è°å¥ä»åºåç§°', title: 'è°å¥ä»åºåç§°', width: 170 }
                        , { field: 'è°åºä»åºåç§°', title: 'è°åºä»åºåç§°', width: 170 }
                        , { field: 'æ°é', title: 'æ°é', width: 170 }
                        , { field: 'å·¥åºä»£ç ', title: 'å·¥åºä»£ç ', width: 170 }
                        , { field: 'å·¥åºåç§°', title: 'å·¥åºåç§°', width: 170 }
                        , { field: 'ä»åºä»£ç ', title: 'ä»åºä»£ç ', width: 170 }
                        , { field: 'è°å¥ä»åºä»£ç ', title: 'è°å¥ä»åºä»£ç ', width: 170 }
                        , { field: 'è°åºä»åºä»£ç ', title: 'è°åºä»åºä»£ç ', width: 170 }
                        , { field: 'åæ®ç±»å', title: 'åæ®ç±»å' }
                        , { field: 'è¡¨å¤´å¤æ³¨', title: 'è¡¨å¤´å¤æ³¨', width: 170 }
                        , { field: 'éåäºº', title: 'éåäºº', width: 170 }
@@ -276,7 +279,6 @@
                        , { field: 'ä¿ç®¡äºº', title: 'ä¿ç®¡äºº', width: 170 }
                        , { field: 'å«ææ¨¡å¼', title: 'å«ææ¨¡å¼', width: 170 }
                        , { field: 'è¡¨ä½å¤æ³¨', title: 'è¡¨ä½å¤æ³¨', width: 170 }
                        , { field: 'ä»åºåç§°', title: 'ä»åºåç§°', width: 170 }
                        , { field: 'ä»ä½åç§°', title: 'ä»ä½åç§°', width: 170 }
                    ]]
                };

 WebTM/views/³µ¼ä¹ÜÀí/½ÐÁÏ¹ÜÀí/½ÐÁÏÍËÁÏµ¥/Jl_CallGoodsBillBackMain.html

@@ -264,7 +264,7 @@
                    , area: ['90%', '90%']//å¤§å°
                    , title: 'ç©æåè¡¨'//æ é¢
                    , shift: 2//å¼¹åºå¨ç»
                    , content: ['../../Baseset/åºç¡èµæ/Gy_MaterialList.html', 'yes']
                    , content: ['../../../Baseset/åºç¡èµæ/Gy_MaterialList.html', 'yes']
                    , btn: ['ç¡®å®', 'åæ¶']
                    , btn1: function (index, layero) {//æé®ãæé®ä¸ãçåè°
                        var iframeWindow = window['layui-layer-iframe' + index]  //è·åå¼¹æ¡é¡µé¢
@@ -290,7 +290,7 @@
                    , area: ['90%', '90%']//å¤§å°
                    , title: 'çäº§è½¦é´åè¡¨'//æ é¢
                    , shift: 2//å¼¹åºå¨ç»
                    , content: ['../../Baseset/åºç¡èµæ/Gy_DepartmentList.html', 'yes']
                    , content: ['../../../Baseset/åºç¡èµæ/Gy_DepartmentList.html', 'yes']
                    , btn: ['ç¡®å®', 'åæ¶']
                    , btn1: function (index, layero) {//æé®ãæé®ä¸ãçåè°
                        var iframeWindow = window['layui-layer-iframe' + index]  //è·åå¼¹æ¡é¡µé¢

 WebTM/views/³µ¼ä¹ÜÀí/³µ¼äÊÕÁÏ/JIT_SendGoodsBillList.html

@@ -233,15 +233,14 @@
                        , { field: 'æ¥æ', title: 'æ¥æ', width: 200, templet: "<div>{{d.æ¥æ ==null ?'':layui.util.toDateString(d.æ¥æ, 'yyyy-MM-dd')}}</div>" }
                        , { field: 'åæ®ç¶æ', title: 'åæ®ç¶æ', width: 170 }
                        , { field: 'æºååå·', title: 'æºååå·', width: 170 }
                        , { field: 'é¨é¨ä»£ç ', title: 'é¨é¨ä»£ç ', width: 170 }
                        , { field: 'é¨é¨åç§°', title: 'é¨é¨åç§°', width: 170 }
                        , { field: 'ç©æä»£ç ', title: 'ç©æä»£ç ', width: 170 }
                        , { field: 'ç©æåç§°', title: 'ç©æåç§°', width: 170 }
                        , { field: 'è§æ ¼åå·', title: 'è§æ ¼åå·', width: 215 }
                        , { field: 'æ°é', title: 'æ°é', width: 170 }
                        , { field: 'å·¥åºä»£ç ', title: 'å·¥åºä»£ç ', width: 170 }
                        , { field: 'å·¥åºåç§°', title: 'å·¥åºåç§°', width: 170 }
                        , { field: 'ä»åºä»£ç ', title: 'ä»åºä»£ç ', width: 170 }
                        , { field: 'è°å¥ä»åºä»£ç ', title: 'è°å¥ä»åºä»£ç ', width: 170 }
                        , { field: 'è°å¥ä»åºåç§°', title: 'è°å¥ä»åºåç§°', width: 170 }
                        , { field: 'è°åºä»åºä»£ç ', title: 'è°åºä»åºä»£ç ', width: 170 }
                        , { field: 'è°åºä»åºåç§°', title: 'è°åºä»åºåç§°', width: 170 }
                        , { field: 'åæ®ç±»å', title: 'åæ®ç±»å' }
                        , { field: 'è¡¨å¤´å¤æ³¨', title: 'è¡¨å¤´å¤æ³¨', width: 170 }
                        , { field: 'éåäºº', title: 'éåäºº', width: 170 }
@@ -270,8 +269,11 @@
                        , { field: 'ä¿ç®¡äºº', title: 'ä¿ç®¡äºº', width: 170 }
                        , { field: 'å«ææ¨¡å¼', title: 'å«ææ¨¡å¼', width: 170 }
                        , { field: 'è¡¨ä½å¤æ³¨', title: 'è¡¨ä½å¤æ³¨', width: 170 }
                        , { field: 'ä»åºåç§°', title: 'ä»åºåç§°', width: 170 }
                        , { field: 'é¨é¨ä»£ç ', title: 'é¨é¨ä»£ç ', width: 170 }
                        , { field: 'é¨é¨åç§°', title: 'é¨é¨åç§°', width: 170 }
                        , { field: 'ä»ä½åç§°', title: 'ä»ä½åç§°', width: 170 }
                        , { field: 'å·¥åºä»£ç ', title: 'å·¥åºä»£ç ', width: 170 }
                        , { field: 'å·¥åºåç§°', title: 'å·¥åºåç§°', width: 170 }
                    ]]
                };
            }

			@@ -108,6 +108,7 @@
			<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\åºç¡èµæ\Gy_WarehouseList_JIT.html" />
			<Content Include="views\Baseset\åºç¡èµæ\Sc_ICMOBillListView2.html" />
			<Content Include="views\Baseset\åºç¡èµæ\Sc_ProcessExchangeBillListView.html" />
			<Content Include="views\Baseset\åºç¡èµæ\Gy_QCCheckItemListView.html" />

New file
			@@ -0,0 +1,122 @@
			ï»¿<!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-inline">
			<input type="text" name="Value" id="Value" lay-verify="Value" autocomplete="off" placeholder="è¯·è¾å¥è¿æ»¤å" class="layui-input">
			</div>
			<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>
			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 params = getUrlVars();
			var MaterNum = params[params[0]];
			var HOrgID = params[params[1]];

			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;

			var index = parent.layer.getFrameIndex(window.name);
			parent.layer.close(index);
			});
			RoadQuery($('#Value').val());
			table.render({
			elem: '#mainTable'
			, data: []
			, cellMinWidth: 80 //å¨å±å®ä¹å¸¸è§ååæ ¼çæå°å®½åº¦ï¼layui 2.2.1 æ°å¢
			, cols: [[
			{ type: 'radio' }
			, { field: 'ä»åºID', width: 150, title: 'ID', hide: true}
			, { field: 'ä»åºåç§°', width: 150, title: 'ä»åºåç§°' }
			, { field: 'ç©æID', width: 150, title: 'ç©æID', hide: true }
			, { field: 'è°åºä»åºåºåæ°é', width: 150, title: 'è°åºä»åºåºåæ°é' }
			, { field: 'è°åºä»åºå¯ç¨åºåæ°é', width: 200, title: 'è°åºä»åºå¯ç¨åºåæ°é' }
			, { field: 'ç©æç¼ç ', width: 150, title: 'ç©æç¼ç ' }
			, { field: 'ç©æåç§°', width: 150, title: 'ç©æåç§°' }
			, { field: 'ç©æè§æ ¼åå·', width: 150, title: 'ç©æè§æ ¼åå·' }
			, { field: 'ç»ç»åç§°', width: 150, title: 'ç»ç»åç§°' }
			, { field: 'ç»ç»ç¼ç ', width: 150, title: 'ç»ç»ç¼ç ' }
			, { field: 'ä»åºç¼ç ', width: 150, title: 'ä»åºç¼ç ' }
			]]
			, page: true
			});
			///å è½½æ¾ç¤ºæ°æ®
			function RoadQuery(Where) {
			var Value = "";
			if (Where != null) {
			Value += " and ( ä»åºç¼ç like '%" + Where + "%' or ä»åºåç§° like '%" + Where + "%')";
			}
			Value += " and ç©æç¼ç = '" + MaterNum + "' and åºåç»ç»=" + HOrgID;

			$.ajax({
			type: "get",
			url: GetWEBURL() + "/Sc_ComplementGoodBill/GetWarehouseList_JIT",
			async: true,
			data: { "sWhere": Value },
			success: function (result) {
			ajaxReturnData = JSON.parse(JSON.stringify(result)).data;
			table.reload('mainTable', {
			data: ajaxReturnData
			, height: 'full-10'
			, loading: false
			, done: function (index, res) {

			}
			});
			},
			error: function (result) {
			console.log(result);
			//layer.msg('è·åéè´è®¢ååºç°å¼å¸¸', { icon: 2, time: 2000 });
			}
			});
			};
			});
			</script>

			</body>
			</html>

			@@ -174,7 +174,7 @@
			//åå¨éç½®æä»¶
			function get_WriteConfigFile() {
			//æ¸ç©ºæ¬å°åå¨çæ°æ®
			localStorage.clear();
			localStorage.removeItem("data");
			var data = {
			UserID: sessionStorage["Czybm"]
			, OrgID: sessionStorage["OrganizationID"]

			@@ -264,7 +264,7 @@
			option = {
			elem: '#mainTable'
			//, toolbar: '#toolbarDemo'
			, height: 'full-190'
			, height: 'full-120'
			, page: true
			, cellMinWidth: 90
			, limit: 50

			@@ -26,7 +26,7 @@
			<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="Bzjjl" id="Bzjjl">æ åä»¶å«æ</button>
			<!--<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="Yce" id="Yce">å¼åºExcel</button>
			@@ -38,89 +38,97 @@
			<button class="layui-btn layui-btn-normal" type="button" lay-submit="" lay-filter="Yltl" id="Yltl">ä½ééæç³è¯·å</button>
			<button class="layui-btn layui-btn-normal" type="button" lay-submit="" lay-filter="Bftl" id="Bftl">æ¥åºéæç³è¯·å</button>
			<button class="layui-btn layui-btn-normal" type="button" lay-submit="" lay-filter="Sctld" id="Sctld">çæéæå</button>
			<button class="layui-btn layui-btn-normal" style="margin-left: 0px;margin-top:5px;" type="button" lay-submit="" lay-filter="HideColumn" id="HideColumn">éèåè®¾ç½®</button>
			<button class="layui-btn layui-btn-normal" type="button" lay-submit="" lay-filter="HideColumn" id="HideColumn">éèåè®¾ç½®</button>
			<button class="layui-btn layui-btn-normal" type="button" lay-submit="" 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-colla-title layui-inline">
			<div class="layui-inline">
			<span>æ´å¤</span>
			</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">
			</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; font-size: 20px;">æ¶æ¯:</label>
			<div style=" height:50px;">
			<p id="wjlCount" style="width: 350px; color: red;"></p>
			<p id="wtlCount" style="width: 350px; color: red;"></p>
			</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">
			<span>æ´å¤</span>
			</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">
			</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-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;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-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" onmouseover="this.title=this.value" readonly>
			</div>
			<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-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="CPNumber" lay-verify="CPNumber" id="CPNumber" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
			<input type="hidden" name="CPID" id="CPID" lay-verify="CPID" value="0">
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnCP" id="btnCP" style="padding: 0 10px;float: right;margin-right: 3px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
			</button>
			</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="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 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="CPName" lay-verify="CPName" id="CPName" style="background-color:#efefef4d;" readonly>
			</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="CPModel" lay-verify="CPModel" id="CPModel" value="" readonly onmouseover="this.title=this.value">
			</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" readonly>
			</div>
			</div>
			</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="CPNumber" lay-verify="CPNumber" id="CPNumber" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
			<input type="hidden" name="CPID" id="CPID" lay-verify="CPID" value="0">
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnCP" id="btnCP" 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;">
			<input type="text" class="layui-input" name="CPName" lay-verify="CPName" id="CPName" style="background-color:#efefef4d;" readonly>
			</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="CPModel" lay-verify="CPModel" id="CPModel" value="" readonly>
			</div>
			</div>
			</div>
			</div>
			</div>
			</div>
			<div class="layui-collapse">
			@@ -160,7 +168,8 @@

			//åå§åçé¢
			set_ClearBill();

			//å®æ¶æ¥è¯¢ å·æ° æªæ£æ æªéæ æ¾ç¤ºçæ¡æ°
			setInterval(NotGeneratedMaterial, 30000);
			//#endregion

			//#region è§¦åäºä»¶ï¼åæ¬form.on(){}æ ¼å¼çææç¹å»äºä»¶ãéæ©äºä»¶ç
			@@ -225,6 +234,11 @@
			getXc();
			})

			//éç½®æé®
			form.on('submit(btnReSearch)', function (data) {
			set_ClearQuery();
			});

			//éèåè®¾ç½®
			form.on('submit(HideColumn)', function () {
			get_HideColumn();
			@@ -237,10 +251,13 @@
			//åå§åçé¢
			function set_ClearBill()
			{
			NotGeneratedMaterial();
			set_InitGrid();
			get_Display(sWhere);
			Organ();
			DisPlay_HideColumn();
			//è¯»åè¿æ»¤æ¡ä»¶
			get_ReadConfigFile();
			}
			//è·åç»ç»
			function Organ() {
			@@ -255,8 +272,17 @@
			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("dataJL");
			if (dataG != null) {
			var data2 = JSON.parse(dataG);
			$("#Organization").val(data2["Organization"]);
			}
			form.render('select');

			}
			layer.closeAll("loading");
			}
			@@ -330,7 +356,8 @@
			option.data = data1.data;
			table.render(option);
			layer.close(ajaxLoad);

			//åå¨è¿æ»¤æ¡ä»¶
			get_WriteConfigFile();
			//layer.alert("æ¥è¯¢æå", { icon: 1 });
			} else {
			layer.close(ajaxLoad);
			@@ -469,6 +496,8 @@
			$(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 = $("#Organization").val();
			//æå¼ç»´ä¿®é¡¹ç®å°çªä½
			layer.open({
			type: 2
			@@ -478,7 +507,7 @@
			, shift: 2 //å¼¹åºå¨ç»
			, area: ["90%", "90%"] //çªä½å¤§å°
			, maxmin: true //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
			, content: ["../../Baseset/åºç¡èµæ/Gy_WarehouseList.html", "yes"]
			, content: ["../../Baseset/åºç¡èµæ/Gy_WarehouseList_JIT.html?MaterNum=" + MaterNum + "&HOrgID=" + HOrgID, "yes"]
			, btn: ["ç¡®å®", "åæ¶"]
			, btn1: function (index, laero) {
			//æé®ä¸ çåè°
			@@ -490,8 +519,11 @@
			}
			//æ´æ°è¡¨æ ¼ç¼åçæ°æ®
			obj.update({
			"è°åºä»åº": checkStatus.data[0].HName
			, "è°åºä»åºid": checkStatus.data[0].HItemID
			"è°åºä»åº": checkStatus.data[0].ä»åºåç§°
			, "è°åºä»åºid": checkStatus.data[0].ä»åºID
			, "è°åºä»åºåºåæ°é": checkStatus.data[0].è°åºä»åºåºåæ°é
			, "è°åºä»åºå¯ç¨åºåæ°é": checkStatus.data[0].è°åºä»åºå¯ç¨åºåæ°é

			})
			layer.close(index);//å³éå¼¹çª
			}
			@@ -877,7 +909,80 @@
			})
			}


			//æªçææ£æç³è¯·å æªçæéæåç æ°æ®
			function NotGeneratedMaterial() {
			//var ajaxLoad = layer.load();
			$.ajax({
			url: GetWEBURL() + '/Sc_ComplementGoodBill/NotGeneratedMaterialList',
			type: "GET",
			data: { "sWhere": sessionStorage["OrganizationID"], "user": sessionStorage["HUserName"] },
			success: function (data1) {
			if (data1.count == 1) {
			$("#wjlCount").text("å·²å«æ,æªæ£æç³è¯· " + data1.data[1]["æªçæ"]+" æ¡åæ®");
			$("#wtlCount").text("å·²éæç³è¯·,æªéæ " + data1.data[0]["æªçæ"]+" æ¡åæ®");
			//console.log(data1)
			//layer.close(ajaxLoad);

			} else {
			//layer.close(ajaxLoad);
			layer.alert(data1.code + data1.Message, { icon: 5 });
			}
			}, error: function () {
			//layer.close(ajaxLoad);
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			});
			}

			//éç½®è¿æ»¤æ¡ä»¶
			function set_ClearQuery() {
			$("#HSeOrderBillNo").val("");
			$("#MaterialNumber").val("");
			$("#MaterialName").val("");
			$("#MaterialModel").val("");
			$("#CPNumber").val("");
			$("#CPName").val("");
			$("#CPModel").val("");
			sWhere = "";
			}

			//è¯»åéç½®æä»¶
			function get_ReadConfigFile() {
			//è·åæ¬å°åå¨çæ°æ®
			var data = localStorage.getItem("dataJL");
			if (data != null) {
			var data2 = JSON.parse(data);
			$("#HSeOrderBillNo").val(data2["HSeOrderBillNo"]);
			$("#DepartmentID").val(data2["DepartmentID"]);
			$("#DepartmentName").val(data2["DepartmentName"]);
			$("#MaterialNumber").val(data2["MaterialNumber"]);
			$("#MaterialName").val(data2["MaterialName"]);
			$("#MaterialModel").val(data2["MaterialModel"]);
			$("#CPNumber").val(data2["CPNumber"]);
			$("#CPName").val(data2["CPName"]);
			$("#CPModel").val(data2["CPModel"]);
			}
			}

			//åå¨éç½®æä»¶
			function get_WriteConfigFile() {
			//æ¸ç©ºæ¬å°åå¨çæ°æ®
			localStorage.removeItem("dataJL");
			var data = {
			HSeOrderBillNo: $("#HSeOrderBillNo").val()
			, DepartmentID: $("#DepartmentID").val()
			, DepartmentName: $("#DepartmentName").val()
			, Organization: $("#Organization").val()
			, MaterialNumber: $("#MaterialNumber").val()
			, MaterialName: $("#MaterialName").val()
			, MaterialModel: $("#MaterialModel").val()
			, CPNumber: $("#CPNumber").val()
			, CPName: $("#CPName").val()
			, CPModel: $("#CPModel").val()
			}
			//æ¬å°åå¨
			localStorage.setItem("dataJL", JSON.stringify(data));
			}

			//#endregion

			@@ -372,7 +372,7 @@
			columns.push({ field: 'éå®è®¢åå·', title: 'éå®è®¢åå·', width: 150});
			columns.push({ field: 'çäº§è®¢åå·', title: 'çäº§è®¢åå·', width: 150, style: 'background-color: #f9f9f9;' });
			columns.push({ field: 'çäº§è®¢åæç»è¡å·', title: 'çäº§è®¢åæç»è¡å·', width: 150 });
			columns.push({ field: 'ä¼åçº§', title: 'ä¼åçº§', width:150 });
			columns.push({ field: 'ä¼åçº§', title: 'ä¼åçº§', width: 150, edit: 'text' });
			columns.push({ field: 'HProdORGID', title: 'HProdORGID', hide: true });
			columns.push({ field: 'çäº§ç»ç»', title: 'çäº§ç»ç»', width:150 });
			columns.push({ field: 'HMaterID', title: 'HMaterID', hide: true });

			@@ -244,10 +244,13 @@
			, { field: 'ç©æä»£ç ', title: 'ç©æä»£ç ', width: 170 }
			, { field: 'ç©æåç§°', title: 'ç©æåç§°', width: 170 }
			, { field: 'è§æ ¼åå·', title: 'è§æ ¼åå·', width: 215 }
			, { field: 'è°å¥ä»åºåç§°', title: 'è°å¥ä»åºåç§°', width: 170 }
			, { field: 'è°åºä»åºåç§°', title: 'è°åºä»åºåç§°', width: 170 }
			, { field: 'æ°é', title: 'æ°é', width: 170 }
			, { field: 'å·¥åºä»£ç ', title: 'å·¥åºä»£ç ', width: 170 }
			, { field: 'å·¥åºåç§°', title: 'å·¥åºåç§°', width: 170 }
			, { field: 'ä»åºä»£ç ', title: 'ä»åºä»£ç ', width: 170 }
			, { field: 'è°å¥ä»åºä»£ç ', title: 'è°å¥ä»åºä»£ç ', width: 170 }
			, { field: 'è°åºä»åºä»£ç ', title: 'è°åºä»åºä»£ç ', width: 170 }
			, { field: 'åæ®ç±»å', title: 'åæ®ç±»å' }
			, { field: 'è¡¨å¤´å¤æ³¨', title: 'è¡¨å¤´å¤æ³¨', width: 170 }
			, { field: 'éåäºº', title: 'éåäºº', width: 170 }
			@@ -276,7 +279,6 @@
			, { field: 'ä¿ç®¡äºº', title: 'ä¿ç®¡äºº', width: 170 }
			, { field: 'å«ææ¨¡å¼', title: 'å«ææ¨¡å¼', width: 170 }
			, { field: 'è¡¨ä½å¤æ³¨', title: 'è¡¨ä½å¤æ³¨', width: 170 }
			, { field: 'ä»åºåç§°', title: 'ä»åºåç§°', width: 170 }
			, { field: 'ä»ä½åç§°', title: 'ä»ä½åç§°', width: 170 }
			]]
			};

			@@ -264,7 +264,7 @@
			, area: ['90%', '90%']//å¤§å°
			, title: 'ç©æåè¡¨'//æ é¢
			, shift: 2//å¼¹åºå¨ç»
			, content: ['../../Baseset/åºç¡èµæ/Gy_MaterialList.html', 'yes']
			, content: ['../../../Baseset/åºç¡èµæ/Gy_MaterialList.html', 'yes']
			, btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {//æé®ãæé®ä¸ãçåè°
			var iframeWindow = window['layui-layer-iframe' + index] //è·åå¼¹æ¡é¡µé¢
			@@ -290,7 +290,7 @@
			, area: ['90%', '90%']//å¤§å°
			, title: 'çäº§è½¦é´åè¡¨'//æ é¢
			, shift: 2//å¼¹åºå¨ç»
			, content: ['../../Baseset/åºç¡èµæ/Gy_DepartmentList.html', 'yes']
			, content: ['../../../Baseset/åºç¡èµæ/Gy_DepartmentList.html', 'yes']
			, btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {//æé®ãæé®ä¸ãçåè°
			var iframeWindow = window['layui-layer-iframe' + index] //è·åå¼¹æ¡é¡µé¢

			@@ -233,15 +233,14 @@
			, { field: 'æ¥æ', title: 'æ¥æ', width: 200, templet: "<div>{{d.æ¥æ ==null ?'':layui.util.toDateString(d.æ¥æ, 'yyyy-MM-dd')}}</div>" }
			, { field: 'åæ®ç¶æ', title: 'åæ®ç¶æ', width: 170 }
			, { field: 'æºååå·', title: 'æºååå·', width: 170 }
			, { field: 'é¨é¨ä»£ç ', title: 'é¨é¨ä»£ç ', width: 170 }
			, { field: 'é¨é¨åç§°', title: 'é¨é¨åç§°', width: 170 }
			, { field: 'ç©æä»£ç ', title: 'ç©æä»£ç ', width: 170 }
			, { field: 'ç©æåç§°', title: 'ç©æåç§°', width: 170 }
			, { field: 'è§æ ¼åå·', title: 'è§æ ¼åå·', width: 215 }
			, { field: 'æ°é', title: 'æ°é', width: 170 }
			, { field: 'å·¥åºä»£ç ', title: 'å·¥åºä»£ç ', width: 170 }
			, { field: 'å·¥åºåç§°', title: 'å·¥åºåç§°', width: 170 }
			, { field: 'ä»åºä»£ç ', title: 'ä»åºä»£ç ', width: 170 }
			, { field: 'è°å¥ä»åºä»£ç ', title: 'è°å¥ä»åºä»£ç ', width: 170 }
			, { field: 'è°å¥ä»åºåç§°', title: 'è°å¥ä»åºåç§°', width: 170 }
			, { field: 'è°åºä»åºä»£ç ', title: 'è°åºä»åºä»£ç ', width: 170 }
			, { field: 'è°åºä»åºåç§°', title: 'è°åºä»åºåç§°', width: 170 }
			, { field: 'åæ®ç±»å', title: 'åæ®ç±»å' }
			, { field: 'è¡¨å¤´å¤æ³¨', title: 'è¡¨å¤´å¤æ³¨', width: 170 }
			, { field: 'éåäºº', title: 'éåäºº', width: 170 }
			@@ -270,8 +269,11 @@
			, { field: 'ä¿ç®¡äºº', title: 'ä¿ç®¡äºº', width: 170 }
			, { field: 'å«ææ¨¡å¼', title: 'å«ææ¨¡å¼', width: 170 }
			, { field: 'è¡¨ä½å¤æ³¨', title: 'è¡¨ä½å¤æ³¨', width: 170 }
			, { field: 'ä»åºåç§°', title: 'ä»åºåç§°', width: 170 }
			, { field: 'é¨é¨ä»£ç ', title: 'é¨é¨ä»£ç ', width: 170 }
			, { field: 'é¨é¨åç§°', title: 'é¨é¨åç§°', width: 170 }
			, { field: 'ä»ä½åç§°', title: 'ä»ä½åç§°', width: 170 }
			, { field: 'å·¥åºä»£ç ', title: 'å·¥åºä»£ç ', width: 170 }
			, { field: 'å·¥åºåç§°', title: 'å·¥åºåç§°', width: 170 }
			]]
			};
			}