From 3d23b025e107d664e4895e226783ac83164bc18a Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期五, 07 四月 2023 17:05:32 +0800
Subject: [PATCH] 乔一优化

---
 /dev/null                                                |    0 
 WebTM/views/车间管理/工序流转/MES_StationOutBill_PDA_QiaoYi.html |  282 ++++++++++++++++++++++++++++++-------------------------
 WebTM/views/计划管理/工艺路线/Gy_RoutingBill.html                |    2 
 WebTM/views/车间管理/工序流转/MES_StationInBill_PDA_QiaoYi.html  |    2 
 4 files changed, 156 insertions(+), 130 deletions(-)

diff --git "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html" "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html"
index cc3aabe..a4db701 100644
--- "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html"
+++ "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html"
@@ -1497,7 +1497,7 @@
                                  
                                     //鏌ヨ宸ヤ綔涓績鐨勬暟鎹�
                                     var WorkCente = [];
-                                    var sWhere = "select  isnull(a.HItemID,'') HCenterID, isnull(a.HNumber,'') 宸ヤ綔涓績浠g爜, isnull(a.HName,'') 宸ヤ綔涓績鍚嶇О ,p.HItemID HProcID,p.HName 宸ュ簭鍚嶇О  from Gy_Process p left join Gy_WorkCenter a on p.HNumber = a.HNumber where p.HNumber in (" + ProcessNumber.toString() + ")  order by p.HNumber";
+                                    var sWhere = "select  isnull(a.HItemID,'') HCenterID, isnull(a.HNumber,'') 宸ヤ綔涓績浠g爜, isnull(a.HName,'') 宸ヤ綔涓績鍚嶇О ,p.HItemID HProcID,p.HName 宸ュ簭鍚嶇О  from Gy_Process p left join Gy_WorkCenter a on p.HNumber = a.HNumber and a.HUSEORGID=p.HUSEORGID where p.HNumber in (" + ProcessNumber.toString() + ") order by p.HNumber ";
                                     $.ajax({
                                         type: "GET",
                                         url: GetWEBURL() + "/Gy_SOPBillList/WindowPrintList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
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.rar" "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.rar"
deleted file mode 100644
index e21980f..0000000
--- "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.rar"
+++ /dev/null
Binary files differ
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_QiaoYi.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_QiaoYi.html"
index d2c175b..861cc77 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_QiaoYi.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_QiaoYi.html"
@@ -544,7 +544,7 @@
             //閫�鍑�--鍏ㄥ睆鐗�
             form.on('submit(Cancel)', function () {
                 layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
-                    parent.location.href = "../../../views/index_Mobile.html";
+                    parent.location.href = "../../../views/index_Mobile_QiaoYi.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_QiaoYi.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_QiaoYi.html"
index b278ab7..2a71268 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_QiaoYi.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_QiaoYi.html"
@@ -134,22 +134,16 @@
                                                 </td>
                                             </tr>
                                             <tr>
-                                                <th>鎿嶄綔鍛�</th>
+                                                <th>娴佽浆鍗″彿</th>
                                                 <td class="bz_td">
-                                                    <input type="text" name="HEmpName_second" class="layui-input" id="HEmpName_second" placeholder="鎿嶄綔鍛樺鍚�" style="background-color:#efefef4d;border-radius: 50px;height:55px" readonly>
+                                                    <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>
+                                                <th>涓婇亾宸ュ簭</th>
                                                 <td class="bz_td">
-                                                    <input type="text" name="HMaterModel" class="layui-input" id="HMaterModel" placeholder="瑙勬牸鍨嬪彿" style="border-radius: 50px;background-color:#efefef4d;height:55px" 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;background-color:#efefef4d;height:55px" readonly>
-                                                    <input type="hidden" name="HMaterID" id="HMaterID" value="0" autocomplete="off" class="layui-input">
+                                                    <input type="text" name="HUpProcName" class="layui-input" id="HUpProcName" placeholder="涓婇亾宸ュ簭" style="border-radius: 50px;background-color:#efefef4d;" readonly>
                                                 </td>
                                             </tr>
                                             <tr>
@@ -157,18 +151,6 @@
                                                 <td class="bz_td">
                                                     <input type="text" name="HProcName" class="layui-input" id="HProcName" placeholder="褰撳墠宸ュ簭" style="border-radius: 50px;background-color:#efefef4d;height:55px" 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="HQty" class="layui-input" id="HQty" value="0" placeholder="璇疯緭鍏ュ悎鏍兼暟閲�" style="border-radius: 50px;height:55px">
-                                                </td>
-                                            </tr>
-                                            <tr>
-                                                <th>鎶ュ簾鏁伴噺</th>
-                                                <td class="bz_td">
-                                                    <input type="text" name="HWasterQty" class="layui-input" id="HWasterQty" value="0" placeholder="璇疯緭鍏ユ姤搴熸暟閲�" style="border-radius: 50px;height:55px">
                                                 </td>
                                             </tr>
                                             <tr>
@@ -180,91 +162,17 @@
                                                 </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;height:55px">
+                                                </td>
+                                            </tr>
+                                            <tr>
                                                 <th>鐢熶骇璧勬簮</th>
                                                 <td class="bz_td">
                                                     <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>
-                                            </tr>
-                                            <tr>
-                                                <th>宸ヤ綔涓績</th>
-                                                <td class="bz_td">
-                                                    <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>
-                                            </tr>
-                                            <tr>
-                                                <th>鐢熶骇鐝粍</th>
-                                                <td class="bz_td">
-                                                    <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>
-                                            </tr>
-                                            <tr>
-                                                <th>鎿嶄綔鍛�</th>
-                                                <td class="bz_td">
-                                                    <input type="text" name="HEmpNumber" id="HEmpNumber" value="" placeholder="鎿嶄綔鍛樹唬鐮�" autocomplete="off" class="layui-input" style="border-radius: 50px;">
-                                                </td>
-                                                <td class="bz_td">
-                                                    <input type="text" name="HEmpName" class="layui-input" id="HEmpName" placeholder="閫夋嫨鎿嶄綔鍛�" style="background-color:#efefef4d;border-radius: 50px;" readonly>
-                                                    <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>
-                                            </tr>
-                                            <tr>
-                                                <th>妫�楠屽憳</th>
-                                                <td class="bz_td">
-                                                    <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>
-                                            </tr>
-                                            <tr>
-                                                <th>娴佽浆鍗″彿</th>
-                                                <td class="bz_td">
-                                                    <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;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;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;background-color:#efefef4d;" readonly>
-                                                </td>
-                                            </tr>
-                                            <tr>
-                                                <th>澶囨敞</th>
-                                                <td class="bz_td">
-                                                    <input type="text" name="HRemark" class="layui-input" id="HRemark" placeholder="璇疯緭鍏ュ娉ㄤ俊鎭�" style="border-radius: 50px;">
-                                                </td>
-                                            </tr>
-                                            <tr>
-                                                <th>鐢熶骇缁勭粐</th>
-                                                <td class="bz_td">
-                                                    <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;background-color:#efefef4d;" readonly>
-                                                    <input type="hidden" name="HICMOInterID" id="HICMOInterID" value="0" autocomplete="off" class="layui-input">
                                                 </td>
                                             </tr>
                                             <tr>
@@ -274,31 +182,19 @@
                                                 </td>
                                             </tr>
                                             <tr>
-                                                <th>鍗曟嵁鍙�</th>
+                                                <th>浜у搧鍚嶇О</th>
                                                 <td class="bz_td">
-                                                    <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">
+                                                    <input type="text" name="HMaterName" class="layui-input" id="HMaterName" placeholder="浜у搧鍚嶇О" style="border-radius: 50px;background-color:#efefef4d;height:55px" readonly>
+                                                    <input type="hidden" name="HMaterID" id="HMaterID" value="0" autocomplete="off" class="layui-input">
                                                 </td>
                                             </tr>
                                             <tr>
-                                                <th>鍗曟嵁鏃ユ湡</th>
-                                                <td class="t1_input">
-                                                    <input type="text" name="HDate" class="layui-input" id="HDate" style="border-radius: 50px;" placeholder="璇烽�夋嫨鏃ユ湡">
-                                                </td>
-                                            </tr>
-                                            <tr>
-                                                <th>璁㈠崟璺熻釜鍙�</th>
+                                                <th>瑙勬牸鍨嬪彿</th>
                                                 <td class="bz_td">
-                                                    <input type="text" name="HOrderProcNO" class="layui-input" id="HOrderProcNO" placeholder="璁㈠崟璺熻釜鍙�" style="border-radius: 50px;background-color:#efefef4d;" readonly>
+                                                    <input type="text" name="HMaterModel" class="layui-input" id="HMaterModel" placeholder="瑙勬牸鍨嬪彿" style="border-radius: 50px;background-color:#efefef4d;height:55px" readonly>
                                                 </td>
                                             </tr>
-                                            <tr>
-                                                <th>杞笅閬�</th>
-                                                <td class="bz_td">
-                                                    <input type="checkbox" name="checkboxHLastSubProc" class="layui-input" id="checkboxHLastSubProc" lay-skin="primary" lay-filter="checkboxHLastSubProc" checked disabled style="border-radius: 50px;">
-                                                    <input type="hidden" value="true" name="HLastSubProc" id="HLastSubProc">
-                                                </td>
-                                            </tr>
+
                                         </tbody>
                                     </table>
                                 </div>
@@ -368,10 +264,131 @@
                                         </tbody>
                                     </table>
                                 </div>
+                                <div class="layui-tab-item">
+                                    <table style="width:80%;">
+                                        <tbody>
+                                            <tr>
+                                                <th>鎿嶄綔鍛�</th>
+                                                <td class="bz_td">
+                                                    <input type="text" name="HEmpName_second" class="layui-input" id="HEmpName_second" placeholder="鎿嶄綔鍛樺鍚�" style="background-color:#efefef4d;border-radius: 50px;height:55px" readonly>
+                                                </td>
+                                            </tr>
+                                            
+                                            <tr>
+                                                <th>鎶ュ簾鏁伴噺</th>
+                                                <td class="bz_td">
+                                                    <input type="text" name="HWasterQty" class="layui-input" id="HWasterQty" value="0" placeholder="璇疯緭鍏ユ姤搴熸暟閲�" style="border-radius: 50px;height:55px">
+                                                </td>
+                                            </tr>
+                                            <tr>
+                                                <th>宸ヤ綔涓績</th>
+                                                <td class="bz_td">
+                                                    <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>
+                                            </tr>
+                                            <tr>
+                                                <th>鐢熶骇鐝粍</th>
+                                                <td class="bz_td">
+                                                    <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>
+                                            </tr>
+                                            <tr>
+                                                <th>鎿嶄綔鍛�</th>
+                                                <td class="bz_td">
+                                                    <input type="text" name="HEmpNumber" id="HEmpNumber" value="" placeholder="鎿嶄綔鍛樹唬鐮�" autocomplete="off" class="layui-input" style="border-radius: 50px;">
+                                                </td>
+                                                <td class="bz_td">
+                                                    <input type="text" name="HEmpName" class="layui-input" id="HEmpName" placeholder="閫夋嫨鎿嶄綔鍛�" style="background-color:#efefef4d;border-radius: 50px;" readonly>
+                                                    <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>
+                                            </tr>
+                                            <tr>
+                                                <th>妫�楠屽憳</th>
+                                                <td class="bz_td">
+                                                    <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>
+                                            </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;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;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;background-color:#efefef4d;" readonly>
+                                                </td>
+                                            </tr>
+                                            <tr>
+                                                <th>澶囨敞</th>
+                                                <td class="bz_td">
+                                                    <input type="text" name="HRemark" class="layui-input" id="HRemark" placeholder="璇疯緭鍏ュ娉ㄤ俊鎭�" style="border-radius: 50px;">
+                                                </td>
+                                            </tr>
+                                            <tr>
+                                                <th>鐢熶骇缁勭粐</th>
+                                                <td class="bz_td">
+                                                    <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;background-color:#efefef4d;" readonly>
+                                                    <input type="hidden" name="HICMOInterID" id="HICMOInterID" value="0" autocomplete="off" class="layui-input">
+                                                </td>
+                                            </tr>
+
+                                            <tr>
+                                                <th>鍗曟嵁鍙�</th>
+                                                <td class="bz_td">
+                                                    <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>
+                                            <tr>
+                                                <th>鍗曟嵁鏃ユ湡</th>
+                                                <td class="t1_input">
+                                                    <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="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="checkbox" name="checkboxHLastSubProc" class="layui-input" id="checkboxHLastSubProc" lay-skin="primary" lay-filter="checkboxHLastSubProc" checked disabled style="border-radius: 50px;">
+                                                    <input type="hidden" value="true" name="HLastSubProc" id="HLastSubProc">
+                                                </td>
+                                            </tr>
+                                        </tbody>
+                                    </table>
+                                </div>
                             </div>
                             <ul class="layui-tab-title">
                                 <li class="layui-this">鍗曟嵁淇℃伅</li>
                                 <li>鍒跺崟淇℃伅</li>
+                                <li>鍏朵粬淇℃伅</li>
                             </ul>
                         </div>
                     </div>                                     
@@ -736,15 +753,22 @@
                                         "HCenterName": data.宸ヤ綔涓績,
                                         "HCenterID": data.HCenterID,
                                         "lngBillSubKey": data.hsubid,
-                                        "HProcName": data.宸ュ簭,
-                                        "HProcID": data.HProcID,
-                                        "HProcNo": data.宸ュ簭鍙�,
-                                        "NoOutboundHqty": (data.娴佽浆鍗℃暟閲� - data.鍑虹珯鎶ュ簾鍏宠仈鏁伴噺 - data.鍑虹珯鍏宠仈鏁伴噺)
+                                        //"NoOutboundHqty": (data.娴佽浆鍗℃暟閲� - data.鍑虹珯鎶ュ簾鍏宠仈鏁伴噺 - data.鍑虹珯鍏宠仈鏁伴噺),
+                                        "HQty": data.娴佽浆鍗℃暟閲�,
                                     });
                                     //$("#HBarCode").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
                                     //$("#HBarCode").css("background-color", "#efefef4d");
                                     $("#HProcNo").attr('disabled', 'disabled');
                                     HProcExchBillNoFlag = true;
+
+                                    if (data.鎺掑簭鍙� == "涔斾竴") {
+                                        if (data.HProcID == "") {
+                                            layer.msg("鐢ㄦ埛鏈粦瀹氬綋鍓嶅伐搴�,闇�閲嶆柊閫夋嫨宸ュ簭!")
+                                        } else {
+                                            $("#HProcNo").val(data.宸ュ簭鍙�);
+                                            txtHProcNo_KeyDown(data.鍗曟嵁鍙�, data.宸ュ簭鍙�);
+                                        }
+                                    }
 
                                     var HProcExchHinteID = $('#HProcExchHinteID').val();
                                     var HInterID = data.hmainid;
@@ -1141,7 +1165,7 @@
             function txtHProcNo_KeyDown(sBillNo, sProcNo) {
                 var index = layer.load();
                 $.ajax({
-                    url: GetWEBURL() + "/Cj_StationInBill/txtHProcNo_KeyDown",
+                    url: GetWEBURL() + "/Cj_StationInBill/txtHProcNo_KeyDown_qiaoyi",
                     type: "GET",
                     data: { "sBillNo": sBillNo, "sProcNo": sProcNo },
                     success: function (result) {
@@ -1153,7 +1177,9 @@
                                 "HProcID": data.HProcID
                                 , "HCenterName": data.宸ヤ綔涓績
                                 , "HCenterID": data.HCenterID
+                                , "HUpProcName": result.data.length > 1 ? result.data[1].宸ュ簭 : ""
                                 , "NoOutboundHqty": (data.娴佽浆鍗℃暟閲� - data.鍑虹珯鎶ュ簾鍏宠仈鏁伴噺 - data.鍑虹珯鍏宠仈鏁伴噺)
+
                             });
                             if (data.棣栭亾宸ュ簭 == "鏄�") {
                                 FirstEndHProcNo = 1;
@@ -1498,7 +1524,7 @@
                         }
                         , end: function () {
                             var sProcNo = $('#HProcNo').val();
-                            var sBillNo = $('#HBarCode').val();
+                            var sBillNo = $('#HProcExchBillNo').val();
                             txtHProcNo_KeyDown(sBillNo, sProcNo);
                         }
                         //, btn: ['纭畾', '鍙栨秷']
@@ -1824,7 +1850,7 @@
             //閫�鍑�--鍏ㄥ睆鐗�
             form.on('submit(Cancel)', function () {
                 layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
-                    parent.location.href = "../../../views/index_Mobile.html";
+                    parent.location.href = "../../../views/index_Mobile_QiaoYi.html";
                 });
             })
 

--
Gitblit v1.9.1