MES-WEB-LayUI.git

parent: c9d64ec1 | 补丁 | 提交 | show whitespace

duhe

2025-08-06 b0f26956ee995f80ab561767c71842a23ad6fcb6

36个文件已修改

	WebTM/WebTM.csproj.user	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/layuiadmin/Scripts/webConfig.js	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/PublicPage/PeopleInformation.html	24 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/WMS扫码模块/其他入库/Kf_OtherInBill_PDA.html	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/WMS扫码模块/其他出库/Kf_OtherOutBill_PDA.html	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/WMS扫码模块/委外入库/Kf_EntrustInBill_PDA.html	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/WMS扫码模块/委外领料/Kf_EntrustOutBill_PDA.html	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/WMS扫码模块/生产入库/Kf_ProductInBill_PDA.html	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/WMS扫码模块/生产汇报/Sc_ICMOReportBill_PDA.html	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/WMS扫码模块/生产补料/Kf_MateReplenishOutBill_PDA.html	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/WMS扫码模块/生产调拨/Kf_MoveStockBill_CusBar_PDA.html	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/WMS扫码模块/生产调拨/Kf_MoveStockBill_Mould_PDA.html	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/WMS扫码模块/生产调拨/Kf_MoveStockBill_PDA.html	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/WMS扫码模块/生产调拨/Kf_MoveStockBill_PDA_XiaBao.html	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/WMS扫码模块/生产调拨/Kf_MoveStockStepInBill_Mould_PDA.html	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/WMS扫码模块/生产调拨/Kf_MoveStockStepInBill_PDA.html	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/WMS扫码模块/生产调拨/Kf_MoveStockStepOutBill_CusBar_PDA.html	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/WMS扫码模块/生产调拨/Kf_MoveStockStepOutBill_Mould_PDA.html	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/WMS扫码模块/生产调拨/Kf_MoveStockStepOutBill_PDA.html	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/WMS扫码模块/生产领料/Kf_MateOutBackBill_PDA.html	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/WMS扫码模块/生产领料/Kf_MateOutBill_PDA.html	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/WMS扫码模块/采购入库/Kf_POStockInBackBill_PDA.html	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/WMS扫码模块/采购入库/Kf_POStockInBill_Mould_PDA.html	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/WMS扫码模块/采购入库/Kf_POStockInBill_PDA.html	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/WMS扫码模块/销售出库/Kf_SellOutBackBill_PDA.html	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/WMS扫码模块/销售出库/Kf_SellOutBill_CusBar_PDA.html	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/WMS扫码模块/销售出库/Kf_SellOutBill_Mould_PDA.html	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/WMS扫码模块/销售出库/Kf_SellOutBill_PDA.html	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/home/console_Mobile.html	18 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/仓存管理/条码生成/Gy_BarCodeBill.html	115 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/基础资料/基础资料/Gy_MatePrice.html	54 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/系统管理/用户管理/Gy_UserStock.html	76 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/系统管理/用户管理/Xt_UserList.html	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/系统管理/用户管理/Xt_UserListEdit.html	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/车间管理/委外工序接收单/Cj_StationEntrustOutBillList.html	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/领料发货/其他出库/Kf_OtherOutBillList.html	19 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 WebTM/WebTM.csproj.user

@@ -2,7 +2,7 @@
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <NameOfLastUsedPublishProfile>D:\æºäºè¿æ\MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
    <NameOfLastUsedPublishProfile>D:\ç½ç«åå¸\åç«¯ä»£ç \MES-WEB-TM\MESWMS-LayUI\WebTM\Properties\PublishProfiles\LAYUI.pubxml</NameOfLastUsedPublishProfile>
    <NameOfLastUsedPublishProfile>D:\WorkBench\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
    <ProjectView>ProjectFiles</ProjectView>
    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
    <UseIISExpress>true</UseIISExpress>

 WebTM/layuiadmin/Scripts/webConfig.js

@@ -3,7 +3,7 @@
    //var WEBURL = "http://192.168.16.80:8011/";          //åå¬å®¤æå¡å¨
    //var WEBURL = "http://localhost:8081/SWEAPI/";       //chæ¬å°*/
    //var WEBURL = "http://61.164.86.218:8099/ABAPI/";
    /*var WEBURL = "http://localhost/API/";             //é¢æåæ¬å°éç½®*/
    // var WEBURL = "http://localhost/API/";             //é¢æåæ¬å°éç½®
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //æ¨ä¹æ¬å°éç½®
    var WEBURL = "http://localhost:8082/API/";    //æè´ºæ¬å°éç½®
    //var WEBURL = "http://localhost:8082/API/";    //å¼ çå¹¿æ¬å°éç½®
@@ -11,6 +11,7 @@
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //æ¨ä¹æ¬å°éç½®
    //var WEBURL = "http://47.96.97.237/API/";          //æºäºæå¡å¨
   /* var WEBURL = "http://localhost:8082/LuBaoAPI/";  //ä½ææ°æ¬å°éç½®*/
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";  //ææä¿æ¬å°éç½®*/
    //var WEBURL = "http://localhost:8088/ARAPI/";      //ä½ææ°æ¬å°éç½®(å®ç)
    //var WEBURL = "http://61.164.86.218:8099/ABAPI/";  //å¥¥é¦
    //var WEBURL = "http://10.1.4.155/API/";            //æ±ä¸°å®¢æ·NEW

 WebTM/views/PublicPage/PeopleInformation.html

@@ -1,5 +1,6 @@
ï»¿<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">

<head>
    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
    <title>éæ©ç¨æ·èµæ</title>
@@ -20,6 +21,7 @@
        }
    </style>
</head>

<body>
    <div class="layui-fluid">
        <div class="layui-col-md12">
@@ -31,14 +33,16 @@
                                <div class="layui-form-item" style="border-top: solid 1px #F6F6F6;">
                                    <div class="layui-row" style="padding:10px 0">
                                        <div class="layui-col-xs3 layui-inline" style="width: 23%; display:none;">
                                            <div id="treeUser" lay-filter="treeUser" class="demo-tree demo-tree-box" style="height: 580px; overflow: scroll;"></div>
                                            <div id="treeUser" lay-filter="treeUser" class="demo-tree demo-tree-box"
                                                style="height: 580px; overflow: scroll;"></div>
                                        </div>
                                        <div class="layui-col-xs12 layui-inline">
                                            <div class="layui-row">
                                                <div class="layui-inline">
                                                    <label class="layui-form-label">ä»£ç </label>
                                                    <div class="layui-input-block">
                                                        <input type="text" class="layui-input" name="HNumber" id="HNumber">
                                                        <input type="text" class="layui-input" name="HNumber"
                                                            id="HNumber">
                                                    </div>
                                                </div>
                                                <div class="layui-inline">
@@ -47,7 +51,8 @@
                                                        <input type="text" class="layui-input" name="HName" id="HName">
                                                    </div>
                                                </div>
                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
                                                <button class="layui-btn layuiadmin-btn-order" type="button"
                                                    lay-submit="" lay-filter="btnSearch" id="btnSearch">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                </button>
                                            </div>
@@ -135,7 +140,19 @@
                }
            });

            //
            table.on('rowDouble(mainTable)', function (obj) {
                if (window.parent == window) {
                    return
                }
                var data = [];
                data.push(obj.data);

                parent.GetPeopleInFormationValue(data)
                var index = parent.layer.getFrameIndex(window.name);

                parent.layer.close(index);
            })
            //æ¥è¯¢æé®
            form.on('submit(btnSearch)', function (data) {

@@ -215,4 +232,5 @@
    </script>

</body>

</html>

 WebTM/views/WMSÉ¨ÂëÄ£¿é/ÆäËûÈë¿â/Kf_OtherInBill_PDA.html

@@ -498,7 +498,7 @@
                $("#HStockOrgName").val(sessionStorage["Organization"]);
                $("#HBillType").val("1203");
                $("#HRedBlueFlag").val("false");
                if (sessionStorage["HWHID"] != 0 && sessionStorage["HWhSPFlag"]) {
                if (sessionStorage["HWHID"] != 0 && sessionStorage["HWhSPFlag"] == 'false') {
                    $("#HStockPlaceID").val("0");
                    $("#HStockPlaceName").val("");
                    $("#HStockPlaceName").attr("disabled", "disabled");

 WebTM/views/WMSÉ¨ÂëÄ£¿é/ÆäËû³ö¿â/Kf_OtherOutBill_PDA.html

@@ -528,7 +528,7 @@
                $("#HStockOrgName").val(sessionStorage["Organization"]);
                $("#HBillType").val("1206");
                $("#HRedBlueFlag").val("false");
                if (sessionStorage["HWHID"] != 0 && sessionStorage["HWhSPFlag"]) {
                if (sessionStorage["HWHID"] != 0 && sessionStorage["HWhSPFlag"] == 'false') {
                    $("#HStockPlaceID").val("0");
                    $("#HStockPlaceName").val("");
                    $("#HStockPlaceName").attr("disabled", "disabled");

 WebTM/views/WMSÉ¨ÂëÄ£¿é/Î¯ÍâÈë¿â/Kf_EntrustInBill_PDA.html

@@ -477,7 +477,7 @@
                $("#HStockOrgName").val(sessionStorage["Organization"]);
                $("#HBillType").val("1210");
                $("#HRedBlueFlag").val("false");
                if (sessionStorage["HWHID"] != 0 && sessionStorage["HWhSPFlag"]) {
                if (sessionStorage["HWHID"] != 0 && sessionStorage["HWhSPFlag"] == 'false') {
                    $("#HStockPlaceID").val("0");
                    $("#HStockPlaceName").val("");
                    $("#HStockPlaceName").attr("disabled", "disabled");

 WebTM/views/WMSÉ¨ÂëÄ£¿é/Î¯ÍâÁìÁÏ/Kf_EntrustOutBill_PDA.html

@@ -500,7 +500,7 @@
                $("#HStockOrgName").val(sessionStorage["Organization"]);
                $("#HBillType").val("1211");
                $("#HRedBlueFlag").val("false");
                if (sessionStorage["HWHID"] != 0 && sessionStorage["HWhSPFlag"]) {
                if (sessionStorage["HWHID"] != 0 && sessionStorage["HWhSPFlag"] == 'false') {
                    $("#HStockPlaceID").val("0");
                    $("#HStockPlaceName").val("");
                    $("#HStockPlaceName").attr("disabled", "disabled");

 WebTM/views/WMSÉ¨ÂëÄ£¿é/Éú²úÈë¿â/Kf_ProductInBill_PDA.html

@@ -479,7 +479,7 @@
                $("#HStockOrgName").val(sessionStorage["Organization"]);
                $("#HBillType").val("1202");
                $("#HRedBlueFlag").val("false");
                if (sessionStorage["HWHID"] != 0 && sessionStorage["HWhSPFlag"]) {
                if (sessionStorage["HWHID"] != 0 && sessionStorage["HWhSPFlag"] == 'false') {
                    $("#HStockPlaceID").val("0");
                    $("#HStockPlaceName").val("");
                    $("#HStockPlaceName").attr("disabled", "disabled");

 WebTM/views/WMSÉ¨ÂëÄ£¿é/Éú²ú»ã±¨/Sc_ICMOReportBill_PDA.html

@@ -357,7 +357,7 @@
                $("#HStockOrgName").val(sessionStorage["Organization"]);
                $("#HBillType").val("3711");
                $("#HRedBlueFlag").val("false");
                if (sessionStorage["HWHID"] != 0 && sessionStorage["HWhSPFlag"]) {
                if (sessionStorage["HWHID"] != 0 && sessionStorage["HWhSPFlag"] == 'false') {
                    $("#HStockPlaceID").val("0");
                    $("#HStockPlaceName").val("");
                    $("#HStockPlaceName").attr("disabled", "disabled");

 WebTM/views/WMSÉ¨ÂëÄ£¿é/Éú²ú²¹ÁÏ/Kf_MateReplenishOutBill_PDA.html

@@ -489,7 +489,7 @@
                $("#HStockOrgName").val(sessionStorage["Organization"]);
                $("#HBillType").val("1254");
                $("#HRedBlueFlag").val("false");
                if (sessionStorage["HWHID"] != 0 && sessionStorage["HWhSPFlag"]) {
                if (sessionStorage["HWHID"] != 0 && sessionStorage["HWhSPFlag"] == 'false') {
                    $("#HStockPlaceID").val("0");
                    $("#HStockPlaceName").val("");
                    $("#HStockPlaceName").attr("disabled", "disabled");

 WebTM/views/WMSÉ¨ÂëÄ£¿é/Éú²úµ÷²¦/Kf_MoveStockBill_CusBar_PDA.html

@@ -638,7 +638,7 @@
                $("#HStockOutOrgID").val(sessionStorage["OrganizationID"]);
                $("#HBillType").val("1207");
                $("#HRedBlueFlag").val("false");
                if (sessionStorage["HSCWHID"]!=0 && sessionStorage["HSCWHSPFlag"]) {
                if (sessionStorage["HSCWHID"] != 0 && sessionStorage["HSCWHSPFlag"] == 'false') {
                    $("#HStockPlaceID").val("0");
                    $("#HStockPlaceName").val("");
                    $("#HStockPlaceName").attr("disabled", "disabled");
@@ -650,7 +650,7 @@
                    $("#HStockPlaceName").removeAttr("disabled");
                    $('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//æé®æ¢å¤æ£å¸¸ç¶æ
                }
                if (sessionStorage["HWHID"] != 0 && sessionStorage["HWhSPFlag"]) {
                if (sessionStorage["HWHID"] != 0 && sessionStorage["HWhSPFlag"] == 'false') {
                    $("#HOutStockPlaceID").val("0");
                    $("#HOutStockPlaceName").val("");
                    $("#HOutStockPlaceName").attr("disabled", "disabled");

 WebTM/views/WMSÉ¨ÂëÄ£¿é/Éú²úµ÷²¦/Kf_MoveStockBill_Mould_PDA.html

@@ -630,7 +630,7 @@
                $("#HStockOutOrgID").val(sessionStorage["OrganizationID"]);
                $("#HBillType").val("1207");
                $("#HRedBlueFlag").val("false");
                if (sessionStorage["HSCWHID"]!=0 && sessionStorage["HSCWHSPFlag"]) {
                if (sessionStorage["HSCWHID"] != 0 && sessionStorage["HSCWHSPFlag"] == 'false') {
                    $("#HStockPlaceID").val("0");
                    $("#HStockPlaceName").val("");
                    $("#HStockPlaceName").attr("disabled", "disabled");
@@ -642,7 +642,7 @@
                    $("#HStockPlaceName").removeAttr("disabled");
                    $('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//æé®æ¢å¤æ£å¸¸ç¶æ
                }
                if (sessionStorage["HWHID"] != 0 && sessionStorage["HWhSPFlag"]) {
                if (sessionStorage["HWHID"] != 0 && sessionStorage["HWhSPFlag"] == 'false') {
                    $("#HOutStockPlaceID").val("0");
                    $("#HOutStockPlaceName").val("");
                    $("#HOutStockPlaceName").attr("disabled", "disabled");

 WebTM/views/WMSÉ¨ÂëÄ£¿é/Éú²úµ÷²¦/Kf_MoveStockBill_PDA.html

@@ -622,7 +622,7 @@
                $("#HStockOutOrgID").val(sessionStorage["OrganizationID"]);
                $("#HBillType").val("1207");
                $("#HRedBlueFlag").val("false");
                if (sessionStorage["HSCWHID"]!=0 && sessionStorage["HSCWHSPFlag"]) {
                if (sessionStorage["HSCWHID"] != 0 && sessionStorage["HSCWHSPFlag"] == 'false') {
                    $("#HStockPlaceID").val("0");
                    $("#HStockPlaceName").val("");
                    $("#HStockPlaceName").attr("disabled", "disabled");
@@ -634,7 +634,7 @@
                    $("#HStockPlaceName").removeAttr("disabled");
                    $('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//æé®æ¢å¤æ£å¸¸ç¶æ
                }
                if (sessionStorage["HWHID"] != 0 && sessionStorage["HWhSPFlag"]) {
                if (sessionStorage["HWHID"] != 0 && sessionStorage["HWhSPFlag"] == 'false') {
                    $("#HOutStockPlaceID").val("0");
                    $("#HOutStockPlaceName").val("");
                    $("#HOutStockPlaceName").attr("disabled", "disabled");

 WebTM/views/WMSÉ¨ÂëÄ£¿é/Éú²úµ÷²¦/Kf_MoveStockBill_PDA_XiaBao.html

@@ -556,7 +556,7 @@
                $("#HStockOutOrgID").val(sessionStorage["OrganizationID"]);
                $("#HBillType").val("1207");
                $("#HRedBlueFlag").val("false");
                if (sessionStorage["HSCWHID"]!=0 && sessionStorage["HSCWHSPFlag"]) {
                if (sessionStorage["HSCWHID"] != 0 && sessionStorage["HSCWHSPFlag"] == 'false') {
                    $("#HStockPlaceID").val("0");
                    $("#HStockPlaceName").val("");
                    $("#HStockPlaceName").attr("disabled", "disabled");
@@ -568,7 +568,7 @@
                    $("#HStockPlaceName").removeAttr("disabled");
                    $('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//æé®æ¢å¤æ£å¸¸ç¶æ
                }
                if (sessionStorage["HWHID"] != 0 && sessionStorage["HWhSPFlag"]) {
                if (sessionStorage["HWHID"] != 0 && sessionStorage["HWhSPFlag"] == 'false') {
                    $("#HOutStockPlaceID").val("0");
                    $("#HOutStockPlaceName").val("");
                    $("#HOutStockPlaceName").attr("disabled", "disabled");

 WebTM/views/WMSÉ¨ÂëÄ£¿é/Éú²úµ÷²¦/Kf_MoveStockStepInBill_Mould_PDA.html

@@ -528,7 +528,7 @@
                $("#HStockOutOrgID").val(sessionStorage["OrganizationID"]);
                $("#HBillType").val("1251");
                $("#HRedBlueFlag").val("false");
                if (sessionStorage["HSCWHID"] != 0 && sessionStorage["HSCWHSPFlag"]) {
                if (sessionStorage["HSCWHID"] != 0 && sessionStorage["HSCWHSPFlag"] == 'false') {
                    $("#HStockPlaceID").val("0");
                    $("#HStockPlaceName").val("");
                    $("#HStockPlaceName").attr("disabled", "disabled");
@@ -540,7 +540,7 @@
                    $("#HStockPlaceName").removeAttr("disabled");
                    $('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//æé®æ¢å¤æ£å¸¸ç¶æ
                }
                if (sessionStorage["HWHID"] != 0 && sessionStorage["HWhSPFlag"]) {
                if (sessionStorage["HWHID"] != 0 && sessionStorage["HWhSPFlag"] == 'false') {
                    $("#HOutStockPlaceID").val("0");
                    $("#HOutStockPlaceName").val("");
                    $("#HOutStockPlaceName").attr("disabled", "disabled");

 WebTM/views/WMSÉ¨ÂëÄ£¿é/Éú²úµ÷²¦/Kf_MoveStockStepInBill_PDA.html

@@ -514,7 +514,7 @@
                $("#HStockOutOrgID").val(sessionStorage["OrganizationID"]);
                $("#HBillType").val("1251");
                $("#HRedBlueFlag").val("false");
                if (sessionStorage["HSCWHID"] != 0 && sessionStorage["HSCWHSPFlag"]) {
                if (sessionStorage["HSCWHID"] != 0 && sessionStorage["HSCWHSPFlag"] == 'false') {
                    $("#HStockPlaceID").val("0");
                    $("#HStockPlaceName").val("");
                    $("#HStockPlaceName").attr("disabled", "disabled");
@@ -526,7 +526,7 @@
                    $("#HStockPlaceName").removeAttr("disabled");
                    $('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//æé®æ¢å¤æ£å¸¸ç¶æ
                }
                if (sessionStorage["HWHID"] != 0 && sessionStorage["HWhSPFlag"]) {
                if (sessionStorage["HWHID"] != 0 && sessionStorage["HWhSPFlag"] == 'false') {
                    $("#HOutStockPlaceID").val("0");
                    $("#HOutStockPlaceName").val("");
                    $("#HOutStockPlaceName").attr("disabled", "disabled");

 WebTM/views/WMSÉ¨ÂëÄ£¿é/Éú²úµ÷²¦/Kf_MoveStockStepOutBill_CusBar_PDA.html

@@ -567,7 +567,7 @@
                $("#HStockOutOrgID").val(sessionStorage["OrganizationID"]);
                $("#HBillType").val("1250");
                $("#HRedBlueFlag").val("false");
                if (sessionStorage["HSCWHID"] != 0 && sessionStorage["HSCWHSPFlag"]) {
                if (sessionStorage["HSCWHID"] != 0 && sessionStorage["HSCWHSPFlag"] == 'false') {
                    $("#HStockPlaceID").val("0");
                    $("#HStockPlaceName").val("");
                    $("#HStockPlaceName").attr("disabled", "disabled");
@@ -579,7 +579,7 @@
                    $("#HStockPlaceName").removeAttr("disabled");
                    $('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//æé®æ¢å¤æ£å¸¸ç¶æ
                }
                if (sessionStorage["HWHID"] != 0 && sessionStorage["HWhSPFlag"]) {
                if (sessionStorage["HWHID"] != 0 && sessionStorage["HWhSPFlag"] == 'false') {
                    $("#HOutStockPlaceID").val("0");
                    $("#HOutStockPlaceName").val("");
                    $("#HOutStockPlaceName").attr("disabled", "disabled");

 WebTM/views/WMSÉ¨ÂëÄ£¿é/Éú²úµ÷²¦/Kf_MoveStockStepOutBill_Mould_PDA.html

@@ -559,7 +559,7 @@
                $("#HStockOutOrgID").val(sessionStorage["OrganizationID"]);
                $("#HBillType").val("1250");
                $("#HRedBlueFlag").val("false");
                if (sessionStorage["HSCWHID"] != 0 && sessionStorage["HSCWHSPFlag"]) {
                if (sessionStorage["HSCWHID"] != 0 && sessionStorage["HSCWHSPFlag"] == 'false') {
                    $("#HStockPlaceID").val("0");
                    $("#HStockPlaceName").val("");
                    $("#HStockPlaceName").attr("disabled", "disabled");
@@ -571,7 +571,7 @@
                    $("#HStockPlaceName").removeAttr("disabled");
                    $('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//æé®æ¢å¤æ£å¸¸ç¶æ
                }
                if (sessionStorage["HWHID"] != 0 && sessionStorage["HWhSPFlag"]) {
                if (sessionStorage["HWHID"] != 0 && sessionStorage["HWhSPFlag"] == 'false') {
                    $("#HOutStockPlaceID").val("0");
                    $("#HOutStockPlaceName").val("");
                    $("#HOutStockPlaceName").attr("disabled", "disabled");

 WebTM/views/WMSÉ¨ÂëÄ£¿é/Éú²úµ÷²¦/Kf_MoveStockStepOutBill_PDA.html

@@ -545,7 +545,7 @@
                $("#HStockOutOrgID").val(sessionStorage["OrganizationID"]);
                $("#HBillType").val("1250");
                $("#HRedBlueFlag").val("false");
                if (sessionStorage["HSCWHID"] != 0 && sessionStorage["HSCWHSPFlag"]) {
                if (sessionStorage["HSCWHID"] != 0 && sessionStorage["HSCWHSPFlag"] == 'false') {
                    $("#HStockPlaceID").val("0");
                    $("#HStockPlaceName").val("");
                    $("#HStockPlaceName").attr("disabled", "disabled");
@@ -557,7 +557,7 @@
                    $("#HStockPlaceName").removeAttr("disabled");
                    $('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//æé®æ¢å¤æ£å¸¸ç¶æ
                }
                if (sessionStorage["HWHID"] != 0 && sessionStorage["HWhSPFlag"]) {
                if (sessionStorage["HWHID"] != 0 && sessionStorage["HWhSPFlag"] == 'false') {
                    $("#HOutStockPlaceID").val("0");
                    $("#HOutStockPlaceName").val("");
                    $("#HOutStockPlaceName").attr("disabled", "disabled");

 WebTM/views/WMSÉ¨ÂëÄ£¿é/Éú²úÁìÁÏ/Kf_MateOutBackBill_PDA.html

@@ -453,7 +453,7 @@
                $("#HStockOrgName").val(sessionStorage["Organization"]);
                $("#HBillType").val("1244");
                $("#HRedBlueFlag").val("false");
                if (sessionStorage["HWHID"] != 0 && sessionStorage["HWhSPFlag"]) {
                if (sessionStorage["HWHID"] != 0 && sessionStorage["HWhSPFlag"] == 'false') {
                    $("#HStockPlaceID").val("0");
                    $("#HStockPlaceName").val("");
                    $("#HStockPlaceName").attr("disabled", "disabled");

 WebTM/views/WMSÉ¨ÂëÄ£¿é/Éú²úÁìÁÏ/Kf_MateOutBill_PDA.html

@@ -493,7 +493,7 @@
                $("#HStockOrgName").val(sessionStorage["Organization"]);
                $("#HBillType").val("1204");
                $("#HRedBlueFlag").val("false");
                if (sessionStorage["HWHID"] != 0 && sessionStorage["HWhSPFlag"]) {
                if (sessionStorage["HWHID"] != 0 && sessionStorage["HWhSPFlag"] == 'false') {
                    $("#HStockPlaceID").val("0");
                    $("#HStockPlaceName").val("");
                    $("#HStockPlaceName").attr("disabled", "disabled");

 WebTM/views/WMSÉ¨ÂëÄ£¿é/²É¹ºÈë¿â/Kf_POStockInBackBill_PDA.html

@@ -477,7 +477,7 @@
                $("#HStockOrgName").val(sessionStorage["Organization"]);
                $("#HBillType").val("1239");
                $("#HRedBlueFlag").val("false");
                if (sessionStorage["HWHID"] != 0 && sessionStorage["HWhSPFlag"]) {
                if (sessionStorage["HWHID"] != 0 && sessionStorage["HWhSPFlag"] == 'false') {
                    $("#HStockPlaceID").val("0");
                    $("#HStockPlaceName").val("");
                    $("#HStockPlaceName").attr("disabled", "disabled");

 WebTM/views/WMSÉ¨ÂëÄ£¿é/²É¹ºÈë¿â/Kf_POStockInBill_Mould_PDA.html

@@ -491,7 +491,7 @@
                $("#HStockOrgName").val(sessionStorage["Organization"]);
                $("#HBillType").val("1201");
                $("#HRedBlueFlag").val("false");
                if (sessionStorage["HWHID"] != 0 && sessionStorage["HWhSPFlag"]) {
                if (sessionStorage["HWHID"] != 0 && sessionStorage["HWhSPFlag"] == 'false') {
                    $("#HStockPlaceID").val("0");
                    $("#HStockPlaceName").val("");
                    $("#HStockPlaceName").attr("disabled", "disabled");

 WebTM/views/WMSÉ¨ÂëÄ£¿é/²É¹ºÈë¿â/Kf_POStockInBill_PDA.html

@@ -477,7 +477,7 @@
                $("#HStockOrgName").val(sessionStorage["Organization"]);
                $("#HBillType").val("1201");
                $("#HRedBlueFlag").val("false");
                if (sessionStorage["HWHID"] != 0 && sessionStorage["HWhSPFlag"]) {
                if (sessionStorage["HWHID"] != 0 && sessionStorage["HWhSPFlag"] == 'false') {
                    $("#HStockPlaceID").val("0");
                    $("#HStockPlaceName").val("");
                    $("#HStockPlaceName").attr("disabled", "disabled");

 WebTM/views/WMSÉ¨ÂëÄ£¿é/ÏúÊÛ³ö¿â/Kf_SellOutBackBill_PDA.html

@@ -470,7 +470,7 @@
                $("#HStockOrgName").val(sessionStorage["Organization"]);
                $("#HBillType").val("1247");
                $("#HRedBlueFlag").val("false");
                if (sessionStorage["HWHID"] != 0 && sessionStorage["HWhSPFlag"]) {
                if (sessionStorage["HWHID"] != 0 && sessionStorage["HWhSPFlag"] == 'false') {
                    $("#HStockPlaceID").val("0");
                    $("#HStockPlaceName").val("");
                    $("#HStockPlaceName").attr("disabled", "disabled");

 WebTM/views/WMSÉ¨ÂëÄ£¿é/ÏúÊÛ³ö¿â/Kf_SellOutBill_CusBar_PDA.html

@@ -523,7 +523,7 @@
                $("#HStockOrgName").val(sessionStorage["Organization"]);
                $("#HBillType").val("1205");
                $("#HRedBlueFlag").val("false");
                if (sessionStorage["HWHID"] != 0 && sessionStorage["HWhSPFlag"]) {
                if (sessionStorage["HWHID"] != 0 && sessionStorage["HWhSPFlag"] == 'false') {
                    $("#HStockPlaceID").val("0");
                    $("#HStockPlaceName").val("");
                    $("#HStockPlaceName").attr("disabled", "disabled");

 WebTM/views/WMSÉ¨ÂëÄ£¿é/ÏúÊÛ³ö¿â/Kf_SellOutBill_Mould_PDA.html

@@ -515,7 +515,7 @@
                $("#HStockOrgName").val(sessionStorage["Organization"]);
                $("#HBillType").val("1205");
                $("#HRedBlueFlag").val("false");
                if (sessionStorage["HWHID"] != 0 && sessionStorage["HWhSPFlag"]) {
                if (sessionStorage["HWHID"] != 0 && sessionStorage["HWhSPFlag"] == 'false') {
                    $("#HStockPlaceID").val("0");
                    $("#HStockPlaceName").val("");
                    $("#HStockPlaceName").attr("disabled", "disabled");

 WebTM/views/WMSÉ¨ÂëÄ£¿é/ÏúÊÛ³ö¿â/Kf_SellOutBill_PDA.html

@@ -501,7 +501,7 @@
                $("#HStockOrgName").val(sessionStorage["Organization"]);
                $("#HBillType").val("1205");
                $("#HRedBlueFlag").val("false");
                if (sessionStorage["HWHID"] != 0 && sessionStorage["HWhSPFlag"]) {
                if (sessionStorage["HWHID"] != 0 && sessionStorage["HWhSPFlag"] == 'false') {
                    $("#HStockPlaceID").val("0");
                    $("#HStockPlaceName").val("");
                    $("#HStockPlaceName").attr("disabled", "disabled");

 WebTM/views/home/console_Mobile.html

@@ -219,6 +219,18 @@
                                                <cite style="white-space:pre-wrap">è½¦é´å®ä½åºåæ¥è¯¢</cite>
                                            </a>
                                        </li>
                                        <li class="layui-col-xs3">
                                            <a href="../WMSæ«ç æ¨¡å/éå®åºåº/Kf_SellOutBill_YP_QiaoYi_PDA.html" target="main_self_frame">
                                                <i class="layui-icon layui-icon-find-fill"></i>
                                                <cite style="white-space:pre-wrap">æ ·åéå®åºåºå</cite>
                                            </a>
                                        </li>
                                        <li class="layui-col-xs3">
                                            <a href="../WMSæ«ç æ¨¡å/çäº§è°æ¨/Kf_MoveStockBill_PDA.html" target="main_self_frame">
                                                <i class="layui-icon layui-icon-template-1"></i>
                                                <cite style="white-space:pre-wrap">è°æ¨</cite>
                                            </a>
                                        </li>
                                    </ul>
                                </div>
                            </div>
@@ -438,6 +450,12 @@
                                                <cite style="white-space:pre-wrap">è½¦é´ä¸æ¶åç¼å</cite>
                                            </a>
                                        </li>
                                        <li class="layui-col-xs3">
                                            <a href="../WMSæ«ç æ¨¡å/éå®åºåº/Kf_SellOutBillList_YP_QiaoYi_PDA.html" target="main_self_frame">
                                                <i class="layui-icon layui-icon-down"></i>
                                                <cite style="white-space:pre-wrap">æ ·ååºåºåç¼å</cite>
                                            </a>
                                        </li>
                                    </ul>
                                </div>
                            </div>

 WebTM/views/²Ö´æ¹ÜÀí/ÌõÂëÉú³É/Gy_BarCodeBill.html

@@ -514,6 +514,11 @@
                    content: [url, 'yes'],
                    btn: [get_MessageError('[0000-2-051]ç¡®å®', sessionStorage["HTranSlate"]), get_MessageError('[0000-2-052]åæ¶', sessionStorage["HTranSlate"])],
                    btn1: function (index, layero) {
                        HBarInfo = ""; //åå¨æ¡ç ä¿¡æ¯
                        HFileList = "";  //åå¨æ¡£æ¡åè¡¨
                        $('#ToolCreate').removeClass("layui-btn-disabled").attr("disabled", false);//çææé®å¯ç¨
                        element.tabChange('tab-TabTest', '1');

                        var iframeWindow = window['layui-layer-iframe' + index]  //è·åå¼¹æ¡é¡µé¢
                        var checkStatus = iframeWindow.layui.table.checkStatus('layTable');//è·åtableçelem:"#test"
                        if (checkStatus.data.length === 0) {
@@ -658,32 +663,7 @@
                    title: get_MessageError("[0000-2-009]æç¤º", sessionStorage["HTranSlate"]),
                    icon: 3,
                }, function (index) {
                    $("#HOrgID").find("option").remove(); //æ¸é¤æºåç±»åéæ©ä¸ææ¡ä¸çå¼
                    set_HOrg(); //è°ç¨è·åæºåç±»åéæ©ä¸ææ¡çå¼
                    $("#HDate").val(Format(new Date(), "yyyy-MM-dd")); //åæ®æ¥æ
                    $("#HSourceBillType").val('1'); //éæ©ä¸ææ¡é»è®¤ç¬¬ä¸ä¸ªéé¡¹
                    $("#HBarCodeType").val('0');
                    var arr = [{ HBillNo: '', HMaterNumber: '', HMaterName: '', HMaterModel: '', HAuxPropNumber: '', HAuxPropName: '', HUnitNumber: '', HUnitName: '', HBatchNo: '', HGiveAwayFlag: '0', HQty: '0', HMinQty: '0', HPackQty: '0', HBQty: '0', HDate: '', HCusNumber: '', HCusName: '', HSeOrderBillNo: '', HRemark: '', HEmpID: 0, HEmpNumber: '', HEmpName: '', HGroupID: 0, HGroupNumber: '', HGroupName: '', HMTONo: '', HCusModel: "", HCusMaterName: "", "HCheckEmpName": "" }]
                    table.reload('mainTable', {
                        data: arr // è°ç¨table.reload éæ°æ¸²ææ¾ç¤ºå è½½è¿½å äºæ°æ®çè¡¨æ ¼
                    });
                    var arr1 = [{
                        "HBarCode": "", "HMaterNumber": "", "HMaterName": "", "HMaterModel": "", "HAuxPropNumber": "", "HAuxPropName": ""
                        , "HGiveAwayFlag": "", "HUnitCode": "", "HUnitName": "", "HQty": 0, "HDate": "", "HCusNumber": "", "HCusName": ""
                        , "HSourceBillNo": "", "HSeOrderBillNo": "", "HRemark": "", "HMTONo": "", "HShowDate": "", "HInnerBillNo": "", "HMaker": ""
                        , "HEmpID": 0, "HEmpNumber": "", "HEmpName": "", "HGroupID": 0, "HGroupNumber": "", "HGroupName": "", "HMTONo": "", "HCusModel": "", "HCusMaterName": "", "HCheckEmpName": ""
                    }]
                    table.reload('mainTable1', {
                        data: arr1 // è°ç¨table.reload éæ°æ¸²ææ¾ç¤ºå è½½è¿½å äºæ°æ®çè¡¨æ ¼
                    });

                    //çææåè·³è½¬å°æ¡ç ä¿¡æ¯æ ç¾é¡µ
                    element.tabChange('tab-TabTest', '1');
                    //å è½½æ¡£æ¡åè¡¨
                    table.reload('mainTable2', {
                        data: [] // è°ç¨table.reload éæ°æ¸²ææ¾ç¤ºå è½½è¿½å äºæ°æ®çè¡¨æ ¼
                    });
                    layer.close(index)
                    location.replace('Gy_BarCodeBill.html?OperationType=1');
                })
            })

@@ -888,6 +868,7 @@
                    , { templet: '#xuhao', title: 'åºå·', sort: true, fixed: 'left', event: "qwe", width: 75 }
                    , { field: 'HMainID', title: 'æºåä¸»åç ', width: 100, hide: true }
                    , { field: 'HSubID', title: 'æºåååç ', width: 100, hide: true }
                    , { field: 'HSourceBillSEQ', title: 'æºåè¡å·', width: 100, hide: true }
                    , { field: 'HBillNo', title: 'æºååå·', width: 200 }
                    , { field: 'HMaterID', title: 'ç©æID', width: 100, hide: true }
                    , { field: 'HMaterNumber', title: 'ç©æä»£ç ', edit: 'text', event: 'HMaterNumber', width: 200 }
@@ -903,6 +884,7 @@
                    , { field: 'HGroupName', title: 'çç»åç§°', width: 200 }
                    , { field: 'HCheckEmpName', title: 'æ£éªå', width: 200, edit: 'text' }
                    , { field: 'HBatchNo', title: 'æ¹å·', edit: 'text', width: 100 }
                    , { field: 'HMTONo', title: 'è®¡åè·è¸ªå·', width: 100, edit: 'text' }
                    , { field: 'HQty', title: 'æ°é', edit: 'text', width: 100, totalRow: true }
                    , { field: 'HMinQty', title: 'æå°åè£æ°', edit: 'text', totalRow: true, width: 100 }
                    , { field: 'HBQty', title: 'ç®±æ°', width: 100, totalRow: true }
@@ -928,7 +910,6 @@
                    , { field: 'HExpirationDateFlag', title: 'æ¯å¦å¯ç¨ä¿è´¨æ', width: 100, templet: '#switchTp3', unresize: false }
                    , { field: 'HGiveAwayFlag', title: 'æ¯å¦èµ å', width: 100, templet: '#switchTpl', unresize: false }
                    , { field: 'HDate', title: 'æ¡ç æ¥æ', width: 100, hide: true }
                    , { field: 'HMTONo', title: 'è®¡åè·è¸ªå·', width: 100, edit: 'text' }
                    , { fixed: 'right', title: 'æä½', toolbar: '#barDemo' }
                ];
                option = {
@@ -1058,7 +1039,7 @@
            //æ æºåæ°å¢
            function set_AddFNew() {
                option.data = [{
                    "HMainID": 0, "HSubID": 0, "HBillNo": "", "HMaterID": 0, "HMaterNumber": "", "HMaterName": "", "HMaterModel": ""
                    "HMainID": 0, "HSubID": 0, "HSourceBillSEQ": 0, "HBillNo": "", "HMaterID": 0, "HMaterNumber": "", "HMaterName": "", "HMaterModel": ""
                    , "HAuxPropID": 0, "HAuxPropNumber": "", "HAuxPropName": "", "HUnitID": 0, "HUnitNumber": "", "HUnitName": "", "HBatchNo": "", "HGiveAwayFlag": 0
                    , "HQty": 0, "HMinQty": '', "HBQty": 0, "HPackQty": 0, "HDate": "", "HCusID": 0, "HCusNumber": "", "HCusName": "", "HSeOrderBillNo": "", "HRemark": ""
                    , "HCoilNO": "", "HFurnaceNO": "", "HFactory": "",
@@ -1600,6 +1581,8 @@
                        //ç©æä¿¡æ¯  å¦æå¨ç©æä»£ç å æF7
                        if (obj.event === 'HMaterNumber')  //ç©æä¿¡æ¯  å¦æå¨æ¨¡å·ä»£ç å æF7
                        {
                            //è·åç»ç»ID
                            var HOrgID = $("#HOrgID").find("option:selected").val();
                            //é¡µé¢å±-èªå®ä¹  //F7éæ©æ¨¡å·
                            layer.open({
                                type: 2,
@@ -1609,7 +1592,7 @@
                                shift: 2,
                                area: ['80%', '80%'],
                                maxmin: true,
                                content: ['../../Baseset/åºç¡èµæ/Gy_MaterialList.html', 'yes'],
                                content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_Material.html?openType=2&HOrgID=' + HOrgID, 'yes'],
                                btn: [get_MessageError('[0000-2-051]ç¡®å®', sessionStorage["HTranSlate"]), get_MessageError('[0000-2-052]åæ¶', sessionStorage["HTranSlate"])]
                                , btn1: function (index, layero) {

@@ -1619,26 +1602,41 @@
                                    if (checkStatus.data.length === 0) {
                                        return layer.msg(get_MessageError('[0000-1-020]è¯·éæ©æ°æ®', sessionStorage["HTranSlate"]));
                                    }
                                    //console.log(obj.data);
                                    //åæ¥æ´æ°è¡¨æ ¼åç¼åå¯¹åºçå¼
                                    obj.update({
                                        HMaterID: checkStatus.data[0].HItemID,
                                        HMaterNumber: checkStatus.data[0].HNumber,
                                        HMaterName: checkStatus.data[0].HName,
                                        HMaterModel: checkStatus.data[0].HModel,
                                        HUnitID: checkStatus.data[0].HUnitID,
                                        HUnitNumber: checkStatus.data[0].HUnitNumber,
                                        HUnitName: checkStatus.data[0].HUnitName
                                    });
                                    OptionData = checkStatus.data[0];
                                    if (checkStatus.data.length >= 1) {
                                        var rowIndex = $(obj.tr).attr("data-index") * 1;
                                        for (var i = 0; i < checkStatus.data.length; i++) {
                                            if (rowIndex + i >= option.data.length) {
                                                var NewRow = {
                                                    "HMaterID": 0, "HMaterCode": "", "HMaterNumber": "", "HMaterName": "", "HMaterModel": "", "HMaterSpec": "", "HBatchNo": "", "HUnitID": 0, "HUnitNumber": "", "HUnitName": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HBQty": 0, "HMinQty": 0, "HPackQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HStockOrgID": sessionStorage["OrganizationID"], "HRemark": "", "HCoilNO": "", "HFurnaceNO": "", "HFactory": "",
                                                    "HAuxQty": 0, "HheatNO": "", "HProduceDate": Format(new Date(), "yyyy-MM-dd"), "HExpiryDate": Format(new Date(), "yyyy-MM-dd"), "HExpirationDateFlag": 0, "HEmpID": sessionStorage["HEmpID"], "HEmpNumber": sessionStorage["HEmpNumber"], "HEmpName": sessionStorage["HEmpName"], "HGroupID": 0, "HGroupNumber": "", "HGroupName": "", "HMTONo": "", "HCusModel": "", "HCusMaterName": "", "HCheckEmpName": ""
                                                };

                                                table.cache["mainTable"].push(NewRow);
                                                option.data = table.cache["mainTable"];

                                                table.render(option);
                                            }

                                            var HMaterID = checkStatus.data[i].HItemID;
                                            var resultData = getMaterialByMaterID(HMaterID);
                                            option.data[rowIndex + i].HMaterID = resultData.HMaterID;
                                            option.data[rowIndex + i].HMaterNumber = resultData.HMaterNumber;
                                            option.data[rowIndex + i].HMaterName = resultData.HMaterName;
                                            option.data[rowIndex + i].HMaterModel = resultData.HMaterModel;
                                            option.data[rowIndex + i].HUnitID = resultData.HUnitID;
                                            option.data[rowIndex + i].HUnitNumber = resultData.HUnitNumber;
                                            option.data[rowIndex + i].HUnitName = resultData.HUnitName;

                                    if ($("#HBarCodeType").find("option:selected").html() == 'æçæ¡ç ') {
                                        obj.update({
                                            HQty: 1,    //æ°é
                                            HMinQty: 1, //æå°åè£æ°é
                                            HBQty: 1    //ç®±æ°
                                        });
                                                option.data[rowIndex + i].HQty = 1;     //æ°é
                                                option.data[rowIndex + i].HMinQty = 1;  //æå°åè£æ°é
                                                option.data[rowIndex + i].HBQty = 1;    //ç®±æ°
                                    }
                                    layer.close(layer.index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
                                        }
                                        table.render(option);
                                    }
                                    layer.closeAll();
                                }
                                , btn2: function (index, layero) {
                                    //æé®ãæé®äºãçåè°
@@ -1873,6 +1871,31 @@

            }

            //#region æ ¹æ®ç©æIDè·åç©æè¯¦ç»ä¿¡æ¯
            function getMaterialByMaterID(HMaterID) {
                var resultData = {};
                $.ajax({
                    url: GetWEBURL() + "Cg_ContractBill/getMaterialByMaterID",
                    async: false,
                    type: "GET",
                    data: {
                        "HMaterID": HMaterID
                    },
                    success: function (result) {
                        if (result.code == 1) {
                            var data = result.data;
                            resultData = data[0];
                        } else {
                            layer.alert(result.msg, { icon: 5, btn: ['éåº'], time: 100000, offset: 't' });
                        }
                    }, error: function () {
                        layer.alert("åçéè¯¯!", { icon: 5 });
                    }
                });
                return resultData;
            }
            //#endregion

            //æ¡ç çæ
            function SaveBarCodeCreate(sMainSub, CampanyName) {
                $.ajax(

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

@@ -9,6 +9,15 @@
    <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/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/PageTitle.js"></script>
    <script src="../../../layuiadmin/SetColumn.js"></script>
    <script src="../../../layuiadmin/QueryScheme.js"></script>
    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
    <script src="../../../layuiadmin/HideButton.js"></script>
</head>
<body>
    <div class="layui-fluid">
@@ -134,7 +143,9 @@
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Stop" id="Stop"><i class="layui-icon layui-icon-radio"></i>ç¦ç¨</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeStop" id="DeStop"><i class="layui-icon layui-icon-radio"></i>åç¦ç¨</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-iconlayuiiconrefresh-3"></i>å·æ°</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn_Export" id="btn_Export"><i class="layui-icon layui-icon-export"></i>å¯¼åº</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layuiiconform"></i>åè®¾ç½®</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_HideButton" id="HideButton"><i class="layui-icon layui-icon-form"></i>æé®è®¾ç½®</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_SaveScheme" id="set_SaveScheme"><i class="layui-icon layui-icon-template"></i>ä¿åæ¹æ¡</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ReadScheme" id="set_ReadScheme"><i class="layui-icon layui-icon-set"></i>è¯»åæ¹æ¡</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Close"><i class="layui-icon layui-icon-logout"></i>éåº</button>
@@ -146,13 +157,7 @@
            </div>
        </div>
    </div>
    <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/SetColumn.js"></script>
    <script src="../../../layuiadmin/QueryScheme.js"></script>
    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>

    <script>
        layui.config({
            base: '../../../layuiadmin/' //éæèµæºæå¨è·¯å¾
@@ -171,7 +176,9 @@
            var sWhere = "";
            var option = [];
            var Organization = sessionStorage["Organization"];
            var HBillType = "Gy_MaterPrice";
            var HModName = "Gy_MaterPrice";
            var set_HideButton_ID = "toolbarDemo_ButtonSet";//éè¦è®¾ç½®çæé®çç¶çº§èç¹çid
            //ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±
            var titleData = ["HItemID", "HUSEORGID", "HCREATEORGID", "ç¶çº§ID", "HMaterID", "HUnitID", "HRelationID"];

@@ -226,6 +233,13 @@
                    case 'set_HideColumn':
                        get_HideColumnNoPage(HModName, sessionStorage["HUserName"], option, get_FastQuery);
                        break;
                    //æé®è®¾ç½®
                    case 'set_HideButton':
                        var btns = document.getElementsByTagName("button");     //è·åæ¬é¡µæææé®å¯¹è±¡
                        var HBillType = "7505";
                        get_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
                        break;
                        break;
                    //ä¿åæ¹æ¡
                    case 'set_SaveScheme': set_SaveScheme(get_FastQuery);
                        break;
@@ -234,6 +248,9 @@
                        break;
                    //å·æ°
                    case 'get_Refresh': get_Refresh();
                        break;
                    //å¯¼åºæé®
                    case 'btn_Export': btn_Export();
                        break;
                    //éåºæé®
                    case 'btn-Close':
@@ -379,8 +396,11 @@
                            //å·æ°è¡¨æ ¼æ°æ®
                            DisPlay_HideColumn(HModName, sessionStorage["HUserName"], option, titleData)
                            ins = table.render(option);
                            ///å·æ°æé®æ¾ç¤º
                            var btns = document.getElementsByTagName("button");     //è·åæ¬é¡µæææé®å¯¹è±¡
                            var HBillType = "7505";
                            Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
                            layer.close(ajaxLoad);

                            if ($("#ColName option").length < 1) {
                                ColFilter();
                                get_DefaultModule();//å è½½æ¹æ¡
@@ -477,9 +497,6 @@
                if (HNumber) {
                    sWhere += " and ç©æç¼ç  like '%" + HNumber + "%'";
                }
                //if (HName) {
                //    sWhere += " and åç§° like '%" + HName + "%'";
                //}
                get_Display(sWhere);
                sWhere = "";//è°ç¨æ¥å£åæ¸ç©ºsWhereç¼å
            }
@@ -873,7 +890,22 @@
                }

            }
            //#region å¯¼åºExecel
            function btn_Export() {
                option.data.forEach((item) => {
                    for (let itemobj in item) {
                        if (item[itemobj] == null) {
                            item[itemobj] = "";
                        }
                        if (item[itemobj].length > 0) {  // åè®¾åæ®µåä¸ºfield
                            item[itemobj] = item[itemobj].toString().replaceAll(/[\r\n]+/g, '');  // å°æ¢è¡ç¬¦æ¿æ¢ä¸ºç©ºåç¬¦ä¸²
                        }
                    }
                });

                table.exportFile(ins.config.id, option.data, "xls");
            }
            //#endregion
            //è¯»åæ¹æ¡
            function set_ReadScheme() {
                var HIsClose_Manual = false;

 WebTM/views/ÏµÍ³¹ÜÀí/ÓÃ»§¹ÜÀí/Gy_UserStock.html

@@ -1,5 +1,6 @@
ï»¿<!DOCTYPE html>
<html>

<head>
    <meta charset="utf-8" />
    <title>ç¨æ·å³èä»åº</title>
@@ -11,8 +12,8 @@
    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
    <script src="../../../layuiadmin/PubCustom.js"></script>
    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
    <script src="../../../layuiadmin/common.js"></script>
    <style type="text/css">

        /*begin æ¤æ ·å¼ç¨äºæ¶é¤è¡åç´ ä¸å¸å±å®½åº¦ä¸å¤çé®é¢*/
        .layui-form-item .layui-inline {
            margin-top: 5px;
@@ -31,6 +32,7 @@
        }
    </style>
</head>

<body>
    <div id="layout1" class="layui-fluid">
        <div class="layui-row layui-col-space15">
@@ -39,8 +41,10 @@
                    <form id="form0" class="layui-form" lay-filter="component-form-group" action="">
                        <div class="layui-card-header">
                            <div class="layui-btn-group">
                                <button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">ä¿å</button>
                                <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">éåº</button>
                                <button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius"
                                    lay-submit="" lay-filter="Saver">ä¿å</button>
                                <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit=""
                                    lay-filter="Exit">éåº</button>
                            </div>
                        </div>
                        <div class="layui-card-body">
@@ -51,10 +55,14 @@
                                            <div class="layui-inline">
                                                <label class="layui-form-label">ç¨æ·</label>
                                                <div class="layui-input-inline">
                                                    <input type="text" name="UserName" id="UserName" readonly class="layui-input" value="" style="float:left;width:150px;">
                                                    <input type="hidden" name="UserID" id="UserID" class="layui-input" value="" style="float:left;width:150px;">
                                                    <button type="button" lay-submit="" id="button_Edit" class="layui-btn" lay-filter="UserList" style="width:40px;">
                                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                    <input type="text" name="UserName" id="UserName" readonly
                                                        class="layui-input" value="" style="float:left;width:150px;">
                                                    <input type="hidden" name="UserID" id="UserID" class="layui-input"
                                                        value="" style="float:left;width:150px;">
                                                    <button type="button" lay-submit="" id="button_Edit"
                                                        class="layui-btn" lay-filter="UserList" style="width:40px;">
                                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn"
                                                            style="margin-left:-9px;"></i>
                                                    </button>
                                                </div>
                                            </div>
@@ -80,11 +88,13 @@
        </div>
    </div>
</body>

</html>
<script type="text/html" id="barDemo">
    <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">å é¤</a>
</script>
<script>
    var optionData = []
    //è·ååæ°
    var params = get_UrlVars();
    if (typeof (params[params[0]]) == "undefined") {
@@ -241,13 +251,12 @@
                            content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_Warehouse.html', 'yes'],
                            btn: ['ç¡®å®', 'åæ¶']
                            , btn1: function (index, layero) {

                                //æé®ãæé®ä¸ãçåè°
                                var iframeWindow = window['layui-layer-iframe' + index]  //è·åå¼¹æ¡é¡µé¢
                                var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//è·åtableçelem:"#test"
                                if (checkStatus.data.length === 0) {
                                    return layer.msg('è¯·éæ©æ°æ®');
                                }
                                } else if (checkStatus.data.length === 1) {
                                //console.log(obj.data);
                                //åæ¥æ´æ°è¡¨æ ¼åç¼åå¯¹åºçå¼
                                obj.update({
@@ -256,6 +265,31 @@
                                    HName: checkStatus.data[0].ä»åºåç§°
                                });

                                } else {
                                    // å¤éè¿å
                                    let tableBak = table.cache['mainTable']
                                    let tempArr = []
                                    console.log(tableBak)
                                    for (let tableOne of tableBak) {
                                        if (isEmpty(tableOne.HItemID, true, true) === false) {
                                            tempArr.push(tableOne)
                                        }
                                    }
                                    for (let checkOne of checkStatus.data) {
                                        if (tempArr.findIndex(e => e.HItemID == checkOne.HItemID) == -1) {
                                            tempArr.push({
                                                "HItemID": checkOne.HItemID
                                                , "HNumber": checkOne.ä»åºä»£ç 
                                                , "HName": checkOne.ä»åºåç§°
                                            })
                                        }
                                    }

                                    table.reload('mainTable', {
                                        data: tempArr
                                    })
                                }

                                layer.close(layer.index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
                            }
                            , btn2: function (index, layero) {
@@ -263,7 +297,15 @@
                                //return false å¼å¯è¯¥ä»£ç å¯ç¦æ¢ç¹å»è¯¥æé®å³é
                            },
                            end: function () {
                                if (isEmpty(optionData) === false) {
                                    obj.update({
                                        HItemID: optionData[0].HItemID,
                                        HNumber: optionData[0].ä»åºä»£ç ,
                                        HName: optionData[0].ä»åºåç§°
                                    });

                                    optionData = []
                                }
                            }
                        });
                    }
@@ -417,6 +459,7 @@

        //å¢å ä¸è¡
        function btnAddLine(NewRow) {
            console.log("NewRow: ", NewRow)
            var tableBak = table.cache["mainTable"]; //è·åä¹åç¼è¾è¿çè¡¨æ ¼æ°æ®

            buttonArr = [];//æ¸ç©ºæ°ç»
@@ -490,4 +533,19 @@
        }

    });

    //#region åå»åè°å½æ°
    // ä»åº
    function GetHWHValue(data) {
        optionData = data
    }

    // ç¨æ·
    function GetPeopleInFormationValue(data) {
        console.log("userData: ", data)
        $("#UserName").val(data[0]['HName'])
        $("#UserID").val(data[0]['HNumber'])
    }

    //#endregion
</script>

 WebTM/views/ÏµÍ³¹ÜÀí/ÓÃ»§¹ÜÀí/Xt_UserList.html

@@ -427,7 +427,8 @@
                        , resize: false,
                        end: function () {
                            //å·æ°é¡µé¢,
                            location.reload();
                            layer.closeAll("loading");
                            //location.reload();
                        }
                        , cancel: function () {
                            //$(".layui-btn").removeClass("layui-btn-disabled");

 WebTM/views/ÏµÍ³¹ÜÀí/ÓÃ»§¹ÜÀí/Xt_UserListEdit.html

@@ -750,7 +750,7 @@
                    shift: 2,
                    area: ['80%', '80%'],
                    maxmin: true,
                    content: ['../../../views/Baseset/åºç¡èµæ/Gy_DepartmentList.html', 'yes'],
                    content: ['../../../views/åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_DepartmentList.html', 'yes'],
                    btn: ['ç¡®å®', 'åæ¶']
                    , btn1: function (index, layero) {

@@ -761,7 +761,7 @@
                            return layer.msg('è¯·éæ©æ°æ®');
                        }

                        $("#HDept").val(checkStatus.data[0].HName);
                        $("#HDept").val(checkStatus.data[0].é¨é¨åç§°);
                        $("#HDeptID").val(checkStatus.data[0].HItemID);
                        layer.close(layer.index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
                    }

 WebTM/views/³µ¼ä¹ÜÀí/Î¯Íâ¹¤Ðò½ÓÊÕµ¥/Cj_StationEntrustOutBillList.html

@@ -62,10 +62,10 @@
                                        <input type="date" class="layui-input ForFilteringSchemes" id="HEndDate" style="width:190px;">
                                    </div>
                                </div>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" style="display:none;" lay-filter="btnSearch" id="btnSearch">
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                </button>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding: 0 5px; display: none;">éç½®</button>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding: 0 5px; ">éç½®</button>
                                <!--æ¾ç¤ºå½åè¿æ»¤æ¹æ¡-->
                                <div class="layui-inline" style="margin-left:5px;">
                                    <div style="text-align:center;font-size:15px;font-weight:bold;color:#fc9393" id="HFilterScheme_Now"></div>
@@ -640,7 +640,7 @@
            function get_DisplayPage(sWhere) {
                var ajaxLoad = layer.load();
                $.ajax({
                    url: GetWEBURL() + '/Cj_StationEntrustInBill/getStationEntrustInBillPage',
                    url: GetWEBURL() + '/Cj_StationEntrustOutBill/getStationEntrustOutBillPage',
                    type: "GET",
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "page": page, "size": size },
                    success: function (data1) {

 WebTM/views/ÁìÁÏ·¢»õ/ÆäËû³ö¿â/Kf_OtherOutBillList.html

@@ -202,7 +202,7 @@
                        <script type="text/html" id="toolbarDemo">
                            <div class="layui-btn-container">
                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-getCheckData"><i class="layui-icon layui-icon-tips"></i>é¢è§</button>-->
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-exit" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>éåº</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="ExitButton" lay-event="get_Exit"><i class="layui-icon layui-icon-return"></i>éåº</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="get_Refresh" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>å·æ°</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-Add" lay-event="btn-Add"><i class="layui-icon layui-icon-file-b"></i>æ°å¢</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-Edit" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>ç¼è¾</button>
@@ -358,6 +358,9 @@
                        break;
                    //å é¤æé®
                    case 'btn-Delete': set_DeleteBill();
                        break;
                    //éåºæé®
                    case 'get_Exit': Pub_Close(2);
                        break;
                    //æç»
                    case 'btn-WmsSub':
@@ -1228,8 +1231,18 @@
            }
            //#endregion

            //#region ãè¿æ»¤æ¹æ¡ã

            //#region ãè¿æ»¤æ¹æ¡ãã
            //éåº
            function Pub_Close(closeType) {
                if (closeType == 1) {
                    //å³éå¼¹çª
                    var index = parent.layer.getFrameIndex(window.name);
                    parent.layer.close(index);
                } else if (closeType == 2) {
                    //å³éé¡µç¾
                    parent.layui.admin.events.closeThisTabs();
                }
            }
            //è·åå½åç¨æ·çé»è®¤è¿æ»¤æ¹æ¡
            function get_DefaultModule() {
                $.ajax({

			@@ -2,7 +2,7 @@
			<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
			<PropertyGroup>
			<NameOfLastUsedPublishProfile>D:\æºäºè¿æ\MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
			<NameOfLastUsedPublishProfile>D:\ç½ç«åå¸\åç«¯ä»£ç \MES-WEB-TM\MESWMS-LayUI\WebTM\Properties\PublishProfiles\LAYUI.pubxml</NameOfLastUsedPublishProfile>
			<NameOfLastUsedPublishProfile>D:\WorkBench\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
			<ProjectView>ProjectFiles</ProjectView>
			<LastActiveSolutionConfig>Debug\|Any CPU</LastActiveSolutionConfig>
			<UseIISExpress>true</UseIISExpress>

			@@ -3,7 +3,7 @@
			//var WEBURL = "http://192.168.16.80:8011/"; //åå¬å®¤æå¡å¨
			//var WEBURL = "http://localhost:8081/SWEAPI/"; //chæ¬å°*/
			//var WEBURL = "http://61.164.86.218:8099/ABAPI/";
			/var WEBURL = "http://localhost/API/"; //é¢æåæ¬å°éç½®/
			// var WEBURL = "http://localhost/API/"; //é¢æåæ¬å°éç½®
			//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //æ¨ä¹æ¬å°éç½®
			var WEBURL = "http://localhost:8082/API/"; //æè´ºæ¬å°éç½®
			//var WEBURL = "http://localhost:8082/API/"; //å¼ çå¹¿æ¬å°éç½®
			@@ -11,6 +11,7 @@
			//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //æ¨ä¹æ¬å°éç½®
			//var WEBURL = "http://47.96.97.237/API/"; //æºäºæå¡å¨
			/* var WEBURL = "http://localhost:8082/LuBaoAPI/"; //ä½ææ°æ¬å°éç½®*/
			//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //ææä¿æ¬å°éç½®*/
			//var WEBURL = "http://localhost:8088/ARAPI/"; //ä½ææ°æ¬å°éç½®(å®ç)
			//var WEBURL = "http://61.164.86.218:8099/ABAPI/"; //å¥¥é¦
			//var WEBURL = "http://10.1.4.155/API/"; //æ±ä¸°å®¢æ·NEW

			@@ -1,5 +1,6 @@
			ï»¿<!DOCTYPE html>
			<html xmlns="http://www.w3.org/1999/xhtml">

			<head>
			<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
			<title>éæ©ç¨æ·èµæ</title>
			@@ -20,6 +21,7 @@
			}
			</style>
			</head>

			<body>
			<div class="layui-fluid">
			<div class="layui-col-md12">
			@@ -31,14 +33,16 @@
			<div class="layui-form-item" style="border-top: solid 1px #F6F6F6;">
			<div class="layui-row" style="padding:10px 0">
			<div class="layui-col-xs3 layui-inline" style="width: 23%; display:none;">
			<div id="treeUser" lay-filter="treeUser" class="demo-tree demo-tree-box" style="height: 580px; overflow: scroll;"></div>
			<div id="treeUser" lay-filter="treeUser" class="demo-tree demo-tree-box"
			style="height: 580px; overflow: scroll;"></div>
			</div>
			<div class="layui-col-xs12 layui-inline">
			<div class="layui-row">
			<div class="layui-inline">
			<label class="layui-form-label">ä»£ç </label>
			<div class="layui-input-block">
			<input type="text" class="layui-input" name="HNumber" id="HNumber">
			<input type="text" class="layui-input" name="HNumber"
			id="HNumber">
			</div>
			</div>
			<div class="layui-inline">
			@@ -47,7 +51,8 @@
			<input type="text" class="layui-input" name="HName" id="HName">
			</div>
			</div>
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
			<button class="layui-btn layuiadmin-btn-order" type="button"
			lay-submit="" lay-filter="btnSearch" id="btnSearch">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
			</button>
			</div>
			@@ -135,7 +140,19 @@
			}
			});

			//
			table.on('rowDouble(mainTable)', function (obj) {
			if (window.parent == window) {
			return
			}
			var data = [];
			data.push(obj.data);

			parent.GetPeopleInFormationValue(data)
			var index = parent.layer.getFrameIndex(window.name);

			parent.layer.close(index);
			})
			//æ¥è¯¢æé®
			form.on('submit(btnSearch)', function (data) {

			@@ -215,4 +232,5 @@
			</script>

			</body>

			</html>

			@@ -498,7 +498,7 @@
			$("#HStockOrgName").val(sessionStorage["Organization"]);
			$("#HBillType").val("1203");
			$("#HRedBlueFlag").val("false");
			if (sessionStorage["HWHID"] != 0 && sessionStorage["HWhSPFlag"]) {
			if (sessionStorage["HWHID"] != 0 && sessionStorage["HWhSPFlag"] == 'false') {
			$("#HStockPlaceID").val("0");
			$("#HStockPlaceName").val("");
			$("#HStockPlaceName").attr("disabled", "disabled");

			@@ -528,7 +528,7 @@
			$("#HStockOrgName").val(sessionStorage["Organization"]);
			$("#HBillType").val("1206");
			$("#HRedBlueFlag").val("false");
			if (sessionStorage["HWHID"] != 0 && sessionStorage["HWhSPFlag"]) {
			if (sessionStorage["HWHID"] != 0 && sessionStorage["HWhSPFlag"] == 'false') {
			$("#HStockPlaceID").val("0");
			$("#HStockPlaceName").val("");
			$("#HStockPlaceName").attr("disabled", "disabled");

			@@ -477,7 +477,7 @@
			$("#HStockOrgName").val(sessionStorage["Organization"]);
			$("#HBillType").val("1210");
			$("#HRedBlueFlag").val("false");
			if (sessionStorage["HWHID"] != 0 && sessionStorage["HWhSPFlag"]) {
			if (sessionStorage["HWHID"] != 0 && sessionStorage["HWhSPFlag"] == 'false') {
			$("#HStockPlaceID").val("0");
			$("#HStockPlaceName").val("");
			$("#HStockPlaceName").attr("disabled", "disabled");

			@@ -500,7 +500,7 @@
			$("#HStockOrgName").val(sessionStorage["Organization"]);
			$("#HBillType").val("1211");
			$("#HRedBlueFlag").val("false");
			if (sessionStorage["HWHID"] != 0 && sessionStorage["HWhSPFlag"]) {
			if (sessionStorage["HWHID"] != 0 && sessionStorage["HWhSPFlag"] == 'false') {
			$("#HStockPlaceID").val("0");
			$("#HStockPlaceName").val("");
			$("#HStockPlaceName").attr("disabled", "disabled");

			@@ -479,7 +479,7 @@
			$("#HStockOrgName").val(sessionStorage["Organization"]);
			$("#HBillType").val("1202");
			$("#HRedBlueFlag").val("false");
			if (sessionStorage["HWHID"] != 0 && sessionStorage["HWhSPFlag"]) {
			if (sessionStorage["HWHID"] != 0 && sessionStorage["HWhSPFlag"] == 'false') {
			$("#HStockPlaceID").val("0");
			$("#HStockPlaceName").val("");
			$("#HStockPlaceName").attr("disabled", "disabled");

			@@ -357,7 +357,7 @@
			$("#HStockOrgName").val(sessionStorage["Organization"]);
			$("#HBillType").val("3711");
			$("#HRedBlueFlag").val("false");
			if (sessionStorage["HWHID"] != 0 && sessionStorage["HWhSPFlag"]) {
			if (sessionStorage["HWHID"] != 0 && sessionStorage["HWhSPFlag"] == 'false') {
			$("#HStockPlaceID").val("0");
			$("#HStockPlaceName").val("");
			$("#HStockPlaceName").attr("disabled", "disabled");

			@@ -489,7 +489,7 @@
			$("#HStockOrgName").val(sessionStorage["Organization"]);
			$("#HBillType").val("1254");
			$("#HRedBlueFlag").val("false");
			if (sessionStorage["HWHID"] != 0 && sessionStorage["HWhSPFlag"]) {
			if (sessionStorage["HWHID"] != 0 && sessionStorage["HWhSPFlag"] == 'false') {
			$("#HStockPlaceID").val("0");
			$("#HStockPlaceName").val("");
			$("#HStockPlaceName").attr("disabled", "disabled");

			@@ -638,7 +638,7 @@
			$("#HStockOutOrgID").val(sessionStorage["OrganizationID"]);
			$("#HBillType").val("1207");
			$("#HRedBlueFlag").val("false");
			if (sessionStorage["HSCWHID"]!=0 && sessionStorage["HSCWHSPFlag"]) {
			if (sessionStorage["HSCWHID"] != 0 && sessionStorage["HSCWHSPFlag"] == 'false') {
			$("#HStockPlaceID").val("0");
			$("#HStockPlaceName").val("");
			$("#HStockPlaceName").attr("disabled", "disabled");
			@@ -650,7 +650,7 @@
			$("#HStockPlaceName").removeAttr("disabled");
			$('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//æé®æ¢å¤æ£å¸¸ç¶æ
			}
			if (sessionStorage["HWHID"] != 0 && sessionStorage["HWhSPFlag"]) {
			if (sessionStorage["HWHID"] != 0 && sessionStorage["HWhSPFlag"] == 'false') {
			$("#HOutStockPlaceID").val("0");
			$("#HOutStockPlaceName").val("");
			$("#HOutStockPlaceName").attr("disabled", "disabled");

			@@ -630,7 +630,7 @@
			$("#HStockOutOrgID").val(sessionStorage["OrganizationID"]);
			$("#HBillType").val("1207");
			$("#HRedBlueFlag").val("false");
			if (sessionStorage["HSCWHID"]!=0 && sessionStorage["HSCWHSPFlag"]) {
			if (sessionStorage["HSCWHID"] != 0 && sessionStorage["HSCWHSPFlag"] == 'false') {
			$("#HStockPlaceID").val("0");
			$("#HStockPlaceName").val("");
			$("#HStockPlaceName").attr("disabled", "disabled");
			@@ -642,7 +642,7 @@
			$("#HStockPlaceName").removeAttr("disabled");
			$('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//æé®æ¢å¤æ£å¸¸ç¶æ
			}
			if (sessionStorage["HWHID"] != 0 && sessionStorage["HWhSPFlag"]) {
			if (sessionStorage["HWHID"] != 0 && sessionStorage["HWhSPFlag"] == 'false') {
			$("#HOutStockPlaceID").val("0");
			$("#HOutStockPlaceName").val("");
			$("#HOutStockPlaceName").attr("disabled", "disabled");

			@@ -622,7 +622,7 @@
			$("#HStockOutOrgID").val(sessionStorage["OrganizationID"]);
			$("#HBillType").val("1207");
			$("#HRedBlueFlag").val("false");
			if (sessionStorage["HSCWHID"]!=0 && sessionStorage["HSCWHSPFlag"]) {
			if (sessionStorage["HSCWHID"] != 0 && sessionStorage["HSCWHSPFlag"] == 'false') {
			$("#HStockPlaceID").val("0");
			$("#HStockPlaceName").val("");
			$("#HStockPlaceName").attr("disabled", "disabled");
			@@ -634,7 +634,7 @@
			$("#HStockPlaceName").removeAttr("disabled");
			$('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//æé®æ¢å¤æ£å¸¸ç¶æ
			}
			if (sessionStorage["HWHID"] != 0 && sessionStorage["HWhSPFlag"]) {
			if (sessionStorage["HWHID"] != 0 && sessionStorage["HWhSPFlag"] == 'false') {
			$("#HOutStockPlaceID").val("0");
			$("#HOutStockPlaceName").val("");
			$("#HOutStockPlaceName").attr("disabled", "disabled");

			@@ -556,7 +556,7 @@
			$("#HStockOutOrgID").val(sessionStorage["OrganizationID"]);
			$("#HBillType").val("1207");
			$("#HRedBlueFlag").val("false");
			if (sessionStorage["HSCWHID"]!=0 && sessionStorage["HSCWHSPFlag"]) {
			if (sessionStorage["HSCWHID"] != 0 && sessionStorage["HSCWHSPFlag"] == 'false') {
			$("#HStockPlaceID").val("0");
			$("#HStockPlaceName").val("");
			$("#HStockPlaceName").attr("disabled", "disabled");
			@@ -568,7 +568,7 @@
			$("#HStockPlaceName").removeAttr("disabled");
			$('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//æé®æ¢å¤æ£å¸¸ç¶æ
			}
			if (sessionStorage["HWHID"] != 0 && sessionStorage["HWhSPFlag"]) {
			if (sessionStorage["HWHID"] != 0 && sessionStorage["HWhSPFlag"] == 'false') {
			$("#HOutStockPlaceID").val("0");
			$("#HOutStockPlaceName").val("");
			$("#HOutStockPlaceName").attr("disabled", "disabled");

			@@ -528,7 +528,7 @@
			$("#HStockOutOrgID").val(sessionStorage["OrganizationID"]);
			$("#HBillType").val("1251");
			$("#HRedBlueFlag").val("false");
			if (sessionStorage["HSCWHID"] != 0 && sessionStorage["HSCWHSPFlag"]) {
			if (sessionStorage["HSCWHID"] != 0 && sessionStorage["HSCWHSPFlag"] == 'false') {
			$("#HStockPlaceID").val("0");
			$("#HStockPlaceName").val("");
			$("#HStockPlaceName").attr("disabled", "disabled");
			@@ -540,7 +540,7 @@
			$("#HStockPlaceName").removeAttr("disabled");
			$('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//æé®æ¢å¤æ£å¸¸ç¶æ
			}
			if (sessionStorage["HWHID"] != 0 && sessionStorage["HWhSPFlag"]) {
			if (sessionStorage["HWHID"] != 0 && sessionStorage["HWhSPFlag"] == 'false') {
			$("#HOutStockPlaceID").val("0");
			$("#HOutStockPlaceName").val("");
			$("#HOutStockPlaceName").attr("disabled", "disabled");

			@@ -514,7 +514,7 @@
			$("#HStockOutOrgID").val(sessionStorage["OrganizationID"]);
			$("#HBillType").val("1251");
			$("#HRedBlueFlag").val("false");
			if (sessionStorage["HSCWHID"] != 0 && sessionStorage["HSCWHSPFlag"]) {
			if (sessionStorage["HSCWHID"] != 0 && sessionStorage["HSCWHSPFlag"] == 'false') {
			$("#HStockPlaceID").val("0");
			$("#HStockPlaceName").val("");
			$("#HStockPlaceName").attr("disabled", "disabled");
			@@ -526,7 +526,7 @@
			$("#HStockPlaceName").removeAttr("disabled");
			$('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//æé®æ¢å¤æ£å¸¸ç¶æ
			}
			if (sessionStorage["HWHID"] != 0 && sessionStorage["HWhSPFlag"]) {
			if (sessionStorage["HWHID"] != 0 && sessionStorage["HWhSPFlag"] == 'false') {
			$("#HOutStockPlaceID").val("0");
			$("#HOutStockPlaceName").val("");
			$("#HOutStockPlaceName").attr("disabled", "disabled");

			@@ -567,7 +567,7 @@
			$("#HStockOutOrgID").val(sessionStorage["OrganizationID"]);
			$("#HBillType").val("1250");
			$("#HRedBlueFlag").val("false");
			if (sessionStorage["HSCWHID"] != 0 && sessionStorage["HSCWHSPFlag"]) {
			if (sessionStorage["HSCWHID"] != 0 && sessionStorage["HSCWHSPFlag"] == 'false') {
			$("#HStockPlaceID").val("0");
			$("#HStockPlaceName").val("");
			$("#HStockPlaceName").attr("disabled", "disabled");
			@@ -579,7 +579,7 @@
			$("#HStockPlaceName").removeAttr("disabled");
			$('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//æé®æ¢å¤æ£å¸¸ç¶æ
			}
			if (sessionStorage["HWHID"] != 0 && sessionStorage["HWhSPFlag"]) {
			if (sessionStorage["HWHID"] != 0 && sessionStorage["HWhSPFlag"] == 'false') {
			$("#HOutStockPlaceID").val("0");
			$("#HOutStockPlaceName").val("");
			$("#HOutStockPlaceName").attr("disabled", "disabled");

			@@ -559,7 +559,7 @@
			$("#HStockOutOrgID").val(sessionStorage["OrganizationID"]);
			$("#HBillType").val("1250");
			$("#HRedBlueFlag").val("false");
			if (sessionStorage["HSCWHID"] != 0 && sessionStorage["HSCWHSPFlag"]) {
			if (sessionStorage["HSCWHID"] != 0 && sessionStorage["HSCWHSPFlag"] == 'false') {
			$("#HStockPlaceID").val("0");
			$("#HStockPlaceName").val("");
			$("#HStockPlaceName").attr("disabled", "disabled");
			@@ -571,7 +571,7 @@
			$("#HStockPlaceName").removeAttr("disabled");
			$('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//æé®æ¢å¤æ£å¸¸ç¶æ
			}
			if (sessionStorage["HWHID"] != 0 && sessionStorage["HWhSPFlag"]) {
			if (sessionStorage["HWHID"] != 0 && sessionStorage["HWhSPFlag"] == 'false') {
			$("#HOutStockPlaceID").val("0");
			$("#HOutStockPlaceName").val("");
			$("#HOutStockPlaceName").attr("disabled", "disabled");

			@@ -545,7 +545,7 @@
			$("#HStockOutOrgID").val(sessionStorage["OrganizationID"]);
			$("#HBillType").val("1250");
			$("#HRedBlueFlag").val("false");
			if (sessionStorage["HSCWHID"] != 0 && sessionStorage["HSCWHSPFlag"]) {
			if (sessionStorage["HSCWHID"] != 0 && sessionStorage["HSCWHSPFlag"] == 'false') {
			$("#HStockPlaceID").val("0");
			$("#HStockPlaceName").val("");
			$("#HStockPlaceName").attr("disabled", "disabled");
			@@ -557,7 +557,7 @@
			$("#HStockPlaceName").removeAttr("disabled");
			$('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//æé®æ¢å¤æ£å¸¸ç¶æ
			}
			if (sessionStorage["HWHID"] != 0 && sessionStorage["HWhSPFlag"]) {
			if (sessionStorage["HWHID"] != 0 && sessionStorage["HWhSPFlag"] == 'false') {
			$("#HOutStockPlaceID").val("0");
			$("#HOutStockPlaceName").val("");
			$("#HOutStockPlaceName").attr("disabled", "disabled");

			@@ -453,7 +453,7 @@
			$("#HStockOrgName").val(sessionStorage["Organization"]);
			$("#HBillType").val("1244");
			$("#HRedBlueFlag").val("false");
			if (sessionStorage["HWHID"] != 0 && sessionStorage["HWhSPFlag"]) {
			if (sessionStorage["HWHID"] != 0 && sessionStorage["HWhSPFlag"] == 'false') {
			$("#HStockPlaceID").val("0");
			$("#HStockPlaceName").val("");
			$("#HStockPlaceName").attr("disabled", "disabled");

			@@ -493,7 +493,7 @@
			$("#HStockOrgName").val(sessionStorage["Organization"]);
			$("#HBillType").val("1204");
			$("#HRedBlueFlag").val("false");
			if (sessionStorage["HWHID"] != 0 && sessionStorage["HWhSPFlag"]) {
			if (sessionStorage["HWHID"] != 0 && sessionStorage["HWhSPFlag"] == 'false') {
			$("#HStockPlaceID").val("0");
			$("#HStockPlaceName").val("");
			$("#HStockPlaceName").attr("disabled", "disabled");

			@@ -477,7 +477,7 @@
			$("#HStockOrgName").val(sessionStorage["Organization"]);
			$("#HBillType").val("1239");
			$("#HRedBlueFlag").val("false");
			if (sessionStorage["HWHID"] != 0 && sessionStorage["HWhSPFlag"]) {
			if (sessionStorage["HWHID"] != 0 && sessionStorage["HWhSPFlag"] == 'false') {
			$("#HStockPlaceID").val("0");
			$("#HStockPlaceName").val("");
			$("#HStockPlaceName").attr("disabled", "disabled");

			@@ -491,7 +491,7 @@
			$("#HStockOrgName").val(sessionStorage["Organization"]);
			$("#HBillType").val("1201");
			$("#HRedBlueFlag").val("false");
			if (sessionStorage["HWHID"] != 0 && sessionStorage["HWhSPFlag"]) {
			if (sessionStorage["HWHID"] != 0 && sessionStorage["HWhSPFlag"] == 'false') {
			$("#HStockPlaceID").val("0");
			$("#HStockPlaceName").val("");
			$("#HStockPlaceName").attr("disabled", "disabled");

			@@ -470,7 +470,7 @@
			$("#HStockOrgName").val(sessionStorage["Organization"]);
			$("#HBillType").val("1247");
			$("#HRedBlueFlag").val("false");
			if (sessionStorage["HWHID"] != 0 && sessionStorage["HWhSPFlag"]) {
			if (sessionStorage["HWHID"] != 0 && sessionStorage["HWhSPFlag"] == 'false') {
			$("#HStockPlaceID").val("0");
			$("#HStockPlaceName").val("");
			$("#HStockPlaceName").attr("disabled", "disabled");

			@@ -523,7 +523,7 @@
			$("#HStockOrgName").val(sessionStorage["Organization"]);
			$("#HBillType").val("1205");
			$("#HRedBlueFlag").val("false");
			if (sessionStorage["HWHID"] != 0 && sessionStorage["HWhSPFlag"]) {
			if (sessionStorage["HWHID"] != 0 && sessionStorage["HWhSPFlag"] == 'false') {
			$("#HStockPlaceID").val("0");
			$("#HStockPlaceName").val("");
			$("#HStockPlaceName").attr("disabled", "disabled");

			@@ -515,7 +515,7 @@
			$("#HStockOrgName").val(sessionStorage["Organization"]);
			$("#HBillType").val("1205");
			$("#HRedBlueFlag").val("false");
			if (sessionStorage["HWHID"] != 0 && sessionStorage["HWhSPFlag"]) {
			if (sessionStorage["HWHID"] != 0 && sessionStorage["HWhSPFlag"] == 'false') {
			$("#HStockPlaceID").val("0");
			$("#HStockPlaceName").val("");
			$("#HStockPlaceName").attr("disabled", "disabled");

			@@ -501,7 +501,7 @@
			$("#HStockOrgName").val(sessionStorage["Organization"]);
			$("#HBillType").val("1205");
			$("#HRedBlueFlag").val("false");
			if (sessionStorage["HWHID"] != 0 && sessionStorage["HWhSPFlag"]) {
			if (sessionStorage["HWHID"] != 0 && sessionStorage["HWhSPFlag"] == 'false') {
			$("#HStockPlaceID").val("0");
			$("#HStockPlaceName").val("");
			$("#HStockPlaceName").attr("disabled", "disabled");

			@@ -219,6 +219,18 @@
			<cite style="white-space:pre-wrap">è½¦é´å®ä½åºåæ¥è¯¢</cite>
			</a>
			</li>
			<li class="layui-col-xs3">
			<a href="../WMSæ«ç æ¨¡å/éå®åºåº/Kf_SellOutBill_YP_QiaoYi_PDA.html" target="main_self_frame">
			<i class="layui-icon layui-icon-find-fill"></i>
			<cite style="white-space:pre-wrap">æ ·åéå®åºåºå</cite>
			</a>
			</li>
			<li class="layui-col-xs3">
			<a href="../WMSæ«ç æ¨¡å/çäº§è°æ¨/Kf_MoveStockBill_PDA.html" target="main_self_frame">
			<i class="layui-icon layui-icon-template-1"></i>
			<cite style="white-space:pre-wrap">è°æ¨</cite>
			</a>
			</li>
			</ul>
			</div>
			</div>
			@@ -438,6 +450,12 @@
			<cite style="white-space:pre-wrap">è½¦é´ä¸æ¶åç¼å</cite>
			</a>
			</li>
			<li class="layui-col-xs3">
			<a href="../WMSæ«ç æ¨¡å/éå®åºåº/Kf_SellOutBillList_YP_QiaoYi_PDA.html" target="main_self_frame">
			<i class="layui-icon layui-icon-down"></i>
			<cite style="white-space:pre-wrap">æ ·ååºåºåç¼å</cite>
			</a>
			</li>
			</ul>
			</div>
			</div>

			@@ -514,6 +514,11 @@
			content: [url, 'yes'],
			btn: [get_MessageError('[0000-2-051]ç¡®å®', sessionStorage["HTranSlate"]), get_MessageError('[0000-2-052]åæ¶', sessionStorage["HTranSlate"])],
			btn1: function (index, layero) {
			HBarInfo = ""; //åå¨æ¡ç ä¿¡æ¯
			HFileList = ""; //åå¨æ¡£æ¡åè¡¨
			$('#ToolCreate').removeClass("layui-btn-disabled").attr("disabled", false);//çææé®å¯ç¨
			element.tabChange('tab-TabTest', '1');

			var iframeWindow = window['layui-layer-iframe' + index] //è·åå¼¹æ¡é¡µé¢
			var checkStatus = iframeWindow.layui.table.checkStatus('layTable');//è·åtableçelem:"#test"
			if (checkStatus.data.length === 0) {
			@@ -658,32 +663,7 @@
			title: get_MessageError("[0000-2-009]æç¤º", sessionStorage["HTranSlate"]),
			icon: 3,
			}, function (index) {
			$("#HOrgID").find("option").remove(); //æ¸é¤æºåç±»åéæ©ä¸ææ¡ä¸çå¼
			set_HOrg(); //è°ç¨è·åæºåç±»åéæ©ä¸ææ¡çå¼
			$("#HDate").val(Format(new Date(), "yyyy-MM-dd")); //åæ®æ¥æ
			$("#HSourceBillType").val('1'); //éæ©ä¸ææ¡é»è®¤ç¬¬ä¸ä¸ªéé¡¹
			$("#HBarCodeType").val('0');
			var arr = [{ HBillNo: '', HMaterNumber: '', HMaterName: '', HMaterModel: '', HAuxPropNumber: '', HAuxPropName: '', HUnitNumber: '', HUnitName: '', HBatchNo: '', HGiveAwayFlag: '0', HQty: '0', HMinQty: '0', HPackQty: '0', HBQty: '0', HDate: '', HCusNumber: '', HCusName: '', HSeOrderBillNo: '', HRemark: '', HEmpID: 0, HEmpNumber: '', HEmpName: '', HGroupID: 0, HGroupNumber: '', HGroupName: '', HMTONo: '', HCusModel: "", HCusMaterName: "", "HCheckEmpName": "" }]
			table.reload('mainTable', {
			data: arr // è°ç¨table.reload éæ°æ¸²ææ¾ç¤ºå è½½è¿½å äºæ°æ®çè¡¨æ ¼
			});
			var arr1 = [{
			"HBarCode": "", "HMaterNumber": "", "HMaterName": "", "HMaterModel": "", "HAuxPropNumber": "", "HAuxPropName": ""
			, "HGiveAwayFlag": "", "HUnitCode": "", "HUnitName": "", "HQty": 0, "HDate": "", "HCusNumber": "", "HCusName": ""
			, "HSourceBillNo": "", "HSeOrderBillNo": "", "HRemark": "", "HMTONo": "", "HShowDate": "", "HInnerBillNo": "", "HMaker": ""
			, "HEmpID": 0, "HEmpNumber": "", "HEmpName": "", "HGroupID": 0, "HGroupNumber": "", "HGroupName": "", "HMTONo": "", "HCusModel": "", "HCusMaterName": "", "HCheckEmpName": ""
			}]
			table.reload('mainTable1', {
			data: arr1 // è°ç¨table.reload éæ°æ¸²ææ¾ç¤ºå è½½è¿½å äºæ°æ®çè¡¨æ ¼
			});

			//çææåè·³è½¬å°æ¡ç ä¿¡æ¯æ ç¾é¡µ
			element.tabChange('tab-TabTest', '1');
			//å è½½æ¡£æ¡åè¡¨
			table.reload('mainTable2', {
			data: [] // è°ç¨table.reload éæ°æ¸²ææ¾ç¤ºå è½½è¿½å äºæ°æ®çè¡¨æ ¼
			});
			layer.close(index)
			location.replace('Gy_BarCodeBill.html?OperationType=1');
			})
			})

			@@ -888,6 +868,7 @@
			, { templet: '#xuhao', title: 'åºå·', sort: true, fixed: 'left', event: "qwe", width: 75 }
			, { field: 'HMainID', title: 'æºåä¸»åç ', width: 100, hide: true }
			, { field: 'HSubID', title: 'æºåååç ', width: 100, hide: true }
			, { field: 'HSourceBillSEQ', title: 'æºåè¡å·', width: 100, hide: true }
			, { field: 'HBillNo', title: 'æºååå·', width: 200 }
			, { field: 'HMaterID', title: 'ç©æID', width: 100, hide: true }
			, { field: 'HMaterNumber', title: 'ç©æä»£ç ', edit: 'text', event: 'HMaterNumber', width: 200 }
			@@ -903,6 +884,7 @@
			, { field: 'HGroupName', title: 'çç»åç§°', width: 200 }
			, { field: 'HCheckEmpName', title: 'æ£éªå', width: 200, edit: 'text' }
			, { field: 'HBatchNo', title: 'æ¹å·', edit: 'text', width: 100 }
			, { field: 'HMTONo', title: 'è®¡åè·è¸ªå·', width: 100, edit: 'text' }
			, { field: 'HQty', title: 'æ°é', edit: 'text', width: 100, totalRow: true }
			, { field: 'HMinQty', title: 'æå°åè£æ°', edit: 'text', totalRow: true, width: 100 }
			, { field: 'HBQty', title: 'ç®±æ°', width: 100, totalRow: true }
			@@ -928,7 +910,6 @@
			, { field: 'HExpirationDateFlag', title: 'æ¯å¦å¯ç¨ä¿è´¨æ', width: 100, templet: '#switchTp3', unresize: false }
			, { field: 'HGiveAwayFlag', title: 'æ¯å¦èµ å', width: 100, templet: '#switchTpl', unresize: false }
			, { field: 'HDate', title: 'æ¡ç æ¥æ', width: 100, hide: true }
			, { field: 'HMTONo', title: 'è®¡åè·è¸ªå·', width: 100, edit: 'text' }
			, { fixed: 'right', title: 'æä½', toolbar: '#barDemo' }
			];
			option = {
			@@ -1058,7 +1039,7 @@
			//æ æºåæ°å¢
			function set_AddFNew() {
			option.data = [{
			"HMainID": 0, "HSubID": 0, "HBillNo": "", "HMaterID": 0, "HMaterNumber": "", "HMaterName": "", "HMaterModel": ""
			"HMainID": 0, "HSubID": 0, "HSourceBillSEQ": 0, "HBillNo": "", "HMaterID": 0, "HMaterNumber": "", "HMaterName": "", "HMaterModel": ""
			, "HAuxPropID": 0, "HAuxPropNumber": "", "HAuxPropName": "", "HUnitID": 0, "HUnitNumber": "", "HUnitName": "", "HBatchNo": "", "HGiveAwayFlag": 0
			, "HQty": 0, "HMinQty": '', "HBQty": 0, "HPackQty": 0, "HDate": "", "HCusID": 0, "HCusNumber": "", "HCusName": "", "HSeOrderBillNo": "", "HRemark": ""
			, "HCoilNO": "", "HFurnaceNO": "", "HFactory": "",
			@@ -1600,6 +1581,8 @@
			//ç©æä¿¡æ¯ å¦æå¨ç©æä»£ç å æF7
			if (obj.event === 'HMaterNumber') //ç©æä¿¡æ¯ å¦æå¨æ¨¡å·ä»£ç å æF7
			{
			//è·åç»ç»ID
			var HOrgID = $("#HOrgID").find("option:selected").val();
			//é¡µé¢å±-èªå®ä¹ //F7éæ©æ¨¡å·
			layer.open({
			type: 2,
			@@ -1609,7 +1592,7 @@
			shift: 2,
			area: ['80%', '80%'],
			maxmin: true,
			content: ['../../Baseset/åºç¡èµæ/Gy_MaterialList.html', 'yes'],
			content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_Material.html?openType=2&HOrgID=' + HOrgID, 'yes'],
			btn: [get_MessageError('[0000-2-051]ç¡®å®', sessionStorage["HTranSlate"]), get_MessageError('[0000-2-052]åæ¶', sessionStorage["HTranSlate"])]
			, btn1: function (index, layero) {

			@@ -1619,26 +1602,41 @@
			if (checkStatus.data.length === 0) {
			return layer.msg(get_MessageError('[0000-1-020]è¯·éæ©æ°æ®', sessionStorage["HTranSlate"]));
			}
			//console.log(obj.data);
			//åæ¥æ´æ°è¡¨æ ¼åç¼åå¯¹åºçå¼
			obj.update({
			HMaterID: checkStatus.data[0].HItemID,
			HMaterNumber: checkStatus.data[0].HNumber,
			HMaterName: checkStatus.data[0].HName,
			HMaterModel: checkStatus.data[0].HModel,
			HUnitID: checkStatus.data[0].HUnitID,
			HUnitNumber: checkStatus.data[0].HUnitNumber,
			HUnitName: checkStatus.data[0].HUnitName
			});
			OptionData = checkStatus.data[0];
			if (checkStatus.data.length >= 1) {
			var rowIndex = $(obj.tr).attr("data-index") * 1;
			for (var i = 0; i < checkStatus.data.length; i++) {
			if (rowIndex + i >= option.data.length) {
			var NewRow = {
			"HMaterID": 0, "HMaterCode": "", "HMaterNumber": "", "HMaterName": "", "HMaterModel": "", "HMaterSpec": "", "HBatchNo": "", "HUnitID": 0, "HUnitNumber": "", "HUnitName": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HBQty": 0, "HMinQty": 0, "HPackQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HStockOrgID": sessionStorage["OrganizationID"], "HRemark": "", "HCoilNO": "", "HFurnaceNO": "", "HFactory": "",
			"HAuxQty": 0, "HheatNO": "", "HProduceDate": Format(new Date(), "yyyy-MM-dd"), "HExpiryDate": Format(new Date(), "yyyy-MM-dd"), "HExpirationDateFlag": 0, "HEmpID": sessionStorage["HEmpID"], "HEmpNumber": sessionStorage["HEmpNumber"], "HEmpName": sessionStorage["HEmpName"], "HGroupID": 0, "HGroupNumber": "", "HGroupName": "", "HMTONo": "", "HCusModel": "", "HCusMaterName": "", "HCheckEmpName": ""
			};

			table.cache["mainTable"].push(NewRow);
			option.data = table.cache["mainTable"];

			table.render(option);
			}

			var HMaterID = checkStatus.data[i].HItemID;
			var resultData = getMaterialByMaterID(HMaterID);
			option.data[rowIndex + i].HMaterID = resultData.HMaterID;
			option.data[rowIndex + i].HMaterNumber = resultData.HMaterNumber;
			option.data[rowIndex + i].HMaterName = resultData.HMaterName;
			option.data[rowIndex + i].HMaterModel = resultData.HMaterModel;
			option.data[rowIndex + i].HUnitID = resultData.HUnitID;
			option.data[rowIndex + i].HUnitNumber = resultData.HUnitNumber;
			option.data[rowIndex + i].HUnitName = resultData.HUnitName;

			if ($("#HBarCodeType").find("option:selected").html() == 'æçæ¡ç ') {
			obj.update({
			HQty: 1, //æ°é
			HMinQty: 1, //æå°åè£æ°é
			HBQty: 1 //ç®±æ°
			});
			option.data[rowIndex + i].HQty = 1; //æ°é
			option.data[rowIndex + i].HMinQty = 1; //æå°åè£æ°é
			option.data[rowIndex + i].HBQty = 1; //ç®±æ°
			}
			layer.close(layer.index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}
			table.render(option);
			}
			layer.closeAll();
			}
			, btn2: function (index, layero) {
			//æé®ãæé®äºãçåè°
			@@ -1873,6 +1871,31 @@

			}

			//#region æ ¹æ®ç©æIDè·åç©æè¯¦ç»ä¿¡æ¯
			function getMaterialByMaterID(HMaterID) {
			var resultData = {};
			$.ajax({
			url: GetWEBURL() + "Cg_ContractBill/getMaterialByMaterID",
			async: false,
			type: "GET",
			data: {
			"HMaterID": HMaterID
			},
			success: function (result) {
			if (result.code == 1) {
			var data = result.data;
			resultData = data[0];
			} else {
			layer.alert(result.msg, { icon: 5, btn: ['éåº'], time: 100000, offset: 't' });
			}
			}, error: function () {
			layer.alert("åçéè¯¯!", { icon: 5 });
			}
			});
			return resultData;
			}
			//#endregion

			//æ¡ç çæ
			function SaveBarCodeCreate(sMainSub, CampanyName) {
			$.ajax(

			@@ -9,6 +9,15 @@
			<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/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/PageTitle.js"></script>
			<script src="../../../layuiadmin/SetColumn.js"></script>
			<script src="../../../layuiadmin/QueryScheme.js"></script>
			<script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
			<script src="../../../layuiadmin/HideButton.js"></script>
			</head>
			<body>
			<div class="layui-fluid">
			@@ -134,7 +143,9 @@
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Stop" id="Stop"><i class="layui-icon layui-icon-radio"></i>ç¦ç¨</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeStop" id="DeStop"><i class="layui-icon layui-icon-radio"></i>åç¦ç¨</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-iconlayuiiconrefresh-3"></i>å·æ°</button>
			<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn_Export" id="btn_Export"><i class="layui-icon layui-icon-export"></i>å¯¼åº</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layuiiconform"></i>åè®¾ç½®</button>
			<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_HideButton" id="HideButton"><i class="layui-icon layui-icon-form"></i>æé®è®¾ç½®</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_SaveScheme" id="set_SaveScheme"><i class="layui-icon layui-icon-template"></i>ä¿åæ¹æ¡</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_ReadScheme" id="set_ReadScheme"><i class="layui-icon layui-icon-set"></i>è¯»åæ¹æ¡</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Close"><i class="layui-icon layui-icon-logout"></i>éåº</button>
			@@ -146,13 +157,7 @@
			</div>
			</div>
			</div>
			<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/SetColumn.js"></script>
			<script src="../../../layuiadmin/QueryScheme.js"></script>
			<script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>

			<script>
			layui.config({
			base: '../../../layuiadmin/' //éæèµæºæå¨è·¯å¾
			@@ -171,7 +176,9 @@
			var sWhere = "";
			var option = [];
			var Organization = sessionStorage["Organization"];
			var HBillType = "Gy_MaterPrice";
			var HModName = "Gy_MaterPrice";
			var set_HideButton_ID = "toolbarDemo_ButtonSet";//éè¦è®¾ç½®çæé®çç¶çº§èç¹çid
			//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±
			var titleData = ["HItemID", "HUSEORGID", "HCREATEORGID", "ç¶çº§ID", "HMaterID", "HUnitID", "HRelationID"];

			@@ -226,6 +233,13 @@
			case 'set_HideColumn':
			get_HideColumnNoPage(HModName, sessionStorage["HUserName"], option, get_FastQuery);
			break;
			//æé®è®¾ç½®
			case 'set_HideButton':
			var btns = document.getElementsByTagName("button"); //è·åæ¬é¡µæææé®å¯¹è±¡
			var HBillType = "7505";
			get_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
			break;
			break;
			//ä¿åæ¹æ¡
			case 'set_SaveScheme': set_SaveScheme(get_FastQuery);
			break;
			@@ -234,6 +248,9 @@
			break;
			//å·æ°
			case 'get_Refresh': get_Refresh();
			break;
			//å¯¼åºæé®
			case 'btn_Export': btn_Export();
			break;
			//éåºæé®
			case 'btn-Close':
			@@ -379,8 +396,11 @@
			//å·æ°è¡¨æ ¼æ°æ®
			DisPlay_HideColumn(HModName, sessionStorage["HUserName"], option, titleData)
			ins = table.render(option);
			///å·æ°æé®æ¾ç¤º
			var btns = document.getElementsByTagName("button"); //è·åæ¬é¡µæææé®å¯¹è±¡
			var HBillType = "7505";
			Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
			layer.close(ajaxLoad);

			if ($("#ColName option").length < 1) {
			ColFilter();
			get_DefaultModule();//å è½½æ¹æ¡
			@@ -477,9 +497,6 @@
			if (HNumber) {
			sWhere += " and ç©æç¼ç like '%" + HNumber + "%'";
			}
			//if (HName) {
			// sWhere += " and åç§° like '%" + HName + "%'";
			//}
			get_Display(sWhere);
			sWhere = "";//è°ç¨æ¥å£åæ¸ç©ºsWhereç¼å
			}
			@@ -873,7 +890,22 @@
			}

			}
			//#region å¯¼åºExecel
			function btn_Export() {
			option.data.forEach((item) => {
			for (let itemobj in item) {
			if (item[itemobj] == null) {
			item[itemobj] = "";
			}
			if (item[itemobj].length > 0) { // åè®¾åæ®µåä¸ºfield
			item[itemobj] = item[itemobj].toString().replaceAll(/[\r\n]+/g, ''); // å°æ¢è¡ç¬¦æ¿æ¢ä¸ºç©ºåç¬¦ä¸²
			}
			}
			});

			table.exportFile(ins.config.id, option.data, "xls");
			}
			//#endregion
			//è¯»åæ¹æ¡
			function set_ReadScheme() {
			var HIsClose_Manual = false;