MES-WEB-LayUI.git

parent: 3a185c48 | 补丁 | 提交 | ignore whitespace

Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI

zzr99

2022-03-01 7cf28455e98100773fd04ea6c213b5249c1c0221

Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI

3个文件已修改

3 文件已复制

1 文件已重命名

	WebTM/WebTM.csproj	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/index.html	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/计划管理/工艺路线/Gy_RoutingBillList.html	10 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/车间管理/叫料管理/Jl_CallGoodsBillMain.html	20 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/车间管理/叫料管理/叫料退料单/Jl_CallGoodsBillBackMain.html	73 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/车间管理/叫料管理/拣料配送单/Jl_ComplementGoodsBillMain.html	52 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/车间管理/叫料管理/生产日计划单/Sc_WorkBillAutoSortBillMain.html	102 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 WebTM/WebTM.csproj

@@ -877,7 +877,10 @@
    <Content Include="views\è´¨éç®¡ç\æ£éªæ¹æ¡å\QC_CheckProjectList.html" />
    <Content Include="views\è´¨éç®¡ç\é¦ä»¶æ£éªå\QC_FirstPieceCheckBillList.html" />
    <Content Include="views\è´¨éç®¡ç\é¦ä»¶æ£éªå\QC_Add_Edit_FirstPieceCheckBill.html" />
    <Content Include="views\è½¦é´ç®¡ç\å«æç®¡ç\Ji_CallGoodsBillMain.html" />
    <Content Include="views\è½¦é´ç®¡ç\å«æç®¡ç\Jl_CallGoodsBillMain.html" />
    <Content Include="views\è½¦é´ç®¡ç\å«æç®¡ç\å«æéæå\Jl_CallGoodsBillBackMain.html" />
    <Content Include="views\è½¦é´ç®¡ç\å«æç®¡ç\æ£æééå\Jl_ComplementGoodsBillMain.html" />
    <Content Include="views\è½¦é´ç®¡ç\å«æç®¡ç\çäº§æ¥è®¡åå\Sc_WorkBillAutoSortBillMain.html" />
    <Content Include="views\è½¦é´ç®¡ç\å§å¤å·¥åºååºå\Cj_StationEntrustInBill_Mul_PDA.html" />
    <Content Include="views\è½¦é´ç®¡ç\å§å¤å·¥åºååºå\Cj_StationEntrustInBill_PDA.html" />
    <Content Include="views\è½¦é´ç®¡ç\å§å¤å·¥åºååºå\Cj_StationEntrustInBill_Mul.html" />
@@ -1204,7 +1207,6 @@
  <ItemGroup>
    <Folder Include="views\ä»åç®¡ç\è°æ¨åæ ¸å¯¹\" />
    <Folder Include="views\ä»åç®¡ç\è°æ¨åç¨½æ ¸\" />
    <Folder Include="views\è½¦é´ç®¡ç\å«æç®¡ç\æ£æééå\" />
  </ItemGroup>
  <PropertyGroup>
    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>

 WebTM/views/index.html

@@ -411,8 +411,10 @@
                                <dd>
                                    <a>å«æç®¡ç</a>
                                    <dl class="layui-nav-child append" id="append">
                                        <dd><a lay-href="è½¦é´ç®¡ç/å«æç®¡ç/Ji_CallGoodsBillMain.html">å«æååè¡¨</a></dd>
                                        <dd><a lay-href="è½¦é´ç®¡ç/å«æç®¡ç/æ£æééå/Ji_CallGoodsBillMain.html">æ£æééååè¡¨</a></dd>
                                        <dd><a lay-href="è½¦é´ç®¡ç/å«æç®¡ç/Jl_CallGoodsBillMain.html">å«æååè¡¨</a></dd>
                                        <dd><a lay-href="è½¦é´ç®¡ç/å«æç®¡ç/æ£æééå/Jl_ComplementGoodsBillMain.html">æ£æééååè¡¨</a></dd>
                                        <dd><a lay-href="è½¦é´ç®¡ç/å«æç®¡ç/å«æéæå/Jl_CallGoodsBillBackMain.html">å«æéæååè¡¨</a></dd>
                                        <dd><a lay-href="è½¦é´ç®¡ç/å«æç®¡ç/çäº§æ¥è®¡åå/Sc_WorkBillAutoSortBillMain.html">çäº§æ¥è®¡åååè¡¨</a></dd>
                                    </dl>
                                </dd>
                            </dl>

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

@@ -133,10 +133,7 @@

            //éç½®æé®
            form.on('submit(btnReSearch)', function (data) {
                $("#WorkCenter").val("");//åæ®å·
                $("#hnumber").val("");//ç©æ
                $("#HOrderProcNO").val("");//åæ®ç±»å
                $("#btnSearch").click();
              
                set_ClearQuery();
            });
            //#endregion
@@ -217,7 +214,10 @@

            //#region éç½®è¿æ»¤æ¡ä»¶æ¹æ³
            function set_ClearQuery() {
                $("#HNumber").val("");
                $("#WorkCenter").val("");//åæ®å·
                $("#hnumber").val("");//ç©æ
                $("#HOrderProcNO").val("");//åæ®ç±»å
                $("#btnSearch").click();
                $("#HName").val("");
                sWhere = "";
            }

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

File was renamed from WebTM/views/³µ¼ä¹ÜÀí/½ÐÁÏ¹ÜÀí/Ji_CallGoodsBillMain.html
@@ -297,16 +297,16 @@

            //#region å¿«éè¿æ»¤
            function get_FastQuery() {
                var HBeginDate =   $("#HBeginDate").val("");//å¼å§æ¶é´
                var HEndDate = $("#HEndDate").val("");//ç»ææ¶é´
                var HBillNo = $("#HBillNo").val("");//åæ®å·
                var HDeptID =$("#HDeptID").val("");//é¨é¨
                var MaterialCode = $("#MaterialCode").val("");//ç©æä»£ç 
                var MaterialName =$("#MaterialName").val("");//ç©æåç§°
                var SpecificationModel =$("#SpecificationModel").val("");//è§æ ¼åå·
                var Warehouse = $("#Warehouse").val("");//åæä»åº
                var HSourceBillNo = $("#HSourceBillNo").val("");//æºååå·
                var Hmaker =$("#Hmaker").val("");//å¶åäºº
                var HBeginDate =   $("#HBeginDate").val();//å¼å§æ¶é´
                var HEndDate = $("#HEndDate").val();//ç»ææ¶é´
                var HBillNo = $("#HBillNo").val();//åæ®å·
                var HDeptID =$("#HDeptID").val();//é¨é¨
                var MaterialCode = $("#MaterialCode").val();//ç©æä»£ç 
                var MaterialName =$("#MaterialName").val();//ç©æåç§°
                var SpecificationModel =$("#SpecificationModel").val();//è§æ ¼åå·
                var Warehouse = $("#Warehouse").val();//åæä»åº
                var HSourceBillNo = $("#HSourceBillNo").val();//æºååå·
                var Hmaker =$("#Hmaker").val();//å¶åäºº

                if (HBeginDate) {
                    sWhere += " and CONVERT(varchar(100),æ¥æ, 23) >= '" + HBeginDate + "'";

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

copy from "WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\217\253\346\226\231\347\256\241\347\220\206/Ji_CallGoodsBillMain.html"
copy to "WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\217\253\346\226\231\347\256\241\347\220\206/\345\217\253\346\226\231\351\200\200\346\226\231\345\215\225/Jl_CallGoodsBillBackMain.html"
File was copied from WebTM/views/³µ¼ä¹ÜÀí/½ÐÁÏ¹ÜÀí/Ji_CallGoodsBillMain.html
@@ -2,15 +2,15 @@
<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/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>
    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
    <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/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>
    <script src="../../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
</head>
<body>
    <div class="layui-fluid">
@@ -117,7 +117,7 @@
    </div>
    <script>
        layui.config({
            base: '../../../layuiadmin/' //éæèµæºæå¨è·¯å¾
            base: '../../../../layuiadmin/' //éæèµæºæå¨è·¯å¾
        }).extend({
            index: 'lib/index', //ä¸»å¥å£æ¨¡å
        }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
@@ -131,7 +131,7 @@
                , element = layui.element
                , laypage = layui.laypage
                , laydate = layui.laydate
            

            var sWhere = "";
            var option = [];
            //#endregion
@@ -178,6 +178,7 @@
            form.on('submit(btnReSearch)', function (data) {
                set_ClearQuery();
            });

            //#endregion

            //#region æ¤é¡µé¢ææçæ¹æ³
@@ -228,13 +229,13 @@
                        , { 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 }
                        , { 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 }
@@ -245,9 +246,16 @@
                        , { 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 }
                        , { 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 }
                    ]]
                };
            }
@@ -274,7 +282,7 @@
            function get_Display(sWhere) {
                var ajaxLoad = layer.load();
                $.ajax({
                    url: GetWEBURL() + '/Cj_CallGoodsBillMain/CallGoodsBillMainList',
                    url: GetWEBURL() + '/Cj_CallGoodsBillBack/CallGoodsBillBackMainList',
                    type: "GET",
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
                    success: function (data1) {
@@ -297,16 +305,16 @@

            //#region å¿«éè¿æ»¤
            function get_FastQuery() {
                var HBeginDate =   $("#HBeginDate").val("");//å¼å§æ¶é´
                var HEndDate = $("#HEndDate").val("");//ç»ææ¶é´
                var HBillNo = $("#HBillNo").val("");//åæ®å·
                var HDeptID =$("#HDeptID").val("");//é¨é¨
                var MaterialCode = $("#MaterialCode").val("");//ç©æä»£ç 
                var MaterialName =$("#MaterialName").val("");//ç©æåç§°
                var SpecificationModel =$("#SpecificationModel").val("");//è§æ ¼åå·
                var Warehouse = $("#Warehouse").val("");//åæä»åº
                var HSourceBillNo = $("#HSourceBillNo").val("");//æºååå·
                var Hmaker =$("#Hmaker").val("");//å¶åäºº
                var HBeginDate = $("#HBeginDate").val();//å¼å§æ¶é´
                var HEndDate = $("#HEndDate").val();//ç»ææ¶é´
                var HBillNo = $("#HBillNo").val();//åæ®å·
                var HDeptID = $("#HDeptID").val();//é¨é¨
                var MaterialCode = $("#MaterialCode").val();//ç©æä»£ç 
                var MaterialName = $("#MaterialName").val();//ç©æåç§°
                var SpecificationModel = $("#SpecificationModel").val();//è§æ ¼åå·
                var Warehouse = $("#Warehouse").val();//åæä»åº
                var HSourceBillNo = $("#HSourceBillNo").val();//æºååå·
                var Hmaker = $("#Hmaker").val();//å¶åäºº

                if (HBeginDate) {
                    sWhere += " and CONVERT(varchar(100),æ¥æ, 23) >= '" + HBeginDate + "'";
@@ -330,7 +338,7 @@
                    sWhere += " and è§æ ¼åå· like '%" + SpecificationModel + "%'";
                }
                if (Warehouse) {
                    sWhere += " and ä»åºåç§° like '%" + Warehouse + "%'";
                    sWhere += " and è°å¥ä»åºåç§° like '%" + Warehouse + "%'";
                }
                if (HSourceBillNo) {
                    sWhere += " and æºååå· like '%" + HSourceBillNo + "%'";
@@ -342,13 +350,6 @@
                sWhere = "";//è°ç¨æ¥å£åæ¸ç©ºsWhereç¼å
            }
            //#endregion

            ////#region å·æ°
            //function get_Refresh() {
            //    set_ClearQuery();
            //    get_Display(sWhere);
            //}
            ////#endregion

            //#endregion


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

copy from "WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\217\253\346\226\231\347\256\241\347\220\206/Ji_CallGoodsBillMain.html"
copy to "WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\217\253\346\226\231\347\256\241\347\220\206/\346\213\243\346\226\231\351\205\215\351\200\201\345\215\225/Jl_ComplementGoodsBillMain.html"
File was copied from WebTM/views/³µ¼ä¹ÜÀí/½ÐÁÏ¹ÜÀí/Ji_CallGoodsBillMain.html
@@ -2,15 +2,15 @@
<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/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>
    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
    <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/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>
    <script src="../../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
</head>
<body>
    <div class="layui-fluid">
@@ -117,7 +117,7 @@
    </div>
    <script>
        layui.config({
            base: '../../../layuiadmin/' //éæèµæºæå¨è·¯å¾
            base: '../../../../layuiadmin/' //éæèµæºæå¨è·¯å¾
        }).extend({
            index: 'lib/index', //ä¸»å¥å£æ¨¡å
        }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
@@ -131,7 +131,7 @@
                , element = layui.element
                , laypage = layui.laypage
                , laydate = layui.laydate
            

            var sWhere = "";
            var option = [];
            //#endregion
@@ -178,6 +178,7 @@
            form.on('submit(btnReSearch)', function (data) {
                set_ClearQuery();
            });

            //#endregion

            //#region æ¤é¡µé¢ææçæ¹æ³
@@ -274,7 +275,7 @@
            function get_Display(sWhere) {
                var ajaxLoad = layer.load();
                $.ajax({
                    url: GetWEBURL() + '/Cj_CallGoodsBillMain/CallGoodsBillMainList',
                    url: GetWEBURL() + '/Cj_ComplementGoodsBill/ComplementGoodsBillMainList',
                    type: "GET",
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
                    success: function (data1) {
@@ -297,16 +298,16 @@

            //#region å¿«éè¿æ»¤
            function get_FastQuery() {
                var HBeginDate =   $("#HBeginDate").val("");//å¼å§æ¶é´
                var HEndDate = $("#HEndDate").val("");//ç»ææ¶é´
                var HBillNo = $("#HBillNo").val("");//åæ®å·
                var HDeptID =$("#HDeptID").val("");//é¨é¨
                var MaterialCode = $("#MaterialCode").val("");//ç©æä»£ç 
                var MaterialName =$("#MaterialName").val("");//ç©æåç§°
                var SpecificationModel =$("#SpecificationModel").val("");//è§æ ¼åå·
                var Warehouse = $("#Warehouse").val("");//åæä»åº
                var HSourceBillNo = $("#HSourceBillNo").val("");//æºååå·
                var Hmaker =$("#Hmaker").val("");//å¶åäºº
                var HBeginDate =   $("#HBeginDate").val();//å¼å§æ¶é´
                var HEndDate = $("#HEndDate").val();//ç»ææ¶é´
                var HBillNo = $("#HBillNo").val();//åæ®å·
                var HDeptID =$("#HDeptID").val();//é¨é¨
                var MaterialCode = $("#MaterialCode").val();//ç©æä»£ç 
                var MaterialName =$("#MaterialName").val();//ç©æåç§°
                var SpecificationModel =$("#SpecificationModel").val();//è§æ ¼åå·
                var Warehouse = $("#Warehouse").val();//åæä»åº
                var HSourceBillNo = $("#HSourceBillNo").val();//æºååå·
                var Hmaker =$("#Hmaker").val();//å¶åäºº

                if (HBeginDate) {
                    sWhere += " and CONVERT(varchar(100),æ¥æ, 23) >= '" + HBeginDate + "'";
@@ -342,13 +343,6 @@
                sWhere = "";//è°ç¨æ¥å£åæ¸ç©ºsWhereç¼å
            }
            //#endregion

            ////#region å·æ°
            //function get_Refresh() {
            //    set_ClearQuery();
            //    get_Display(sWhere);
            //}
            ////#endregion

            //#endregion


 WebTM/views/³µ¼ä¹ÜÀí/½ÐÁÏ¹ÜÀí/Éú²úÈÕ¼Æ»®µ¥/Sc_WorkBillAutoSortBillMain.html

copy from "WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\217\253\346\226\231\347\256\241\347\220\206/Ji_CallGoodsBillMain.html"
copy to "WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\217\253\346\226\231\347\256\241\347\220\206/\347\224\237\344\272\247\346\227\245\350\256\241\345\210\222\345\215\225/Sc_WorkBillAutoSortBillMain.html"
File was copied from WebTM/views/³µ¼ä¹ÜÀí/½ÐÁÏ¹ÜÀí/Ji_CallGoodsBillMain.html
@@ -2,15 +2,15 @@
<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/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>
    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
    <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/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>
    <script src="../../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
</head>
<body>
    <div class="layui-fluid">
@@ -73,7 +73,7 @@
                                            <input type="text" class="layui-input" name="SpecificationModel" id="SpecificationModel" style="width:190px;">
                                        </div>
                                    </div>
                                    <div class="layui-inline">
                                    <!--<div class="layui-inline">
                                        <label class="layui-form-label">åæä»åº</label>
                                        <div class="layui-input-block">
                                            <input type="text" class="layui-input" name="Warehouse" id="Warehouse" style="width:190px;">
@@ -84,7 +84,7 @@
                                        <div class="layui-input-block">
                                            <input type="text" class="layui-input" name="HSourceBillNo" id="HSourceBillNo" style="width:190px;">
                                        </div>
                                    </div>
                                    </div>-->

                                    <div class="layui-inline">
                                        <label class="layui-form-label">å¶åäºº</label>
@@ -117,7 +117,7 @@
    </div>
    <script>
        layui.config({
            base: '../../../layuiadmin/' //éæèµæºæå¨è·¯å¾
            base: '../../../../layuiadmin/' //éæèµæºæå¨è·¯å¾
        }).extend({
            index: 'lib/index', //ä¸»å¥å£æ¨¡å
        }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
@@ -131,7 +131,7 @@
                , element = layui.element
                , laypage = layui.laypage
                , laydate = layui.laydate
            

            var sWhere = "";
            var option = [];
            //#endregion
@@ -178,6 +178,7 @@
            form.on('submit(btnReSearch)', function (data) {
                set_ClearQuery();
            });

            //#endregion

            //#region æ¤é¡µé¢ææçæ¹æ³
@@ -212,7 +213,6 @@
                        , { field: 'è¡¨å¤´å¤æ³¨', title: 'è¡¨å¤´å¤æ³¨', width: 170 }
                        , { field: 'éåäºº', title: 'éåäºº', width: 170 }
                        , { field: 'éåæ¥æ', title: 'éåæ¥æ', width: 200, templet: "<div>{{d.éåæ¥æ ==null ?'':layui.util.toDateString(d.éåæ¥æ, 'yyyy-MM-dd')}}</div>" }
                        , { field: 'éååå ', title: 'éååå ', width: 170 }
                        , { field: 'å®¡æ ¸äºº', title: 'å®¡æ ¸äºº' }
                        , { field: 'å®¡æ ¸æ¥æ', title: 'å®¡æ ¸æ¥æ', width: 200, templet: "<div>{{d.å®¡æ ¸æ¥æ ==null ?'':layui.util.toDateString(d.å®¡æ ¸æ¥æ, 'yyyy-MM-dd')}}</div>" }
                        , { field: 'å¶åäºº', title: 'å¶åäºº' }
@@ -224,30 +224,19 @@
                        , { field: 'å³éç±»å', title: 'å³éç±»å', width: 170 }
                        , { field: 'ä½åºäºº', title: 'ä½åºäºº' }
                        , { 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: 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 }
                        , { 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: 'çç»åç§°', width: 170 }
                        , { field: 'èµæºæ°', title: 'èµæºæ°', width: 170 }
                        , { field: 'æè¿å¼å·¥', title: 'æè¿å¼å·¥', width: 170 }
                        , { field: 'æè¿å®å·¥', title: 'æè¿å®å·¥', width: 170 }
                        , { field: 'å°æ¶äº§è½', title: 'å°æ¶äº§è½', width: 170 }
                    ]]
                };
            }
@@ -261,8 +250,8 @@
                $("#MaterialCode").val("");//ç©æä»£ç 
                $("#MaterialName").val("");//ç©æåç§°
                $("#SpecificationModel").val("");//è§æ ¼åå·
                $("#Warehouse").val("");//åæä»åº
                $("#HSourceBillNo").val("");//æºååå·
                //$("#Warehouse").val("");//åæä»åº
                //$("#HSourceBillNo").val("");//æºååå·
                $("#Hmaker").val("");//å¶åäºº

                $("#btnSearch").click();//å·æ°
@@ -274,7 +263,7 @@
            function get_Display(sWhere) {
                var ajaxLoad = layer.load();
                $.ajax({
                    url: GetWEBURL() + '/Cj_CallGoodsBillMain/CallGoodsBillMainList',
                    url: GetWEBURL() + '/Sc_WorkBillAutoSortBillMain/WorkBillAutoSortBillMainList',
                    type: "GET",
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
                    success: function (data1) {
@@ -297,16 +286,16 @@

            //#region å¿«éè¿æ»¤
            function get_FastQuery() {
                var HBeginDate =   $("#HBeginDate").val("");//å¼å§æ¶é´
                var HEndDate = $("#HEndDate").val("");//ç»ææ¶é´
                var HBillNo = $("#HBillNo").val("");//åæ®å·
                var HDeptID =$("#HDeptID").val("");//é¨é¨
                var MaterialCode = $("#MaterialCode").val("");//ç©æä»£ç 
                var MaterialName =$("#MaterialName").val("");//ç©æåç§°
                var SpecificationModel =$("#SpecificationModel").val("");//è§æ ¼åå·
                var Warehouse = $("#Warehouse").val("");//åæä»åº
                var HSourceBillNo = $("#HSourceBillNo").val("");//æºååå·
                var Hmaker =$("#Hmaker").val("");//å¶åäºº
                var HBeginDate = $("#HBeginDate").val();//å¼å§æ¶é´
                var HEndDate = $("#HEndDate").val();//ç»ææ¶é´
                var HBillNo = $("#HBillNo").val();//åæ®å·
                var HDeptID = $("#HDeptID").val();//é¨é¨
                var MaterialCode = $("#MaterialCode").val();//ç©æä»£ç 
                var MaterialName = $("#MaterialName").val();//ç©æåç§°
                var SpecificationModel = $("#SpecificationModel").val();//è§æ ¼åå·
                //var Warehouse = $("#Warehouse").val();//åæä»åº
                //var HSourceBillNo = $("#HSourceBillNo").val();//æºååå·
                var Hmaker = $("#Hmaker").val();//å¶åäºº

                if (HBeginDate) {
                    sWhere += " and CONVERT(varchar(100),æ¥æ, 23) >= '" + HBeginDate + "'";
@@ -329,12 +318,12 @@
                if (SpecificationModel) {
                    sWhere += " and è§æ ¼åå· like '%" + SpecificationModel + "%'";
                }
                if (Warehouse) {
                    sWhere += " and ä»åºåç§° like '%" + Warehouse + "%'";
                }
                if (HSourceBillNo) {
                    sWhere += " and æºååå· like '%" + HSourceBillNo + "%'";
                }
                //if (Warehouse) {
                //    sWhere += " and è°å¥ä»åºåç§° like '%" + Warehouse + "%'";
                //}
                //if (HSourceBillNo) {
                //    sWhere += " and æºååå· like '%" + HSourceBillNo + "%'";
                //}
                if (Hmaker) {
                    sWhere += " and å¶åäºº like '%" + Hmaker + "%'";
                }
@@ -342,13 +331,6 @@
                sWhere = "";//è°ç¨æ¥å£åæ¸ç©ºsWhereç¼å
            }
            //#endregion

            ////#region å·æ°
            //function get_Refresh() {
            //    set_ClearQuery();
            //    get_Display(sWhere);
            //}
            ////#endregion

            //#endregion

			@@ -877,7 +877,10 @@
			<Content Include="views\è´¨éç®¡ç\æ£éªæ¹æ¡å\QC_CheckProjectList.html" />
			<Content Include="views\è´¨éç®¡ç\é¦ä»¶æ£éªå\QC_FirstPieceCheckBillList.html" />
			<Content Include="views\è´¨éç®¡ç\é¦ä»¶æ£éªå\QC_Add_Edit_FirstPieceCheckBill.html" />
			<Content Include="views\è½¦é´ç®¡ç\å«æç®¡ç\Ji_CallGoodsBillMain.html" />
			<Content Include="views\è½¦é´ç®¡ç\å«æç®¡ç\Jl_CallGoodsBillMain.html" />
			<Content Include="views\è½¦é´ç®¡ç\å«æç®¡ç\å«æéæå\Jl_CallGoodsBillBackMain.html" />
			<Content Include="views\è½¦é´ç®¡ç\å«æç®¡ç\æ£æééå\Jl_ComplementGoodsBillMain.html" />
			<Content Include="views\è½¦é´ç®¡ç\å«æç®¡ç\çäº§æ¥è®¡åå\Sc_WorkBillAutoSortBillMain.html" />
			<Content Include="views\è½¦é´ç®¡ç\å§å¤å·¥åºååºå\Cj_StationEntrustInBill_Mul_PDA.html" />
			<Content Include="views\è½¦é´ç®¡ç\å§å¤å·¥åºååºå\Cj_StationEntrustInBill_PDA.html" />
			<Content Include="views\è½¦é´ç®¡ç\å§å¤å·¥åºååºå\Cj_StationEntrustInBill_Mul.html" />
			@@ -1204,7 +1207,6 @@
			<ItemGroup>
			<Folder Include="views\ä»åç®¡ç\è°æ¨åæ ¸å¯¹\" />
			<Folder Include="views\ä»åç®¡ç\è°æ¨åç¨½æ ¸\" />
			<Folder Include="views\è½¦é´ç®¡ç\å«æç®¡ç\æ£æééå\" />
			</ItemGroup>
			<PropertyGroup>
			<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>

			@@ -411,8 +411,10 @@
			<dd>
			<a>å«æç®¡ç</a>
			<dl class="layui-nav-child append" id="append">
			<dd><a lay-href="è½¦é´ç®¡ç/å«æç®¡ç/Ji_CallGoodsBillMain.html">å«æååè¡¨</a></dd>
			<dd><a lay-href="è½¦é´ç®¡ç/å«æç®¡ç/æ£æééå/Ji_CallGoodsBillMain.html">æ£æééååè¡¨</a></dd>
			<dd><a lay-href="è½¦é´ç®¡ç/å«æç®¡ç/Jl_CallGoodsBillMain.html">å«æååè¡¨</a></dd>
			<dd><a lay-href="è½¦é´ç®¡ç/å«æç®¡ç/æ£æééå/Jl_ComplementGoodsBillMain.html">æ£æééååè¡¨</a></dd>
			<dd><a lay-href="è½¦é´ç®¡ç/å«æç®¡ç/å«æéæå/Jl_CallGoodsBillBackMain.html">å«æéæååè¡¨</a></dd>
			<dd><a lay-href="è½¦é´ç®¡ç/å«æç®¡ç/çäº§æ¥è®¡åå/Sc_WorkBillAutoSortBillMain.html">çäº§æ¥è®¡åååè¡¨</a></dd>
			</dl>
			</dd>
			</dl>

			@@ -133,10 +133,7 @@

			//éç½®æé®
			form.on('submit(btnReSearch)', function (data) {
			$("#WorkCenter").val("");//åæ®å·
			$("#hnumber").val("");//ç©æ
			$("#HOrderProcNO").val("");//åæ®ç±»å
			$("#btnSearch").click();

			set_ClearQuery();
			});
			//#endregion
			@@ -217,7 +214,10 @@

			//#region éç½®è¿æ»¤æ¡ä»¶æ¹æ³
			function set_ClearQuery() {
			$("#HNumber").val("");
			$("#WorkCenter").val("");//åæ®å·
			$("#hnumber").val("");//ç©æ
			$("#HOrderProcNO").val("");//åæ®ç±»å
			$("#btnSearch").click();
			$("#HName").val("");
			sWhere = "";
			}

File was renamed from WebTM/views/³µ¼ä¹ÜÀí/½ÐÁÏ¹ÜÀí/Ji_CallGoodsBillMain.html
			@@ -297,16 +297,16 @@

			//#region å¿«éè¿æ»¤
			function get_FastQuery() {
			var HBeginDate = $("#HBeginDate").val("");//å¼å§æ¶é´
			var HEndDate = $("#HEndDate").val("");//ç»ææ¶é´
			var HBillNo = $("#HBillNo").val("");//åæ®å·
			var HDeptID =$("#HDeptID").val("");//é¨é¨
			var MaterialCode = $("#MaterialCode").val("");//ç©æä»£ç
			var MaterialName =$("#MaterialName").val("");//ç©æåç§°
			var SpecificationModel =$("#SpecificationModel").val("");//è§æ ¼åå·
			var Warehouse = $("#Warehouse").val("");//åæä»åº
			var HSourceBillNo = $("#HSourceBillNo").val("");//æºååå·
			var Hmaker =$("#Hmaker").val("");//å¶åäºº
			var HBeginDate = $("#HBeginDate").val();//å¼å§æ¶é´
			var HEndDate = $("#HEndDate").val();//ç»ææ¶é´
			var HBillNo = $("#HBillNo").val();//åæ®å·
			var HDeptID =$("#HDeptID").val();//é¨é¨
			var MaterialCode = $("#MaterialCode").val();//ç©æä»£ç
			var MaterialName =$("#MaterialName").val();//ç©æåç§°
			var SpecificationModel =$("#SpecificationModel").val();//è§æ ¼åå·
			var Warehouse = $("#Warehouse").val();//åæä»åº
			var HSourceBillNo = $("#HSourceBillNo").val();//æºååå·
			var Hmaker =$("#Hmaker").val();//å¶åäºº

			if (HBeginDate) {
			sWhere += " and CONVERT(varchar(100),æ¥æ, 23) >= '" + HBeginDate + "'";

File was copied from WebTM/views/³µ¼ä¹ÜÀí/½ÐÁÏ¹ÜÀí/Ji_CallGoodsBillMain.html
			@@ -2,15 +2,15 @@
			<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/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>
			<script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
			<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/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>
			<script src="../../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
			</head>
			<body>
			<div class="layui-fluid">
			@@ -117,7 +117,7 @@
			</div>
			<script>
			layui.config({
			base: '../../../layuiadmin/' //éæèµæºæå¨è·¯å¾
			base: '../../../../layuiadmin/' //éæèµæºæå¨è·¯å¾
			}).extend({
			index: 'lib/index', //ä¸»å¥å£æ¨¡å
			}).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
			@@ -131,7 +131,7 @@
			, element = layui.element
			, laypage = layui.laypage
			, laydate = layui.laydate


			var sWhere = "";
			var option = [];
			//#endregion
			@@ -178,6 +178,7 @@
			form.on('submit(btnReSearch)', function (data) {
			set_ClearQuery();
			});

			//#endregion

			//#region æ¤é¡µé¢ææçæ¹æ³
			@@ -228,13 +229,13 @@
			, { 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 }
			, { 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 }
			@@ -245,9 +246,16 @@
			, { 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 }
			, { 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 }
			]]
			};
			}
			@@ -274,7 +282,7 @@
			function get_Display(sWhere) {
			var ajaxLoad = layer.load();
			$.ajax({
			url: GetWEBURL() + '/Cj_CallGoodsBillMain/CallGoodsBillMainList',
			url: GetWEBURL() + '/Cj_CallGoodsBillBack/CallGoodsBillBackMainList',
			type: "GET",
			data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
			success: function (data1) {
			@@ -297,16 +305,16 @@

			//#region å¿«éè¿æ»¤
			function get_FastQuery() {
			var HBeginDate = $("#HBeginDate").val("");//å¼å§æ¶é´
			var HEndDate = $("#HEndDate").val("");//ç»ææ¶é´
			var HBillNo = $("#HBillNo").val("");//åæ®å·
			var HDeptID =$("#HDeptID").val("");//é¨é¨
			var MaterialCode = $("#MaterialCode").val("");//ç©æä»£ç
			var MaterialName =$("#MaterialName").val("");//ç©æåç§°
			var SpecificationModel =$("#SpecificationModel").val("");//è§æ ¼åå·
			var Warehouse = $("#Warehouse").val("");//åæä»åº
			var HSourceBillNo = $("#HSourceBillNo").val("");//æºååå·
			var Hmaker =$("#Hmaker").val("");//å¶åäºº
			var HBeginDate = $("#HBeginDate").val();//å¼å§æ¶é´
			var HEndDate = $("#HEndDate").val();//ç»ææ¶é´
			var HBillNo = $("#HBillNo").val();//åæ®å·
			var HDeptID = $("#HDeptID").val();//é¨é¨
			var MaterialCode = $("#MaterialCode").val();//ç©æä»£ç
			var MaterialName = $("#MaterialName").val();//ç©æåç§°
			var SpecificationModel = $("#SpecificationModel").val();//è§æ ¼åå·
			var Warehouse = $("#Warehouse").val();//åæä»åº
			var HSourceBillNo = $("#HSourceBillNo").val();//æºååå·
			var Hmaker = $("#Hmaker").val();//å¶åäºº

			if (HBeginDate) {
			sWhere += " and CONVERT(varchar(100),æ¥æ, 23) >= '" + HBeginDate + "'";
			@@ -330,7 +338,7 @@
			sWhere += " and è§æ ¼åå· like '%" + SpecificationModel + "%'";
			}
			if (Warehouse) {
			sWhere += " and ä»åºåç§° like '%" + Warehouse + "%'";
			sWhere += " and è°å¥ä»åºåç§° like '%" + Warehouse + "%'";
			}
			if (HSourceBillNo) {
			sWhere += " and æºååå· like '%" + HSourceBillNo + "%'";
			@@ -342,13 +350,6 @@
			sWhere = "";//è°ç¨æ¥å£åæ¸ç©ºsWhereç¼å
			}
			//#endregion

			////#region å·æ°
			//function get_Refresh() {
			// set_ClearQuery();
			// get_Display(sWhere);
			//}
			////#endregion

			//#endregion