MES-WEB-LayUI.git

parent: 0e84962e | 补丁 | 提交 | ignore whitespace

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

chenhaozhe

2 天以前 0790fd08b4fbcd89b71490ae0b840f9676abc876

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

2个文件已添加

9个文件已修改

	WebTM/Properties/PublishProfiles/LAYUI.pubxml.user	5069 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/WebTM.csproj	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/WebTM.csproj.user	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/PublicPage/HSourceReportHtml.html	17 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/WMS扫码模块/生产调拨/Kf_MoveStockBill_AutoBarCode_PDA.html	745 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/home/console_Mobile.html	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/基础资料/公用基础资料/Gy_PNLInfoEdit_Import.html	226 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/基础资料/公用基础资料/Gy_PNLInfoList.html	19 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/案例代码/华远/HY_HistogramReport.html	51 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/质量管理/PNL检验信息/QC_CheckNote_PNL_TempEdit.html	45 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/质量管理/PNL检验信息/QC_CheckNote_PNL_TempList.html	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 WebTM/Properties/PublishProfiles/LAYUI.pubxml.user

Diff too large

 WebTM/WebTM.csproj

@@ -368,6 +368,7 @@
    <Content Include="views\WMSæ«ç æ¨¡å\çäº§è°æ¨\Kf_MoveStockBillList_PDA_XiaBao.html" />
    <Content Include="views\WMSæ«ç æ¨¡å\çäº§è°æ¨\Kf_MoveStockBill_CusBar_PDA.html" />
    <Content Include="views\WMSæ«ç æ¨¡å\çäº§è°æ¨\Kf_MoveStockBill_Mould_PDA.html" />
    <Content Include="views\WMSæ«ç æ¨¡å\çäº§è°æ¨\Kf_MoveStockBill_AutoBarCode_PDA.html" />
    <Content Include="views\WMSæ«ç æ¨¡å\çäº§è°æ¨\Kf_MoveStockBill_PDA_XiaBao.html" />
    <Content Include="views\WMSæ«ç æ¨¡å\çäº§è°æ¨\Kf_MoveStockStepInBill_Mould_PDA.html" />
    <Content Include="views\WMSæ«ç æ¨¡å\çäº§è°æ¨\Kf_MoveStockStepInBill_PDA.html" />
@@ -473,6 +474,7 @@
    <Content Include="views\åºç¡èµæ\å¬ç¨åºç¡èµæ\Gy_BarCodeReport.html" />
    <Content Include="views\åºç¡èµæ\å¬ç¨åºç¡èµæ\Gy_PNLInfoEdit.html" />
    <Content Include="views\åºç¡èµæ\å¬ç¨åºç¡èµæ\Gy_BarCodeBill_PNL_TempEdit.html" />
    <Content Include="views\åºç¡èµæ\å¬ç¨åºç¡èµæ\Gy_PNLInfoEdit_Import.html" />
    <Content Include="views\åºç¡èµæ\å¬ç¨åºç¡èµæ\Gy_PNLInfoList.html" />
    <Content Include="views\åºç¡èµæ\å¬ç¨åºç¡èµæ\Gy_BarCodeBill_PNL_TempList.html" />
    <Content Include="views\åºç¡èµæ\å¬ç¨åºç¡èµæ\Gy_BarCodeBill_Set_TempEdit.html" />

 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:\WorkBench\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
    <NameOfLastUsedPublishProfile>D:\ç½ç«åå¸\åç«¯ä»£ç \MES-WEB-TM\MESWMS-LayUI\WebTM\Properties\PublishProfiles\LAYUI.pubxml</NameOfLastUsedPublishProfile>
    <ProjectView>ProjectFiles</ProjectView>
    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
    <UseIISExpress>true</UseIISExpress>

 WebTM/views/PublicPage/HSourceReportHtml.html

@@ -380,7 +380,7 @@
                        $("#HProcExchBillNoHidden").show();
                        HModName = "ProductInBill_1202";
                        break;
                    case 'éè´å¥åº':
                    case 'éè´å¥åºå':
                        HModName = "POStockInBill_1201";
                        break;
                    case 'éå®éè´§':
@@ -625,6 +625,21 @@
                        }
                        return sWhere;
                        break;
                    case "éè´å¥åºå":
                        if (HBillNo) {
                            sWhere += " and åæ®å· like '%" + HBillNo + "%'";
                        }
                        if (PartNumber) {
                            sWhere += " and ç©æä»£ç  like '%" + PartNumber + "%'";
                        }
                        if (PartName) {
                            sWhere += " and ç©æåç§° like '%" + PartName + "%'";
                        }
                        if (HDeptName && HDeptName != 0) {
                            sWhere += " and HDeptID = '" + HDeptName + "'";
                        }
                        return sWhere;
                        break;
                    case 'éè´§éç¥å':
                        return sWhere;
                        break;

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

New file
@@ -0,0 +1,745 @@
ï»¿<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
    <title>ç´æ¥è°æ¨å-åæ«ç </title>
    <meta name="renderer" content="webkit">
    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
    <!--å¼ç¨layuiæ ·å¼æä»¶-->
    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
    <!--å¼ç¨layui jsæä»¶-->
    <script src="../../../layuiadmin/layui/layui.js"></script>
    <script src="../../../layuiadmin/Scripts/json2.js"></script>
    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
    <script src="../../../layuiadmin/PubCustom.js"></script>
    <style>
        .layui-col-xs8 {
            width: 55.666667%;
        }
    </style>
</head>
<body>
    <div class="layui-fluid" style="padding:0">
        <div class="layui-card" style="padding: 1px">
            <div class="layui-card-body" style="padding: 0px; height:800px;">
                <form class="layui-form" action="" lay-filter="component-form-group">
                    <div style="background-color:#0085E8;">
                        <span style="color: white;"><i class="layui-icon layui-icon-form"></i>ç´æ¥è°æ¨å-åæ«ç </span>
                    </div>
                    <div class="layui-form-item" style="padding:15px;margin:0px">
                        <div class="layui-row">
                            <div class="layui-col-xs3">
                                <label class="layui-form-label" style="width:60px;padding-left:0px;">æºååå·</label>
                            </div>
                            <div class="layui-col-xs9">
                                <div class="layui-col-xs8">
                                    <input type="text" name="HSourceBillNo" id="HSourceBillNo" lay-verify="HSourceBillNo" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
                                </div>
                                <div class="layui-col-xs2">
                                    <button type="button" lay-submit="" lay-filter="cmdHSourceBillNo" class="layui-btn" id="cmdHSourceBillNo" style="width: 45px; margin-left: 10px; padding-left: 12px">
                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-2px;"></i>
                                    </button>
                                </div>
                                <div class="layui-col-xs2" style="float: right;">
                                    <button type="button" lay-submit="" lay-filter="HSourceBillNo-BT" class="layui-btn" id="HSourceBillNo-BT" style="width: 45px; margin-left: -5px;padding-left:12px">OK</button>
                                </div>
                            </div>
                        </div>
                        <div class="layui-tab layui-col-xs12" style="margin-top:5px;" lay-filter="tab-Kf_MoveStockBill_AutoBarCode_PDA">
                            <ul class="layui-tab-title" lay-filter="tab-all">
                                <li lay-id="1" style="padding:1px;">è¡¨å¤´ä¿¡æ¯</li>
                                <li lay-id="2" style="padding:1px;">ç©æä¿¡æ¯</li>
                            </ul>
                            <div class="layui-tab-content">
                                <!--è¡¨å¤´ä¿¡æ¯-->
                                <div class="layui-tab-item">
                                    <div class="layui-form-item" style="padding: 0px; margin: 0px">
                                        <div class="layui-row">
                                            <div class="layui-col-xs3">
                                                <label class="layui-form-label" style="width:60px;padding-left:0px;">æºåç±»å</label>
                                            </div>
                                            <div class="layui-col-xs9">
                                                <select name="HMainSourceBillType" id="HMainSourceBillType">
                                                    <option value="3720">çäº§ç¨ææ¸å</option>
                                                </select>
                                            </div>
                                        </div>
                                        <div class="layui-row">
                                            <div class="layui-col-xs3">
                                                <label class="layui-form-label" style="width:60px;padding-left:0px;">è°æ¨ç±»å</label>
                                            </div>
                                            <div class="layui-col-xs9">
                                                <select lay-filter="HStockStyle" name=" HStockStyle" id="HStockStyle">
                                                    <option value="ç»ç»åè°æ¨">ç»ç»åè°æ¨</option>
                                                </select>
                                            </div>
                                        </div>
                                        <div class="layui-row">
                                            <div class="layui-col-xs3">
                                                <label class="layui-form-label" style="width:60px;padding-left:0px;">è°åºç»ç»</label>
                                            </div>
                                            <div class="layui-col-xs9">
                                                <select lay-filter="HStockOutOrgID" name=" HStockOutOrgID" id="HStockOutOrgID" disabled>
                                                    <!--å¨ææ¸²æç»ç»-->
                                                </select>
                                            </div>
                                        </div>
                                        <div class="layui-row">
                                            <div class="layui-col-xs3">
                                                <label class="layui-form-label" style="width:60px;padding-left:0px;">è°å¥ç»ç»</label>
                                            </div>
                                            <div class="layui-col-xs9">
                                                <select lay-filter="HStockInOrgID" name=" HStockInOrgID" id="HStockInOrgID" disabled>
                                                    <!--å¨ææ¸²æç»ç»-->
                                                </select>
                                            </div>
                                        </div>
                                        <div class="layui-row">
                                            <div class="layui-col-xs3">
                                                <label class="layui-form-label" style="width:60px;padding-left:0px;">æ¥æ</label>
                                            </div>
                                            <div class="layui-col-xs9">
                                                <input name="HDate" id="HDate" autocomplete="off" class="layui-input">
                                            </div>
                                        </div>
                                        <div class="layui-row">
                                            <div class="layui-col-xs3">
                                                <label class="layui-form-label" style="width:60px;padding-left:0px;">å¶åäºº</label>
                                            </div>
                                            <div class="layui-col-xs9">
                                                <input type="text" name="HMaker" id="HMaker" lay-verify="HMaker" autocomplete="off" class="layui-input" style="border-radius: 5px;background-color:#efefef4d;" disabled>
                                            </div>
                                        </div>
                                        <div class="layui-row">
                                            <div class="layui-col-xs3">
                                                <label class="layui-form-label" style="width:60px;padding-left:0px;">åæ®å·</label>
                                            </div>
                                            <div class="layui-col-xs9">
                                                <input type="text" name="HBillNo" id="HBillNo" lay-verify="HBillNo" autocomplete="off" class="layui-input" style="border-radius: 5px;background-color:#efefef4d;" disabled>
                                            </div>
                                        </div>
                                        <div class="layui-row">
                                            <div class="layui-col-xs3">
                                                <label class="layui-form-label" style="width:60px;padding-left:0px;">åæ®ID</label>
                                            </div>
                                            <div class="layui-col-xs9">
                                                <input type="text" name="HInterID" id="HInterID" lay-verify="HInterID" value="0" autocomplete="off" class="layui-input" style="border-radius: 5px;background-color:#efefef4d;" disabled>
                                            </div>
                                        </div>
                                    </div>
                                </div>
                                <!--ç©æä¿¡æ¯-->
                                <div class="layui-tab-item">
                                    <div class="layui-row">
                                        <div class="layui-col-xs12">
                                            <div class="layui-form-item" style="padding:0px;margin:0px"></div>
                                            <table class="layui-hide" id="wl-table" lay-filter="wl-table"></table>
                                        </div>
                                    </div>
                                </div>
                            </div>
                        </div>
                        <div class="layer-footer" style="z-index: 10; position: fixed; text-align: center; bottom: 0; width:100%; height:50px">
                            <button type="button" lay-submit="" lay-filter="cmdSaver" class="layui-btn" id="cmdSaver">æäº¤</button>
                            <button type="button" lay-submit="" lay-filter="cmdCancel" class="layui-btn" id="cmdCancel">éåº</button>
                        </div>
                    </div>

                    <!--éèåæ®µ-->
                    <input type="hidden" name="HBillType" id="HBillType">
                    <input type="hidden" name="HBillerID" id="HBillerID">
                    <input type="hidden" name="HRedBlueFlag" id="HRedBlueFlag">
                    <input type="hidden" name="HSourceBillListCtl" id="HSourceBillListCtl">
                    <!--å¤±è´¥æç¤ºé³-->
                    <div id="" style="display:none;">
                        <audio id="cs" hidden controls>
                            <source src="../../video/jingbao.wav" type="audio/ogg">
                        </audio>
                    </div>
                    <!--æåæç¤ºé³-->
                    <div id="" style="display:none;">
                        <audio id="cs2" hidden controls>
                            <source src="../../video/success.wav" type="audio/ogg">
                        </audio>
                    </div>
                </form>
            </div>
        </div>
    </div>
    <script>
        layui.config({
            base: '../../../layuiadmin/' //éæèµæºæå¨è·¯å¾
        }).extend({
            index: 'lib/index' //ä¸»å¥å£æ¨¡å
        }).use(['index', 'form', 'laydate', 'table', 'element'], function () {

            //#region å¬å±åé
            var $ = layui.$
                , admin = layui.admin
                , layer = layui.layer
                , table = layui.table
                , form = layui.form
                , laydate = layui.laydate
                , element = layui.element;
            var HInterID = $('#HInterID').val()
            var HBillNo = $('#HBillNo').val()
            var HBillType = '1207'
            var HRedBlueFlag = false
            var HMaker = sessionStorage["HUserName"]
            var HBillerID = sessionStorage["HBillerID"]
            var HStockInOrgID = sessionStorage["OrganizationID"]    //è°å¥ç»ç»ID
            var HStockOutOrgID = sessionStorage["OrganizationID"]   //è°åºç»ç»ID
            var HStockOrgID = sessionStorage["OrganizationID"]      //ç»å¥ç»ç»ID
            var OperationType = 1       //æä½ç±»åï¼1æ°å¢ã2ä»ç¼ååè¡¨ä¸è¿åï¼
            var listOption = [];
            var columns = "";
            var HModName = "Kf_MoveStockBill_AutoBarCode_PDA";
            var ModRightName = "CE_MoveStock3";    //æ¨¡åæéåæ°
            var titleData = [];                 //ä¸éè¦æ¾ç¤ºçåæ®µ
            var params = get_UrlVars();
            var OperationType = params[params[0]] == null ? 1 : params[params[0]];  //ä»ç¼ååè¡¨ä¸è¿åæ°æ®ç±»åï¼1æ°å¢ã2ä»ç¼ååè¡¨ä¸è¿åï¼
            var HInterID_Temp = params[params[1]];      //ä»ç¼ååè¡¨ä¸è¿ååæ®ID

            //#endregion

            //å¤ææ¯å¦ç»å½ æªç»å½åè·³å°ç»å½é¡µ
            if (sessionStorage.login != "login") {
                layer.confirm("ç»å½å¤±æï¼è¯·éæ°ç»å½ï¼", {
                    icon: 4, skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º", closeBtn: 0, btn: ['éæ°ç»å½']
                }, function () { window.location.href = "../../user/login_pda.html"; });
            }

            //#region   ç¨æ·æ¨¡åæéå¤æ

            //ç¨æ·æ¨¡åæéå¤æ
            CheckModRight();

            function CheckModRight() {
                layer.load(3);
                $.ajax({
                    type: "GET",
                    url: GetWEBURL() + "/WEBSController/CheckModRight_Json",
                    async: false,    //asyncç¨äºæ§å¶ï¼falseï¼åæ¥åï¼trueï¼å¼æ¥ï¼é»è®¤çæ¯trueï¼å³è¯·æ±é»è®¤çæ¯å¼æ¥è¯·æ±
                    data: { "ModRightName": ModRightName, "HUserName": HMaker },
                    success: function (d) {
                        if (d.count == 1) {
                        }
                        else {
                            layer.msg(d.Message, {
                                icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º", btn: ['ç¡®è®¤']
                            }, function () { parent.location.href = "../../../views/index_Mobile.html"; });
                        }
                    },
                    complete: function (XHR, TS) { XHR = null }//åæ¶èµæº
                });
                layer.closeAll("loading");
            }
            //#endregion

            //å¤±è´¥æç¤ºé³
            function playSound() {
                console.log("playSound");
                var audio = document.getElementById("cs");
                audio.play();
                audio.onended = function () {
                    // å½é³é¢ææ¥å®ææ¶ï¼è°ç¨ pause åè®¾ç½® currentTime ä¸º 0 ä»¥åæ¢ææ¥å¹¶éç½®
                    audio.pause();
                    audio.currentTime = 0;
                };
            }
            //æåæç¤ºé³
            function playSound_OK() {
                console.log("playSound_OK");
                var audio = document.getElementById("cs2");
                audio.play();
                audio.onended = function () {
                    // å½é³é¢ææ¥å®ææ¶ï¼è°ç¨ pause åè®¾ç½® currentTime ä¸º 0 ä»¥åæ¢ææ¥å¹¶éç½®
                    audio.pause();
                    audio.currentTime = 0;
                };
            }

            //#region åå§åçé¢

            set_ClearBill();

            function set_ClearBill() {
                //è¡¨å¤´åå§åèµå¼
                $("#HMaker").val(sessionStorage["HUserName"]);
                $("#HDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
                $("#HBillerID").val(sessionStorage["HBillerID"]);
                $("#HStockInOrgID").val(sessionStorage["OrganizationID"]);
                $("#HStockOutOrgID").val(sessionStorage["OrganizationID"]);
                $("#HBillType").val("1207");
                $("#HRedBlueFlag").val("false");

                //é»è®¤æ¾ç¤ºé¡µé¢
                element.tabChange('tab-Kf_MoveStockBill_AutoBarCode_PDA', '1');
                set_InitDate();             //åå§åè¡¨åæ¶é´
                set_InitStockOrgID();       //è·åè°å¥è°åºç»ç»
                set_InitGrid();             //åå§åè¡¨æ ¼

                var data = [];
                listOption.cols = [[
                    { field: 'æ°é', title: 'æ°é', width: 100 }
                    , { field: 'æºåæ°é', title: 'æºåæ°é', width: 100 }
                    , { field: 'ç©æä»£ç ', title: 'ç©æä»£ç ', width: 100 }
                    , { field: 'ç©æåç§°', title: 'ç©æåç§°', width: 100 }
                    , { field: 'è§æ ¼åå·', title: 'è§æ ¼åå·', width: 100 }
                    , { field: 'è¾å©å±æ§', title: 'è¾å©å±æ§', width: 100 }
                    , { field: 'æºååå·', title: 'æºååå·', width: 100 }
                ]];
                listOption.data = data;
                table.render(listOption);

                //åæ é»è®¤å¨æºååå·ä½ç½®ä¸
                var pFocus = $("#HSourceBillNo");
                pFocus.select();
                pFocus.focus();     //è·ååæ 
            }

            //åå§åè¡¨åæ¶é´æä»¶
            function set_InitDate() {
                //å¸¸è§ç¨æ³
                laydate.render({
                    elem: '#HDate'
                });
            }
            //è·åè°å¥è°åºç»ç»
            function set_InitStockOrgID() {
                $.ajax({
                    type: "GET",
                    url: GetWEBURL() + "/Web/GetOrganizations",
                    async: false,    //asyncç¨äºæ§å¶ï¼falseï¼åæ¥åï¼trueï¼å¼æ¥ï¼é»è®¤çæ¯trueï¼å³è¯·æ±é»è®¤çæ¯å¼æ¥è¯·æ±
                    success: function (result) {
                        var Organization = "";
                        if (result.count == 1) { // è¯´æéªè¯æåäºï¼
                            var data = result.data;
                            for (var i = 0; i < data.length; i++) {
                                Organization += '<option  style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
                            }
                            $("#HStockInOrgID").append(Organization);
                            $("#HStockInOrgID").val(HStockInOrgID)
                            $("#HStockOutOrgID").append(Organization);
                            $("#HStockOutOrgID").val(HStockOutOrgID)
                            form.render('select');
                        }
                        layer.closeAll("loading");
                    },
                    complete: function (XHR, TS) { XHR = null }//åæ¶èµæº
                })
            }
            //åå§åè¡¨æ ¼
            function set_InitGrid() {
                listOption = {
                    elem: '#wl-table'
                    //, toolbar: '#toolbarDemo'
                    , totalRow: true
                    , height: 'full-60'
                    , cellMinWidth: 90
                    , limit: 200
                };
            }

            //#region ç¹å»è¡éä¸é«äº®
            table.on('row(wl-table)', function (obj) {
                //éä¸è¡æ¹åé¢è²
                $(".layui-table-body tr ").attr({ "style": "background:" });    //å¶ä»træ¢å¤åæ ·
                obj.tr.addClass('layui-table-click').siblings().removeClass('layui-table-click');   //éä¸è¡æ ·å¼
                obj.tr.find('i[class="layui-anim layui-icon"]').trigger("click");   //éä¸radioæ ·å¼
                $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" }); //æ¹åå½åtrèæ¯é¢è²ååä½é¢è²
            })
            //#endregion

            //å¤ææ¯å¦æ°å¢ï¼è·åæå¤§åæ®å·
            if (HInterID != 0) {

            }
            else {
                //è·åæå¤§åæ®IDãåæ®å·
                $.ajax({
                    type: "GET",
                    url: GetWEBURL() + "/WEBSController/GetMaxBillNoAndID_Json",
                    async: false,    //asyncç¨äºæ§å¶ï¼falseï¼åæ¥åï¼trueï¼å¼æ¥ï¼é»è®¤çæ¯trueï¼å³è¯·æ±é»è®¤çæ¯å¼æ¥è¯·æ±
                    data: { "HBillType": HBillType },
                    success: function (d) {
                        if (d.count == 1) {
                            $("#HInterID").val(d.data[0].HInterID);
                            $("#HBillNo").val(d.data[0].HBillNo);
                            HInterID = $('#HInterID').val()
                            HBillNo = $('#HBillNo').val()
                        }
                        else {
                            layer.msg(d.Message, { icon: 0, btn: ['ç¡®è®¤'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
                        }
                    },
                    complete: function (XHR, TS) { XHR = null }//åæ¶èµæº
                });
                $("#HSourceBillNo").select();
                $("#HSourceBillNo").focus();     //è·ååæ 
            }

            //#endregion


            //#region åè½æ§ä»¶

            //#region æäº¤
            form.on('submit(cmdSaver)', function (data) {
                var sMainStr = JSON.stringify(data.field);
                var sSubStr = table.cache['wl-table'];
                if (AllowLoadData(sSubStr) != false)//éç©ºéªè¯
                {
                    //æ¼æ¥åºååçæ°æ®
                    var msg = sMainStr + ';' + JSON.stringify(sSubStr);

                    layer.load(3);
                    $.ajax(
                        {
                            type: "POST",
                            url: GetWEBURL() + "/WEBSController/set_SaveMoveStockBill_AutoBarCode_Json",
                            async: false,    //asyncç¨äºæ§å¶ï¼falseï¼åæ¥åï¼trueï¼å¼æ¥ï¼é»è®¤çæ¯trueï¼å³è¯·æ±é»è®¤çæ¯å¼æ¥è¯·æ±
                            data: { "oMain": msg },
                            dataType: "json",
                            success: function (data) {
                                if (data.count == 1) { // è¯´æéªè¯æåäº
                                    layer.confirm(data.Message, {
                                        icon: 1, skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º", closeBtn: 0, btn: ['æ°å¢','å³é'],
                                        btn2: function () {
                                            parent.location.href = "../../../views/index_Mobile.html";
                                        }//å³é
                                    }
                                        , function () {
                                            location.replace('Kf_MoveStockBill_AutoBarCode_PDA.html?OperationType=1&HInterID=0');
                                        });//æ°å¢
                                }
                                else {
                                    layer.msg(data.Message, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
                                }
                            },
                            complete: function (XHR, TS) { XHR = null },//åæ¶èµæº
                            error: function (err) {
                                layer.msg("éè¯¯:" + err, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
                            }
                        });
                    layer.closeAll("loading");
                    return;
                }
            });

            //#endregion

            //#region éåº

            form.on('submit(cmdCancel)', function () {
                layer.confirm('æ¨ç¡®å®è¦éåºåï¼', { icon: 3, title: 'æç¤º' }, function (index) {
                    if (OperationType == 2) {
                        var index = parent.layer.getFrameIndex(window.name);    //åå¾å°å½åiframeå±çç´¢å¼
                        parent.location.reload();                               //å·æ°ç¶é¡µé¢ï¼æ³¨æä¸å®è¦å¨å³éå½åiframeå±ä¹åæ§è¡å·æ°
                        parent.layer.close(index);                              //åæ§è¡å³é
                    }
                    else {
                        parent.location.href = "../../../views/index_Mobile.html";
                    }
                });
            })

            //#endregion

            //#endregion


            //#region æºåéæ©

            form.on('submit(cmdHSourceBillNo)', function () {
                var HSourceTitle = "";
                var HSourceBillType = $("#HMainSourceBillType").val()
                if (HSourceBillType == '3720') {
                    HSourceTitle = "çäº§ç¨ææ¸å";
                }

                layer.open({
                    type: 2
                    , area: ['100%', '100%']
                    , title: HSourceTitle + 'åè¡¨'//æ é¢
                    , shade: 0.6 //é®ç½©éæåº¦
                    , maxmin: true //åè®¸å¨å±æå°å
                    , anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
                    , content: ['../../../views/å¬å±é¡µé¢/Kf_SourceBillEditDlg_PDA.html?HBillType =' + HBillType + '&HSourceBillType =' + HSourceBillType + '&HStockOrgID =' + HStockOrgID, 'yes']
                    , resize: false
                    , cancel: function () {
                        //$(".layui-btn").removeClass("layui-btn-disabled");
                    }
                    , end: function () {
                        if ($("#HSourceBillListCtl").val() == '1') {
                            GetMeesageBySourceBillNo();
                            $("#HSourceBillListCtl").val("0");  //ç¨äºåºåæºååè¡¨çé¢å³éç¶æï¼1ä¸ºè¿åï¼0ä¸ºéåºï¼
                        }
                    }
                })
            });

            //#endregion
            
            //#region æ«ææºåæ¡ç 

            //æ«ææºåæ¡ç 
            $('#HSourceBillNo').on('keydown', function (event) {
                if (event.keyCode == 13) {
                    GetMeesageBySourceBillNo();
                }
            });

            //æºåæé®
            form.on('submit(HSourceBillNo-BT)', function (data) {
                GetMeesageBySourceBillNo();
            });

            //æ«ææºåæ¡ç 
            function GetMeesageBySourceBillNo(obj) {
                var HSourceBillNo = $('#HSourceBillNo').val()
                var HSourceBillType = $("#HMainSourceBillType").val()

                layer.load(3)
                $.ajax({
                    type: "GET",
                    url: GetWEBURL() + "/WEBSController/get_SourceBarCode_MoveStock_AutoBarCode_Json",
                    async: false,    //asyncç¨äºæ§å¶ï¼falseï¼åæ¥åï¼trueï¼å¼æ¥ï¼é»è®¤çæ¯trueï¼å³è¯·æ±é»è®¤çæ¯å¼æ¥è¯·æ±
                    data: { "HInterID": HInterID, "HBillNo": HBillNo, "HBillType": HBillType, "HSourceBillNo": HSourceBillNo, "HSourceBillType": HSourceBillType, "HMaker": HMaker, "HOWNERID": HStockOutOrgID },
                    success: function (result) {
                        if (result.count == 1) { // è¯´æéªè¯æåäºï¼
                            playSound_OK();
                            $("#HSourceBillNo").val(result.data[0].HSourceBillNo);
                            $("#HMainSourceBillType").attr("disabled", "disabled");
                            $("#HSourceBillNo").attr("disabled", "disabled");
                            $('#HSourceBillNo-BT').addClass("layui-btn-disabled").attr("disabled", true);//æé®ç¦ç¨
                            $('#cmdHSourceBillNo').addClass("layui-btn-disabled").attr("disabled", true);//æé®ç¦ç¨
                            $("#HStockStyle").val(result.data[0].HStockStyle);
                            $("#HStockStyle").attr("disabled", "disabled");
                            $("#HStockInOrgID").val(result.data[0].HStockInOrgID);
                            $("#HStockInOrgID").attr("disabled", "disabled");
                            $("#HStockOutOrgID").val(result.data[0].HStockOutOrgID);
                            $("#HStockOutOrgID").attr("disabled", "disabled");
                            form.render('select');
                            HStockInOrgID = $('#HStockInOrgID').val()
                            HStockOutOrgID = $('#HStockOutOrgID').val()
                            element.tabChange('tab-Kf_MoveStockBill_AutoBarCode_PDA', '2');
                            //æ¾ç¤ºè¡¨ä½æç»
                            DisBillEntryList();
                        }
                        else {
                            playSound();
                            layer.msg(result.Message, {
                                icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º", btn: ['ç¡®è®¤']
                            }, function () {
                                element.tabChange('tab-Kf_MoveStockBill_AutoBarCode_PDA', '1');
                                $("#HSourceBillNo").select();
                                $("#HSourceBillNo").focus();
                            });
                        }
                    },
                    complete: function (XHR, TS) { XHR = null }//åæ¶èµæº
                });
                layer.closeAll("loading");
            }

            //#endregion


            //#region æ¾ç¤ºç©æåè¡¨ä¿¡æ¯

            function DisBillEntryList() {
                $.ajax({
                    type: "GET",
                    url: GetWEBURL() + '/WEBSController/GetBillEntryTmpList_Json',
                    async: false,    //asyncç¨äºæ§å¶ï¼falseï¼åæ¥åï¼trueï¼å¼æ¥ï¼é»è®¤çæ¯trueï¼å³è¯·æ±é»è®¤çæ¯å¼æ¥è¯·æ±
                    data: { "HInterID": HInterID, "HBillNo": HBillNo, "HBillType": HBillType, "HStockOrgID": HStockOutOrgID },
                    success: function (result) {
                        var data = [];
                        var col = [];
                        if (result.count == 1) { // è¯´æéªè¯æåäºï¼
                            //ç»ç©ºçæ°ç»èµå¼
                            for (var key in result.list) {
                                //å¨æè·ååè¡¨ææåå
                                data.push({ "id": result.list[key].ColmCols, "name": result.list[key].ColmCols, "Type": result.list[key].ColmType });
                                //è·åä¸éè¦æ¾ç¤ºçåï¼Hå¼å¤´çåä¸æ¾ç¤ºï¼
                                var patrn = new RegExp(/^h/i);
                                if (patrn.test(result.list[key].ColmCols)) {
                                    titleData[key] = result.list[key].ColmCols;
                                }
                            }

                            //å¨åè¡¨å·¦è¾¹æ·»å å¾éæ¡
                            col.push({ type: 'radio', totalRowText: 'åè®¡' });
                            for (var i = 0; i < data.length; i++) {
                                if ($.inArray(data[i].name, titleData) > -1) {
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //éèidå
                                }
                                else {
                                    switch (data[i].Type) {
                                        //int
                                        case 'DateTime':
                                            col.push({ field: data[i].id, title: data[i].name, align: 'left', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 120 });
                                            break;
                                        default:

                                        if (data[i].name == 'æ°é') {
                                            col.push({ field: 'HQty', title: data[i].name, edit: 'text', align: 'left', totalRow: true });
                                        } 
                                        else if (data[i].name == 'æºåæ°é') {
                                            col.push({ field: data[i].id, title: data[i].name, align: 'left', totalRow: true });
                                        } else if (data[i].name == 'ç©æåç§°' || data[i].name == 'è§æ ¼åå·') {
                                            col.push({ field: data[i].id, title: data[i].name, align: 'left', width: 180 });
                                        } else {
                                            col.push({ field: data[i].id, title: data[i].name, align: 'left', width: 150 });
                                        }
                                    }
                                }
                            }
                            columns = col;
                            listOption.cols = [columns];
                            listOption.data = result.data.Materlist;
                            listOption.totalRow = true;
                            table.cache['wl-table'] = null;         //æ¸ç©ºè¡¨æ ¼ç¼åæ°æ®
                            table.render(listOption);
                        }
                        else {
                            listOption.cols = [[
                                { field: 'æ°é', title: 'æ°é', width: 100 }
                                , { field: 'æºåæ°é', title: 'æºåæ°é', width: 100 }
                                , { field: 'ç©æä»£ç ', title: 'ç©æä»£ç ', width: 100 }
                                , { field: 'ç©æåç§°', title: 'ç©æåç§°', width: 100 }
                                , { field: 'è§æ ¼åå·', title: 'è§æ ¼åå·', width: 100 }
                                , { field: 'è¾å©å±æ§', title: 'è¾å©å±æ§', width: 100 }
                                , { field: 'æºååå·', title: 'æºååå·', width: 100 }
                            ]];
                            listOption.data = data;
                            table.render(listOption);
                        }
                    },
                    complete: function (XHR, TS) { XHR = null }//åæ¶èµæº
                });
            }

            //#endregion


            //#region éæ©è°æ¨ç±»å
            form.on('select(HStockStyle)', function (data) {
                if ($("#HStockStyle").val() == 'è·¨ç»ç»è°æ¨') {
                    $("#HStockInOrgID").attr("disabled", false);
                    form.render('select');
                }
                else {
                    $("#HStockInOrgID").val(sessionStorage["OrganizationID"]);
                    $("#HStockInOrgID").attr("disabled", true);
                    form.render('select');
                    if (HStockInOrgID != $('#HStockInOrgID').val()) {
                        HStockInOrgID = $('#HStockInOrgID').val()
                    }
                }
            });

            //#endregion


            //#region éæ©è°å¥ç»ç»
            form.on('select(HStockInOrgID)', function (data) {
                HStockInOrgID = $('#HStockInOrgID').val()
            });

            //#endregion


            //#region çå¬ååæ ¼ç¼è¾  ååæ ¼ç¼è¾å åæ´
            table.on('edit(wl-table)', function (obj) {
                //æ°å¼æ ¼å¼æ ¡éªå·¥å·
                var ref = /^\d+(\.\d+)?$/;          //éè´æ°æ£åè¡¨è¾¾å¼
                var temp = "";

                var value = obj.value //å¾å°ä¿®æ¹åçå¼
                    , data = obj.data //å¾å°æå¨è¡ææé®å¼
                    , field = obj.field; //å¾å°åæ®µ

                switch (field) {
                    case "HQty":        //æ°é
                        //æ°æ®æ ¼å¼æ ¡éª
                        temp = value + "";
                        if (!ref.test(temp)) {
                            //æè¾å¥æ°æ®ä¸ä¸ºæ°åï¼é»è®¤ä¸º0
                            obj.update({
                                HQty: 0
                            });
                            table.render(listOption);
                            return;
                        }

                        //æ°æ®æ ¡éªåæ ¼ï¼éç®è®°å½
                        var HQty = isNaN(value) ? 0 : value;                                            //æ°é

                        //åæ¥æ´æ°è¡¨æ ¼åç¼åå¯¹åºçå¼
                        obj.update({
                            HQty: HQty
                        });
                        table.render(listOption);
                        break;
                    default:
                }
            });
            //#endregion
            
        });

        //ä»¥ä¸ä¸ºlayuiæ¨¡å
        //æ¤å¤æ¹æ³æ¶åå°è¢«å¤é¨é¡µé¢parent.æ¹æ³åè°ç¨çå¿é¡»æ¾å¨Layuiæ¹æ³å¤é¨

        //ç¹å»æé®éæ©å   è¿åæºååå·
        function GetHSourceBillValue(obj) {
            if (obj.length > 0) {
                $("#HSourceBillNo").val(obj[0].åæ®å·);
                $("#HSourceBillListCtl").val("1");
            }
        }

        //åæ®ä¸ä¼ åå¤æ
        function AllowLoadData(sSubStr) {
            if (HInterID == 0) {
                layer.msg("åæ®åç è·åå¤±è´¥ï¼éè¯¯çåæ®åç ï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
                return false;
            }
            if (HBillNo == '') {
                layer.msg("åæ®å·è·åå¤±è´¥ï¼éè¯¯çåæ®å·ï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
                return false;
            }
            if (sSubStr.length == 0) {
                layer.msg("æ²¡ææ«ç ä¿¡æ¯ï¼è¯·åæ«ææ¡ç ï¼ç¡®è®¤æ è¯¯ååæäº¤ï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
                return false;
            }
            else {
                var s = 0;
                for (var i = 0; i <= sSubStr.length - 1; i++) {
                    // å°è¯å° HQty å±æ§è§£æä¸ºæ°å
                    let quantity = parseFloat(sSubStr[i].HQty) || 0;

                    // æ£æ¥è§£æåçå¼æ¯å¦ä¸º NaNï¼ä¸æ¯ä¸ä¸ªæ°åï¼
                    if (isNaN(quantity)) {
                        // å¦ææ¯ NaNï¼åå°å¶è®¾ç½®ä¸º 0
                        sSubStr[i].HQty = 0;
                    } else if (sSubStr[i].HQty > 0) {
                            s = 1;
                        }
                }
                if (s == 0) {
                    layer.msg("è³å°éè¦åå¨ä¸è¡æ°éå¤§äº0 çæ°æ®ï¼è¯·ç¡®è®¤æ è¯¯ååæäº¤ï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
                    return false;
                }
            }
            return true;
        }
    </script>

</body>
</html>

 WebTM/views/home/console_Mobile.html

@@ -231,6 +231,12 @@
                                                <cite style="white-space:pre-wrap">æ ·åéå®åºåºå</cite>
                                            </a>
                                        </li>
                                        <li class="layui-col-xs3">
                                            <a href="../WMSæ«ç æ¨¡å/çäº§è°æ¨/Kf_MoveStockBill_AutoBarCode_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>

 WebTM/views/»ù´¡×ÊÁÏ/¹«ÓÃ»ù´¡×ÊÁÏ/Gy_PNLInfoEdit_Import.html

New file
@@ -0,0 +1,226 @@
ï»¿<!DOCTYPE html>
<html>
<head>
    <meta charset="utf-8" />
    <title>PNLå¸å±ä¿¡æ¯å¯¼å¥</title>
    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
    <script src="../../../layuiadmin/layui/layui.js"></script>
    <script src="../../../layuiadmin/Scripts/json2.js"></script>
    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
    <script src="../../../layuiadmin/PubCustom.js"></script>
</head>
<body>
    <div class="layui-fluid" style="padding: 0;">
        <div class="layui-card" style="padding: 2px;background-color: #efefef;">
            <div class="layui-card-body" style="padding: 1px;">
                <form class="layui-form" action="" lay-filter="formData" style="background-color:white;">
                    <div style="padding: 10px; ">
                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSave" id="btnSave">å¯¼å¥æ°æ®</button>
                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Cancel" id="Cancel">éåº</button>
                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="UpLoad" id="UpLoad">æä»¶ä¸ä¼ </button>
                    </div>
                    <div class="layui-tab" lay-filter="tab-POStockInBill">
                        <div class="layui-tab-content">
                            <!--åºæ¬ä¿¡æ¯-->
                            <div class="layui-tab-item layui-show">
                                <div class="layui-form-item" style="padding-top: 10px;">

                                </div>
                            </div>
                        </div>
                    </div>

                    <table class="" id="mainTable" lay-filter="mainTable"></table>
                    <script type="text/html" id="toolbarDemo">
                        <div class="layui-btn-container">
                        </div>
                    </script>
                </form>
            </div>
        </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>

    layui.config({
        base: '../../../layuiadmin/' //éæèµæºæå¨è·¯å¾
    }).extend({
        index: 'lib/index' //ä¸»å¥å£æ¨¡å
    }).use(['tree', 'index', 'form', 'table', 'element', 'laypage', 'laydate', 'util', 'upload'], function () {
        //#region å¬ç¨åé
        var $ = layui.$
            , admin = layui.admin
            , layer = layui.layer
            , table = layui.table
            , form = layui.form
            , element = layui.element
            , laypage = layui.laypage
            , laydate = layui.laydate
            , util = layui.util
            , tree = layui.tree
            , util = layui.util
            , upload = layui.upload


        var option = [];
        //#endregion

        //#region è¿å¥é¡µé¢å³å è½½
        //åå§åçé¢
        set_ClearBill();
        //#endregion

        //#region è§¦åäºä»¶
        //#region æä»¶ä¸ä¼ 
        upload.render({
            elem: '#UpLoad',
            url: GetWEBURL() + '/Gy_PNLInfo/Gy_PNLInfo_Excel',
            contentType: 'application/json',
            exts: 'xls|xlsx', //åè®¸ä¸ä¼ çç±»å
            done: function (data1) {
                if (data1.count == 1) {
                    option.data = data1.data;
                    table.render(option);
                } else {
                    layer.alert(data1.code + data1.Message, { icon: 5 });
                }
            },
            error: function (err) {
                debugger
                layer.alert('å¯¼å¥åºç°å¼å¸¸', { icon: 2 });
            }
        });
        //#endregion

        //#region å¯¼å¥ æé®çå¬
        form.on('submit(btnSave)', function (data) {
            if (table.cache["mainTable"] != null) {
                set_AddNew(data);
            }
            else {
                layer.msg("æ æ°æ®,è¯·åå¯¼å¥æ°æ®!");
            }
        })

        //#region å¯¼å¥(ä¿å)
        function set_AddNew(data) {
            var num = [];
            for (var i = 0; i < option.data.length; i++) {
                if (option.data[i] != "") {
                    num.push(option.data[i])
                }
            }

            //data.field.HOrgID = sessionStorage["OrganizationID"];//ç»ç»
            //var sMainStr = JSON.stringify(data.field);
            var sSubStr = JSON.stringify(num);
            var sMainSub = sSubStr + '&å' + sessionStorage["HUserName"];
            var index = layer.load();

            $.ajax({
                type: "POST",
                url: GetWEBURL() + "/Gy_PNLInfo/Gy_PNLInfo_btnSave",
                async: true,
                data: { "sMainSub": sMainSub },
                dataType: "json",
                success: function (data) {
                    if (data.count == 1) {
                        layer.close(index);
                        layer.msg(data.Message);
                        option.data = null;
                        table.cache["mainTable"] = null;
                        table.render(option);
                    }
                    else {
                        layer.close(index);
                        layer.msg(data.Message, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
                    }
                },
                error: function (err) {
                    layer.close(index);
                    layer.msg("éè¯¯:" + err, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
                }
            });
        }
        //#endregion
        //#endregion

        //#region éåº
        form.on('submit(Cancel)', function () {
            Pub_Close(1);
        })
        //#endregion

        //#region è¡åäºä»¶
        table.on('tool(mainTable)', function (obj) {
            set_GridDelete(obj);   //è¡åå é¤
        });
        //#endregion
        //#endregion

        //#region æ¤é¡µé¢ææçæ¹æ³
        //#region åå§åçé¢
        function set_ClearBill() {
            //åå§åè¡¨æ ¼
            set_InitGrid();
        }
        //#endregion

        //#region åå§åè¡¨æ ¼
        function set_InitGrid() {
            option = {
                elem: '#mainTable'
                , toolbar: '#toolbarDemo'
                , height: 'full-120'
                , page: true
                , cellMinWidth: 90
                , limit: 50
                , limits: [50, 500, 5000, 20000]
                , loading: false
                , cols: [[
                    { type: 'checkbox', fixed: 'left' }
                    , { field: 'æå·', title: 'æå·', width: 120 }
                    , { field: 'HPNLInfoTypeID', title: 'HPNLInfoTypeID', width: 120 }
                    , { field: 'åç±»', title: 'åç±»', width: 120 }
                    , { field: 'Setå·', title: 'Setå·' }
                    , { field: 'PCSå·', title: 'PCSå·' }
                    , { field: 'è¡ç´¢å¼', title: 'è¡ç´¢å¼' }
                    , { field: 'åç´¢å¼', title: 'åç´¢å¼' }
                    , { fixed: 'right', title: 'æä½', toolbar: '#barDemo' }
                ]]
            };

            //æ¸²æé¡µé¢
            table.render(option);
            //DisPlay_HideColumn();
        }
        //#endregion

        //#region è¡åå é¤
        function set_GridDelete(obj) {
            var data = obj.data;
            var rowIndex = $(obj.tr).attr("data-index");
            if (obj.event === 'del') {
                layer.confirm('ççå é¤è¡åï¼', function (index) {
                    console.log("ç´¢å¼ä¸º:" + rowIndex);
                    var oldData = option.data;
                    oldData.splice(obj.tr.data('index'), 1)
                    option.data = oldData;//å°æ°æ®ç»å®å°dataä¸
                    table.render(option);
                    layer.close(index);
                });
            }
        }
        //#endregion
        //#endregion

    });

</script>

 WebTM/views/»ù´¡×ÊÁÏ/¹«ÓÃ»ù´¡×ÊÁÏ/Gy_PNLInfoList.html

@@ -191,6 +191,7 @@

                        <script type="text/html" id="toolbarDemo">
                            <div class="layui-btn-container" id="toolbarDemo_ButtonSet">
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="set_ImportExcel" lay-event="set_ImportExcel"><i class="layui-icon layui-icon-form"></i>Excelå¯¼å¥</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="set_AddNew" lay-event="set_AddNew"><i class="layui-icon layui-icon-form"></i>æ°å¢</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="set_ShowBill" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>ç¼è¾</button>
                                <!--<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-Copy" id="btn-Copy"><i class="layui-icon layui-icon-transfer"></i>å¤å¶</button>-->
@@ -282,6 +283,10 @@
        //å¤´å·¥å·æ äºä»¶
        table.on('toolbar(mainTable)', function (obj) {
            switch (obj.event) {
                //Excelå¯¼å¥
                case 'set_ImportExcel':
                    set_ImportExcel();
                    break;
                //æ°å¢
                case 'set_AddNew':
                    set_AddNew();
@@ -1147,6 +1152,20 @@
            }
        }

        //å¯¼å¥         
        function set_ImportExcel() {
            layer.open({
                type: 2
                , skin: "layui-layer-rim" //å ä¸è¾¹æ¡
                , title: "PNLå¸å±ä¿¡æ¯å¯¼å¥"  //æ é¢
                , closeBtn: 1  //çªä½å³ä¸è§å³é ç æ ·å¼
                , shift: 2 //å¼¹åºå¨ç»
                , area: ["100%", "100%"] //çªä½å¤§å°
                , maxmin: true //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
                , content: ['./Gy_PNLInfoEdit_Import.html', "yes"]
            })
        }

        //è¯»åæ¹æ¡
        function set_ReadScheme() {
            var HIsClose_Manual = false;

 WebTM/views/°¸Àý´úÂë/»ªÔ¶/HY_HistogramReport.html

@@ -551,6 +551,15 @@
                                        return;
                                    }

                                    if (!judgeRepeatDataByPNLAndPCS(HBarCode_PNL_Note, PCSNo)) {
                                        layer.msg("è¯¥PCSå·²ç»åå¨ä¸è¯è®°å½ï¼ç¦æ¢éå¤æ è®°ï¼ï¼", { icon: 5 });
                                        var HSelectElement = document.getElementById("HBadReason");
                                        if (HSelectElement != null) {
                                            document.body.removeChild(HSelectElement);
                                        }
                                        return;
                                    }

                                    layer.open({
                                        type: 2,
                                        skin: 'layui-layer-rim', //å ä¸è¾¹æ¡
@@ -680,6 +689,21 @@
                        }

                        for (var i = 0; i < HBatchDeletePCSList.length; i++) {
                            var HBarCode_PNL_Note = HBatchDeletePCSList[i].HBarCode;
                            var PCSNo = HBatchDeletePCSList[i].HPCSNo;
                            if (!judgeRepeatDataByPNLAndPCS(HBarCode_PNL_Note, PCSNo)) {
                                layer.msg("PCSã" + PCSNo + "ãå·²ç»åå¨ä¸è¯è®°å½ï¼ç¦æ¢éå¤æ è®°ï¼ï¼", { icon: 5 });

                                var HSelectElement = document.getElementById("HBadReason");
                                if (HSelectElement != null) {
                                    document.body.removeChild(HSelectElement);
                                }

                                return;
                            }
                        }

                        for (var i = 0; i < HBatchDeletePCSList.length; i++) {
                            var title = HBatchDeletePCSList[i].title;
                            var HBarCode_PNL_Note = HBatchDeletePCSList[i].HBarCode;
                            var SetNo = HBatchDeletePCSList[i].HSetNo;
@@ -722,6 +746,33 @@
                }
            }
            //#endregion

            //#region å¤æè¯¥PNLä¸çè¯¥PCSæ¯å¦å·²ç»åå¨ä¸è¯è®°å½ãè¥åå¨ï¼åä¸åè®¸ç»§ç»çæã
            function judgeRepeatDataByPNLAndPCS(HBarCode_Temp, HPCSNo_Temp) {
                var flag = true;
                var sql = "select HBarCode from QC_CheckNote_PNL_Temp where HBarCode = '" + HBarCode_Temp + "' and HPCSNo = '" + HPCSNo_Temp + "' ";
                sql += " union select HBarCode from QC_CheckNote_PNL_His where HBarCode = '" + HBarCode_Temp + "' and HPCSNo = '" + HPCSNo_Temp + "' ";
                var ModRightNameCheck = "";
                $.ajax({
                    url: GetWEBURL() + '/CommonModel/searchMethod',
                    async: false,
                    type: "GET",
                    data: { "sql": sql, "user": sessionStorage["HUserName"], "ModRightNameCheck": ModRightNameCheck },
                    success: function (data1) {
                        if (data1.count == 1) {
                            if (data1.data.length > 0) {
                                flag = false;
                            }
                        } else {
                            flag = false;
                        }
                    }, error: function (e) {
                        flag = false;
                    }
                });
                return flag;
            }
            //#endregion
            //#endregion
        });
    </script>

 WebTM/views/ÖÊÁ¿¹ÜÀí/PNL¼ìÑéÐÅÏ¢/QC_CheckNote_PNL_TempEdit.html

@@ -261,7 +261,8 @@
            }
            else if (OperationType == 3) {//ç¼è¾
                roadBillMain();
            } else if (OperationType == 4) {//ç´æ¹å¾æ°å¢
            }
            else if (OperationType == 4) {//ç´æ¹å¾æ°å¢
                set_AddFNew();
                $("#HBarCode").val(HBarCode_PNL);
                $("#HSetNo").val(HSetNo);
@@ -270,12 +271,14 @@
                document.getElementById("HBarCode").setAttribute("disabled", "disabled");
                document.getElementById("HSetNo").setAttribute("disabled", "disabled");
                document.getElementById("HPCSNo").setAttribute("disabled", "disabled");
            } else if (OperationType == 5) {//ç´æ¹å¾ç¼è¾
            }
            else if (OperationType == 5) {//ç´æ¹å¾ç¼è¾
                roadBillMain();
                document.getElementById("HBarCode").setAttribute("disabled", "disabled");
                document.getElementById("HSetNo").setAttribute("disabled", "disabled");
                document.getElementById("HPCSNo").setAttribute("disabled", "disabled");
            } else if (OperationType == 6) {//ç´æ¹å¾-avi æ°å¢
            }
            else if (OperationType == 6) {//ç´æ¹å¾-avi æ°å¢
                set_AddFNew();
                $("#HBarCode").val(HBarCode_PNL);
                $("#HSetNo").val(HSetNo);
@@ -339,6 +342,11 @@
                    url += "/QC_CheckNote_PNL_TempController/EditBill"
                } else if (OperationType == 1 || OperationType == 2 || OperationType == 4 || OperationType == 6 || OperationType == 7 || OperationType == 8) {
                    url += "/QC_CheckNote_PNL_TempController/AddBill"

                    if (!judgeRepeatDataByPNLAndPCS()) {
                        layer.msg("è¯¥PCSå·²ç»åå¨ä¸è¯è®°å½ï¼ç¦æ¢éå¤æ è®°ï¼ï¼", { icon: 5 });
                        return;
                    }
                }
                $.ajax(
                    {
@@ -586,6 +594,37 @@

            }


            //#region å¤æè¯¥PNLä¸çè¯¥PCSæ¯å¦å·²ç»åå¨ä¸è¯è®°å½ãè¥åå¨ï¼åä¸åè®¸ç»§ç»çæã
            function judgeRepeatDataByPNLAndPCS() {
                var flag = true;

                var HBarCode_Temp = $("#HBarCode").val();
                var HPCSNo_Temp = $("#HPCSNo").val();

                var sql = "select HBarCode from QC_CheckNote_PNL_Temp where HBarCode = '" + HBarCode_Temp + "' and HPCSNo = '" + HPCSNo_Temp + "' ";
                sql += " union select HBarCode from QC_CheckNote_PNL_His where HBarCode = '" + HBarCode_Temp + "' and HPCSNo = '" + HPCSNo_Temp + "' ";
                var ModRightNameCheck = "";
                $.ajax({
                    url: GetWEBURL() + '/CommonModel/searchMethod',
                    async: false,
                    type: "GET",
                    data: { "sql": sql, "user": sessionStorage["HUserName"], "ModRightNameCheck": ModRightNameCheck },
                    success: function (data1) {
                        if (data1.count == 1) {
                            if (data1.data.length > 0) {
                                flag = false;
                            }
                        } else {
                            flag = false;
                        }
                    }, error: function (e) {
                        flag = false;
                    }
                });
                return flag;
            }
            //#endregion
        });
        //#endregion


 WebTM/views/ÖÊÁ¿¹ÜÀí/PNL¼ìÑéÐÅÏ¢/QC_CheckNote_PNL_TempList.html

@@ -502,6 +502,10 @@
                            }
                        }

                        for (var i = 0; i < data1.data.length; i++) {
                            data1.data[i]["ä¸è¯åå "] = data1.data[i]["ä¸è¯åå "].replace(",", "ï¼");
                        }

                        columns = col;
                        option.cols = [col];
                        option.data = data1.data;

			@@ -368,6 +368,7 @@
			<Content Include="views\WMSæ«ç æ¨¡å\çäº§è°æ¨\Kf_MoveStockBillList_PDA_XiaBao.html" />
			<Content Include="views\WMSæ«ç æ¨¡å\çäº§è°æ¨\Kf_MoveStockBill_CusBar_PDA.html" />
			<Content Include="views\WMSæ«ç æ¨¡å\çäº§è°æ¨\Kf_MoveStockBill_Mould_PDA.html" />
			<Content Include="views\WMSæ«ç æ¨¡å\çäº§è°æ¨\Kf_MoveStockBill_AutoBarCode_PDA.html" />
			<Content Include="views\WMSæ«ç æ¨¡å\çäº§è°æ¨\Kf_MoveStockBill_PDA_XiaBao.html" />
			<Content Include="views\WMSæ«ç æ¨¡å\çäº§è°æ¨\Kf_MoveStockStepInBill_Mould_PDA.html" />
			<Content Include="views\WMSæ«ç æ¨¡å\çäº§è°æ¨\Kf_MoveStockStepInBill_PDA.html" />
			@@ -473,6 +474,7 @@
			<Content Include="views\åºç¡èµæ\å¬ç¨åºç¡èµæ\Gy_BarCodeReport.html" />
			<Content Include="views\åºç¡èµæ\å¬ç¨åºç¡èµæ\Gy_PNLInfoEdit.html" />
			<Content Include="views\åºç¡èµæ\å¬ç¨åºç¡èµæ\Gy_BarCodeBill_PNL_TempEdit.html" />
			<Content Include="views\åºç¡èµæ\å¬ç¨åºç¡èµæ\Gy_PNLInfoEdit_Import.html" />
			<Content Include="views\åºç¡èµæ\å¬ç¨åºç¡èµæ\Gy_PNLInfoList.html" />
			<Content Include="views\åºç¡èµæ\å¬ç¨åºç¡èµæ\Gy_BarCodeBill_PNL_TempList.html" />
			<Content Include="views\åºç¡èµæ\å¬ç¨åºç¡èµæ\Gy_BarCodeBill_Set_TempEdit.html" />

			@@ -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:\WorkBench\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
			<NameOfLastUsedPublishProfile>D:\ç½ç«åå¸\åç«¯ä»£ç \MES-WEB-TM\MESWMS-LayUI\WebTM\Properties\PublishProfiles\LAYUI.pubxml</NameOfLastUsedPublishProfile>
			<ProjectView>ProjectFiles</ProjectView>
			<LastActiveSolutionConfig>Release\|Any CPU</LastActiveSolutionConfig>
			<UseIISExpress>true</UseIISExpress>

			@@ -380,7 +380,7 @@
			$("#HProcExchBillNoHidden").show();
			HModName = "ProductInBill_1202";
			break;
			case 'éè´å¥åº':
			case 'éè´å¥åºå':
			HModName = "POStockInBill_1201";
			break;
			case 'éå®éè´§':
			@@ -625,6 +625,21 @@
			}
			return sWhere;
			break;
			case "éè´å¥åºå":
			if (HBillNo) {
			sWhere += " and åæ®å· like '%" + HBillNo + "%'";
			}
			if (PartNumber) {
			sWhere += " and ç©æä»£ç like '%" + PartNumber + "%'";
			}
			if (PartName) {
			sWhere += " and ç©æåç§° like '%" + PartName + "%'";
			}
			if (HDeptName && HDeptName != 0) {
			sWhere += " and HDeptID = '" + HDeptName + "'";
			}
			return sWhere;
			break;
			case 'éè´§éç¥å':
			return sWhere;
			break;

			@@ -231,6 +231,12 @@
			<cite style="white-space:pre-wrap">æ ·åéå®åºåºå</cite>
			</a>
			</li>
			<li class="layui-col-xs3">
			<a href="../WMSæ«ç æ¨¡å/çäº§è°æ¨/Kf_MoveStockBill_AutoBarCode_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>

New file
			@@ -0,0 +1,226 @@
			ï»¿<!DOCTYPE html>
			<html>
			<head>
			<meta charset="utf-8" />
			<title>PNLå¸å±ä¿¡æ¯å¯¼å¥</title>
			<link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
			<link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
			<script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
			<script src="../../../layuiadmin/layui/layui.js"></script>
			<script src="../../../layuiadmin/Scripts/json2.js"></script>
			<script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
			<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
			<script src="../../../layuiadmin/PubCustom.js"></script>
			</head>
			<body>
			<div class="layui-fluid" style="padding: 0;">
			<div class="layui-card" style="padding: 2px;background-color: #efefef;">
			<div class="layui-card-body" style="padding: 1px;">
			<form class="layui-form" action="" lay-filter="formData" style="background-color:white;">
			<div style="padding: 10px; ">
			<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSave" id="btnSave">å¯¼å¥æ°æ®</button>
			<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Cancel" id="Cancel">éåº</button>
			<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="UpLoad" id="UpLoad">æä»¶ä¸ä¼ </button>
			</div>
			<div class="layui-tab" lay-filter="tab-POStockInBill">
			<div class="layui-tab-content">
			<!--åºæ¬ä¿¡æ¯-->
			<div class="layui-tab-item layui-show">
			<div class="layui-form-item" style="padding-top: 10px;">

			</div>
			</div>
			</div>
			</div>

			<table class="" id="mainTable" lay-filter="mainTable"></table>
			<script type="text/html" id="toolbarDemo">
			<div class="layui-btn-container">
			</div>
			</script>
			</form>
			</div>
			</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>

			layui.config({
			base: '../../../layuiadmin/' //éæèµæºæå¨è·¯å¾
			}).extend({
			index: 'lib/index' //ä¸»å¥å£æ¨¡å
			}).use(['tree', 'index', 'form', 'table', 'element', 'laypage', 'laydate', 'util', 'upload'], function () {
			//#region å¬ç¨åé
			var $ = layui.$
			, admin = layui.admin
			, layer = layui.layer
			, table = layui.table
			, form = layui.form
			, element = layui.element
			, laypage = layui.laypage
			, laydate = layui.laydate
			, util = layui.util
			, tree = layui.tree
			, util = layui.util
			, upload = layui.upload


			var option = [];
			//#endregion

			//#region è¿å¥é¡µé¢å³å è½½
			//åå§åçé¢
			set_ClearBill();
			//#endregion

			//#region è§¦åäºä»¶
			//#region æä»¶ä¸ä¼
			upload.render({
			elem: '#UpLoad',
			url: GetWEBURL() + '/Gy_PNLInfo/Gy_PNLInfo_Excel',
			contentType: 'application/json',
			exts: 'xls\|xlsx', //åè®¸ä¸ä¼ çç±»å
			done: function (data1) {
			if (data1.count == 1) {
			option.data = data1.data;
			table.render(option);
			} else {
			layer.alert(data1.code + data1.Message, { icon: 5 });
			}
			},
			error: function (err) {
			debugger
			layer.alert('å¯¼å¥åºç°å¼å¸¸', { icon: 2 });
			}
			});
			//#endregion

			//#region å¯¼å¥ æé®çå¬
			form.on('submit(btnSave)', function (data) {
			if (table.cache["mainTable"] != null) {
			set_AddNew(data);
			}
			else {
			layer.msg("æ æ°æ®,è¯·åå¯¼å¥æ°æ®!");
			}
			})

			//#region å¯¼å¥(ä¿å)
			function set_AddNew(data) {
			var num = [];
			for (var i = 0; i < option.data.length; i++) {
			if (option.data[i] != "") {
			num.push(option.data[i])
			}
			}

			//data.field.HOrgID = sessionStorage["OrganizationID"];//ç»ç»
			//var sMainStr = JSON.stringify(data.field);
			var sSubStr = JSON.stringify(num);
			var sMainSub = sSubStr + '&å' + sessionStorage["HUserName"];
			var index = layer.load();

			$.ajax({
			type: "POST",
			url: GetWEBURL() + "/Gy_PNLInfo/Gy_PNLInfo_btnSave",
			async: true,
			data: { "sMainSub": sMainSub },
			dataType: "json",
			success: function (data) {
			if (data.count == 1) {
			layer.close(index);
			layer.msg(data.Message);
			option.data = null;
			table.cache["mainTable"] = null;
			table.render(option);
			}
			else {
			layer.close(index);
			layer.msg(data.Message, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			}
			},
			error: function (err) {
			layer.close(index);
			layer.msg("éè¯¯:" + err, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			}
			});
			}
			//#endregion
			//#endregion

			//#region éåº
			form.on('submit(Cancel)', function () {
			Pub_Close(1);
			})
			//#endregion

			//#region è¡åäºä»¶
			table.on('tool(mainTable)', function (obj) {
			set_GridDelete(obj); //è¡åå é¤
			});
			//#endregion
			//#endregion

			//#region æ¤é¡µé¢ææçæ¹æ³
			//#region åå§åçé¢
			function set_ClearBill() {
			//åå§åè¡¨æ ¼
			set_InitGrid();
			}
			//#endregion

			//#region åå§åè¡¨æ ¼
			function set_InitGrid() {
			option = {
			elem: '#mainTable'
			, toolbar: '#toolbarDemo'
			, height: 'full-120'
			, page: true
			, cellMinWidth: 90
			, limit: 50
			, limits: [50, 500, 5000, 20000]
			, loading: false
			, cols: [[
			{ type: 'checkbox', fixed: 'left' }
			, { field: 'æå·', title: 'æå·', width: 120 }
			, { field: 'HPNLInfoTypeID', title: 'HPNLInfoTypeID', width: 120 }
			, { field: 'åç±»', title: 'åç±»', width: 120 }
			, { field: 'Setå·', title: 'Setå·' }
			, { field: 'PCSå·', title: 'PCSå·' }
			, { field: 'è¡ç´¢å¼', title: 'è¡ç´¢å¼' }
			, { field: 'åç´¢å¼', title: 'åç´¢å¼' }
			, { fixed: 'right', title: 'æä½', toolbar: '#barDemo' }
			]]
			};

			//æ¸²æé¡µé¢
			table.render(option);
			//DisPlay_HideColumn();
			}
			//#endregion

			//#region è¡åå é¤
			function set_GridDelete(obj) {
			var data = obj.data;
			var rowIndex = $(obj.tr).attr("data-index");
			if (obj.event === 'del') {
			layer.confirm('ççå é¤è¡åï¼', function (index) {
			console.log("ç´¢å¼ä¸º:" + rowIndex);
			var oldData = option.data;
			oldData.splice(obj.tr.data('index'), 1)
			option.data = oldData;//å°æ°æ®ç»å®å°dataä¸
			table.render(option);
			layer.close(index);
			});
			}
			}
			//#endregion
			//#endregion

			});

			</script>

			@@ -191,6 +191,7 @@

			<script type="text/html" id="toolbarDemo">
			<div class="layui-btn-container" id="toolbarDemo_ButtonSet">
			<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="set_ImportExcel" lay-event="set_ImportExcel"><i class="layui-icon layui-icon-form"></i>Excelå¯¼å¥</button>
			<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="set_AddNew" lay-event="set_AddNew"><i class="layui-icon layui-icon-form"></i>æ°å¢</button>
			<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="set_ShowBill" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>ç¼è¾</button>
			<!--<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-Copy" id="btn-Copy"><i class="layui-icon layui-icon-transfer"></i>å¤å¶</button>-->
			@@ -282,6 +283,10 @@
			//å¤´å·¥å·æ äºä»¶
			table.on('toolbar(mainTable)', function (obj) {
			switch (obj.event) {
			//Excelå¯¼å¥
			case 'set_ImportExcel':
			set_ImportExcel();
			break;
			//æ°å¢
			case 'set_AddNew':
			set_AddNew();
			@@ -1147,6 +1152,20 @@
			}
			}

			//å¯¼å¥
			function set_ImportExcel() {
			layer.open({
			type: 2
			, skin: "layui-layer-rim" //å ä¸è¾¹æ¡
			, title: "PNLå¸å±ä¿¡æ¯å¯¼å¥" //æ é¢
			, closeBtn: 1 //çªä½å³ä¸è§å³é ç æ ·å¼
			, shift: 2 //å¼¹åºå¨ç»
			, area: ["100%", "100%"] //çªä½å¤§å°
			, maxmin: true //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
			, content: ['./Gy_PNLInfoEdit_Import.html', "yes"]
			})
			}

			//è¯»åæ¹æ¡
			function set_ReadScheme() {
			var HIsClose_Manual = false;

			@@ -551,6 +551,15 @@
			return;
			}

			if (!judgeRepeatDataByPNLAndPCS(HBarCode_PNL_Note, PCSNo)) {
			layer.msg("è¯¥PCSå·²ç»åå¨ä¸è¯è®°å½ï¼ç¦æ¢éå¤æ è®°ï¼ï¼", { icon: 5 });
			var HSelectElement = document.getElementById("HBadReason");
			if (HSelectElement != null) {
			document.body.removeChild(HSelectElement);
			}
			return;
			}

			layer.open({
			type: 2,
			skin: 'layui-layer-rim', //å ä¸è¾¹æ¡
			@@ -680,6 +689,21 @@
			}

			for (var i = 0; i < HBatchDeletePCSList.length; i++) {
			var HBarCode_PNL_Note = HBatchDeletePCSList[i].HBarCode;
			var PCSNo = HBatchDeletePCSList[i].HPCSNo;
			if (!judgeRepeatDataByPNLAndPCS(HBarCode_PNL_Note, PCSNo)) {
			layer.msg("PCSã" + PCSNo + "ãå·²ç»åå¨ä¸è¯è®°å½ï¼ç¦æ¢éå¤æ è®°ï¼ï¼", { icon: 5 });

			var HSelectElement = document.getElementById("HBadReason");
			if (HSelectElement != null) {
			document.body.removeChild(HSelectElement);
			}

			return;
			}
			}

			for (var i = 0; i < HBatchDeletePCSList.length; i++) {
			var title = HBatchDeletePCSList[i].title;
			var HBarCode_PNL_Note = HBatchDeletePCSList[i].HBarCode;
			var SetNo = HBatchDeletePCSList[i].HSetNo;
			@@ -722,6 +746,33 @@
			}
			}
			//#endregion

			//#region å¤æè¯¥PNLä¸çè¯¥PCSæ¯å¦å·²ç»åå¨ä¸è¯è®°å½ãè¥åå¨ï¼åä¸åè®¸ç»§ç»çæã
			function judgeRepeatDataByPNLAndPCS(HBarCode_Temp, HPCSNo_Temp) {
			var flag = true;
			var sql = "select HBarCode from QC_CheckNote_PNL_Temp where HBarCode = '" + HBarCode_Temp + "' and HPCSNo = '" + HPCSNo_Temp + "' ";
			sql += " union select HBarCode from QC_CheckNote_PNL_His where HBarCode = '" + HBarCode_Temp + "' and HPCSNo = '" + HPCSNo_Temp + "' ";
			var ModRightNameCheck = "";
			$.ajax({
			url: GetWEBURL() + '/CommonModel/searchMethod',
			async: false,
			type: "GET",
			data: { "sql": sql, "user": sessionStorage["HUserName"], "ModRightNameCheck": ModRightNameCheck },
			success: function (data1) {
			if (data1.count == 1) {
			if (data1.data.length > 0) {
			flag = false;
			}
			} else {
			flag = false;
			}
			}, error: function (e) {
			flag = false;
			}
			});
			return flag;
			}
			//#endregion
			//#endregion
			});
			</script>

			@@ -261,7 +261,8 @@
			}
			else if (OperationType == 3) {//ç¼è¾
			roadBillMain();
			} else if (OperationType == 4) {//ç´æ¹å¾æ°å¢
			}
			else if (OperationType == 4) {//ç´æ¹å¾æ°å¢
			set_AddFNew();
			$("#HBarCode").val(HBarCode_PNL);
			$("#HSetNo").val(HSetNo);
			@@ -270,12 +271,14 @@
			document.getElementById("HBarCode").setAttribute("disabled", "disabled");
			document.getElementById("HSetNo").setAttribute("disabled", "disabled");
			document.getElementById("HPCSNo").setAttribute("disabled", "disabled");
			} else if (OperationType == 5) {//ç´æ¹å¾ç¼è¾
			}
			else if (OperationType == 5) {//ç´æ¹å¾ç¼è¾
			roadBillMain();
			document.getElementById("HBarCode").setAttribute("disabled", "disabled");
			document.getElementById("HSetNo").setAttribute("disabled", "disabled");
			document.getElementById("HPCSNo").setAttribute("disabled", "disabled");
			} else if (OperationType == 6) {//ç´æ¹å¾-avi æ°å¢
			}
			else if (OperationType == 6) {//ç´æ¹å¾-avi æ°å¢
			set_AddFNew();
			$("#HBarCode").val(HBarCode_PNL);
			$("#HSetNo").val(HSetNo);
			@@ -339,6 +342,11 @@
			url += "/QC_CheckNote_PNL_TempController/EditBill"
			} else if (OperationType == 1 \|\| OperationType == 2 \|\| OperationType == 4 \|\| OperationType == 6 \|\| OperationType == 7 \|\| OperationType == 8) {
			url += "/QC_CheckNote_PNL_TempController/AddBill"

			if (!judgeRepeatDataByPNLAndPCS()) {
			layer.msg("è¯¥PCSå·²ç»åå¨ä¸è¯è®°å½ï¼ç¦æ¢éå¤æ è®°ï¼ï¼", { icon: 5 });
			return;
			}
			}
			$.ajax(
			{
			@@ -586,6 +594,37 @@

			}


			//#region å¤æè¯¥PNLä¸çè¯¥PCSæ¯å¦å·²ç»åå¨ä¸è¯è®°å½ãè¥åå¨ï¼åä¸åè®¸ç»§ç»çæã
			function judgeRepeatDataByPNLAndPCS() {
			var flag = true;

			var HBarCode_Temp = $("#HBarCode").val();
			var HPCSNo_Temp = $("#HPCSNo").val();

			var sql = "select HBarCode from QC_CheckNote_PNL_Temp where HBarCode = '" + HBarCode_Temp + "' and HPCSNo = '" + HPCSNo_Temp + "' ";
			sql += " union select HBarCode from QC_CheckNote_PNL_His where HBarCode = '" + HBarCode_Temp + "' and HPCSNo = '" + HPCSNo_Temp + "' ";
			var ModRightNameCheck = "";
			$.ajax({
			url: GetWEBURL() + '/CommonModel/searchMethod',
			async: false,
			type: "GET",
			data: { "sql": sql, "user": sessionStorage["HUserName"], "ModRightNameCheck": ModRightNameCheck },
			success: function (data1) {
			if (data1.count == 1) {
			if (data1.data.length > 0) {
			flag = false;
			}
			} else {
			flag = false;
			}
			}, error: function (e) {
			flag = false;
			}
			});
			return flag;
			}
			//#endregion
			});
			//#endregion

			@@ -502,6 +502,10 @@
			}
			}

			for (var i = 0; i < data1.data.length; i++) {
			data1.data[i]["ä¸è¯åå "] = data1.data[i]["ä¸è¯åå "].replace(",", "ï¼");
			}

			columns = col;
			option.cols = [col];
			option.data = data1.data;