From 9fc747c8fe1b492e0e82da57a60f4ac17ef196d8 Mon Sep 17 00:00:00 2001
From: zgq <519541279@qq.com>
Date: 星期一, 22 二月 2021 22:28:09 +0800
Subject: [PATCH] 1、上架归还单:先扫条码再扫货架,如果不匹配不允许提交。2、下架找货单:已下架的条码允许再次下架。

---
 WebTM/views/工序汇报/MES_StationOutBill_PDA.html |  286 +++++++++++++++++++++++++++++++-------------------------
 1 files changed, 159 insertions(+), 127 deletions(-)

diff --git "a/WebTM/views/\345\267\245\345\272\217\346\261\207\346\212\245/MES_StationOutBill_PDA.html" "b/WebTM/views/\345\267\245\345\272\217\346\261\207\346\212\245/MES_StationOutBill_PDA.html"
index 90bea60..8ccaa3f 100644
--- "a/WebTM/views/\345\267\245\345\272\217\346\261\207\346\212\245/MES_StationOutBill_PDA.html"
+++ "b/WebTM/views/\345\267\245\345\272\217\346\261\207\346\212\245/MES_StationOutBill_PDA.html"
@@ -57,136 +57,141 @@
                                 <tr>
                                     <th>鏉″舰鐮�</th>
                                     <td class="t1_input">
-                                        <input type="text" name="鏉″舰鐮�" class="layui-input" id="sBillBarCode" placeholder="璇疯緭鍏ユ潯褰㈢爜" style="border-radius: 50px;">
+                                        <input type="text" name="HBarCode" class="layui-input" id="HBarCode" placeholder="璇疯緭鍏ユ潯褰㈢爜" style="border-radius: 50px;">
                                     </td>
                                 </tr>
                                 <tr>
                                     <th>娴佽浆鍗″彿</th>
                                     <td class="t1_input">
-                                        <input type="text" name="娴佽浆鍗″彿" class="layui-input" id="娴佽浆鍗″彿" placeholder="娴佽浆鍗″彿" style="background-color:#efefef4d;" readonly>
+                                        <input type="text" name="HProcExchBillNo" class="layui-input" id="HProcExchBillNo" placeholder="娴佽浆鍗″彿" style="background-color:#efefef4d;" readonly>
                                     </td>
                                 </tr>
                                 <tr>
                                     <th>娴佹按鍙�</th>
                                     <td class="t1_input">
-                                        <input type="text" name="娴佹按鍙�" class="layui-input" id="sProcNo" placeholder="璇疯緭鍏ユ祦姘村彿" style="background-color:#efefef4d;" readonly>
+                                        <input type="text" name="HProcNo" class="layui-input" id="HProcNo" placeholder="璇疯緭鍏ユ祦姘村彿" style="background-color:#efefef4d;" readonly>
                                     </td>
                                 </tr>
                                 <tr>
                                     <th>宸ュ簭浠g爜</th>
                                     <td class="t1_input">
-                                        <input type="text" name="宸ュ簭浠g爜" class="layui-input" id="宸ュ簭浠g爜" placeholder="璇疯緭鍏ュ伐搴忎唬鐮�" style="background-color:#efefef4d;" readonly>
+                                        <input type="text" name="HProcName" class="layui-input" id="HProcName" placeholder="璇疯緭鍏ュ伐搴忎唬鐮�" style="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="t1_input">
-                                        <input type="text" name="宸ュ簭鍚嶇О" class="layui-input" id="宸ュ簭鍚嶇О" placeholder="璇疯緭鍏ュ伐搴忓悕绉�" style="background-color:#efefef4d;" readonly>
+                                        <input type="text" name="HProc" class="layui-input" id="HProc" placeholder="璇疯緭鍏ュ伐搴忓悕绉�" style="background-color:#efefef4d;" readonly>
                                     </td>
                                 </tr>
                                 <tr>
                                     <th>鍒涘缓浜�</th>
                                     <td class="t1_input">
-                                        <input type="text" name="鍒涘缓浜�" class="layui-input" id="鍒涘缓浜�" placeholder="璇疯緭鍏ュ垱寤轰汉" style="background-color:#efefef4d;" readonly>
+                                        <input type="text" class="layui-input" id="HEmp" placeholder="璇疯緭鍏ュ垱寤轰汉" style="background-color:#efefef4d;" readonly>
+                                        <input type="hidden" name="HEmpID" id="HEmpID" value="0" autocomplete="off" class="layui-input">
                                     </td>
                                 </tr>
                                 <tr>
                                     <th>鍚堟牸鏁伴噺</th>
                                     <td class="t1_input">
-                                        <input type="text" name="鍚堟牸鏁伴噺" class="layui-input" id="鍚堟牸鏁伴噺" placeholder="璇疯緭鍏ュ悎鏍兼暟閲�">
+                                        <input type="text" name="HQty" class="layui-input" id="HQty" placeholder="璇疯緭鍏ュ悎鏍兼暟閲�">
                                     </td>
                                 </tr>
-                                <tr>
+                                <tr style="display:none;">
                                     <th>宸ユ椂</th>
                                     <td class="t1_input">
-                                        <input type="text" name="宸ユ椂" class="layui-input" id="宸ユ椂" placeholder="璇疯緭鍏ュ伐鏃�">
+                                        <input type="text" name="HWorkTimes" class="layui-input" id="HWorkTimes" placeholder="璇疯緭鍏ュ伐鏃�">
                                     </td>
                                 </tr>
-                                <tr>
+                                <tr style="display:none;">
                                     <th>鎶ュ簾鏁伴噺</th>
                                     <td class="t1_input">
-                                        <input type="text" name="鎶ュ簾鏁伴噺" class="layui-input" id="鎶ュ簾鏁伴噺" placeholder="璇疯緭鍏ユ姤搴熸暟閲�">
+                                        <input type="text" name="HWasterQty" class="layui-input" id="HWasterQty" placeholder="璇疯緭鍏ユ姤搴熸暟閲�">
                                     </td>
                                 </tr>
-                                <tr>
+                                <tr style="display:none;">
                                     <th>鐢熶骇璧勬簮</th>
                                     <td class="bz_td">
-                                        <input type="text" name="鐢熶骇鐝粍" class="layui-input" id="ProductionResources" placeholder="閫夋嫨鐢熶骇璧勬簮" style="background-color:#efefef4d;" readonly>
-                                        <input type="hidden" name="鐢熶骇璧勬簮浠g爜" id="ProductionResourcesID" value="0" autocomplete="off" class="layui-input">
+                                        <input type="text" name="HSource" class="layui-input" id="HSource" placeholder="閫夋嫨鐢熶骇璧勬簮" style="background-color:#efefef4d;" readonly>
+                                        <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">...</button>
                                     </td>
                                 </tr>
                                 <tr>
                                     <th>鐢熶骇鐝粍</th>
                                     <td class="bz_td">
-                                        <input type="text" name="鐢熶骇鐝粍" class="layui-input" id="ProductionTeam" placeholder="閫夋嫨鐢熶骇鐝粍" style="background-color:#efefef4d;" readonly>
-                                        <input type="hidden" name="鐢熶骇鐝粍浠g爜" id="ProductionTeamID" value="0" autocomplete="off" class="layui-input">
+                                        <input type="text" name="HGroup" class="layui-input" id="HGroup" placeholder="閫夋嫨鐢熶骇鐝粍" style="background-color:#efefef4d;" readonly>
+                                        <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">...</button>
                                     </td>
                                 </tr>
                                 <tr>
                                     <th>宸ヤ綔涓績</th>
                                     <td class="bz_td">
-                                        <input type="text" name="宸ヤ綔涓績" class="layui-input" id="WorkCenter" placeholder="閫夋嫨宸ヤ綔涓績" style="background-color:#efefef4d;" readonly>
-                                        <input type="hidden" name="宸ヤ綔涓績ID" id="WorkCenterID" value="0" autocomplete="off" class="layui-input">
+                                        <input type="text" name="HCenter" class="layui-input" id="HCenter" placeholder="閫夋嫨宸ヤ綔涓績" style="background-color:#efefef4d;" readonly>
+                                        <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">...</button>
                                     </td>
                                 </tr>
-                                <tr>
+                                <tr style="display:none;">
                                     <th>妫�楠屽憳</th>
                                     <td class="bz_td">
-                                        <input type="text" name="妫�楠屽憳" class="layui-input" id="Employee" placeholder="閫夋嫨妫�楠屽憳" style="background-color:#efefef4d;" readonly>
-                                        <input type="hidden" name="妫�楠屽憳ID" id="EmployeeID" value="0" autocomplete="off" class="layui-input">
+                                        <input type="text" name="HQCCheck" class="layui-input" id="HQCCheck" placeholder="閫夋嫨妫�楠屽憳" style="background-color:#efefef4d;" readonly>
+                                        <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">...</button>
                                     </td>
                                 </tr>
                                 <tr>
                                     <th>鍑虹珯鍗曞彿</th>
                                     <td class="t1_input">
-                                        <input type="text" name="鍑虹珯鍗曞彿" class="layui-input" id="HBillNo" placeholder="璇疯緭鍏ュ嚭绔欏崟鍙�" style="background-color:#efefef4d;" readonly>
-                                        <input type="hidden" name="鍑虹珯鍗曞彿ID" class="layui-input" id="HInterID">
+                                        <input type="text" name="HBillNo" class="layui-input" id="HBillNo" placeholder="璇疯緭鍏ュ嚭绔欏崟鍙�" style="background-color:#efefef4d;" readonly>
+                                        <input type="hidden" name="HInterID" class="layui-input" id="HInterID">
                                     </td>
                                 </tr>
                                 <tr>
                                     <th>鏃ユ湡</th>
                                     <td class="t1_input">
-                                        <input type="date" name="鏃ユ湡" class="layui-input HDateNow" id="HDateNow" placeholder="璇烽�夋嫨鏃ユ湡">
+                                        <input type="date" name="HStationOutTime" class="layui-input" id="HStationOutTime" placeholder="璇烽�夋嫨鏃ユ湡">
                                     </td>
                                 </tr>
                                 <tr>
                                     <th>鐢熶骇璁㈠崟</th>
                                     <td class="t1_input">
-                                        <input type="text" name="鐢熶骇璁㈠崟" class="layui-input" id="鐢熶骇璁㈠崟" placeholder="璇疯緭鍏ョ敓浜ц鍗�" style="background-color:#efefef4d;" readonly>
+                                        <input type="text" name="HICMOBillNo" class="layui-input" id="HICMOBillNo" placeholder="璇疯緭鍏ョ敓浜ц鍗�" style="background-color:#efefef4d;" readonly>
                                     </td>
                                 </tr>
                                 <tr>
                                     <th>浜у搧浠g爜</th>
                                     <td class="t1_input">
-                                        <input type="text" name="浜у搧浠g爜" class="layui-input" id="浜у搧浠g爜" placeholder="璇疯緭鍏ヤ骇鍝佷唬鐮�" style="background-color:#efefef4d;" readonly>
+                                        <input type="text" name="HMaterID" class="layui-input" id="HMaterID" placeholder="璇疯緭鍏ヤ骇鍝佷唬鐮�" style="background-color:#efefef4d;" readonly>
                                     </td>
                                 </tr>
                                 <tr>
                                     <th>浜у搧鍚嶇О</th>
                                     <td class="t1_input">
-                                        <input type="text" name="浜у搧鍚嶇О" class="layui-input" id="浜у搧鍚嶇О" placeholder="璇疯緭鍏ヤ骇鍝佸悕绉�" style="background-color:#efefef4d;" readonly>
+                                        <input type="text" name="HMaterName" class="layui-input" id="HMaterName" placeholder="璇疯緭鍏ヤ骇鍝佸悕绉�" style="background-color:#efefef4d;" readonly>
                                     </td>
                                 </tr>
                                 <tr>
                                     <th>瑙勬牸鍨嬪彿</th>
                                     <td class="t1_input">
-                                        <input type="text" name="瑙勬牸鍨嬪彿" class="layui-input" id="瑙勬牸鍨嬪彿" placeholder="璇疯緭鍏ヨ鏍煎瀷鍙�" style="background-color:#efefef4d;" readonly>
+                                        <input type="text" name="HMaterModel" class="layui-input" id="HMaterModel" placeholder="璇疯緭鍏ヨ鏍煎瀷鍙�" style="background-color:#efefef4d;" readonly>
                                     </td>
                                 </tr>
                                 <tr>
                                     <th>璁㈠崟璺熻釜鍙�</th>
                                     <td class="t1_input">
-                                        <input type="text" name="璁㈠崟璺熻釜鍙�" class="layui-input" id="璁㈠崟璺熻釜鍙�" placeholder="璇疯緭鍏ヨ鍗曡窡韪彿" style="background-color:#efefef4d;" readonly>
+                                        <input type="text" name="HOrderProcNO" class="layui-input" id="HOrderProcNO" placeholder="璇疯緭鍏ヨ鍗曡窡韪彿" style="background-color:#efefef4d;" readonly>
                                     </td>
                                 </tr>
                                 <tr>
                                     <th>鐢熶骇璁㈠崟鏁伴噺</th>
                                     <td class="t1_input">
-                                        <input type="text" name="鐢熶骇璁㈠崟鏁伴噺" class="layui-input" id="鐢熶骇璁㈠崟鏁伴噺" placeholder="璇疯緭鍏ョ敓浜ц鍗曟暟閲�" style="background-color:#efefef4d;" readonly>
+                                        <input type="text" name="HICMOQty" class="layui-input" id="HICMOQty" placeholder="璇疯緭鍏ョ敓浜ц鍗曟暟閲�" style="background-color:#efefef4d;" readonly>
+                                        <!--闅愯棌瀛楁-->
+                                        <input type="hidden" name="HICMOInterID" class="layui-input" id="HICMOInterID"><!--浠诲姟鍗曞彿ID鍙杊icmointerid-->
+                                        <input type="hidden" name="HDeptID" class="layui-input" id="HDeptID"><!--鐢熶骇杞﹂棿id-->
                                     </td>
                                 </tr>
                             </tbody>
@@ -229,15 +234,26 @@
                 , form = layui.form;
 
             //鑾峰彇褰撳墠鏃堕棿澶勭悊
-            $("#HDateNow").val(Format(new Date(), "yyyy-MM-dd"));
-            $("#鍒涘缓浜�").val(sessionStorage["HUserName"]);
+            $("#HStationOutTime").val(Format(new Date(), "yyyy-MM-dd"));
+            $("#HEmp").val(sessionStorage["HUserName"]);//鍒涘缓浜�
+            $("#HEmpID").val(sessionStorage["HEmpID"]);
+            $("#HProc").val(sessionStorage["HProc"]);//宸ュ簭
+            $("#HProcName").val(sessionStorage["HProcName"]);//宸ュ簭浠g爜
+            $("#HProcID").val(sessionStorage["HProcID"]);//宸ュ簭ID
+            $("#HSource").val(sessionStorage["HSource"]);//鐢熶骇璧勬簮
+            $("#HSourceID").val(sessionStorage["HSourceID"]);
+            $("#HGroup").val(sessionStorage["HGroup"]);//鐢熶骇鐝粍
+            $("#HGroupID").val(sessionStorage["HGroupID"]);
+            $("#HCenter").val(sessionStorage["HWorkCenter"]);//宸ヤ綔涓績
+            $("#HCenterID").val(sessionStorage["HWorkCenterID"]);
+            $("#HProcNo").val(sessionStorage["HProcNo"]);//娴佹按鍙�
 
             //椤甸潰鍒濆鍖栬祴鍊�
             //鑾峰彇鍗曟嵁鍙�
             $.ajax({
                 url: GetWEBURL() + "/api/newBill/getNewInterBillNo",
                 type: "GET",
-                //data: { "HBillType": '3790' },
+                data: { "billType": '3791' },
                 success: function (d) {
                     $("#HBillNo").val(d.data.HBillNo);//杩涚珯鍗曞彿
                     $("#HInterID").val(d.data.HInterID);//杩涚珯鍗曞彿ID
@@ -246,20 +262,16 @@
                 }
             });
 
-            $("#sBillBarCode").focus();
-            $("#sBillBarCode").css("box-shadow", "0 0 0 1px #00ff00");
-            $("#Serial_number").attr("readonly", "readonly");//娴佹按鍙峰彧璇�
-            $("#Serial_number").css("background-color", "#efefef4d");
-            $("#Entrants_number").attr("readonly", "readonly");//杩涚珯鏁伴噺鍙
-            $("#Entrants_number").css("background-color", "#efefef4d");
+            $("#HBarCode").focus();
+            $("#HBarCode").css("box-shadow", "0 0 0 1px #00ff00");
 
 
             //鎵潯褰㈢爜鏂规硶
-            $('#sBillBarCode').on('keydown', function (event) {   //鎵潯褰㈢爜
-                var sBillBarCode = $('#sBillBarCode').val();//鏉″舰鐮侊紙娴佽浆鍗″彿锛夛紙鏁版嵁搴撲腑涓哄崟鎹彿锛�
+            $('#HBarCode').on('keydown', function (event) {   //鎵潯褰㈢爜
+                var HBarCode = $('#HBarCode').val();//鏉″舰鐮侊紙娴佽浆鍗″彿锛夛紙鏁版嵁搴撲腑涓哄崟鎹彿锛�
                 if (event.keyCode == 13) {
                     //鍒ゆ柇鏂囨湰妗嗘槸鍚︽湁鏁版嵁    new
-                    if (sBillBarCode == "") {
+                    if (HBarCode == "") {
                         layer.alert("鏉″舰鐮佷负绌猴紒", { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
                         return;
                     }
@@ -268,30 +280,32 @@
                         url: GetWEBURL() + "api/newBill/getHbarCodeDetail",
                         type: "GET",
                         data: {
-                            "sBillBarCode": sBillBarCode
+                            "sBillBarCode": HBarCode
                         },
                         success: function (result) {
                             var data = result.data.h_v_Sc_ProcessExchangeBillList[0];
                             if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
                                 form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
-                                    "娴佽浆鍗″彿": $("#sBillBarCode").val()
-                                    , "宸ュ簭浠g爜": data.宸ュ簭浠g爜
-                                    , "宸ュ簭鍚嶇О": data.宸ュ簭
-                                    , "鍚堟牸鏁伴噺": data.璁″垝鏁伴噺
-                                    , "浜у搧浠g爜": data.浜у搧浠g爜
-                                    , "浜у搧鍚嶇О": data.浜у搧
-                                    , "瑙勬牸鍨嬪彿": data.瑙勬牸鍨嬪彿
-                                    , "鐢熶骇璁㈠崟鏁伴噺": data.鐢熶骇鏁伴噺
+                                    "HProcExchBillNo": $("#HBarCode").val()
+                                    //, "HProcID": data.HProcID
+                                    //, "HProc": data.宸ュ簭
+                                    //, "HCenter": data.宸ヤ綔涓績
+                                    //, "HCenterID": data.宸ヤ綔涓績浠g爜
+                                    , "HICMOInterID": data.hicmointerid
+                                    , "HICMOBillNo": data.浠诲姟鍗曞彿
+                                    , "HDeptID": data.HDeptID
+                                    , "HQty": data.璁″垝鏁伴噺
+                                    , "HMaterID": data.HMaterID
+                                    , "HMaterName": data.浜у搧
+                                    , "HMaterModel": data.瑙勬牸鍨嬪彿
+                                    , "HICMOQty": data.鐢熶骇鏁伴噺
+                                    , "HOrderProcNO": data.璁㈠崟璺熻釜鍙�
                                 });
-                                //$("#sBillBarCode").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
-                                //$("#sBillBarCode").css("background-color", "#efefef4d");
-                                $("#sBillBarCode").css("box-shadow", "none");
-                                $("#sProcNo").removeAttr("readonly");//绉婚櫎娴佹按鍙峰彧璇�
-                                $("#sProcNo").css("background-color", "white");
-                                $("#sProcNo").focus();
-                                $("#sProcNo").css("box-shadow", "0 0 0 1px #00ff00");
+                                //$("#HBarCode").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
+                                //$("#HBarCode").css("background-color", "#efefef4d");
+                                $("#HBarCode").css("box-shadow", "none");
                             } else {
-                                layer.alert(result.Message, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+                                layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
                             }
                         }, error: function () {
                             layer.alert("鎵潯褰㈢爜鏂规硶鍙戠敓閿欒!", { icon: 5 });
@@ -301,11 +315,11 @@
             });
 
             //娴佹按鍙峰洖杞︽柟娉�
-            $('#sProcNo').on('keydown', function (event) {   //鎵潯褰㈢爜
-                var sProcNo = $('#sProcNo').val();
-                var sBillNo = $('#sBillBarCode').val();
+            $('#HProcNo').on('keydown', function (event) {   //鎵潯褰㈢爜
+                var HProcNo = $('#HProcNo').val();
+                var HBarCode = $('#HBarCode').val();
                 if (event.keyCode == 13) {
-                    if (sProcNo == "" || sBillNo == "") {
+                    if (HProcNo == "" || HBarCode == "") {
                         layer.alert("娴佹按鍙锋垨娴佽浆鍗″彿涓虹┖锛�", { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
                         return;
                     }
@@ -313,22 +327,28 @@
                         url: GetWEBURL() + "/api/newBill/getProcDetail",
                         type: "GET",
                         data: {
-                            "sBillNo": sBillNo
-                            , "sProcNo": sProcNo
+                            "sBillNo": HBarCode
+                            , "sProcNo": HProcNo
                         },
                         success: function (result) {
                             var data = result.data.h_v_Sc_ProcessExchangeBillList[0];
                             if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                var data = result.data.h_v_Sc_ProcessExchangeBillList[0];
                                 form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
-                                    "宸ュ簭浠g爜": data.宸ュ簭浠g爜
-                                    , "宸ュ簭鍚嶇О": data.宸ュ簭
-                                    , "鍚堟牸鏁伴噺": data.璁″垝鏁伴噺
-                                    , "浜у搧浠g爜": data.浜у搧浠g爜
-                                    , "浜у搧鍚嶇О": data.浜у搧
-                                    , "瑙勬牸鍨嬪彿": data.瑙勬牸鍨嬪彿
-                                    , "鐢熶骇璁㈠崟鏁伴噺": data.鐢熶骇鏁伴噺
+                                    //"HProcID": data.HProcID
+                                    //, "HProc": data.宸ュ簭
+                                    //, "HCenter": data.宸ヤ綔涓績
+                                    //, "HCenterID": data.宸ヤ綔涓績浠g爜
+                                     "HICMOInterID": data.hicmointerid
+                                    , "HICMOBillNo": data.浠诲姟鍗曞彿
+                                    , "HDeptID": data.HDeptID
+                                    , "HQty": data.璁″垝鏁伴噺
+                                    , "HMaterID": data.HMaterID
+                                    , "HMaterName": data.浜у搧
+                                    , "HMaterModel": data.瑙勬牸鍨嬪彿
+                                    , "HICMOQty": data.鐢熶骇鏁伴噺
                                 });
-                                $("#sProcNo").css("box-shadow", "none");
+                                $("#HProcNo").css("box-shadow", "none");
                                 checkPopup();
                             } else {
                                 layer.alert(result.Message, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
@@ -340,15 +360,28 @@
                 }
             });
 
+            //鍚堟牸鏁伴噺鍥炶溅鏂规硶
+            $('#HQty').on('keydown', function (event) {
+                if (event.keyCode == 13) {
+                    $("#HQty").css("box-shadow", "none");
+                    checkPopup();
+                }
+            });
+
             //宸ユ椂鍥炶溅鏂规硶
-            $('#宸ユ椂').on('keydown', function (event) {
-                checkPopup();
+            $('#HWorkTimes').on('keydown', function (event) {
+                if (event.keyCode == 13) {
+                    $("#HWorkTimes").css("box-shadow", "none");
+                    checkPopup();
+                }
             });
 
             //鎶ュ簾鏁伴噺鍥炶溅鏂规硶
-            $('#鎶ュ簾鏁伴噺').on('keydown', function (event) {
-                $('#鎶ュ簾鏁伴噺').blur();
-                checkPopup();
+            $('#HWasterQty').on('keydown', function (event) {
+                if (event.keyCode == 13) {
+                    $("#HWasterQty").css("box-shadow", "none");
+                    checkPopup();
+                }
             });
 
             //閫夋嫨鐢熶骇鐝粍寮圭獥
@@ -401,6 +434,7 @@
 
             //閫夋嫨妫�楠屽憳
             form.on('submit(HSecManagerID-BT)', function (data) {//閫夋嫨妫�楠屽憳
+                var sMainStr = JSON.stringify(data.field);
                 layer.open({
                     type: 2
                     , area: ['100%', '100%']
@@ -419,16 +453,17 @@
             //淇濆瓨鎸夐挳
             form.on('submit(Saver)', function (data) {//鎻愪氦
                 //debugger;
-                var sMainStr = JSON.stringify(data.field);
-                console.log(sMainStr);
+                var sMainStr = data.field;
                 $.ajax(
                     {
                         type: "POST",
-                        url: GetWEBURL() + "/test", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        url: GetWEBURL() + "/api/newBill/setStationOutBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        //url:"http://localhost:12761/api/newBill/setStationOutBill",
                         async: true,
-                        data: { "oMain": sMainStr },
+                        data: sMainStr,
                         dataType: "json",
                         success: function (result) {
+                            console.log(result);
                             if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
                                 $("#sHWHID").val("");
                                 layer.alert(result.msg + "鍗曞彿涓猴細" + $("#HBillNo").val(), { icon: 1 }, function () {
@@ -450,16 +485,16 @@
             //閫�鍑烘寜閽�
             form.on('submit(Close)', function (data) {//閫�鍑�
                 layer.confirm('鎮ㄧ‘瀹氳鍏抽棴鏈〉鍚楋紵', { icon: 3, title: '鎻愮ず' }, function (index) {
-                    parent.layui.admin.events.closeThisTabs();
+                    parent.location.href = "../../views/index.html";
                 });
             });
 
             //鏂板鎸夐挳
-            //form.on('submit(HAddBT)', function (data) {//閫�鍑�
-            //    layer.confirm('鎮ㄧ‘瀹氳鏂板鍚楋紵', { icon: 3, title: '鎻愮ず' }, function (index) {
-            //        window.location.reload();
-            //    });
-            //});
+            form.on('submit(HAddBT)', function (data) {//閫�鍑�
+                layer.confirm('鎮ㄧ‘瀹氳鏂板鍚楋紵', { icon: 3, title: '鎻愮ず' }, function (index) {
+                    window.location.reload();
+                });
+            });
 
 
 
@@ -474,33 +509,31 @@
 
         });
 
-        //鎻愮ず鏄惁閫夋嫨寮圭獥浜嬩欢鍙婃槸鍚﹁緭鍏ュ伐鏃跺拰鍚堟牸鏁伴噺
+        //鏍¢獙鏄惁閫夋嫨寮圭獥浜嬩欢
         function checkPopup() {
-            $("#宸ユ椂").css("box-shadow", "none");
-            $("#鎶ュ簾鏁伴噺").css("box-shadow", "none");
-            $("#ProductionResources").css("box-shadow", "none");
-            $("#ProductionTeam").css("box-shadow", "none");
-            $("#WorkCenter").css("box-shadow", "none"); 
-            $("#Employee").css("box-shadow", "none"); 
-            if (!$("#宸ユ椂").val()) {
-                $("#宸ユ椂").focus();
-                $("#宸ユ椂").css("box-shadow", "0 0 1px 2px #00ff00");
+            if (!$("#HQty").val()) {
+                $("#HQty").css("box-shadow", "0 0 0 1px #00ff00");
+                $("#HQty").focus();
             }
-            else if (!$("#鎶ュ簾鏁伴噺").val()) {
-                $("#鎶ュ簾鏁伴噺").focus();
-                $("#鎶ュ簾鏁伴噺").css("box-shadow", "0 0 1px 2px #00ff00");
+            //else if (!$("#HWorkTimes").val()) {//宸ユ椂
+            //    $("#HWorkTimes").css("box-shadow", "0 0 0 1px #00ff00");
+            //    $("#HWorkTimes").focus();
+            //}
+            //else if (!$("#HWasterQty").val()) {//鎶ュ簾鏁伴噺
+            //    $("#HWasterQty").css("box-shadow", "0 0 0 1px #00ff00");
+            //    $("#HWasterQty").focus();
+            //}
+            //else if (!$("#HSource").val()) {//鐢熶骇璧勬簮
+            //    $("#HSource").css("box-shadow", "0 0 1px 2px #00ff00");
+            //    $("#HSource").focus();
+            //}
+            else if (!$("#HGroup").val()) {
+                $("#HGroup").css("box-shadow", "0 0 1px 2px #00ff00");
+                $("#HGroup").focus();
             }
-            else if (!$("#ProductionResources").val()) {
-                $("#ProductionResources").css("box-shadow", "0 0 1px 2px #00ff00");
-            }
-            else if (!$("#ProductionTeam").val()) {
-                $("#ProductionTeam").css("box-shadow", "0 0 1px 2px #00ff00");
-            }
-            else if (!$("#WorkCenter").val()) {
-                $("#WorkCenter").css("box-shadow", "0 0 1px 2px #00ff00");
-            }
-            else if (!$("#Employee").val()) {
-                $("#Employee").css("box-shadow", "0 0 1px 2px #00ff00");
+            else if (!$("#HCenter").val()) {
+                $("#HCenter").css("box-shadow", "0 0 1px 2px #00ff00");
+                $("#HCenter").focus();
             }
         }
 
@@ -509,9 +542,9 @@
             if (obj.length == 0) {
                 layer.msg("璇峰厛閫夋嫨鐝粍", { index: 0 });
             } else {
-                $("#ProductionTeam").val(obj[0].鐝粍);
-                $("#ProductionTeamID").val(obj[0].HItemID);
-                $("#ProductionTeam").css("box-shadow", "none");
+                $("#HGroup").val(obj[0].鐝粍);
+                $("#HGroupID").val(obj[0].HItemID);
+                $("#HGroup").css("box-shadow", "none");
                 checkPopup();
                 layer.closeAll();
             }
@@ -519,12 +552,12 @@
 
         //杩斿洖鐢熶骇璧勬簮
         function GetProductionResourcesValue(obj) {  //杩斿洖鐢熶骇璧勬簮
-            if ($("#ProductionResources").val()) {
-                $("#ProductionResources").css("box-shadow", "none");
+            if ($("#HSource").val()) {
+                $("#HSource").css("box-shadow", "none");
             }
-            $("#ProductionResources").val(obj[0].鐢熶骇璧勬簮);
-            $("#ProductionResourcesID").val(obj[0].鐢熶骇璧勬簮浠g爜);
-            $("#ProductionResources").css("box-shadow", "none");
+            $("#HSource").val(obj[0].鐢熶骇璧勬簮);
+            $("#HSourceID").val(obj[0].HItemID);
+            $("#HSource").css("box-shadow", "none");
             checkPopup();
         }
 
@@ -533,9 +566,9 @@
             if (obj.length == 0) {
                 layer.msg("璇峰厛閫夋嫨鐝粍", { index: 0 });
             } else {
-                $("#WorkCenter").val(obj[0].鐢熶骇鐝粍);
-                $("#WorkCenterID").val(obj[0].HItemID);
-                $("#WorkCenter").css("box-shadow", "none");
+                $("#HCenter").val(obj[0].宸ヤ綔涓績);
+                $("#HCenterID").val(obj[0].HItemID);
+                $("#HCenter").css("box-shadow", "none");
                 checkPopup();
                 layer.closeAll();
             }
@@ -543,12 +576,11 @@
 
         //杩斿洖妫�楠屽憳
         function GetHSecManagerValue(obj) {  //杩斿洖妫�楠屽憳
-            $("#Employee").val(obj[0].HName);
-            $("#EmployeeID").val(obj[0].HNumber);
-            $("#Employee").css("box-shadow", "none");
-            checkPopup();
+            $("#HQCCheck").val(obj[0].HName);
+            $("#HQCCheckID").val(obj[0].HItemID);
         }
 
+
     </script>
 </body>
 </html>

--
Gitblit v1.9.1