From baf5322413d77f9aff39e46a8e765b7003078320 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期五, 10 三月 2023 19:08:11 +0800
Subject: [PATCH] 工序进出站

---
 WebTM/views/车间管理/工序流转/MES_StationOutBill_PDA.html        |  709 +++++-------------------
 WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBill.html          |  201 ++++--
 WebTM/views/车间管理/工序流转/MES_StationOutBill_PDA_Detail.html |  309 ++++++++++
 WebTM/views/车间管理/工序进站接收单/Cj_StationInBill.html           |   87 ++
 WebTM/views/index_Mobile.html                            |    4 
 WebTM/views/Baseset/基础资料/Gy_GetProcNoList.html           |    2 
 WebTM/views/车间管理/工序流转/MES_StationInBill_PDA.html         |  395 +++++++-----
 WebTM/WebTM.csproj                                       |    1 
 8 files changed, 901 insertions(+), 807 deletions(-)

diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 7bf094e..48bbad1 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -178,6 +178,7 @@
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_MaterTypeEdit.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Gy_SourceList.aspx" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Sc_ProcExchRecordBackBillList.aspx" />
+    <Content Include="views\杞﹂棿绠$悊\宸ュ簭娴佽浆\MES_StationOutBill_PDA_Detail.html" />
     <Content Include="views\杞﹂棿绠$悊\宸ュ簭娴佽浆鍗Sc_ProcExchRecordBackBillList.html" />
     <Content Include="views\杞﹂棿绠$悊\宸ュ簭娴佽浆鍗Sc_ProcExchRecordBackBillEdit.html" />
     <Content Include="views\杞﹂棿绠$悊\宸ュ簭娴佽浆鍗Sc_ProcessSendWorkEdit.html" />
diff --git "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_GetProcNoList.html" "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_GetProcNoList.html"
index e751928..70561ea 100644
--- "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_GetProcNoList.html"
+++ "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_GetProcNoList.html"
@@ -95,7 +95,7 @@
                     type: "get",
                     url: GetWEBURL() + "/Web/GetProcNoList",
                     async: true,
-                    data: { "HInterID": HInterID, "sWhere": sWhere },
+                    data: { "HInterID": HInterID, "sWhere": sWhere, "UserID": sessionStorage["Czybm"] },
                     success: function (result) {
                         ajaxReturnData = JSON.parse(JSON.stringify(result)).data;
                         table.reload('mainTable', {
diff --git a/WebTM/views/index_Mobile.html b/WebTM/views/index_Mobile.html
index 1d25932..61a644c 100644
--- a/WebTM/views/index_Mobile.html
+++ b/WebTM/views/index_Mobile.html
@@ -162,13 +162,13 @@
                           </a>
                       </dd>
                       <dd>
-                          <a lay-href="杞﹂棿绠$悊/宸ュ簭娴佽浆/MES_StationInBill_PDA.html" style="color: aqua;">
+                          <a href="杞﹂棿绠$悊/宸ュ簭娴佽浆/MES_StationInBill_PDA.html" target="main_self_frame" style="color: aqua;">
                               <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
                               宸ュ簭杩涚珯鎺ユ敹鍗�
                           </a>
                       </dd>
                       <dd>
-                          <a lay-href="杞﹂棿绠$悊/宸ュ簭娴佽浆/MES_StationOutBill_PDA.html" style="color: aqua;">
+                          <a href="杞﹂棿绠$悊/宸ュ簭娴佽浆/MES_StationOutBill_PDA.html" target="main_self_frame" style="color: aqua;">
                               <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
                               宸ュ簭鍑虹珯鎺ユ敹鍗�
                           </a>
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.html"
index d0e9e4c..283e015 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.html"
@@ -853,76 +853,157 @@
             });
 
             function txtHBarCode_KeyDown(HBarCode) {
+                var barNo = HBarCode.substr(0, 3);
+                if (barNo == 'PRO' && $('#HProcExchHinteID').val() == '') {
+                    layer.msg("璇锋壂瀹屾祦杞崱鍚庡啀鎵伐搴忕爜")
+                    layer.close(index);
+                    return;
+                }
+
                 var index = layer.load();
                 $.ajax({
-                    url: GetWEBURL() + "/Cj_StationEntrustInBill/txtHBarCode_KeyDown",
+                    url: GetWEBURL() + "/Cj_StationBill/txtHBarCode_KeyDown2",
                     type: "GET",
-                    data: { "HBarCode": HBarCode },
+                    data: { "HBarCode": HBarCode, "HInterID": $('#HProcExchHinteID').val(), "UserID": sessionStorage["Czybm"] },
                     success: function (result) {
                         if (result.count == 1) {
                             var data = result.data[0];
-                            form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
-                                "HICMOInterID": data.hicmointerid,
-                                "HICMOBillNo": data.浠诲姟鍗曞彿,
-                                "HMaterID": data.HMaterID,
-                                "HMaterName": data.浜у搧,
-                                "HMaterNumber": data.浜у搧浠g爜,
-                                "HMaterModel": data.瑙勬牸鍨嬪彿,
-                                "HPieceQty": data.娴佽浆鍗℃暟閲�,
-                                "HPlanQty": data.娴佽浆鍗℃暟閲�,
-                                "lngBillKey": data.hmainid,
-                                "HProcExchBillNo": data.鍗曟嵁鍙�,
-                                "HProcExchHinteID": data.hmainid,
-                                "HICMOQty": data.浠诲姟鍗曟暟閲�,
-                                "HOrderProcNO": data.璁㈠崟璺熻釜鍙�,
-                                "HPRDOrgID": data.缁勭粐
-                            });
-                            $("#HBarCode").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
-                            $("#HBarCode").css("background-color", "#efefef4d");
-                            HProcExchBillNoFlag = true;
+            
+                            switch (barNo) {
+                                case "HCX":
+                                    form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+                                        "HSourceID": data.HItemID,
+                                        "HSourceName": data.鐢熶骇璧勬簮鍚嶇О
+                                    });
+                                    break;
+                                case "SBM":
+                                    layer.msg("璁惧鍚嶇О : " + data.璁惧鍚嶇О, { icon: 6, btn: ['纭'], time: 6000, offset: 't', skin: 'layui-layer-lan', title: "璁惧鐮�" });
+                                    break;
+                                case "JYM"://妫�楠屽憳
+                                    form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+                                        "HQCCheckID": data.HItemID,
+                                        "HQCCheckName": data.鑱屽憳鍚嶇О
+                                        //"HGroupID": data.鐝粍ID,
+                                        //"HGroupName": data.鐝粍鍚嶇О
+                                    });
+                                    break;
+                                case "GRM"://鎿嶄綔鍛橈紝鎺ユ敹浜�
+                                    form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+                                        "HEmpID": data.HItemID,
+                                        "HEmpNumber": data.鑱屽憳浠g爜,
+                                        "HEmpName": data.鑱屽憳鍚嶇О,
+                                        "HGroupID": data.鐝粍ID,
+                                        "HGroupName": data.鐝粍鍚嶇О
+                                    });
+                                    break;
+                                //case "CGM":
+                                //    form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+                                //        "HEmpID": data.HItemID,
+                                //        "HEmpNumber": data.鑱屽憳浠g爜,
+                                //        "HEmpName": data.鑱屽憳鍚嶇О
+                                //    });
+                                //    break;
+                                case "HWH":
+                                    var HSpflag = data.鍚敤浠撲綅 == "Y" ? "鏄�" : "鍚�";
+                                    layer.msg("浠撳簱鍚嶇О : " + data.浠撳簱鍚嶇О + "<br>" + "鍚敤浠撲綅 : " + HSpflag, { icon: 6, btn: ['纭'], time: 6000, offset: 't', skin: 'layui-layer-lan', title: "浠撳簱鐮�" });
+                                    break;
+                                case "HSP":
+                                    layer.msg("浠撲綅鍚嶇О : " + data.浠撲綅鍚嶇О + "<br>" + "浠撳簱鍚嶇О : " + data.浠撳簱鍚嶇О, { icon: 6, btn: ['纭'], time: 6000, offset: 't', skin: 'layui-layer-lan', title: "浠撲綅鐮�" });
+                                    break;
+                                case "PRO":
+                                    form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+                                        "HProcID": data.HItemID,
+                                        "HProcName": data.宸ュ簭鍚嶇О
+                                    });
+                                    break;
+                                case "WLM":
+                                    form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+                                        "HMaterID": data.HItemID,
+                                        "HMaterName": data.鐗╂枡鍚嶇О,
+                                        "HMaterNumber": data.鐗╂枡浠g爜,
+                                        "HMaterModel": data.瑙勬牸鍨嬪彿
+                                    });
+                                    break;
+                                case "GXL":
+                                    form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+                                        "HICMOInterID": data.hicmointerid,
+                                        "HICMOBillNo": data.浠诲姟鍗曞彿,
+                                        "HMaterID": data.HMaterID,
+                                        "HMaterName": data.浜у搧,
+                                        "HMaterNumber": data.浜у搧浠g爜,
+                                        "HMaterModel": data.瑙勬牸鍨嬪彿,
+                                        "HPieceQty": data.娴佽浆鍗℃暟閲�,
+                                        "HPlanQty": data.娴佽浆鍗℃暟閲�,
+                                        "lngBillKey": data.hmainid,
+                                        "HProcExchBillNo": data.鍗曟嵁鍙�,
+                                        "HProcExchHinteID": data.hmainid,
+                                        "HICMOQty": data.浠诲姟鍗曟暟閲�,
+                                        "HOrderProcNO": data.璁㈠崟璺熻釜鍙�,
+                                        "HPRDOrgID": data.缁勭粐
+                                    });
+                                    $("#HBarCode").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
+                                    $("#HBarCode").css("background-color", "#efefef4d");
+                                    HProcExchBillNoFlag = true;
 
-                            var HProcExchHinteID = $('#HProcExchHinteID').val();
-                            //$.ajax({
-                            //    url: GetWEBURL() + "/Cj_StationEntrustInBill/DisBillEntryList",
-                            //    type: "GET",
-                            //    data: { HProcExchHinteID: HProcExchHinteID},
-                            //    success: function (result) {
-                            //        if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                    var HProcExchHinteID = $('#HProcExchHinteID').val();
+                                    var HInterID = data.hmainid;
+                                    //鑷姩鍖归厤娴佹按鍙�
+                                    $.ajax({
+                                        url: GetWEBURL() + "/Sc_StationInBill/autoGetProcNo",
+                                        type: "GET",
+                                        data: { "HUserID": sessionStorage["Czybm"], "HInterID": HInterID },
+                                        success: function (data1) {
+                                            if (data1.count == 1) {
+                                                var data = data1.data[0];
+                                                form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+                                                    "lngBillSubKey": data.hsubid,
+                                                    "HProcName": data.宸ュ簭,
+                                                    "HProcID": data.宸ュ簭ID,
+                                                    "HProcNo": data.娴佹按鍙�,
+                                                    "HCenterName": data.宸ヤ綔涓績,
+                                                    "HCenterID": data.HCenterID,
+                                                    "NoOutboundHqty": (data.娴佽浆鍗℃暟閲� - data.鍑虹珯鎶ュ簾鍏宠仈鏁伴噺 - data.鍑虹珯鍏宠仈鏁伴噺)
+                                                });
 
-                            //        }
-                            //        else {
-                            //            layer.msg(result.Message);
-                            //        }
-                            //        layer.closeAll("loading");
-                            //    }
-                            //});
+                                                if (data.棣栭亾宸ュ簭 == "鏄�") {
+                                                    FirstEndHProcNo = 1;
+                                                } else if (data.鏈亾宸ュ簭 == "鏄�") {
+                                                    FirstEndHProcNo = 2;
+                                                }
+                                                $("#HProcNo").attr("readonly", "readonly");
+                                                $("#HProcNo").css("background-color", "#efefef4d");
+                                            }
+                                        }
+                                    })
 
-                            option = {
-                                elem: '#mainTable',
-                                url: GetWEBURL() + "/Cj_StationEntrustInBill/DisBillEntryList",
-                                //, cellMinWidth: 80
-                                toolbar: '#toolbarDemo'
-                                , where: { HProcExchHinteID: HProcExchHinteID }
-                                , cols: [[
-                                    { type: 'numbers', title: '搴忓彿', totalRow: true }
-                                    , { field: 'HOrderProcNO', title: '璁㈠崟璺熻釜鍙�', edit: 'text' }
-                                    , { field: 'hbillno', title: '娴佽浆鍗″彿', hide: true }
-                                    , { field: 'HICMOBillNo', title: '鐢熶骇璁㈠崟鍙�', edit: 'text' }
-                                    , { field: '浜у搧浠g爜', title: '浜у搧浠g爜' }
-                                    , { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О', edit: 'text' }
-                                    , { field: '娴佽浆鍗℃暟閲�', title: '娴佽浆鍗℃暟閲�' }
-                                    , { field: '娴佹按鍙�', title: '娴佹按鍙�', edit: 'text' }
-                                    , { field: '宸ュ簭鍚嶇О', title: '宸ュ簭鍚嶇О' }
-                                    , { field: '宸ヤ綔涓績', title: '宸ヤ綔涓績' }
-                                    , { field: '鏄惁濮斿', title: '鏄惁濮斿', edit: 'text' }
-                                    , { field: '渚涘簲鍟�', title: '渚涘簲鍟�' }
-                                    , { field: '璁″垝鏁伴噺', title: '璁″垝鏁伴噺' }
-                                    , { field: '杩涚珯鏁伴噺', title: '杩涚珯鏁伴噺', edit: 'text' }
-                                    , { field: '鍑虹珯鏁伴噺', title: '鍑虹珯鏁伴噺' }
-                                ]]
-                                , height: 500
+                                    option = {
+                                        elem: '#mainTable',
+                                        url: GetWEBURL() + "/Cj_StationEntrustInBill/DisBillEntryList",
+                                        //, cellMinWidth: 80
+                                        toolbar: '#toolbarDemo'
+                                        , where: { HProcExchHinteID: HProcExchHinteID }
+                                        , cols: [[
+                                            { type: 'numbers', title: '搴忓彿', totalRow: true }
+                                            , { field: 'HOrderProcNO', title: '璁㈠崟璺熻釜鍙�', edit: 'text' }
+                                            , { field: 'hbillno', title: '娴佽浆鍗″彿', hide: true }
+                                            , { field: 'HICMOBillNo', title: '鐢熶骇璁㈠崟鍙�', edit: 'text' }
+                                            , { field: '浜у搧浠g爜', title: '浜у搧浠g爜' }
+                                            , { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О', edit: 'text' }
+                                            , { field: '娴佽浆鍗℃暟閲�', title: '娴佽浆鍗℃暟閲�' }
+                                            , { field: '娴佹按鍙�', title: '娴佹按鍙�', edit: 'text' }
+                                            , { field: '宸ュ簭鍚嶇О', title: '宸ュ簭鍚嶇О' }
+                                            , { field: '宸ヤ綔涓績', title: '宸ヤ綔涓績' }
+                                            , { field: '鏄惁濮斿', title: '鏄惁濮斿', edit: 'text' }
+                                            , { field: '渚涘簲鍟�', title: '渚涘簲鍟�' }
+                                            , { field: '璁″垝鏁伴噺', title: '璁″垝鏁伴噺' }
+                                            , { field: '杩涚珯鏁伴噺', title: '杩涚珯鏁伴噺', edit: 'text' }
+                                            , { field: '鍑虹珯鏁伴噺', title: '鍑虹珯鏁伴噺' }
+                                        ]]
+                                        , height: 500
+                                    }
+                                    table.render(option)
+                                    break;
                             }
-                            table.render(option)
                             //layer.close(index);
                             //set_InitGrid();
                             //table.render(option);
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254/MES_StationInBill_PDA.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254/MES_StationInBill_PDA.html"
index 307e045..1978428 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254/MES_StationInBill_PDA.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254/MES_StationInBill_PDA.html"
@@ -135,7 +135,9 @@
                                             <tr>
                                                 <th>娴佹按鍙�</th>
                                                 <td class="bz_td">
-                                                    <input type="text" name="HProcNo" class="layui-input" id="HProcNo" placeholder="璇疯緭鍏ユ祦姘村彿鍚庡洖杞�" style="border-radius: 50px;">
+                                                    <input type="text" name="HProcNo" class="layui-input" id="HProcNo" placeholder="璇烽�夋嫨娴佹按鍙峰悗鍥炶溅" style="border-radius: 50px;">
+                                                    <input type="hidden" name="HProcID" id="HProcID" value="0" autocomplete="off" class="layui-input">
+                                                    <button type="button" lay-submit="" class="layui-btn layui-col-xs2 bz_btu" lay-filter="SerialNum-BT" id="SerialNum-BT" style="font-weight:bolder">...</button>
                                                 </td>
                                             </tr>
                                             <tr>
@@ -147,7 +149,7 @@
                                             <tr>
                                                 <th>鐢熶骇璧勬簮</th>
                                                 <td class="bz_td">
-                                                    <input type="text" name="HSourceName" class="layui-input" id="HSourceName" placeholder="閫夋嫨鐢熶骇璧勬簮" style="background-color:#efefef4d;">
+                                                    <input type="text" name="HSourceName" class="layui-input" id="HSourceName" placeholder="閫夋嫨鐢熶骇璧勬簮" style="border-radius: 50px;">
                                                     <input type="hidden" name="HSourceID" id="HSourceID" value="0" autocomplete="off" class="layui-input">
                                                     <button type="button" lay-submit="" class="layui-btn layui-col-xs2 bz_btu" lay-filter="ProductionResources-BT" id="ProductionResources-BT" style="font-weight:bolder">...</button>
                                                 </td>
@@ -155,7 +157,7 @@
                                             <tr>
                                                 <th>宸ヤ綔涓績</th>
                                                 <td class="bz_td">
-                                                    <input type="text" name="HCenterName" class="layui-input" id="HCenterName" placeholder="閫夋嫨宸ヤ綔涓績" style="background-color:#efefef4d;">
+                                                    <input type="text" name="HCenterName" class="layui-input" id="HCenterName" placeholder="閫夋嫨宸ヤ綔涓績" style="background-color:#efefef4d;border-radius: 50px;">
                                                     <input type="hidden" name="HCenterID" id="HCenterID" value="0" autocomplete="off" class="layui-input">
                                                     <button type="button" lay-submit="" class="layui-btn layui-col-xs2 bz_btu" lay-filter="HWorkingProcedure-BT" id="HWorkingProcedure-BT" style="font-weight:bolder">...</button>
                                                 </td>
@@ -163,7 +165,7 @@
                                             <tr>
                                                 <th>鐢熶骇鐝粍</th>
                                                 <td class="bz_td">
-                                                    <input type="text" name="HGroupName" class="layui-input" id="HGroupName" placeholder="閫夋嫨鐢熶骇鐝粍" style="background-color:#efefef4d;">
+                                                    <input type="text" name="HGroupName" class="layui-input" id="HGroupName" placeholder="閫夋嫨鐢熶骇鐝粍" style="background-color:#efefef4d;border-radius: 50px;">
                                                     <input type="hidden" name="HGroupID" id="HGroupID" value="0" autocomplete="off" class="layui-input">
                                                     <button type="button" lay-submit="" class="layui-btn layui-col-xs2 bz_btu" lay-filter="ProductionTeam-BT" id="ProductionTeam-BT" style="font-weight:bolder">...</button>
                                                 </td>
@@ -171,10 +173,10 @@
                                             <tr>
                                                 <th>鎺ユ敹浜�</th>
                                                 <td class="bz_td">
-                                                    <input type="text" name="HEmpNumber" id="HEmpNumber" value="" placeholder="鎺ユ敹浜轰唬鐮�" autocomplete="off" class="layui-input" readonly>
+                                                    <input type="text" name="HEmpNumber" id="HEmpNumber" value="" placeholder="鎺ユ敹浜轰唬鐮�" autocomplete="off" class="layui-input" style="border-radius: 50px;" readonly>
                                                 </td>
                                                 <td class="bz_td">
-                                                    <input type="text" name="HEmpName" class="layui-input" id="HEmpName" placeholder="閫夋嫨鎺ユ敹浜�" style="background-color:#efefef4d;">
+                                                    <input type="text" name="HEmpName" class="layui-input" id="HEmpName" placeholder="閫夋嫨鎺ユ敹浜�" style="background-color:#efefef4d;border-radius: 50px;">
                                                     <input type="hidden" name="HEmpID" id="HEmpID" value="0" autocomplete="off" class="layui-input">
                                                     <button type="button" lay-submit="" class="layui-btn layui-col-xs2 bz_btu" lay-filter="HEmployeeID-BT" id="HEmployeeID-BT" style="font-weight:bolder">...</button>
                                                 </td>
@@ -182,13 +184,13 @@
                                             <tr>
                                                 <th>鍗曟嵁鏃ユ湡</th>
                                                 <td class="t1_input">
-                                                    <input type="text" name="HDate" class="layui-input" id="HDate" placeholder="璇烽�夋嫨鏃ユ湡">
+                                                    <input type="text" name="HDate" class="layui-input" id="HDate" style="border-radius: 50px;" placeholder="璇烽�夋嫨鏃ユ湡">
                                                 </td>
                                             </tr>
                                             <tr>
                                                 <th>鍗曟嵁鍙�</th>
                                                 <td class="bz_td">
-                                                    <input type="text" name="HBillNo" class="layui-input" id="HBillNo" placeholder="鍗曟嵁鍙�" style="border-radius: 50px;" readonly>
+                                                    <input type="text" name="HBillNo" class="layui-input" id="HBillNo" placeholder="鍗曟嵁鍙�" style="border-radius: 50px;background-color:#efefef4d;" readonly>
                                                     <input type="hidden" name="HInterID" id="HInterID" value="0" autocomplete="off" class="layui-input">
                                                 </td>
                                             </tr>
@@ -201,65 +203,65 @@
                                             <tr>
                                                 <th>娴佽浆鍗″彿</th>
                                                 <td class="bz_td">
-                                                    <input type="text" name="HProcExchBillNo" class="layui-input" id="HProcExchBillNo" placeholder="娴佽浆鍗″彿" style="border-radius: 50px;" readonly>
-                                                    <input type="hidden" name="HProcExchHinteID" id="HProcExchHinteID" value="0" autocomplete="off" class="layui-input">
+                                                    <input type="text" name="HProcExchBillNo" class="layui-input" id="HProcExchBillNo" placeholder="娴佽浆鍗″彿" style="border-radius: 50px;background-color:#efefef4d;" readonly>
+                                                    <input type="hidden" name="HProcExchHinteID" id="HProcExchHinteID" autocomplete="off" class="layui-input">
                                                 </td>
                                             </tr>
                                             <tr>
                                                 <th>褰撳墠宸ュ簭</th>
                                                 <td class="bz_td">
-                                                    <input type="text" name="HProcName" class="layui-input" id="HProcName" placeholder="褰撳墠宸ュ簭" style="border-radius: 50px;" readonly>
+                                                    <input type="text" name="HProcName" class="layui-input" id="HProcName" placeholder="褰撳墠宸ュ簭" style="border-radius: 50px;background-color:#efefef4d;" readonly>
                                                     <input type="hidden" name="HProcID" id="HProcID" value="0" autocomplete="off" class="layui-input">
                                                 </td>
                                             </tr>
                                             <tr>
                                                 <th>鐢熶骇缁勭粐</th>
                                                 <td class="bz_td">
-                                                    <input type="text" name="HPRDOrg" class="layui-input" id="HPRDOrg" placeholder="鐢熶骇缁勭粐" style="border-radius: 50px;" readonly>
+                                                    <input type="text" name="HPRDOrg" class="layui-input" id="HPRDOrg" placeholder="鐢熶骇缁勭粐" style="border-radius: 50px;background-color:#efefef4d;" readonly>
                                                     <input type="hidden" name="HPRDOrgID" id="HPRDOrgID" value="0" autocomplete="off" class="layui-input">
                                                 </td>
                                             </tr>
                                             <tr>
                                                 <th>浜у搧浠g爜</th>
                                                 <td class="bz_td">
-                                                    <input type="text" name="HMaterNumber" class="layui-input" id="HMaterNumber" placeholder="浜у搧浠g爜" style="border-radius: 50px;" readonly>
+                                                    <input type="text" name="HMaterNumber" class="layui-input" id="HMaterNumber" placeholder="浜у搧浠g爜" style="border-radius: 50px;background-color:#efefef4d;" readonly>
                                                 </td>
                                             </tr>
                                             <tr>
                                                 <th>浜у搧鍚嶇О</th>
                                                 <td class="bz_td">
-                                                    <input type="text" name="HMaterName" class="layui-input" id="HMaterName" placeholder="浜у搧鍚嶇О" style="border-radius: 50px;" readonly>
+                                                    <input type="text" name="HMaterName" class="layui-input" id="HMaterName" placeholder="浜у搧鍚嶇О" style="border-radius: 50px;background-color:#efefef4d;" readonly>
                                                     <input type="hidden" name="HMaterID" id="HMaterID" value="0" autocomplete="off" class="layui-input">
                                                 </td>
                                             </tr>
                                             <tr>
                                                 <th>瑙勬牸鍨嬪彿</th>
                                                 <td class="bz_td">
-                                                    <input type="text" name="HMaterModel" class="layui-input" id="HMaterModel" placeholder="瑙勬牸鍨嬪彿" style="border-radius: 50px;" readonly>
+                                                    <input type="text" name="HMaterModel" class="layui-input" id="HMaterModel" placeholder="瑙勬牸鍨嬪彿" style="border-radius: 50px;background-color:#efefef4d;" readonly>
                                                 </td>
                                             </tr>
                                             <tr>
                                                 <th>娴佽浆鍗℃暟閲�</th>
                                                 <td class="bz_td">
-                                                    <input type="text" name="HPlanQty" class="layui-input" id="HPlanQty" value="0" placeholder="娴佽浆鍗℃暟閲�" style="border-radius: 50px;" readonly>
+                                                    <input type="text" name="HPlanQty" class="layui-input" id="HPlanQty" value="0" placeholder="娴佽浆鍗℃暟閲�" style="border-radius: 50px;background-color:#efefef4d;" readonly>
                                                 </td>
                                             </tr>
                                             <tr>
                                                 <th>璁㈠崟鏁伴噺</th>
                                                 <td class="bz_td">
-                                                    <input type="text" name="HICMOQty" class="layui-input" id="HICMOQty" value="0" placeholder="璁㈠崟鏁伴噺" style="border-radius: 50px;" readonly>
+                                                    <input type="text" name="HICMOQty" class="layui-input" id="HICMOQty" value="0" placeholder="璁㈠崟鏁伴噺" style="border-radius: 50px;background-color:#efefef4d;" readonly>
                                                 </td>
                                             </tr>
                                             <tr>
                                                 <th>璁㈠崟璺熻釜鍙�</th>
                                                 <td class="bz_td">
-                                                    <input type="text" name="HOrderProcNO" class="layui-input" id="HOrderProcNO" placeholder="璁㈠崟璺熻釜鍙�" style="border-radius: 50px;" readonly>
+                                                    <input type="text" name="HOrderProcNO" class="layui-input" id="HOrderProcNO" placeholder="璁㈠崟璺熻釜鍙�" style="border-radius: 50px;background-color:#efefef4d;" readonly>
                                                 </td>
                                             </tr>
                                             <tr>
                                                 <th>鐢熶骇璁㈠崟鍙�</th>
                                                 <td class="bz_td">
-                                                    <input type="text" name="HICMOBillNo" class="layui-input" id="HICMOBillNo" placeholder="鐢熶骇璁㈠崟鍙�" style="border-radius: 50px;" readonly>
+                                                    <input type="text" name="HICMOBillNo" class="layui-input" id="HICMOBillNo" placeholder="鐢熶骇璁㈠崟鍙�" style="border-radius: 50px;background-color:#efefef4d;" readonly>
                                                     <input type="hidden" name="HICMOInterID" id="HICMOInterID" value="0" autocomplete="off" class="layui-input">
                                                 </td>
                                             </tr>
@@ -272,61 +274,61 @@
                                             <tr>
                                                 <th>鍒跺崟浜�</th>
                                                 <td class="bz_td">
-                                                    <input type="text" name="HMaker" class="layui-input" id="HMaker" style="border-radius: 50px;">
-                                                </td>
-                                            </tr>
-                                            <tr>
-                                                <th>淇敼浜�</th>
-                                                <td class="bz_td">
-                                                    <input type="text" name="HUpDater" class="layui-input" id="HUpDater" style="border-radius: 50px;">
-                                                </td>
-                                            </tr>
-                                            <tr>
-                                                <th>瀹℃牳浜�</th>
-                                                <td class="bz_td">
-                                                    <input type="text" name="HChecker" class="layui-input" id="HChecker" style="border-radius: 50px;">
+                                                    <input type="text" name="HMaker" class="layui-input" id="HMaker" style="border-radius: 50px;background-color:#efefef4d;" readonly>
                                                 </td>
                                             </tr>
                                             <tr>
                                                 <th>鍒跺崟鏃ユ湡</th>
                                                 <td class="bz_td">
-                                                    <input type="text" name="HMakeDate" class="layui-input" id="HMakeDate" style="border-radius: 50px;">
+                                                    <input type="text" name="HMakeDate" class="layui-input" id="HMakeDate" style="border-radius: 50px;background-color:#efefef4d;" readonly>
+                                                </td>
+                                            </tr>
+                                            <tr>
+                                                <th>淇敼浜�</th>
+                                                <td class="bz_td">
+                                                    <input type="text" name="HUpDater" class="layui-input" id="HUpDater" style="border-radius: 50px;background-color:#efefef4d;" readonly>
                                                 </td>
                                             </tr>
                                             <tr>
                                                 <th>淇敼鏃ユ湡</th>
                                                 <td class="bz_td">
-                                                    <input type="text" name="HUpDateDate" class="layui-input" id="HUpDateDate" style="border-radius: 50px;">
+                                                    <input type="text" name="HUpDateDate" class="layui-input" id="HUpDateDate" style="border-radius: 50px;background-color:#efefef4d;" readonly>
+                                                </td>
+                                            </tr>
+                                            <tr>
+                                                <th>瀹℃牳浜�</th>
+                                                <td class="bz_td">
+                                                    <input type="text" name="HChecker" class="layui-input" id="HChecker" style="border-radius: 50px;background-color:#efefef4d;" readonly>
                                                 </td>
                                             </tr>
                                             <tr>
                                                 <th>瀹℃牳鏃ユ湡</th>
                                                 <td class="bz_td">
-                                                    <input type="text" name="HCheckDate" class="layui-input" id="HCheckDate" style="border-radius: 50px;">
+                                                    <input type="text" name="HCheckDate" class="layui-input" id="HCheckDate" style="border-radius: 50px;background-color:#efefef4d;" readonly>
                                                 </td>
                                             </tr>
                                             <tr>
                                                 <th>鍏抽棴浜�</th>
                                                 <td class="bz_td">
-                                                    <input type="text" name="HCloseMan" class="layui-input" id="HCloseMan" style="border-radius: 50px;">
-                                                </td>
-                                            </tr>
-                                            <tr>
-                                                <th>浣滃簾浜�</th>
-                                                <td class="bz_td">
-                                                    <input type="text" name="HDeleteMan" class="layui-input" id="HDeleteMan" style="border-radius: 50px;">
+                                                    <input type="text" name="HCloseMan" class="layui-input" id="HCloseMan" style="border-radius: 50px;background-color:#efefef4d;" readonly>
                                                 </td>
                                             </tr>
                                             <tr>
                                                 <th>鍏抽棴鏃ユ湡</th>
                                                 <td class="bz_td">
-                                                    <input type="text" name="HCloseDate" class="layui-input" id="HCloseDate" style="border-radius: 50px;">
+                                                    <input type="text" name="HCloseDate" class="layui-input" id="HCloseDate" style="border-radius: 50px;background-color:#efefef4d;" readonly>
+                                                </td>
+                                            </tr>
+                                            <tr>
+                                                <th>浣滃簾浜�</th>
+                                                <td class="bz_td">
+                                                    <input type="text" name="HDeleteMan" class="layui-input" id="HDeleteMan" style="border-radius: 50px;background-color:#efefef4d;" readonly>
                                                 </td>
                                             </tr>
                                             <tr>
                                                 <th>浣滃簾鏃ユ湡</th>
                                                 <td class="bz_td">
-                                                    <input type="text" name="HDeleteDate" class="layui-input" id="HDeleteDate" style="border-radius: 50px;">
+                                                    <input type="text" name="HDeleteDate" class="layui-input" id="HDeleteDate" style="border-radius: 50px;background-color:#efefef4d;" readonly>
                                                 </td>
                                             </tr>
                                         </tbody>
@@ -372,7 +374,7 @@
             base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
         }).extend({
             index: 'lib/index' //涓诲叆鍙fā鍧�
-        }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+        }).use(['index', 'form', 'laydate', 'table', 'element','upload'], function () {
             var $ = layui.$
                 , admin = layui.admin
                 , layer = layui.layer
@@ -383,35 +385,36 @@
             var params = get_UrlVars();
             var option = [];
             var titleData = [];           
+            var upload = layui.upload;
             //#region 鍒濆鍖栭〉闈�
-            laydate.render({
-                elem: '#HBeginDate'
-                , type: 'datetime'
-            });
-            laydate.render({
-                elem: '#HEndDate'
-                , type: 'datetime'
-            });
-            laydate.render({
-                elem: '#HDate'
-                , type: 'datetime'
-            });
-            laydate.render({
-                elem: '#HMakeDate'
-                , type: 'datetime'
-            });
-            laydate.render({
-                elem: '#HUpDateDate'
-                , type: 'datetime'
-            });
-            laydate.render({
-                elem: '#HCheckDate'
-                , type: 'datetime'
-            });
-            laydate.render({
-                elem: '#HDeleteDate'
-                , type: 'datetime'
-            });
+            //laydate.render({
+            //    elem: '#HBeginDate'
+            //    , type: 'datetime'
+            //});
+            //laydate.render({
+            //    elem: '#HEndDate'
+            //    , type: 'datetime'
+            //});
+            //laydate.render({
+            //    elem: '#HDate'
+            //    , type: 'datetime'
+            //});
+            //laydate.render({
+            //    elem: '#HMakeDate'
+            //    , type: 'datetime'
+            //});
+            //laydate.render({
+            //    elem: '#HUpDateDate'
+            //    , type: 'datetime'
+            //});
+            //laydate.render({
+            //    elem: '#HCheckDate'
+            //    , type: 'datetime'
+            //});
+            //laydate.render({
+            //    elem: '#HDeleteDate'
+            //    , type: 'datetime'
+            //});
             //#endregion
 
             if (typeof (params[params[0]]) == "undefined") {
@@ -451,7 +454,7 @@
                         //console.log(d.data);
                         $("#HInterID").val(d.data[0].HInterID);
                         $("#HBillNo").val(d.data[0].HBillNo);
-                        //PicUpload();
+                        PicUpload();
                         layer.close(ajaxLoad);
                     }
                     , error: function () {
@@ -484,7 +487,7 @@
             //杩涘叆椤甸潰榛樿鍏夋爣鍦ㄦ潯褰㈢爜涓�
             $("#HBarCode").focus();
 
-            //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+            //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�            
 
             //#region 纭畾鎸夐挳
             form.on('submit(QueDin)', function (data) {//
@@ -508,20 +511,27 @@
             //#endregion
 
             //#region 閫�鍑烘寜閽�
+            //form.on('submit(Cancel)', function () {
+            //    layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
+            //        if (OperationType == 1) {
+            //            Pub_Close(closeType);
+            //        } else if (OperationType == 3) {
+            //            Pub_Close(1);
+            //        } else if (OperationType == 4) {
+            //            Pub_Close(1);
+            //        } else if (OperationType == 2) {
+            //            Pub_Close(1);
+            //        }
+            //    });
+            //})
+            //#endregion
+
+            //閫�鍑�--鍏ㄥ睆鐗�
             form.on('submit(Cancel)', function () {
                 layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
-                    if (OperationType == 1) {
-                        Pub_Close(closeType);
-                    } else if (OperationType == 3) {
-                        Pub_Close(1);
-                    } else if (OperationType == 4) {
-                        Pub_Close(1);
-                    } else if (OperationType == 2) {
-                        Pub_Close(1);
-                    }
+                    parent.location.href = "../../../views/index_Mobile.html";
                 });
             })
-            //#endregion
 
             //#region 淇敼鎸夐挳
             form.on('submit(set_Modify)', function () {//鎻愪氦
@@ -751,68 +761,68 @@
 
 
             //鏂囦欢涓婁紶
-            //function PicUpload() {
-            //    //澶氬浘鐗囦笂浼�
-            //    //澶氭枃浠跺垪琛ㄧず渚�
-            //    var ProImgByList = $('#ProImgByList')
-            //        , uploadListIns = upload.render({
-            //            elem: '#testList'
+            function PicUpload() {
+                //澶氬浘鐗囦笂浼�
+                //澶氭枃浠跺垪琛ㄧず渚�
+                var ProImgByList = $('#ProImgByList')
+                    , uploadListIns = upload.render({
+                        elem: '#testList'
 
-            //            , url: GetWEBURL() + "/Cj_StationOutBill/UploadFile1"
-            //            , accept: 'file'
-            //            , multiple: true
-            //            , auto: false
-            //            //, bindAction: '#testListAction' //鎸夋壄缁戝畾
-            //            , data: { "HBillNo": $("#HBillNo").val(), "HRemark": $("#HRemark").val(), "HUserName": sessionStorage["HUserName"] }
-            //            , choose: function (obj) {
-            //                var files = this.files = obj.pushFile(); //灏嗘瘡娆¢�夋嫨鐨勬枃浠惰拷鍔犲埌鏂囦欢闃熷垪
-            //                //璇诲彇鏈湴鏂囦欢
-            //                obj.preview(function (index, file, result) {
-            //                    var tr = $(['<tr id="upload-' + index + '">'
-            //                        , '<td>' + file.name + '</td>'
-            //                        , '<td>' + (file.size / 1014).toFixed(1) + 'kb</td>'
-            //                        , '<td>绛夊緟涓婁紶</td>'
-            //                        , '<td>'
-            //                        , '<button class="layui-btn layui-btn-xs demo-reload ">涓婁紶</button>'
-            //                        , '<button class="layui-btn layui-btn-xs layui-btn-danger demo-delete">鍒犻櫎</button>'
-            //                        , '</td>'
-            //                        , '</tr>'].join(''));
+                        , url: GetWEBURL() + "/Cj_StationOutBill/UploadFile1"
+                        , accept: 'file'
+                        , multiple: true
+                        , auto: false
+                        //, bindAction: '#testListAction' //鎸夋壄缁戝畾
+                        , data: { "HBillNo": $("#HBillNo").val(), "HRemark": $("#HRemark").val(), "HUserName": sessionStorage["HUserName"] }
+                        , choose: function (obj) {
+                            var files = this.files = obj.pushFile(); //灏嗘瘡娆¢�夋嫨鐨勬枃浠惰拷鍔犲埌鏂囦欢闃熷垪
+                            //璇诲彇鏈湴鏂囦欢
+                            obj.preview(function (index, file, result) {
+                                var tr = $(['<tr id="upload-' + index + '">'
+                                    , '<td>' + file.name + '</td>'
+                                    , '<td>' + (file.size / 1014).toFixed(1) + 'kb</td>'
+                                    , '<td>绛夊緟涓婁紶</td>'
+                                    , '<td>'
+                                    , '<button class="layui-btn layui-btn-xs demo-reload ">涓婁紶</button>'
+                                    , '<button class="layui-btn layui-btn-xs layui-btn-danger demo-delete">鍒犻櫎</button>'
+                                    , '</td>'
+                                    , '</tr>'].join(''));
 
-            //                    //鍗曚釜閲嶄紶
-            //                    tr.find('.demo-reload').on('click', function () {
-            //                        obj.upload(index, file);
-            //                        return false;
-            //                    });
+                                //鍗曚釜閲嶄紶
+                                tr.find('.demo-reload').on('click', function () {
+                                    obj.upload(index, file);
+                                    return false;
+                                });
 
-            //                    //鍒犻櫎
-            //                    tr.find('.demo-delete').on('click', function () {
-            //                        delete files[index]; //鍒犻櫎瀵瑰簲鐨勬枃浠�
-            //                        tr.remove();
-            //                        uploadListIns.config.elem.next()[0].value = ''; //娓呯┖ input file 鍊硷紝浠ュ厤鍒犻櫎鍚庡嚭鐜板悓鍚嶆枃浠朵笉鍙��
-            //                    });
+                                //鍒犻櫎
+                                tr.find('.demo-delete').on('click', function () {
+                                    delete files[index]; //鍒犻櫎瀵瑰簲鐨勬枃浠�
+                                    tr.remove();
+                                    uploadListIns.config.elem.next()[0].value = ''; //娓呯┖ input file 鍊硷紝浠ュ厤鍒犻櫎鍚庡嚭鐜板悓鍚嶆枃浠朵笉鍙��
+                                });
 
-            //                    ProImgByList.append(tr);
-            //                });
-            //            }
-            //            , done: function (res, index, upload) {
-            //                if (res.code == 1) { //涓婁紶鎴愬姛
-            //                    var tr = ProImgByList.find('tr#upload-' + index)
-            //                        , tds = tr.children();
-            //                    tds.eq(2).html('<span style="color: #5FB878;">涓婁紶鎴愬姛</span>');
-            //                    tds.eq(3).html(''); //娓呯┖鎿嶄綔
-            //                    //tds.eq(3).find('.demo-reload').addClass('layui-hide'); //闅愯棌涓婁紶
-            //                    return delete this.files[index]; //鍒犻櫎鏂囦欢闃熷垪宸茬粡涓婁紶鎴愬姛鐨勬枃浠�
-            //                }
-            //                this.error(index, upload);
-            //            }
-            //            , error: function (index, upload) {
-            //                var tr = ProImgByList.find('tr#upload-' + index)
-            //                    , tds = tr.children();
-            //                tds.eq(2).html('<span style="color: #FF5722;">涓婁紶澶辫触[妫�鏌ユ枃浠跺悕鍙婃枃浠舵牸寮廬</span>');
-            //                tds.eq(3).find('.demo-reload').removeClass('layui-hide'); //鏄剧ず涓婁紶
-            //            }
-            //        });
-            //}
+                                ProImgByList.append(tr);
+                            });
+                        }
+                        , done: function (res, index, upload) {
+                            if (res.code == 1) { //涓婁紶鎴愬姛
+                                var tr = ProImgByList.find('tr#upload-' + index)
+                                    , tds = tr.children();
+                                tds.eq(2).html('<span style="color: #5FB878;">涓婁紶鎴愬姛</span>');
+                                tds.eq(3).html(''); //娓呯┖鎿嶄綔
+                                //tds.eq(3).find('.demo-reload').addClass('layui-hide'); //闅愯棌涓婁紶
+                                return delete this.files[index]; //鍒犻櫎鏂囦欢闃熷垪宸茬粡涓婁紶鎴愬姛鐨勬枃浠�
+                            }
+                            this.error(index, upload);
+                        }
+                        , error: function (index, upload) {
+                            var tr = ProImgByList.find('tr#upload-' + index)
+                                , tds = tr.children();
+                            tds.eq(2).html('<span style="color: #FF5722;">涓婁紶澶辫触[妫�鏌ユ枃浠跺悕鍙婃枃浠舵牸寮廬</span>');
+                            tds.eq(3).find('.demo-reload').removeClass('layui-hide'); //鏄剧ず涓婁紶
+                        }
+                    });
+            }
 
             //鑾峰彇缂栬緫鏃�,宸蹭笂浼犵殑鏂囦欢鍒楄〃
             if (HBillNo != null || HBillNo != undefined) {
@@ -858,6 +868,8 @@
             //$("#HEmpID").val(sessionStorage["Czybm"]);
             //$("#HEmp").val(sessionStorage["HUserName"]);
             $("#HMaker").val(sessionStorage["HUserName"]);
+            $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));
+
 
 
 
@@ -874,16 +886,22 @@
             });           
 
             function txtHBarCode_KeyDown(HBarCode) {
+                var barNo = HBarCode.substr(0, 3);
+                if (barNo == 'PRO' && $('#HProcExchHinteID').val() == '') {
+                    layer.msg("璇锋壂瀹屾祦杞崱鍚庡啀鎵伐搴忕爜")
+                    layer.close(index);
+                    return;
+                }
+
                 var index = layer.load();
                 $.ajax({
-                    url: GetWEBURL() + "/Cj_StationEntrustInBill/txtHBarCode_KeyDown",
+                    url: GetWEBURL() + "/Cj_StationBill/txtHBarCode_KeyDown2",
                     type: "GET",
-                    data: { "HBarCode": HBarCode },
+                    data: { "HBarCode": HBarCode, "HInterID": $('#HProcExchHinteID').val(), "UserID": sessionStorage["Czybm"] },
                     success: function (result) {
                         if (result.count == 1) {
                             var data = result.data[0];
 
-                            var barNo = HBarCode.substr(0, 3);
                             switch (barNo) {
                                 case "HCX":
                                     form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
@@ -894,33 +912,50 @@
                                 case "SBM":
                                     layer.msg("璁惧鍚嶇О : " + data.璁惧鍚嶇О, { icon: 6, btn: ['纭'], time: 6000, offset: 't', skin: 'layui-layer-lan', title: "璁惧鐮�" });
                                     break;
-                                case "JYM":
+                                case "JYM"://妫�楠屽憳
+                                    layer.msg("妫�楠屽憳 : " + data.鑱屽憳鍚嶇О + "<br>" + "閮ㄩ棬 : " + data.閮ㄩ棬鍚嶇О + "<br>" + "鐝粍 : " + data.鐝粍鍚嶇О, { icon: 6, btn: ['纭'], time: 6000, offset: 't', skin: 'layui-layer-lan', title: "鍛樺伐鐮�" });
+                                    //form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+                                    //    "HEmpID": data.HItemID,
+                                    //    "HEmpNumber": data.鑱屽憳浠g爜,
+                                    //    "HEmpName": data.鑱屽憳鍚嶇О
+                                    //});
+                                    break;
+                                case "GRM"://鎿嶄綔鍛橈紝鎺ユ敹浜�
                                     form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
                                         "HEmpID": data.HItemID,
-                                        "HEmpNumber": data.鍛樺伐浠g爜,
-                                        "HEmpName": data.鍛樺伐鍚嶇О
+                                        "HEmpNumber": data.鑱屽憳浠g爜,
+                                        "HEmpName": data.鑱屽憳鍚嶇О,
+                                        "HGroupID": data.鐝粍ID,
+                                        "HGroupName": data.鐝粍鍚嶇О
                                     });
                                     break;
-                                case "GRM":
-                                    form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
-                                        "HEmpID": data.HItemID,
-                                        "HEmpNumber": data.鍛樺伐浠g爜,
-                                        "HEmpName": data.鍛樺伐鍚嶇О
-                                    });
-                                    break;
-                                case "CGM":
-                                    form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
-                                        "HEmpID": data.HItemID,
-                                        "HEmpNumber": data.鍛樺伐浠g爜,
-                                        "HEmpName": data.鍛樺伐鍚嶇О
-                                    });
-                                    break;
+                                //case "CGM":
+                                //    form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+                                //        "HEmpID": data.HItemID,
+                                //        "HEmpNumber": data.鑱屽憳浠g爜,
+                                //        "HEmpName": data.鑱屽憳鍚嶇О
+                                //    });
+                                //    break;
                                 case "HWH":
                                     var HSpflag = data.鍚敤浠撲綅 == "Y" ? "鏄�" : "鍚�";
                                     layer.msg("浠撳簱鍚嶇О : " + data.浠撳簱鍚嶇О + "<br>" + "鍚敤浠撲綅 : " + HSpflag, { icon: 6, btn: ['纭'], time: 6000, offset: 't', skin: 'layui-layer-lan', title: "浠撳簱鐮�" });
                                     break;
                                 case "HSP":
                                     layer.msg("浠撲綅鍚嶇О : " + data.浠撲綅鍚嶇О + "<br>" +"浠撳簱鍚嶇О : " + data.浠撳簱鍚嶇О, { icon: 6, btn: ['纭'], time: 6000, offset: 't', skin: 'layui-layer-lan', title: "浠撲綅鐮�" });
+                                    break;
+                                case "PRO":
+                                    form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+                                        "HProcID": data.HItemID,
+                                        "HProcName": data.宸ュ簭鍚嶇О
+                                    });
+                                    break;
+                                case "WLM":
+                                    form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+                                        "HMaterID": data.HItemID,
+                                        "HMaterName": data.鐗╂枡鍚嶇О,
+                                        "HMaterNumber": data.鐗╂枡浠g爜,
+                                        "HMaterModel": data.瑙勬牸鍨嬪彿
+                                    });
                                     break;
                                 case "GXL":
                                     form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
@@ -952,7 +987,7 @@
                                     $.ajax({
                                         url: GetWEBURL() + "/Sc_StationInBill/autoGetProcNo",
                                         type: "GET",
-                                        data: { "HUserName": sessionStorage["HUserName"], "HInterID": HInterID },
+                                        data: { "HUserID": sessionStorage["Czybm"], "HInterID": HInterID },
                                         success: function (data1) {
                                             if (data1.count == 1) {
                                                 var data = data1.data[0];
@@ -1135,9 +1170,9 @@
                 var index = layer.load();
                 var billType = sBillNo.substr(0, 3);
                 $.ajax({
-                    url: GetWEBURL() + "/Cj_StationEntrustInBill/txtHBarCode_KeyDown",
+                    url: GetWEBURL() + "/Cj_StationBill/txtHBarCode_KeyDown2",
                     type: "GET",
-                    data: { "HBarCode": sBillNo },
+                    data: { "HBarCode": sBillNo, "HInterID": $('#HProcExchHinteID').val(), "UserID": sessionStorage["Czybm"] },
                     success: function (result) {
                         if (result.count == 1) {
                             var data = result.data[0];
@@ -1330,6 +1365,29 @@
                 //layer.msg('绂佹閫夋嫨');
             });
 
+            //閫夋嫨娴佹按鍙峰脊绐�
+            form.on('submit(SerialNum-BT)', function () {//鐢熶骇璧勬簮
+                var value = $("#HProcExchHinteID").val();
+                // 鍒ゆ柇鏄惁宸茬粡杈撳叆娴佹按鍙凤紝鏄垯寮瑰嚭妯℃�佹锛屽惁鍒欑粰鍑烘彁绀�
+                if (value) {
+                    layer.open({
+                        type: 2
+                        , area: ['80%', '80%']
+                        , title: '娴佹按鍙�'
+                        , shade: 0.6 //閬僵閫忔槑搴�
+                        //, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                        , content: [`../../Baseset/鍩虹璧勬枡/Gy_GetProcNoList.html?HInterID=${value}`, 'yes']
+                        , resize: false
+                        , cancel: function (index, layero) {
+                        }
+                    })
+                } else {
+                    layer.alert('璇锋偍纭杈撳叆娴佽浆鍗″彿鍚庨噸璇昢_^', { icon: 7 });
+                    //alert('璇峰厛杈撳叆娴佽浆鍗″彿!')
+                }
+            });
+
             //閫夋嫨渚涘簲鍟�
             form.on('submit(btnSearchSup)', function () {
                 layer.msg('绂佹閫夋嫨');
@@ -1363,6 +1421,11 @@
             $("#HProcName").val(obj[0].宸ュ簭);
             $("#HProcID").val(obj[0].HItemID);
         }
+
+        //杩斿洖娴佹按鍙�
+        function GetProcNoValue(obj) {
+            $("#HProcNo").val(obj[0].娴佹按鍙�);
+        }
     </script>
 </body>
 </html>
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254/MES_StationOutBill_PDA.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254/MES_StationOutBill_PDA.html"
index a62178d..6917316 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254/MES_StationOutBill_PDA.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254/MES_StationOutBill_PDA.html"
@@ -116,7 +116,7 @@
                     </div>
                     <div class="layui-form-item" style="margin: 1% 2%;text-align: right;">
                         <button type="button" lay-submit="" lay-filter="Add" class="layui-btn layui-btn-radius">鏂板</button>
-                        <!--<button type="button" lay-submit="" lay-filter="" class="layui-btn layui-btn-radius">娓呯┖</button>-->
+                        <button type="button" lay-submit="" lay-filter="Detail" class="layui-btn layui-btn-radius">鏄庣粏</button>
                         <button type="button" lay-submit="" lay-filter="Saver" class="layui-btn layui-btn-radius">淇濆瓨</button>
                         <button type="button" lay-submit="" lay-filter="Cancel" class="layui-btn layui-btn-radius layui-btn-danger">閫�鍑�</button>
                     </div>
@@ -136,7 +136,9 @@
                                             <tr>
                                                 <th>娴佹按鍙�</th>
                                                 <td class="bz_td">
-                                                    <input type="text" name="HProcNo" class="layui-input" id="HProcNo" placeholder="璇疯緭鍏ユ祦姘村彿鍚庡洖杞�" style="border-radius: 50px;">
+                                                    <input type="text" name="HProcNo" class="layui-input" id="HProcNo" placeholder="璇烽�夋嫨娴佹按鍙峰悗鍥炶溅" style="border-radius: 50px;">
+                                                    <input type="hidden" name="HProcID" id="HProcID" value="0" autocomplete="off" class="layui-input">
+                                                    <button type="button" lay-submit="" class="layui-btn layui-col-xs2 bz_btu" lay-filter="SerialNum-BT" id="SerialNum-BT" style="font-weight:bolder">...</button>
                                                 </td>
                                             </tr>
                                             <tr>
@@ -154,7 +156,7 @@
                                             <tr>
                                                 <th>鐢熶骇璧勬簮</th>
                                                 <td class="bz_td">
-                                                    <input type="text" name="HSourceName" class="layui-input" id="HSourceName" placeholder="閫夋嫨鐢熶骇璧勬簮" style="background-color:#efefef4d;">
+                                                    <input type="text" name="HSourceName" class="layui-input" id="HSourceName" placeholder="閫夋嫨鐢熶骇璧勬簮" style="border-radius: 50px;">
                                                     <input type="hidden" name="HSourceID" id="HSourceID" value="0" autocomplete="off" class="layui-input">
                                                     <button type="button" lay-submit="" class="layui-btn layui-col-xs2 bz_btu" lay-filter="ProductionResources-BT" id="ProductionResources-BT" style="font-weight:bolder">...</button>
                                                 </td>
@@ -162,7 +164,7 @@
                                             <tr>
                                                 <th>宸ヤ綔涓績</th>
                                                 <td class="bz_td">
-                                                    <input type="text" name="HCenterName" class="layui-input" id="HCenterName" placeholder="閫夋嫨宸ヤ綔涓績" style="background-color:#efefef4d;">
+                                                    <input type="text" name="HCenterName" class="layui-input" id="HCenterName" placeholder="閫夋嫨宸ヤ綔涓績" style="background-color:#efefef4d;border-radius: 50px;">
                                                     <input type="hidden" name="HCenterID" id="HCenterID" value="0" autocomplete="off" class="layui-input">
                                                     <button type="button" lay-submit="" class="layui-btn layui-col-xs2 bz_btu" lay-filter="HWorkingProcedure-BT" id="HWorkingProcedure-BT" style="font-weight:bolder">...</button>
                                                 </td>
@@ -170,7 +172,7 @@
                                             <tr>
                                                 <th>鐢熶骇鐝粍</th>
                                                 <td class="bz_td">
-                                                    <input type="text" name="HGroupName" class="layui-input" id="HGroupName" placeholder="閫夋嫨鐢熶骇鐝粍" style="background-color:#efefef4d;">
+                                                    <input type="text" name="HGroupName" class="layui-input" id="HGroupName" placeholder="閫夋嫨鐢熶骇鐝粍" style="background-color:#efefef4d;border-radius: 50px;">
                                                     <input type="hidden" name="HGroupID" id="HGroupID" value="0" autocomplete="off" class="layui-input">
                                                     <button type="button" lay-submit="" class="layui-btn layui-col-xs2 bz_btu" lay-filter="ProductionTeam-BT" id="ProductionTeam-BT" style="font-weight:bolder">...</button>
                                                 </td>
@@ -178,10 +180,10 @@
                                             <tr>
                                                 <th>鎿嶄綔鍛�</th>
                                                 <td class="bz_td">
-                                                    <input type="text" name="HEmpNumber" id="HEmpNumber" value="" placeholder="鎿嶄綔鍛樹唬鐮�" autocomplete="off" class="layui-input" readonly>
+                                                    <input type="text" name="HEmpNumber" id="HEmpNumber" value="" placeholder="鎿嶄綔鍛樹唬鐮�" autocomplete="off" class="layui-input" style="border-radius: 50px;" readonly>
                                                 </td>
                                                 <td class="bz_td">
-                                                    <input type="text" name="HEmpName" class="layui-input" id="HEmpName" placeholder="閫夋嫨鎿嶄綔鍛�" style="background-color:#efefef4d;">
+                                                    <input type="text" name="HEmpName" class="layui-input" id="HEmpName" placeholder="閫夋嫨鎿嶄綔鍛�" style="background-color:#efefef4d;border-radius: 50px;">
                                                     <input type="hidden" name="HEmpID" id="HEmpID" value="0" autocomplete="off" class="layui-input">
                                                     <button type="button" lay-submit="" class="layui-btn layui-col-xs2 bz_btu" lay-filter="HEmployeeID-BT" id="HEmployeeID-BT" style="font-weight:bolder">...</button>
                                                 </td>
@@ -189,7 +191,7 @@
                                             <tr>
                                                 <th>妫�楠屽憳</th>
                                                 <td class="bz_td">
-                                                    <input type="text" name="HQCCheckName" class="layui-input" id="HQCCheckName" placeholder="閫夋嫨妫�楠屽憳" style="background-color:#efefef4d;">
+                                                    <input type="text" name="HQCCheckName" class="layui-input" id="HQCCheckName" placeholder="閫夋嫨妫�楠屽憳" style="background-color:#efefef4d;border-radius: 50px;">
                                                     <input type="hidden" name="HQCCheckID" id="HQCCheckID" value="0" autocomplete="off" class="layui-input">
                                                     <button type="button" lay-submit="" class="layui-btn layui-col-xs2 bz_btu" lay-filter="HSecManagerID-BT" id="HSecManagerID-BT" style="font-weight:bolder">...</button>
                                                 </td>
@@ -197,13 +199,13 @@
                                             <tr>
                                                 <th>鍗曟嵁鏃ユ湡</th>
                                                 <td class="t1_input">
-                                                    <input type="text" name="HDate" class="layui-input" id="HDate" placeholder="璇烽�夋嫨鏃ユ湡">
+                                                    <input type="text" name="HDate" class="layui-input" id="HDate" style="border-radius: 50px;" placeholder="璇烽�夋嫨鏃ユ湡">
                                                 </td>
                                             </tr>
                                             <tr>
                                                 <th>鍗曟嵁鍙�</th>
                                                 <td class="bz_td">
-                                                    <input type="text" name="HBillNo" class="layui-input" id="HBillNo" placeholder="鍗曟嵁鍙�" style="border-radius: 50px;" readonly>
+                                                    <input type="text" name="HBillNo" class="layui-input" id="HBillNo" placeholder="鍗曟嵁鍙�" style="border-radius: 50px;background-color:#efefef4d;" readonly>
                                                     <input type="hidden" name="HInterID" id="HInterID" value="0" autocomplete="off" class="layui-input">
                                                 </td>
                                             </tr>
@@ -216,79 +218,79 @@
                                             <tr>
                                                 <th>鐢熶骇缁勭粐</th>
                                                 <td class="bz_td">
-                                                    <input type="text" name="HPRDOrg" class="layui-input" id="HPRDOrg" placeholder="鐢熶骇缁勭粐" style="border-radius: 50px;" readonly>
+                                                    <input type="text" name="HPRDOrg" class="layui-input" id="HPRDOrg" placeholder="鐢熶骇缁勭粐" style="border-radius: 50px;background-color:#efefef4d;" readonly>
                                                     <input type="hidden" name="HPRDOrgID" id="HPRDOrgID" value="0" autocomplete="off" class="layui-input">
                                                 </td>
                                             </tr>
                                             <tr>
                                                 <th>鐢熶骇璁㈠崟鍙�</th>
                                                 <td class="bz_td">
-                                                    <input type="text" name="HICMOBillNo" class="layui-input" id="HICMOBillNo" placeholder="鐢熶骇璁㈠崟鍙�" style="border-radius: 50px;" readonly>
+                                                    <input type="text" name="HICMOBillNo" class="layui-input" id="HICMOBillNo" placeholder="鐢熶骇璁㈠崟鍙�" style="border-radius: 50px;background-color:#efefef4d;" readonly>
                                                     <input type="hidden" name="HICMOInterID" id="HICMOInterID" value="0" autocomplete="off" class="layui-input">
                                                 </td>
                                             </tr>
                                             <tr>
                                                 <th>浜у搧浠g爜</th>
                                                 <td class="bz_td">
-                                                    <input type="text" name="HMaterNumber" class="layui-input" id="HMaterNumber" placeholder="浜у搧浠g爜" style="border-radius: 50px;" readonly>
+                                                    <input type="text" name="HMaterNumber" class="layui-input" id="HMaterNumber" placeholder="浜у搧浠g爜" style="border-radius: 50px;background-color:#efefef4d;" readonly>
                                                 </td>
                                             </tr>
                                             <tr>
                                                 <th>浜у搧鍚嶇О</th>
                                                 <td class="bz_td">
-                                                    <input type="text" name="HMaterName" class="layui-input" id="HMaterName" placeholder="浜у搧鍚嶇О" style="border-radius: 50px;" readonly>
+                                                    <input type="text" name="HMaterName" class="layui-input" id="HMaterName" placeholder="浜у搧鍚嶇О" style="border-radius: 50px;background-color:#efefef4d;" readonly>
                                                     <input type="hidden" name="HMaterID" id="HMaterID" value="0" autocomplete="off" class="layui-input">
                                                 </td>
                                             </tr>
                                             <tr>
                                                 <th>瑙勬牸鍨嬪彿</th>
                                                 <td class="bz_td">
-                                                    <input type="text" name="HMaterModel" class="layui-input" id="HMaterModel" placeholder="瑙勬牸鍨嬪彿" style="border-radius: 50px;" readonly>
+                                                    <input type="text" name="HMaterModel" class="layui-input" id="HMaterModel" placeholder="瑙勬牸鍨嬪彿" style="border-radius: 50px;background-color:#efefef4d;" readonly>
                                                 </td>
                                             </tr>
                                             <tr>
                                                 <th>娴佽浆鍗″彿</th>
                                                 <td class="bz_td">
-                                                    <input type="text" name="HProcExchBillNo" class="layui-input" id="HProcExchBillNo" placeholder="娴佽浆鍗″彿" style="border-radius: 50px;" readonly>
-                                                    <input type="hidden" name="HProcExchHinteID" id="HProcExchHinteID" value="0" autocomplete="off" class="layui-input">
+                                                    <input type="text" name="HProcExchBillNo" class="layui-input" id="HProcExchBillNo" placeholder="娴佽浆鍗″彿" style="border-radius: 50px;background-color:#efefef4d;" readonly>
+                                                    <input type="hidden" name="HProcExchHinteID" id="HProcExchHinteID" autocomplete="off" class="layui-input">
                                                 </td>
                                             </tr>
                                             <tr>
                                                 <th>娴佽浆鍗℃暟閲�</th>
                                                 <td class="bz_td" readonly>
-                                                    <input type="text" name="HPlanQty" class="layui-input" id="HPlanQty" value="0" placeholder="娴佽浆鍗℃暟閲�" style="border-radius: 50px;" readonly>
+                                                    <input type="text" name="HPlanQty" class="layui-input" id="HPlanQty" value="0" placeholder="娴佽浆鍗℃暟閲�" style="border-radius: 50px;background-color:#efefef4d;" readonly>
                                                 </td>
                                             </tr>
                                             <tr>
                                                 <th>鏈嚭绔欐暟閲�</th>
                                                 <td class="bz_td">
-                                                    <input type="text" name="NoOutboundHqty" class="layui-input" id="NoOutboundHqty" value="0" placeholder="鏈嚭绔欐暟閲�" style="border-radius: 50px;" readonly>
+                                                    <input type="text" name="NoOutboundHqty" class="layui-input" id="NoOutboundHqty" value="0" placeholder="鏈嚭绔欐暟閲�" style="border-radius: 50px;background-color:#efefef4d;" readonly>
                                                 </td>
                                             </tr>
                                             <tr>
                                                 <th>璁㈠崟鏁伴噺</th>
                                                 <td class="bz_td">
-                                                    <input type="text" name="HICMOQty" class="layui-input" id="HICMOQty" value="0" placeholder="璁㈠崟鏁伴噺" style="border-radius: 50px;" readonly>
+                                                    <input type="text" name="HICMOQty" class="layui-input" id="HICMOQty" value="0" placeholder="璁㈠崟鏁伴噺" style="border-radius: 50px;background-color:#efefef4d;" readonly>
                                                 </td>
                                             </tr>
                                             <tr>
                                                 <th>褰撳墠宸ュ簭</th>
                                                 <td class="bz_td">
-                                                    <input type="text" name="HProcName" class="layui-input" id="HProcName" placeholder="褰撳墠宸ュ簭" style="border-radius: 50px;" readonly>
+                                                    <input type="text" name="HProcName" class="layui-input" id="HProcName" placeholder="褰撳墠宸ュ簭" style="border-radius: 50px;background-color:#efefef4d;" readonly>
                                                     <input type="hidden" name="HProcID" id="HProcID" value="0" autocomplete="off" class="layui-input">
                                                 </td>
                                             </tr>
                                             <tr>
                                                 <th>鐢熶骇缁勭粐</th>
                                                 <td class="bz_td">
-                                                    <input type="text" name="HPRDOrg" class="layui-input" id="HPRDOrg" placeholder="鐢熶骇缁勭粐" style="border-radius: 50px;" readonly>
+                                                    <input type="text" name="HPRDOrg" class="layui-input" id="HPRDOrg" placeholder="鐢熶骇缁勭粐" style="border-radius: 50px;background-color:#efefef4d;" readonly>
                                                     <input type="hidden" name="HPRDOrgID" id="HPRDOrgID" value="0" autocomplete="off" class="layui-input">
                                                 </td>
                                             </tr>
                                             <tr>
                                                 <th>璁㈠崟璺熻釜鍙�</th>
                                                 <td class="bz_td">
-                                                    <input type="text" name="HOrderProcNO" class="layui-input" id="HOrderProcNO" placeholder="璁㈠崟璺熻釜鍙�" style="border-radius: 50px;" readonly>
+                                                    <input type="text" name="HOrderProcNO" class="layui-input" id="HOrderProcNO" placeholder="璁㈠崟璺熻釜鍙�" style="border-radius: 50px;background-color:#efefef4d;" readonly>
                                                 </td>
                                             </tr>
                                             <tr>
@@ -307,61 +309,61 @@
                                             <tr>
                                                 <th>鍒跺崟浜�</th>
                                                 <td class="bz_td">
-                                                    <input type="text" name="HMaker" class="layui-input" id="HMaker" style="border-radius: 50px;">
-                                                </td>
-                                            </tr>
-                                            <tr>
-                                                <th>淇敼浜�</th>
-                                                <td class="bz_td">
-                                                    <input type="text" name="HUpDater" class="layui-input" id="HUpDater" style="border-radius: 50px;">
-                                                </td>
-                                            </tr>
-                                            <tr>
-                                                <th>瀹℃牳浜�</th>
-                                                <td class="bz_td">
-                                                    <input type="text" name="HChecker" class="layui-input" id="HChecker" style="border-radius: 50px;">
+                                                    <input type="text" name="HMaker" class="layui-input" id="HMaker" style="border-radius: 50px;background-color:#efefef4d;" readonly>
                                                 </td>
                                             </tr>
                                             <tr>
                                                 <th>鍒跺崟鏃ユ湡</th>
                                                 <td class="bz_td">
-                                                    <input type="text" name="HMakeDate" class="layui-input" id="HMakeDate" style="border-radius: 50px;">
+                                                    <input type="text" name="HMakeDate" class="layui-input" id="HMakeDate" style="border-radius: 50px;background-color:#efefef4d;" readonly>
+                                                </td>
+                                            </tr>
+                                            <tr>
+                                                <th>淇敼浜�</th>
+                                                <td class="bz_td">
+                                                    <input type="text" name="HUpDater" class="layui-input" id="HUpDater" style="border-radius: 50px;background-color:#efefef4d;" readonly>
                                                 </td>
                                             </tr>
                                             <tr>
                                                 <th>淇敼鏃ユ湡</th>
                                                 <td class="bz_td">
-                                                    <input type="text" name="HUpDateDate" class="layui-input" id="HUpDateDate" style="border-radius: 50px;">
+                                                    <input type="text" name="HUpDateDate" class="layui-input" id="HUpDateDate" style="border-radius: 50px;background-color:#efefef4d;" readonly>
+                                                </td>
+                                            </tr>
+                                            <tr>
+                                                <th>瀹℃牳浜�</th>
+                                                <td class="bz_td">
+                                                    <input type="text" name="HChecker" class="layui-input" id="HChecker" style="border-radius: 50px;background-color:#efefef4d;" readonly>
                                                 </td>
                                             </tr>
                                             <tr>
                                                 <th>瀹℃牳鏃ユ湡</th>
                                                 <td class="bz_td">
-                                                    <input type="text" name="HCheckDate" class="layui-input" id="HCheckDate" style="border-radius: 50px;">
+                                                    <input type="text" name="HCheckDate" class="layui-input" id="HCheckDate" style="border-radius: 50px;background-color:#efefef4d;" readonly>
                                                 </td>
                                             </tr>
                                             <tr>
                                                 <th>鍏抽棴浜�</th>
                                                 <td class="bz_td">
-                                                    <input type="text" name="HCloseMan" class="layui-input" id="HCloseMan" style="border-radius: 50px;">
-                                                </td>
-                                            </tr>
-                                            <tr>
-                                                <th>浣滃簾浜�</th>
-                                                <td class="bz_td">
-                                                    <input type="text" name="HDeleteMan" class="layui-input" id="HDeleteMan" style="border-radius: 50px;">
+                                                    <input type="text" name="HCloseMan" class="layui-input" id="HCloseMan" style="border-radius: 50px;background-color:#efefef4d;" readonly>
                                                 </td>
                                             </tr>
                                             <tr>
                                                 <th>鍏抽棴鏃ユ湡</th>
                                                 <td class="bz_td">
-                                                    <input type="text" name="HCloseDate" class="layui-input" id="HCloseDate" style="border-radius: 50px;">
+                                                    <input type="text" name="HCloseDate" class="layui-input" id="HCloseDate" style="border-radius: 50px;background-color:#efefef4d;" readonly>
+                                                </td>
+                                            </tr>
+                                            <tr>
+                                                <th>浣滃簾浜�</th>
+                                                <td class="bz_td">
+                                                    <input type="text" name="HDeleteMan" class="layui-input" id="HDeleteMan" style="border-radius: 50px;background-color:#efefef4d;" readonly>
                                                 </td>
                                             </tr>
                                             <tr>
                                                 <th>浣滃簾鏃ユ湡</th>
                                                 <td class="bz_td">
-                                                    <input type="text" name="HDeleteDate" class="layui-input" id="HDeleteDate" style="border-radius: 50px;">
+                                                    <input type="text" name="HDeleteDate" class="layui-input" id="HDeleteDate" style="border-radius: 50px;background-color:#efefef4d;" readonly>
                                                 </td>
                                             </tr>
                                         </tbody>
@@ -373,455 +375,7 @@
                                 <li>鍒跺崟淇℃伅</li>
                             </ul>
                         </div>
-                    </div>
-
-
-                    <!--<div class="layui-tab layui-tab-card" lay-filter="TabTest">
-                        <ul class="layui-tab-title">
-                            <li class="layui-this">鍗曟嵁淇℃伅</li>
-                            <li>鍏朵粬淇℃伅</li>
-                            <li>鍒跺崟淇℃伅</li>
-                            <li>鏄庣粏淇℃伅</li>
-                        </ul>
-                        <div class="layui-tab-content">-->
-                            <!--鍗曟嵁淇℃伅-->
-                            <!--<div class="layui-tab-item layui-show">
-                                <div class="layui-form-item" style="padding-top: 10px;">
-                                    <div class="layui-row">
-                                        <label class="layui-form-label" style="width: 85px;"><span style="color:red;">*</span>鏉″舰鐮�</label>
-                                        <div class="layui-input-block" style="margin-left: 100px;width:46%;">
-                                            <input type="text" name="HBarCode" id="HBarCode" lay-verify="required" placeholder="璇烽敭鍏ュ悗鍥炶溅" autocomplete="off" class="layui-input">
-                                            <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="QueDin" style="width: 70px; background-color: #1492ff;color:white">纭畾</button>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="layui-form-item" style="padding-top: 10px;">
-                                    <div class="layui-row">
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;padding: 9px 5px;"><span style="color:red;">*</span>娴佹按鍙�</label>
-                                            <div class="layui-input-block">
-                                                <input type="text" class="layui-input" name="HProcNo" placeholder="璇烽敭鍏ュ悗鍥炶溅" id="HProcNo" style="width: 80%; background-color: #efefef4d; display: inline-block;">
-                                                <button class="layui-btn layui-btn-primary" type="button" lay-submit="" lay-filter="SerialNum-BT" id="SerialNum-BT" style="width: 40px">
-                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
-                                                </button>
-                                                <input type="hidden" value="0" name="HProcID" id="HProcID">
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="color:red;"><span style="color:red;">*</span>鍚堟牸鏁伴噺</label>
-                                            <div class="layui-input-block" style="margin-left: 95px;">
-                                                <input type="text" class="layui-input" value="0" name="HQty" id="HQty">
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="color:red;"><span style="color:red;">*</span>鎶ュ簾鏁伴噺</label>
-                                            <div class="layui-input-block" style="margin-left: 95px;">
-                                                <input type="text" class="layui-input" name="HWasterQty" id="HWasterQty" value="0">
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <div class="layui-row">
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;padding: 9px 5px;">鐢熶骇璧勬簮</label>
-                                            <div class="layui-input-block">
-                                                <input type="text" class="layui-input" name="HSourceName" id="HSourceName" style="width: 80%; background-color: #efefef4d; display: inline-block;" placeholder="璇烽敭鍏ュ悗鍥炶溅">
-                                                <button class="layui-btn layui-btn-primary" type="button" lay-submit="" lay-filter="ProductionResources-BT" id="ProductionResources-BT" style="width: 40px">
-                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
-                                                </button>
-                                                <input type="hidden" value="0" name="HSourceID" id="HSourceID">
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;padding: 9px 5px;">宸ヤ綔涓績</label>
-                                            <div class="layui-input-block">
-                                                <input type="text" class="layui-input" name="HCenterName" id="HCenterName" style="width: 80%; background-color: #efefef4d; display: inline-block;" placeholder="璇烽敭鍏ュ悗鍥炶溅">
-                                                <button class="layui-btn layui-btn-primary" type="button" lay-submit="" lay-filter="HWorkingProcedure-BT" id="HWorkingProcedure-BT" style="width: 40px">
-                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
-                                                </button>
-                                                <input type="hidden" name="HCenterID" id="HCenterID" value="0">
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;padding: 9px 5px;">鐢熶骇鐝粍</label>
-                                            <div class="layui-input-block">
-                                                <input type="text" class="layui-input" name="HGroupName" id="HGroupName" style="width: 80%; background-color: #efefef4d; display: inline-block;" placeholder="璇烽敭鍏ュ悗鍥炶溅">
-                                                <button class="layui-btn layui-btn-primary" type="button" lay-submit="" lay-filter="ProductionTeam-BT" id="ProductionTeam-BT" style="width: 40px">
-                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
-                                                </button>
-                                                <input type="hidden" value="0" name="HGroupID" id="HGroupID">
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <div class="layui-row">
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;padding: 9px 5px;"><span style="color:red;">*</span>鎿嶄綔鍛�</label>
-                                            <div class="layui-input-block">
-                                                <input type="text" class="layui-input" name="HEmpNumber" id="HEmpNumber" style="width: 80%; background-color: #efefef4d; display: inline-block;" readonly>
-                                                <input type="text" class="layui-input" name="HEmpName" id="HEmpName" style="width: 80%;margin-left:10px; background-color: #efefef4d; display: inline-block;" placeholder="璇烽敭鍏ュ悗鍥炶溅">
-                                                <button class="layui-btn layui-btn-primary" type="button" lay-submit="" lay-filter="HEmployeeID-BT" id="HEmployeeID-BT" style="width: 40px">
-                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
-                                                </button>
-                                                <input type="hidden" value="0" name="HEmpID" id="HEmpID">
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;padding: 9px 5px;">妫�楠屽憳</label>
-                                            <div class="layui-input-block">
-                                                <input type="text" class="layui-input" name="HQCCheckName" id="HQCCheckName" style="width: 80%; background-color: #efefef4d; display: inline-block;" placeholder="璇烽敭鍏ュ悗鍥炶溅">
-                                                <button class="layui-btn layui-btn-primary" type="button" lay-submit="" lay-filter="HSecManagerID-BT" id="HSecManagerID-BT" style="width: 40px">
-                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
-                                                </button>
-                                                <input type="hidden" value="0" name="HQCCheckID" id="HQCCheckID">
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;"><span style="color:red;">*</span>鍗曟嵁鍙�</label>
-                                            <div class="layui-input-block" style="margin-left: 95px;">
-                                                <input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly>
-                                                <input type="hidden" name="HInterID" id="HInterID">
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <div class="layui-row">
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;"><span style="color:red;">*</span>鍗曟嵁鏃ユ湡</label>
-                                            <div class="layui-input-block" style="margin-left: 95px;">
-                                                <input type="text" class="layui-input" name="HDate" id="HDate" style="background-color:#efefef4d;" readonly>
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;">鐢熶骇缁勭粐</label>
-                                            <div class="layui-input-block" style="margin-left: 95px;">
-                                                <input type="text" class="layui-input" name="HPRDOrg" id="HPRDOrg" style="background-color:#efefef4d;" readonly>
-                                                <input type="hidden" name="HPRDOrgID" id="HPRDOrgID">
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;"><span style="color:red;">*</span>鐢熶骇璁㈠崟鍙�</label>
-                                            <div class="layui-input-block" style="margin-left: 95px;">
-                                                <input type="text" class="layui-input" name="HICMOBillNo" id="HICMOBillNo" style="background-color:#efefef4d;" readonly>
-                                                <input type="hidden" name="HICMOInterID" id="HICMOInterID" value="0">
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <div class="layui-row">
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;"><span style="color:red;">*</span>浜у搧浠g爜</label>
-                                            <div class="layui-input-block" style="margin-left: 95px;">
-                                                <input type="text" class="layui-input" name="HMaterNumber" id="HMaterNumber" style="background-color: #efefef4d; display: inline-block;" readonly>-->
-                                                <!--<button class="layui-btn layui-btn-primary" type="button" lay-submit="" lay-filter="HMateriaID-BT" id="HMateriaID-BT" style="width: 40px">
-                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
-                                </button>-->
-                                            <!--</div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;">浜у搧鍚嶇О</label>
-                                            <div class="layui-input-block" style="margin-left: 95px;">
-                                                <input type="text" class="layui-input" name="HMaterName" id="HMaterName" style="background-color:#efefef4d;" readonly>
-                                                <input type="hidden" name="HMaterID" id="HMaterID" value="0">
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;">瑙勬牸鍨嬪彿</label>
-                                            <div class="layui-input-block" style="margin-left: 95px;">
-                                                <input type="text" class="layui-input" name="HMaterModel" id="HMaterModel" style="background-color:#efefef4d;" readonly>
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <div class="layui-row">
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;"><span style="color:red;">*</span>娴佽浆鍗″彿</label>
-                                            <div class="layui-input-block" style="margin-left: 95px;">
-                                                <input type="text" class="layui-input" name="HProcExchBillNo" id="HProcExchBillNo" style="background-color:#efefef4d;" readonly>
-                                                <input type="hidden" class="layui-input" name="HProcExchHinteID" id="HProcExchHinteID">
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;">娴佽浆鍗℃暟閲�</label>
-                                            <div class="layui-input-block" style="margin-left: 95px;">
-                                                <input type="text" class="layui-input" value="0" name="HPlanQty" style="background-color:#efefef4d;" id="HPlanQty">
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;">鏈嚭绔欐暟閲�</label>
-                                            <div class="layui-input-block" style="margin-left: 95px;">
-                                                <input type="text" class="layui-input" value="0" name="NoOutboundHqty" style="background-color:#efefef4d;" id="NoOutboundHqty">
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <div class="layui-row">
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;">璁㈠崟鏁伴噺</label>
-                                            <div class="layui-input-block" style="margin-left: 95px;">
-                                                <input type="text" class="layui-input" value="0" name="HICMOQty" id="HICMOQty" style="background-color:#efefef4d;" readonly>
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;"></label>
-                                            <div class="layui-input-block" style="margin-left: 95px;">
-                                                <input type="checkbox" name="checkboxHLastSubProc" id="checkboxHLastSubProc" title="杞笅閬�" lay-skin="primary" lay-filter="checkboxHLastSubProc" checked disabled>
-                                                <input type="hidden" value="true" name="HLastSubProc" id="HLastSubProc">
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>-->
-                            <!--鍏朵粬淇℃伅-->
-                            <!--<div class="layui-tab-item">
-                                <div class="layui-form-item" style="padding-top: 10px;">
-                                    <div class="layui-row">
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;padding: 9px 5px;">鑱屽憳2</label>
-                                            <div class="layui-input-block">
-                                                <input type="text" class="layui-input" name="HEmpNumber2" id="HEmpNumber2" style="width: 80%; background-color: #efefef4d; display: inline-block;" readonly>
-                                                <input type="text" class="layui-input" name="HEmpName2" id="HEmpName2" style="width: 80%; margin-left:10px; background-color: #efefef4d; display: inline-block;" readonly>
-                                                <button class="layui-btn layui-btn-primary" type="button" lay-submit="" lay-filter="HEmployeeID-BT2" id="HEmployeeID-BT2" style="width: 40px">
-                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
-                                                </button>
-                                                <input type="hidden" value="0" name="HEmpID2" id="HEmpID2">
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;padding: 9px 5px;">鑱屽憳3</label>
-                                            <div class="layui-input-block">
-                                                <input type="text" class="layui-input" name="HEmpNumber3" id="HEmpNumber3" style="width: 80%; background-color: #efefef4d; display: inline-block;" readonly>
-                                                <input type="text" class="layui-input" name="HEmpName3" id="HEmpName3" style="width: 80%; margin-left:10px; background-color: #efefef4d; display: inline-block;" readonly>
-                                                <button class="layui-btn layui-btn-primary" type="button" lay-submit="" lay-filter="HEmployeeID-BT3" id="HEmployeeID-BT3" style="width: 40px">
-                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
-                                                </button>
-                                                <input type="hidden" value="0" name="HEmpID3" id="HEmpID3">
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;">璁㈠崟璺熻釜鍙�</label>
-                                            <div class="layui-input-block" style="margin-left: 95px;">
-                                                <input type="text" class="layui-input" name="HOrderProcNO" id="HOrderProcNO" style="background-color:#efefef4d;" readonly>
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <div class="layui-row">
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;padding: 9px 5px;">鑱屽憳4</label>
-                                            <div class="layui-input-block">
-                                                <input type="text" class="layui-input" name="HEmpNumber4" id="HEmpNumber4" style="width: 80%; background-color: #efefef4d; display: inline-block;" readonly>
-                                                <input type="text" class="layui-input" name="HEmpName4" id="HEmpName4" style="width: 80%; margin-left:10px; background-color: #efefef4d; display: inline-block;" readonly>
-                                                <button class="layui-btn layui-btn-primary" type="button" lay-submit="" lay-filter="HEmployeeID-BT4" id="HEmployeeID-BT4" style="width: 40px">
-                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
-                                                </button>
-                                                <input type="hidden" value="0" name="HEmpID4" id="HEmpID4">
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;padding: 9px 5px;">鑱屽憳5</label>
-                                            <div class="layui-input-block">
-                                                <input type="text" class="layui-input" name="HEmpNumber5" id="HEmpNumber5" style="width: 80%; background-color: #efefef4d; display: inline-block;" readonly>
-                                                <input type="text" class="layui-input" name="HEmpName5" id="HEmpName5" style="width: 80%; margin-left:10px; background-color: #efefef4d; display: inline-block;" readonly>
-                                                <button class="layui-btn layui-btn-primary" type="button" lay-submit="" lay-filter="HEmployeeID-BT5" id="HEmployeeID-BT5" style="width: 40px">
-                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
-                                                </button>
-                                                <input type="hidden" value="0" name="HEmpID5" id="HEmpID5">
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;">鍑虹珯鏃堕棿</label>
-                                            <div class="layui-input-block" style="margin-left: 95px;">
-                                                <input type="text" class="layui-input" name="HStationOutTime" id="HStationOutTime" style="background-color:#efefef4d;" readonly>
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <div class="layui-row">
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;">妯$┐鍙�</label>
-                                            <div class="layui-input-block" style="margin-left: 95px;">
-                                                <input type="text" class="layui-input" name="HMouldNum" id="HMouldNum" style="background-color:#efefef4d;" readonly>
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;padding: 9px 5px;">鐢熶骇璧勬簮2</label>
-                                            <div class="layui-input-block">
-                                                <input type="text" class="layui-input" name="HSourceName2" id="HSourceName2" style="width: 80%; background-color: #efefef4d; display: inline-block;" readonly>
-                                                <button class="layui-btn layui-btn-primary" type="button" lay-submit="" lay-filter="" id="" style="width: 40px; background-color: gainsboro;">
-                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;color:black;"></i>
-                                                </button>
-                                                <input type="hidden" value="0" name="HSourceID2" id="HSourceID2">
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;padding: 9px 5px;">鐢熶骇璧勬簮3</label>
-                                            <div class="layui-input-block">
-                                                <input type="text" class="layui-input" name="HSourceName3" id="HSourceName3" style="width: 80%; background-color: #efefef4d; display: inline-block;" readonly>
-                                                <button class="layui-btn layui-btn-primary" type="button" lay-submit="" lay-filter="" id="" style="width: 40px; background-color: gainsboro;">
-                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;color:black;"></i>
-                                                </button>
-                                                <input type="hidden" value="0" name="HSourceID3" id="HSourceID3">
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <div class="layui-row">
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;padding: 9px 5px;">鐢熶骇璧勬簮4</label>
-                                            <div class="layui-input-block">
-                                                <input type="text" class="layui-input" name="HSourceName4" id="HSourceName4" style="width: 80%; background-color: #efefef4d; display: inline-block;" readonly>
-                                                <button class="layui-btn layui-btn-primary" type="button" lay-submit="" lay-filter="" id="" style="width: 40px; background-color: gainsboro;">
-                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;color:black;"></i>
-                                                </button>
-                                                <input type="hidden" value="0" name="HSourceID4" id="HSourceID4">
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;padding: 9px 5px;">鐢熶骇璧勬簮5</label>
-                                            <div class="layui-input-block">
-                                                <input type="text" class="layui-input" name="HSourceName5" id="HSourceName5" style="width: 80%; background-color: #efefef4d; display: inline-block;" readonly>
-                                                <button class="layui-btn layui-btn-primary" type="button" lay-submit="" lay-filter="" id="" style="width: 40px; background-color: gainsboro;">
-                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;color:black;"></i>
-                                                </button>
-                                                <input type="hidden" value="0" name="HSourceID5" id="HSourceID5">
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;padding: 9px 5px;">褰撳墠宸ュ簭</label>
-                                            <div class="layui-input-block">
-                                                <input type="text" class="layui-input" name="HProcName" id="HProcName" style="width: 80%; background-color: #efefef4d; display: inline-block;" readonly>
-                                                <input type="hidden" name="HProcID" id="HProcID" value="0">
-                                                <button class="layui-btn layui-btn-primary" type="button" lay-submit="" lay-filter="HSQProcID-BT" id="HSQProcID-BT" style="width: 40px">
-                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
-                                                </button>
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <div class="layui-row">
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;">鏍哥畻宸ュ簭</label>
-                                            <div class="layui-input-block" style="margin-left: 95px;">
-                                                <input type="text" class="layui-input" name="HPayProcID" id="HPayProcID" style="background-color:#efefef4d;" readonly>
-                                                <input type="hidden" value="0" name="HPayProcID" id="HPayProcID">
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;">宸ユ椂</label>
-                                            <div class="layui-input-block" style="margin-left: 95px;">
-                                                <input type="text" class="layui-input" name="HWorkTimes" id="HWorkTimes" value="0">
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;">璁惧娓呭崟</label>
-                                            <div class="layui-input-block" style="margin-left: 95px;">
-                                                <input type="text" class="layui-input" name="HSourceNameList" id="HSourceNameList" style="background-color:#efefef4d;" readonly>
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <div class="layui-row">
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;">涓嶈壇鏁伴噺</label>
-                                            <div class="layui-input-block" style="margin-left: 95px;">
-                                                <input type="text" class="layui-input" value="0" name="" id="">
-                                            </div>
-                                        </div>
-                                        <div class="layui-col-xs8 layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;">澶囨敞</label>
-                                            <div class="layui-input-block" style="margin-left: 95px;">
-                                                <input class="layui-input" name="HRemark" id="HRemark" autocomplete="off" style=" width: 75%;">
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>-->
-                            <!--鍒跺崟淇℃伅-->
-                            <!--<div class="layui-tab-item">
-                                <div class="layui-form-item" style="padding-top: 10px;">
-                                    <div class="layui-row">
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;">鍒跺崟浜�</label>
-                                            <div class="layui-input-block" style="margin-left: 95px;">
-                                                <input type="text" class="layui-input" name="HMaker" id="HMaker" style="background-color:#efefef4d;" readonly>
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;">淇敼浜�</label>
-                                            <div class="layui-input-block" style="margin-left: 95px;">
-                                                <input type="text" class="layui-input" name="HUpDater" id="HUpDater" style="background-color:#efefef4d;" readonly>
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;">瀹℃牳浜�</label>
-                                            <div class="layui-input-block" style="margin-left: 95px;">
-                                                <input type="text" class="layui-input" name="HChecker" id="HChecker" style="background-color:#efefef4d;" readonly>
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <div class="layui-row">
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;">鍒跺崟鏃ユ湡</label>
-                                            <div class="layui-input-block" style="margin-left: 95px;">
-                                                <input type="text" class="layui-input" name="HMakeDate" id="HMakeDate" style="background-color:#efefef4d;" readonly>
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;">淇敼鏃ユ湡</label>
-                                            <div class="layui-input-block" style="margin-left: 95px;">
-                                                <input type="text" class="layui-input" name="HUpDateDate" id="HUpDateDate" style="background-color:#efefef4d;" readonly>
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;">瀹℃牳鏃ユ湡</label>
-                                            <div class="layui-input-block" style="margin-left: 95px;">
-                                                <input type="text" class="layui-input" name="HCheckDate" id="HCheckDate" style="background-color:#efefef4d;" readonly>
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <div class="layui-row">
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;">鍏抽棴浜�</label>
-                                            <div class="layui-input-block" style="margin-left: 95px;">
-                                                <input type="text" class="layui-input" name="HCloseMan" id="HCloseMan" style="background-color:#efefef4d;" readonly>
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;">浣滃簾浜�</label>
-                                            <div class="layui-input-block" style="margin-left: 95px;">
-                                                <input type="text" class="layui-input" name="HDeleteMan" id="HDeleteMan" style="background-color:#efefef4d;" readonly>
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <div class="layui-row">
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;">鍏抽棴鏃ユ湡</label>
-                                            <div class="layui-input-block" style="margin-left: 95px;">
-                                                <input type="text" class="layui-input" name="HCloseDate" id="HCloseDate" style="background-color:#efefef4d;" readonly>
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;">浣滃簾鏃ユ湡</label>
-                                            <div class="layui-input-block" style="margin-left: 95px;">
-                                                <input type="text" class="layui-input" name="HDeleteDate" id="HDeleteDate" style="background-color:#efefef4d;" readonly>
-                                            </div>
-                                        </div>
-                                    </div>-->
-
-                                    <!--<table class="" id="mainTable" lay-filter="mainTable"></table>-->
-                                    <!--<script type="text/html" id="toolbarDemo">
-                        <div class="layui-btn-container">
-                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>澧炶</button>
-                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
-                        </div>
-                    </script>-->
-                                    <!--<script type="text/html" id="xuhao">
-                                        {{d.LAY_TABLE_INDEX+1}}
-                                    </script>
-                                    <script type="text/html" id="barDemo">
-                                        <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
-                                    </script>
-                                </div>
-                            </div>-->
-                            <!--鏄庣粏淇℃伅-->
-                            <!--<div class="layui-tab-item" lay-filter="formData" id="formData" style="background-color:white;">
-                                <div class="layui-form-item" style="padding-top: 10px;">
-                                    <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                 
+                    </div>                                     
                     <!--闅愯棌瀛楁-->
                     <input type="hidden" name="lngICMOEntryID" id="lngICMOEntryID">
                     <input type="hidden" name="lngBillKey" id="lngBillKey" value="0">
@@ -852,34 +406,34 @@
             var option = [];
             var titleData = [];
             //#region 鍒濆鍖栭〉闈�
-            laydate.render({
-                elem: '#HBeginDate'
-                , type: 'datetime'
-            });
-            laydate.render({
-                elem: '#HEndDate'
-                , type: 'datetime'
-            });
-            laydate.render({
-                elem: '#HDate'
-                , type: 'datetime'
-            });
-            laydate.render({
-                elem: '#HMakeDate'
-                , type: 'datetime'
-            });
-            laydate.render({
-                elem: '#HUpDateDate'
-                , type: 'datetime'
-            });
-            laydate.render({
-                elem: '#HCheckDate'
-                , type: 'datetime'
-            });
-            laydate.render({
-                elem: '#HDeleteDate'
-                , type: 'datetime'
-            });
+            //laydate.render({
+            //    elem: '#HBeginDate'
+            //    , type: 'datetime'
+            //});
+            //laydate.render({
+            //    elem: '#HEndDate'
+            //    , type: 'datetime'
+            //});
+            //laydate.render({
+            //    elem: '#HDate'
+            //    , type: 'datetime'
+            //});
+            //laydate.render({
+            //    elem: '#HMakeDate'
+            //    , type: 'datetime'
+            //});
+            //laydate.render({
+            //    elem: '#HUpDateDate'
+            //    , type: 'datetime'
+            //});
+            //laydate.render({
+            //    elem: '#HCheckDate'
+            //    , type: 'datetime'
+            //});
+            //laydate.render({
+            //    elem: '#HDeleteDate'
+            //    , type: 'datetime'
+            //});
             //#endregion
 
             //杩涘叆椤甸潰榛樿鍏夋爣鍦ㄦ潯褰㈢爜涓�
@@ -1135,16 +689,22 @@
             });
 
             function txtHBarCode_KeyDown(HBarCode) {
+                var barNo = HBarCode.substr(0, 3);
+                if (barNo == 'PRO' && $('#HProcExchHinteID').val() == '') {
+                    layer.msg("璇锋壂瀹屾祦杞崱鍚庡啀鎵伐搴忕爜")
+                    layer.close(index);
+                    return;
+                }
+
                 var index = layer.load();
                 $.ajax({
-                    url: GetWEBURL() + "/Cj_StationEntrustInBill/txtHBarCode_KeyDown",
+                    url: GetWEBURL() + "/Cj_StationBill/txtHBarCode_KeyDown2",
                     type: "GET",
-                    data: { "HBarCode": HBarCode },
+                    data: { "HBarCode": HBarCode, "HInterID": $('#HProcExchHinteID').val(), "UserID": sessionStorage["Czybm"] },
                     success: function (result) {
                         if (result.count == 1) {
                             var data = result.data[0];
 
-                            var barNo = HBarCode.substr(0, 3);
                             switch (barNo) {
                                 case "HCX":
                                     form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
@@ -1155,33 +715,50 @@
                                 case "SBM":
                                     layer.msg("璁惧鍚嶇О : " + data.璁惧鍚嶇О, { icon: 6, btn: ['纭'], time: 6000, offset: 't', skin: 'layui-layer-lan', title: "璁惧鐮�" });
                                     break;
-                                case "JYM":
+                                case "JYM"://妫�楠屽憳
                                     form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
-                                        "HEmpID": data.HItemID,
-                                        "HEmpNumber": data.鍛樺伐浠g爜,
-                                        "HEmpName": data.鍛樺伐鍚嶇О
+                                        "HQCCheckID": data.HItemID,
+                                        "HQCCheckName": data.鑱屽憳鍚嶇О
+                                        //"HGroupID": data.鐝粍ID,
+                                        //"HGroupName": data.鐝粍鍚嶇О
                                     });
                                     break;
-                                case "GRM":
+                                case "GRM"://鎿嶄綔鍛橈紝鎺ユ敹浜�
                                     form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
                                         "HEmpID": data.HItemID,
-                                        "HEmpNumber": data.鍛樺伐浠g爜,
-                                        "HEmpName": data.鍛樺伐鍚嶇О
+                                        "HEmpNumber": data.鑱屽憳浠g爜,
+                                        "HEmpName": data.鑱屽憳鍚嶇О,
+                                        "HGroupID": data.鐝粍ID,
+                                        "HGroupName": data.鐝粍鍚嶇О
                                     });
                                     break;
-                                case "CGM":
-                                    form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
-                                        "HEmpID": data.HItemID,
-                                        "HEmpNumber": data.鍛樺伐浠g爜,
-                                        "HEmpName": data.鍛樺伐鍚嶇О
-                                    });
-                                    break;
+                                //case "CGM":
+                                //    form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+                                //        "HEmpID": data.HItemID,
+                                //        "HEmpNumber": data.鑱屽憳浠g爜,
+                                //        "HEmpName": data.鑱屽憳鍚嶇О
+                                //    });
+                                //    break;
                                 case "HWH":
                                     var HSpflag = data.鍚敤浠撲綅 == "Y" ? "鏄�" : "鍚�";
                                     layer.msg("浠撳簱鍚嶇О : " + data.浠撳簱鍚嶇О + "<br>" + "鍚敤浠撲綅 : " + HSpflag, { icon: 6, btn: ['纭'], time: 6000, offset: 't', skin: 'layui-layer-lan', title: "浠撳簱鐮�" });
                                     break;
                                 case "HSP":
                                     layer.msg("浠撲綅鍚嶇О : " + data.浠撲綅鍚嶇О + "<br>" + "浠撳簱鍚嶇О : " + data.浠撳簱鍚嶇О, { icon: 6, btn: ['纭'], time: 6000, offset: 't', skin: 'layui-layer-lan', title: "浠撲綅鐮�" });
+                                    break;
+                                case "PRO":
+                                    form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+                                        "HProcID": data.HItemID,
+                                        "HProcName": data.宸ュ簭鍚嶇О
+                                    });
+                                    break;
+                                case "WLM":
+                                    form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+                                        "HMaterID": data.HItemID,
+                                        "HMaterName": data.鐗╂枡鍚嶇О,
+                                        "HMaterNumber": data.鐗╂枡浠g爜,
+                                        "HMaterModel": data.瑙勬牸鍨嬪彿
+                                    });
                                     break;
                                 case "GXL":
                                     form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
@@ -1210,7 +787,7 @@
                                     $.ajax({
                                         url: GetWEBURL() + "/Sc_StationInBill/autoGetProcNo",
                                         type: "GET",
-                                        data: { "HUserName": sessionStorage["HUserName"], "HInterID": HInterID },
+                                        data: { "HUserID": sessionStorage["Czybm"], "HInterID": HInterID },
                                         success: function (data1) {
                                             if (data1.count == 1) {
                                                 var data = data1.data[0];
@@ -1344,9 +921,9 @@
                 var index = layer.load();
                 var billType = sBillNo.substr(0, 3);
                 $.ajax({
-                    url: GetWEBURL() + "/Cj_StationEntrustInBill/txtHBarCode_KeyDown",
+                    url: GetWEBURL() + "/Cj_StationBill/txtHBarCode_KeyDown2",
                     type: "GET",
-                    data: { "HBarCode": sBillNo },
+                    data: { "HBarCode": sBillNo, "HInterID": $('#HProcExchHinteID').val(), "UserID": sessionStorage["Czybm"] },
                     success: function (result) {
                         if (result.count == 1) {
                             var data = result.data[0];
@@ -1767,6 +1344,21 @@
             });
             //#endregion
 
+            form.on('submit(Detail)', function (data) {
+                layer.open({
+                    type: 2
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['100%', '100%']
+                    , title: '鍑虹珯鏄庣粏'
+                    , shift: 0//寮瑰嚭鍔ㄧ敾
+                    , content: './MES_StationOutBill_PDA_Detail.html?OperationType=1&linterid='
+                    , end: function () {
+                        //鍒锋柊椤甸潰,
+                        location.reload();
+                    }
+                })
+            })
+
             //姹囨姤
             form.on('submit(btn-InStorage)', function (data) {
                 GetInStorage();
@@ -2114,20 +1706,27 @@
             //#endregion
 
             //#region 閫�鍑烘寜閽�
+            //form.on('submit(Cancel)', function () {
+            //    layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
+            //        if (OperationType == 1) {
+            //            Pub_Close(closeType);
+            //        } else if (OperationType == 3) {
+            //            Pub_Close(1);
+            //        } else if (OperationType == 4) {
+            //            Pub_Close(1);
+            //        } else if (OperationType == 2) {
+            //            Pub_Close(1);
+            //        }
+            //    });
+            //})
+            //#endregion
+
+            //閫�鍑�--鍏ㄥ睆鐗�
             form.on('submit(Cancel)', function () {
                 layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
-                    if (OperationType == 1) {
-                        Pub_Close(closeType);
-                    } else if (OperationType == 3) {
-                        Pub_Close(1);
-                    } else if (OperationType == 4) {
-                        Pub_Close(1);
-                    } else if (OperationType == 2) {
-                        Pub_Close(1);
-                    }
+                    parent.location.href = "../../../views/index_Mobile.html";
                 });
             })
-            //#endregion
 
             //#region 瀹℃牳鎸夐挳
             form.on('submit(set_CheckBill)', function () {
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254/MES_StationOutBill_PDA_Detail.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254/MES_StationOutBill_PDA_Detail.html"
new file mode 100644
index 0000000..b8b9ab4
--- /dev/null
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254/MES_StationOutBill_PDA_Detail.html"
@@ -0,0 +1,309 @@
+锘�<!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>
+    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+    <!--鑷畾涔夋牱寮�-->
+    <style>
+        .layui-form-label {
+            font-size: 14px;
+            width: 85px;
+            text-align: inherit;
+        }
+        /*鍏ㄥ眬璁剧疆杈撳叆妗嗛珮搴�*/
+        .layui-input {
+            height: 30px;
+        }
+        /*璁剧疆琛ㄥご杈撳叆妗�*/
+        .t1_input {
+            padding: 1%;
+        }
+        /*鏈珯淇℃伅td*/
+        .bz_td {
+            display: -webkit-box; /*璁剧疆鎸夐挳涓嶆崲琛�*/
+            padding: 1%; /*璁剧疆杈撳叆妗嗚竟璺�*/
+        }
+        /*璁剧疆鏈珯淇℃伅鎸夐挳楂樺害*/
+        .bz_btu {
+            height: 30px;
+            width: 60px;
+            line-height: 30px;
+        }
+
+        th {
+            width: 70px;
+            text-align: center;
+        }
+    </style>
+</head>
+
+<body>
+    <div class="layui-fluid" style="padding: 0;">
+        <div class="layui-card">
+            <div class="layui-card-body" style="padding: 1px;">
+                <form class="layui-form" action="" lay-filter="formData" id="formData" style="background-color:white;">
+                    <div style="background-color:#0085E8;">
+                        <span style="color: white;"><i class="layui-icon layui-icon-form"></i>宸ュ簭鍑虹珯姹囨姤鍗曟槑缁�</span>
+                    </div>                    
+                    <div class="layui-tab layui-tab-card" lay-filter="TabTest">
+                        <table style="width:80%;">
+                            <tbody>
+                                <tr>
+                                    <th>娴佹按鍙�</th>
+                                    <td class="bz_td">
+                                        <input type="text" name="HProcNo" class="layui-input" id="HProcNo" placeholder="璇烽�夋嫨娴佹按鍙�" style="border-radius:50px;">
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <th>宸ュ簭</th>
+                                    <td class="bz_td">
+                                        <input type="text" name="HQty" class="layui-input" id="HQty" value="0" placeholder="璇疯緭鍏ュ悎閲�" style="border-radius:50px;">
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <th>鏁伴噺</th>
+                                    <td class="bz_td">
+                                        <input type="text" name="HQty" class="layui-input" id="HQty" value="0" placeholder="璇疯緭鍏ュ悎閲�" style="border-radius:50px;">
+                                    </td>
+                                </tr>
+                            </tbody>
+                        </table>
+                                
+                        <table class="" id="mainTable" lay-filter="mainTable"></table>
+                        <!--<script type="text/html" id="toolbarDemo">
+                            <div class="layui-btn-container">
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>澧炶</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+                            </div>
+                        </script>
+                        <script type="text/html" id="xuhao">
+                            {{d.LAY_TABLE_INDEX+1}}
+                        </script>
+                        <script type="text/html" id="barDemo">
+                            <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
+                        </script>-->
+                    </div>
+                     <div class="layui-form-item" style="margin: 1% 2%;text-align: right;">
+                        <button type="button" lay-submit="" lay-filter="Saver" class="layui-btn layui-btn-radius" style="float:left">鎻愪氦</button>
+                        <button type="button" lay-submit="" lay-filter="Cancel" class="layui-btn layui-btn-radius layui-btn-danger" style="float:right">閫�鍑�</button>
+                    </div>
+                    <!--闅愯棌瀛楁-->
+                    <!--<input type="hidden" name="lngBillKey" id="lngBillKey">-->
+                </form>
+            </div>
+        </div>
+    </div>
+
+    <script>
+        layui.config({
+            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index' //涓诲叆鍙fā鍧�
+        }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+            var $ = layui.$
+                , admin = layui.admin
+                , layer = layui.layer
+                , table = layui.table
+                , form = layui.form
+                , laydate = layui.laydate
+                , element = layui.element;
+            /*鍥哄畾浠g爜锛屾瘡寮犲崟鎹兘瑕乥egin*/
+            /* 1.鏃犳簮鍗曟柊澧�
+             * 2.鏈夋簮鍗曟柊澧�
+             * 3.缂栬緫
+             * 4.娴忚
+             * 5.鍙樻洿
+             */
+            //鑾峰彇鍙傛暟
+            function getUrlVars() {
+                var vars = [], hash;
+                var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
+                for (var i = 0; i < hashes.length; i++) {
+                    hash = hashes[i].split('=');
+                    vars.push(hash[0]);
+                    vars[hash[0]] = hash[1];
+                }
+                return vars;
+            }
+            var params = getUrlVars();
+            if (typeof (params[params[0]]) == "undefined") {
+                var OperationType = 1;//鎿嶄綔绫诲瀷
+                var closeType = 2;  //鍏抽棴绫诲瀷
+            } else if (params[params[0]] == 2) { //宸ュ簭鍑虹珯姹囨姤鍗�
+                var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
+                var HBillNo = params[params[1]];//婧愬崟鍗曞彿
+                var HProcNo = params[params[2]];//娴佹按鍙�
+
+                var HBarCode = HBillNo;//鏉″舰鐮�
+                var sProcNo = HProcNo;//娴佹按鍙�
+
+                if (HBarCode != "undefined" && sProcNo != "undefined") {
+                    $("#HBarCode").val(HBarCode);
+                    $('#HProcNo').val(sProcNo);
+                    txtHBarCode_KeyDown(HBarCode);
+                    txtHProcNo_KeyDown(HBarCode, sProcNo);
+                    get_DisplayTech(HBillNo);
+                }
+            } else {
+                var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
+                var linterid = params[params[1]];//婧愬崟id
+                var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
+                var HBillNo = params[params[3]];  //鑾峰彇鍗曟嵁鍙�
+                var closeType = params[params[4]];  //鍏抽棴绫诲瀷
+            }
+            /*鍥哄畾浠g爜锛屾瘡寮犲崟鎹兘瑕乥egin*/
+
+            var option = [];
+
+            set_InitGrid();
+
+            //澶村伐鍏锋爮浜嬩欢
+            table.on('toolbar(mainTable)', function (obj) {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                //鏂板琛岃〃鏍兼暟鎹�
+                var NewRow = {
+                    "HProcID": 0, "HProcNumber": "", "HProcName": "", "HGroupID": 0, "HGroupNumber": "", "HGroupName": "",
+                    "HWorkerID": 0, "HWorkerNumber": "", "HWorkerName": "", "HQty": 0, "HPlanBeginDate": "", "HPlanEndDate": "",
+                    "HPlanTimes": 0, "HSeOrderInterID": 0, "HSeOrderEntryID": 0, "HSeOrderBillNo": "", "HICMOBillNo": "", "HICMOInterID": 0,
+                    "HProcPlanInterID": 0, "HProcPlanEntryID": 0, "HProcPlanBillNo": "", "HRemark": "",
+                    "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": "", "HRelationQty": 0, "HRelationMoney": 0
+                };
+
+                switch (obj.event) {
+                    case 'btn-AddLine':
+                        table.cache["mainTable"].push(NewRow);
+                        option.data = table.cache["mainTable"];
+                        table.render(option);
+                        for (var i = 1; i <= option.data.length; i++) {
+                            $('#HSupFlag' + i + '').find("option[value='" + option.data[i - 1].HSupFlag + "']").attr("selected", true);
+                        }
+                        form.render('select');
+                        break;
+                    case 'btn-CopyLine':
+                        var copydata = JSON.stringify(data);
+                        if (data.length <= 0) {
+                            layer.msg("璇烽�夋嫨闇�瑕佸鍒剁殑涓�琛岋紒");
+                        }
+                        else if (data.length > 1) {
+                            layer.msg("鍙兘閫夋嫨澶嶅埗涓�琛岋紒");
+                        }
+                        else {
+                            var copydata2 = copydata.substring(1, copydata.length);//鍘婚櫎棣栬瀛楃'['
+                            var copyrow = copydata2.substring(0, copydata2.length - 1);//鍘婚櫎鏈熬瀛楃']'
+                            table.cache["mainTable"].push(JSON.parse(copyrow));//灏嗗鍒剁殑琛屽己杞垚json杩藉姞鍒拌〃鏍间笂
+                            option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
+                            table.render(option);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
+                            for (var i = 1; i <= option.data.length; i++) {
+                                $('#HSupFlag' + i + '').find("option[value='" + option.data[i - 1].HSupFlag + "']").attr("selected", true);
+                            }
+                            form.render('select');
+                        }
+                        break;
+                }
+            });
+
+            //#region 閫�鍑烘寜閽�
+            form.on('submit(Cancel)', function () {
+                layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
+                    if (OperationType == 1) {
+                        Pub_Close(1);
+                    } else if (OperationType == 3) {
+                        Pub_Close(1);
+                    } else if (OperationType == 4) {
+                        Pub_Close(1);
+                    } else if (OperationType == 2) {
+                        Pub_Close(1);
+                    }
+                });
+            })
+            //#endregion
+
+            //琛屽唴浜嬩欢
+            table.on('tool(mainTable)', function (obj) {
+                var data = obj.data;
+                var rowIndex = $(obj.tr).attr("data-index");
+                if (obj.event === 'del') {
+                    layer.confirm('鐪熺殑鍒犻櫎琛屽悧锛�', function (index) {
+                        if (rowIndex === '0') {
+                            layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
+                        } else {
+                            obj.del();
+                            option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
+                            layer.close(index);
+                        }
+                    });
+                }
+            });
+
+            //鍒濆鍖栬〃鏍�
+            function set_InitGrid() {
+                //琛ㄥご
+                columns = [ //琛ㄥご
+                    //{ type: 'checkbox', totalRowText: '鍚堣琛�' }
+                    { field: 'HProcID', title: '宸ヨ祫', width: 70 }
+                    , { field: 'HProcNumber', title: '鑱屽憳', width: 60 }
+                    , { field: 'HProcName', title: '宸ヤ环', width: 60 }
+                    , { field: 'HGroupID', title: '鏁伴噺', width: 60 }
+                    , { field: 'HGroupNumber', title: '鐢熶骇璧勬簮', width: 60 }
+                    , { type: 'numbers', title: '搴忓彿', totalRow: true, width: 50 }
+
+                    //, { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
+                ];
+                option = {
+                    id: 'mainTable'
+                    , elem: '#mainTable'
+                    , toolbar: '#toolbarDemo'
+                    , page: false
+                    , cellMinWidth: 120
+                    , height: 400
+                    , cols: [columns]
+                    , limit: Number.MAX_VALUE//榛樿鏄剧ず鍏ㄩ儴
+                    , done: function (res, curr, count) {
+                        option.data = res.data;
+                        //鍘绘帀涓嬫媺妗嗗け鐒︿簨浠跺惁鍒欏湪涓嬫媺妗嗛噷杈撳叆鍊�
+                        $('.layui-form-select').find('input').unbind("blur");
+                        //琛ㄦ牸閲嶈浇鍥炴樉涓嬫媺妗嗛噷鐨勬暟鎹�
+                        $('tr').each(function (e) {
+                            var $cr = $(this);
+                            var dataIndex = $cr.attr("data-index");
+                            $.each(option.data, function (index, value) {
+                                if (value.LAY_TNDEX == dataIndex) {
+                                    $cr.find('input').val(value.HSupFlag);
+                                }
+                            });
+                        });
+                    }
+                    , done: function (res, curr, count) {
+
+                    }
+                };
+                option.data = [{
+                    "HProcID": 0, "HProcNumber": "", "HProcName": "", "HGroupID": 0, "HGroupNumber": "", "HGroupName": "",
+                    "HWorkerID": 0, "HWorkerNumber": "", "HWorkerName": "", "HQty": 0, "HPlanBeginDate": new Date(), "HPlanEndDate": new Date(),
+                    "HPlanTimes": 0, "HSeOrderInterID": 0, "HSeOrderEntryID": 0, "HSeOrderBillNo": "", "HICMOBillNo": "", "HICMOInterID": 0,
+                    "HProcPlanInterID": 0, "HProcPlanEntryID": 0, "HProcPlanBillNo": "", "HRemark": "",
+                    "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": "", "HRelationQty": 0, "HRelationMoney": 0
+                }];
+                table.render(option);
+
+            }
+            
+            //浠ヤ笂涓簂ayui妯″潡
+        });
+    </script>
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBill.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBill.html"
index 905c6d7..a3bb2c1 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBill.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBill.html"
@@ -161,6 +161,10 @@
                                             <div class="layui-input-inline">
                                                 <input type="text" class="layui-input" name="HProcNo" id="HProcNo" placeholder="璇烽敭鍏ュ悗鍥炶溅">
                                             </div>
+                                            <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="SerialNum-BT" id="SerialNum-BT" style="width: 40px; padding: 0 10px;">
+                                                <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                            </button>
+                                            <input type="hidden" value="0" name="HProcID" id="HProcID">
                                         </div>
                                         <div class="layui-col-xs4 layui-inline">
                                             <label class="layui-form-label">鐢熶骇璧勬簮</label>
@@ -489,6 +493,29 @@
             $("#HBarCode").focus();
 
             //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+            //閫夋嫨娴佹按鍙峰脊绐�
+            form.on('submit(SerialNum-BT)', function () {//鐢熶骇璧勬簮
+                var value = $("#HProcExchHinteID").val();
+                // 鍒ゆ柇鏄惁宸茬粡杈撳叆娴佹按鍙凤紝鏄垯寮瑰嚭妯℃�佹锛屽惁鍒欑粰鍑烘彁绀�
+                if (value) {
+                    layer.open({
+                        type: 2
+                        , area: ['80%', '80%']
+                        , title: '娴佹按鍙�'
+                        , shade: 0.6 //閬僵閫忔槑搴�
+                        //, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                        , content: [`../../Baseset/鍩虹璧勬枡/Gy_GetProcNoList.html?HInterID=${value}`, 'yes']
+                        , resize: false
+                        , cancel: function (index, layero) {
+                        }                       
+                    })
+                } else {
+                    layer.alert('璇锋偍纭杈撳叆娴佽浆鍗″彿鍚庨噸璇昢_^', { icon: 7 });
+                    //alert('璇峰厛杈撳叆娴佽浆鍗″彿!')
+                }
+            });
 
             //#region 鏂板鎸夐挳
             form.on('submit(set_AddNew)', function () {//鎻愪氦
@@ -866,16 +893,22 @@
             });
 
             function txtHBarCode_KeyDown(HBarCode) {
+                var barNo = HBarCode.substr(0, 3);
+                if (barNo == 'PRO' && $('#HProcExchHinteID').val() == '') {
+                    layer.msg("璇锋壂瀹屾祦杞崱鍚庡啀鎵伐搴忕爜")
+                    layer.close(index);
+                    return;
+                }
+
                 var index = layer.load();
                 $.ajax({
-                    url: GetWEBURL() + "/Cj_StationEntrustInBill/txtHBarCode_KeyDown",
+                    url: GetWEBURL() + "/Cj_StationBill/txtHBarCode_KeyDown2",
                     type: "GET",
-                    data: { "HBarCode": HBarCode },
+                    data: { "HBarCode": HBarCode, "HInterID": $('#HProcExchHinteID').val(), "UserID": sessionStorage["Czybm"] },
                     success: function (result) {
                         if (result.count == 1) {
-                            var data = result.data[0];
+                            var data = result.data[0];                            
 
-                            var barNo = HBarCode.substr(0, 3);
                             switch (barNo) {
                                 case "HCX":
                                     form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
@@ -886,27 +919,30 @@
                                 case "SBM":
                                     layer.msg("璁惧鍚嶇О : " + data.璁惧鍚嶇О, { icon: 6, btn: ['纭'], time: 6000, offset: 't', skin: 'layui-layer-lan', title: "璁惧鐮�" });
                                     break;
-                                case "JYM":
+                                case "JYM"://妫�楠屽憳
+                                    layer.msg("妫�楠屽憳 : " + data.鑱屽憳鍚嶇О + "<br>" + "閮ㄩ棬 : " + data.閮ㄩ棬鍚嶇О + "<br>" + "鐝粍 : " + data.鐝粍鍚嶇О, { icon: 6, btn: ['纭'], time: 6000, offset: 't', skin: 'layui-layer-lan', title: "鍛樺伐鐮�" });
+                                    //form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+                                    //    "HEmpID": data.HItemID,
+                                    //    "HEmpNumber": data.鑱屽憳浠g爜,
+                                    //    "HEmpName": data.鑱屽憳鍚嶇О
+                                    //});
+                                    break;
+                                case "GRM"://鎿嶄綔鍛橈紝鎺ユ敹浜�
                                     form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
                                         "HEmpID": data.HItemID,
-                                        "HEmpNumber": data.鍛樺伐浠g爜,
-                                        "HEmpName": data.鍛樺伐鍚嶇О
+                                        "HEmpNumber": data.鑱屽憳浠g爜,
+                                        "HEmpName": data.鑱屽憳鍚嶇О,
+                                        "HGroupID": data.鐝粍ID,
+                                        "HGroupName": data.鐝粍鍚嶇О
                                     });
                                     break;
-                                case "GRM":
-                                    form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
-                                        "HEmpID": data.HItemID,
-                                        "HEmpNumber": data.鍛樺伐浠g爜,
-                                        "HEmpName": data.鍛樺伐鍚嶇О
-                                    });
-                                    break;
-                                case "CGM":
-                                    form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
-                                        "HEmpID": data.HItemID,
-                                        "HEmpNumber": data.鍛樺伐浠g爜,
-                                        "HEmpName": data.鍛樺伐鍚嶇О
-                                    });
-                                    break;
+                                //case "CGM":
+                                //    form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+                                //        "HEmpID": data.HItemID,
+                                //        "HEmpNumber": data.鑱屽憳浠g爜,
+                                //        "HEmpName": data.鑱屽憳鍚嶇О
+                                //    });
+                                //    break;
                                 case "HWH":
                                     var HSpflag = data.鍚敤浠撲綅 == "Y" ? "鏄�" : "鍚�";
                                     layer.msg("浠撳簱鍚嶇О : " + data.浠撳簱鍚嶇О + "<br>" + "鍚敤浠撲綅 : " + HSpflag, { icon: 6, btn: ['纭'], time: 6000, offset: 't', skin: 'layui-layer-lan', title: "浠撳簱鐮�" });
@@ -917,7 +953,8 @@
                                 case "PRO":
                                     form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
                                         "HProcID": data.HItemID,
-                                        "HProcName": data.宸ュ簭鍚嶇О
+                                        "HProcName": data.宸ュ簭鍚嶇О,
+                                        "HProcNo": data.娴佹按鍙�
                                     });
                                     break;
                                 case "WLM":
@@ -958,7 +995,7 @@
                                     $.ajax({
                                         url: GetWEBURL() + "/Sc_StationInBill/autoGetProcNo",
                                         type: "GET",
-                                        data: { "HUserName": sessionStorage["HUserName"], "HInterID": HInterID },
+                                        data: { "HUserID": sessionStorage["Czybm"], "HInterID": HInterID },
                                         success: function (data1) {
                                             if (data1.count == 1) {
                                                 var data = data1.data[0];
@@ -1301,6 +1338,10 @@
             $("#HProcID").val(obj[0].HItemID);
         }
 
+        //杩斿洖娴佹按鍙�
+        function GetProcNoValue(obj) {
+            $("#HProcNo").val(obj[0].娴佹按鍙�);
+        }
     </script>
 </body>
 </html>
\ No newline at end of file

--
Gitblit v1.9.1