From 58721e39b560c0b4fd0963042aaeb24c8508c901 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期一, 25 八月 2025 11:40:31 +0800
Subject: [PATCH] 1

---
 WebTM/views/车间管理/产线/MES_ProductionLinePackaging_MXG.html |  150 +++++++++++++++++++++++++++----------------------
 1 files changed, 82 insertions(+), 68 deletions(-)

diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/MES_ProductionLinePackaging_MXG.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/MES_ProductionLinePackaging_MXG.html"
index ca9ab09..fb92a43 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/MES_ProductionLinePackaging_MXG.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/MES_ProductionLinePackaging_MXG.html"
@@ -39,11 +39,12 @@
                             </div>
                         </div>
                         <button type="button" lay-submit="" lay-filter="Print" id="Print" class="layui-btn layui-btn-radius">鎵撳嵃</button>
-                        <button type="button" lay-submit="" lay-filter="Print2" id="Print2" hidden="hidden" ></button>
+                        <button type="button" lay-submit="" lay-filter="Print2" id="Print2" hidden="hidden"></button>
                         <div class="layui-inline" style="width: 200px;">
                             <div class="layui-input-block">
                                 <select name="PrintName" lay-verify="required" id="PrintName">
-                                    <option value="鏂帿灏�" selected>鏂帿灏�</option>
+                                    <option value="澧ㄨタ鍝�" selected>澧ㄨタ鍝�</option>
+                                    <option value="鏂帿灏�">鏂帿灏�</option>
                                     <option value="鏅彶鐗�">鏅彶鐗�</option>
                                 </select>
                             </div>
@@ -51,7 +52,8 @@
                         <div class="layui-inline">
                             <div class="layui-input-block">
                                 <select name="LDM" lay-verify="required" id="LDM">
-                                    <option value="DU3" selected>DU3</option>
+                                    <option value="HEJ" selected>HEJ</option>
+                                    <option value="DU3" >DU3</option>
                                     <option value="QDR">QDR</option>
                                     <option value="AAA">15杞﹂棿</option>
                                     <option value="鍏朵粬">鍏朵粬</option>
@@ -77,33 +79,34 @@
                         <div class="layui-row" style="padding:10px 0">
                             <div class="layui-col-xs3 layui-inline">
                                 <fieldset class="layui-elem-field layui-field-title" style="text-align:center;">
-                                    <legend>浜х嚎鍖呰鍗�</legend>
+                                    <legend id="BT_CXBZD">浜х嚎鍖呰鍗�</legend>
                                 </fieldset>
                             </div>
                             <div class="layui-col-xs1 layui-inline">
                                 <img src="222.jpg" style="width:70%;height:50%;" />
                             </div>
-                            <div class="layui-col-xs4 layui-inline" >
+                            <div class="layui-col-xs4 layui-inline">
                                 <div class="" hidden="hidden">
-                                    <label class="layui-inline" style="width:60px;">娴佽浆鍗″彿</label>
+                                    <label class="layui-inline" style="width:60px;" id="BT_HFbarcode">娴佽浆鍗″彿</label>
                                     <div class="layui-inline">
                                         <input type="text" style="border-radius: 50px;width: 140%;" name="娴佽浆鍗″彿" id="HFbarcode" placeholder="璇疯緭鍏ユ祦杞崱鍙�" autocomplete="off" class="layui-input">
+
                                     </div>
                                 </div>
                                 <div class="">
-                                    <label class="layui-inline" style="width:60px;">瀛愪欢鏉$爜鏁伴噺</label>
+                                    <label class="layui-inline" style="width:60px;" id="BT_pcmQty">瀛愪欢鏉$爜鏁伴噺</label>
                                     <div class="layui-inline">
                                         <input type="text" lay-verify="verifyPcmQty" style="border-radius: 50px;width: 140%;" name="瀛愪欢鏉$爜鏁伴噺" id="pcmQty" autocomplete="off" placeholder="璇疯緭鍏ュ瓙浠舵潯鐮佹暟閲�" class="layui-input">
                                     </div>
                                 </div>
                                 <div class="">
-                                    <label class="layui-inline" style="width:60px;">瀛愪欢鏉$爜</label>
+                                    <label class="layui-inline" style="width:60px;" id="BT_SubBarcode">瀛愪欢鏉$爜</label>
                                     <div class="layui-inline">
                                         <input type="text" style="border-radius: 50px;width: 140%;" name="瀛愪欢鏉$爜" id="SubBarcode" autocomplete="off" placeholder="璇疯緭鍏ュ瓙浠舵潯鐮�" class="layui-input">
                                     </div>
                                 </div>
                                 <div class="" hidden="hidden">
-                                    <label class="layui-inline" style="width:60px;">鏄惁娣风</label>
+                                    <label class="layui-inline" style="width:60px;" id="BT_HMixedBox"> 鏄惁娣风</label>
                                     <div class="layui-inline">
                                         <input type="checkbox" id="HMixedBox" name="HMixedBox" lay-skin="primary" value="" lay-filter="HMixedBox">
                                     </div>
@@ -111,19 +114,19 @@
                             </div>
                             <div class="layui-inline">
                                 <div class="">
-                                    <label class="layui-inline" style="width:60px;">瑁呯鏁伴噺</label>
+                                    <label class="layui-inline" style="width:60px;" id="BT_zxQty">瑁呯鏁伴噺</label>
                                     <div class="layui-inline">
                                         <input type="text" style="border-radius: 50px;" name="" id="zxQty" placeholder="璇疯緭鍏ヨ绠辨暟閲�" autocomplete="off" class="layui-input">
                                     </div>
                                 </div>
                                 <div class="" hidden="hidden">
-                                    <label class="layui-inline" style="width:60px;">涓嶆弧绠辨爣璇�</label>
+                                    <label class="layui-inline" style="width:60px;" id="BT_HRemark">涓嶆弧绠辨爣璇�</label>
                                     <div class="layui-inline">
                                         <input type="text" style="border-radius: 50px;" name="" id="HRemark" autocomplete="off" placeholder="璇疯緭鍏ヤ笉婊$鏍囪瘑" class="layui-input">
                                     </div>
                                 </div>
                                 <div class="">
-                                    <label class="layui-inline" style="width:60px;">鐧芥爣鍙�</label>
+                                    <label class="layui-inline" style="width:60px;" id="BT_HBarCode_White">鐧芥爣鍙�</label>
                                     <div class="layui-inline">
                                         <input type="text" style="border-radius: 50px;" name="" id="HBarCode_White" autocomplete="off" placeholder="鐧芥爣鍙�" class="layui-input">
                                     </div>
@@ -145,13 +148,9 @@
                                                 <table class="layui-hide" id="smjl-table" lay-filter="smjl-table"></table>
                                                 <script type="text/html" id="smjl-toolbar">
                                                     <div class="layui-btn-container">
-                                                        <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-getCheckData"><i class="layui-icon layui-icon-tips"></i>棰勮</button>-->
-                                                        <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload"><i class="layui-icon layui-icon-refresh"></i>鍒锋柊</button>-->
-                                                        <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-confirm" id="btn_confirm"><i class="layui-icon layui-icon-ok-circle"></i>纭</button>-->
+                                                      
                                                         <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-back" id="btn_back"><i class="layui-icon layui-icon-close-fill"></i>鍒犺</button>
                                                         <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-details"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
-                                                        <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-generate"><i class="layui-icon layui-icon-file"></i>鐢熸垚閫佽揣鍗�</button>-->
-                                                        <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>-->
                                                     </div>
                                                 </script>
                                             </div>
@@ -174,64 +173,65 @@
                                         <table>
                                             <tbody>
                                                 <tr>
-                                                    <th style="width:80px;padding:10px" hidden="hidden">娴佽浆鍗″彿</th>
+                                                    <th style="width:80px;padding:10px" hidden="hidden" id="BT_HProcExchBillNo">娴佽浆鍗″彿</th>
                                                     <td hidden="hidden">
                                                         <input type="text" name="娴佽浆鍗″彿" id="HProcExchBillNo" lay-verify="" autocomplete="off" placeholder="娴佽浆鍗″彿" class="layui-input" style="background-color:#efefef4d" readonly>
                                                         <input type="hidden" name="娴佽浆鍗D" id="HFbarcodeID">
+                                                        <input type="hidden" name="HOrgID" id="HOrgID">
                                                     </td>
-                                                    <th style="width:80px;padding:10px">缁勮鏃堕棿</th>
+                                                    <th style="width:80px;padding:10px" id="BT_HDateNow">缁勮鏃堕棿</th>
                                                     <td>
                                                         <input type="text" name="缁勮鏃堕棿" class="layui-input" id="HDateNow" placeholder="缁勮鏃堕棿" style="background-color:#efefef4d;" readonly>
                                                     </td>
                                                 </tr>
                                                 <tr>
-                                                    <th style="width:80px;padding:10px" hidden="hidden">鐢熶骇璁㈠崟鍙�</th>
+                                                    <th style="width:80px;padding:10px" hidden="hidden" id="BT_HSourceBillNo">鐢熶骇璁㈠崟鍙�</th>
                                                     <td hidden="hidden">
                                                         <input type="text" name="鐢熶骇璁㈠崟鍙�" id="HSourceBillNo" lay-verify="" autocomplete="off" placeholder="鐢熶骇璁㈠崟鍙�" class="layui-input" style="background-color:#efefef4d" readonly>
                                                     </td>
-                                                    <th hidden="hidden" style="width:80px;padding:10px">浜у搧浠g爜</th>
+                                                    <th hidden="hidden" style="width:80px;padding:10px" id="BT_HNumber">浜у搧浠g爜</th>
                                                     <td hidden="hidden">
                                                         <input type="text" name="浜у搧浠g爜" class="layui-input" id="HNumber" placeholder="浜у搧浠g爜" style="background-color:#efefef4d;" readonly>
                                                         <input type="hidden" name="鐗╂枡鍐呯爜" id="HMaterID">
                                                     </td>
                                                 </tr>
                                                 <tr>
-                                                    <th hidden="hidden" style="width:80px;padding:10px">浜у搧鍚嶇О</th>
+                                                    <th hidden="hidden" style="width:80px;padding:10px" id="BT_HMaterName">浜у搧鍚嶇О</th>
                                                     <td hidden="hidden">
                                                         <input type="text" name="浜у搧鍚嶇О" id="HMaterName" lay-verify="" autocomplete="off" placeholder="浜у搧鍚嶇О" class="layui-input" style="background-color:#efefef4d" readonly>
                                                     </td>
-                                                    <th hidden="hidden" style="width:80px;padding:10px">瑙勬牸鍨嬪彿</th>
+                                                    <th hidden="hidden" style="width:80px;padding:10px" id="BT_HModel">瑙勬牸鍨嬪彿</th>
                                                     <td hidden="hidden">
                                                         <input type="text" name="瑙勬牸鍨嬪彿" class="layui-input" id="HModel" placeholder="瑙勬牸鍨嬪彿" style="background-color:#efefef4d;" readonly>
                                                     </td>
                                                 </tr>
                                                 <tr>
-                                                    <th hidden="hidden" style="width:80px;padding:10px">璁¢噺鍗曚綅</th>
+                                                    <th hidden="hidden" style="width:80px;padding:10px" id="BT_HUntil">璁¢噺鍗曚綅</th>
                                                     <td hidden="hidden">
                                                         <input type="text" name="璁¢噺鍗曚綅" id="" lay-verify="" autocomplete="off" placeholder="璁¢噺鍗曚綅" class="layui-input" style="background-color:#efefef4d" readonly>
                                                     </td>
-                                                    <th hidden="hidden" style="width:80px;padding:10px">娴佽浆鍗℃暟閲�</th>
+                                                    <th hidden="hidden" style="width:80px;padding:10px" id="BT_HLZK">娴佽浆鍗℃暟閲�</th>
                                                     <td hidden="hidden">
                                                         <input type="text" name="娴佽浆鍗℃暟閲�" class="layui-input" id="" placeholder="娴佽浆鍗℃暟閲�" style="background-color:#efefef4d;" readonly>
                                                     </td>
                                                 </tr>
                                                 <tr>
-                                                    <th hidden="hidden" style="width:80px;padding:10px">鐢熶骇璁㈠崟鏁伴噺</th>
+                                                    <th hidden="hidden" style="width:80px;padding:10px" id="BT_SCDD">鐢熶骇璁㈠崟鏁伴噺</th>
                                                     <td hidden="hidden">
                                                         <input type="text" name="鐢熶骇璁㈠崟鏁伴噺" id="" lay-verify="" autocomplete="off" placeholder="鐢熶骇璁㈠崟鏁伴噺" class="layui-input" style="background-color:#efefef4d" readonly>
                                                     </td>
-                                                    <th style="width:80px;padding:10px">鍗曟嵁鍙�</th>
+                                                    <th style="width:80px;padding:10px" id="BT_DJH">鍗曟嵁鍙�</th>
                                                     <td>
                                                         <input type="text" name="鍗曟嵁鍙�" class="layui-input" id="HBillNo2" placeholder="鍗曟嵁鍙�" style="background-color:#efefef4d;" readonly>
                                                         <input type="hidden" name="鍗曟嵁鍙稩D" id="HInterID">
                                                     </td>
                                                 </tr>
                                                 <tr>
-                                                    <th hidden="hidden" style="width:80px;padding:10px">璁㈠崟璺熻釜鍙�</th>
+                                                    <th hidden="hidden" style="width:80px;padding:10px" id="BT_DDGZH">璁㈠崟璺熻釜鍙�</th>
                                                     <td hidden="hidden">
                                                         <input type="text" name="璁㈠崟璺熻釜鍙�" id="" lay-verify="" autocomplete="off" placeholder="璁㈠崟璺熻釜鍙�" class="layui-input" style="background-color:#efefef4d" readonly>
                                                     </td>
-                                                    <th style="width:80px;padding:10px">鎵樻潯鐮�</th>
+                                                    <th style="width:80px;padding:10px" id="BT_HBarCode_wym">鎵樻潯鐮�</th>
                                                     <td>
                                                         <input type="text" name="鎵樻潯鐮�" class="layui-input" id="HBarCode_wym" placeholder="鎵樻潯鐮�" style="background-color:#efefef4d;" readonly>
                                                         <!--闅愯棌瀛楁-->
@@ -239,7 +239,7 @@
                                                     </td>
                                                 </tr>
                                                 <tr>
-                                                    <th hidden="hidden" style="width:80px;padding:10px">椤圭洰鍙�</th>
+                                                    <th hidden="hidden" style="width:80px;padding:10px" id="BT_HProjectNum">椤圭洰鍙�</th>
                                                     <td hidden="hidden">
                                                         <input type="text" name="椤圭洰鍙�" id="HProjectNum" lay-verify="" autocomplete="off" placeholder="椤圭洰鍙�" class="layui-input" style="background-color:#efefef4d" readonly>
                                                     </td>
@@ -251,31 +251,31 @@
                                         <table>
                                             <tbody>
                                                 <tr>
-                                                    <th style="width:80px;padding:10px">鍒跺崟浜�</th>
+                                                    <th style="width:80px;padding:10px" id="BT_Hmaker">鍒跺崟浜�</th>
                                                     <td>
                                                         <input type="text" name="鍒跺崟浜�" id="" lay-verify="" autocomplete="off" placeholder="鍒跺崟浜�" class="layui-input" style="background-color:#efefef4d" readonly>
                                                     </td>
-                                                    <th style="width:80px;padding:10px">鍒跺崟鏃ユ湡</th>
+                                                    <th style="width:80px;padding:10px" id="BT_Hmakerdate">鍒跺崟鏃ユ湡</th>
                                                     <td>
                                                         <input type="text" name="鍒跺崟鏃ユ湡" class="layui-input" id="" placeholder="鍒跺崟鏃ユ湡" style="background-color:#efefef4d;" readonly>
                                                     </td>
                                                 </tr>
                                                 <tr>
-                                                    <th style="width:80px;padding:10px">淇敼浜�</th>
+                                                    <th style="width:80px;padding:10px" id="BT_HupdateMan">淇敼浜�</th>
                                                     <td>
                                                         <input type="text" name="淇敼浜�" id="" lay-verify="" autocomplete="off" placeholder="淇敼浜�" class="layui-input" style="background-color:#efefef4d" readonly>
                                                     </td>
-                                                    <th style="width:80px;padding:10px">淇敼鏃ユ湡</th>
+                                                    <th style="width:80px;padding:10px" id="BT_Hupdate">淇敼鏃ユ湡</th>
                                                     <td>
                                                         <input type="text" name="淇敼鏃ユ湡" class="layui-input" id="" placeholder="淇敼鏃ユ湡" style="background-color:#efefef4d;" readonly>
                                                     </td>
                                                 </tr>
                                                 <tr>
-                                                    <th style="width:80px;padding:10px">瀹℃牳浜�</th>
+                                                    <th style="width:80px;padding:10px" id="BT_HCheckMan">瀹℃牳浜�</th>
                                                     <td>
                                                         <input type="text" name="瀹℃牳浜�" id="" lay-verify="" autocomplete="off" placeholder="瀹℃牳浜�" class="layui-input" style="background-color:#efefef4d" readonly>
                                                     </td>
-                                                    <th style="width:80px;padding:10px">瀹℃牳鏃ユ湡</th>
+                                                    <th style="width:80px;padding:10px" id="BT_HCheckDate">瀹℃牳鏃ユ湡</th>
                                                     <td>
                                                         <input type="text" name="瀹℃牳鏃ユ湡" class="layui-input" id="" placeholder="瀹℃牳鏃ユ湡" style="background-color:#efefef4d;" readonly>
                                                     </td>
@@ -305,8 +305,9 @@
     <script src="../../../layuiadmin/layui/layui.js"></script>
     <script src="../../../layuiadmin/Scripts/json2.js" type="text/javascript"></script>
     <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js" type="text/javascript"></script>
-    <script src="../../../layuiadmin/Scripts/webConfig2.js"></script>
+    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
     <script src="../../CreateControl.js"></script>
+    <script src="../../../layuiadmin/MESLanguage.js"></script>
     <script>
         //CreateReport("Report");
         function getUrlVars() {
@@ -346,7 +347,8 @@
             }
             var option = [];
             set_InitGrid();
-
+            var HModName = "MES_ProductionLinePackaging_MXG";
+            initFunction(1, HModName, sessionStorage["HTranSlate"]);
             //鍒濆鍖栨槑缁嗚〃鏍�
             function set_InitGrid() {
                 columns = [
@@ -404,9 +406,10 @@
             layer.load(3);
             //鑾峰彇鍗曟嵁鍙�
             getBillno();
-         
+
             $("#HDateNow").val(time);//鍔犺浇褰撳墠鏃堕棿
             $("#zxQty").focus();
+            $("#HOrgID").val(sessionStorage["OrganizationID"]);
             //$("#HFbarcode").css("box-shadow", "0 0 0 1px #00ff00");
             $("#SubBarcode").attr("readonly", "readonly");//瀛愪欢鏉$爜鍙
             $("#SubBarcode").css("background-color", "#efefef4d");
@@ -427,7 +430,7 @@
                         layer.msg("璇疯緭鍏ユ纭殑鏁存暟锛�");
                         return;
                     }
-              
+
                     if (zxQty == "" || zxQty <= 0) {
                         playSound();
                         layer.msg("璇疯緭鍏ユ纭殑鏁伴噺锛�", { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
@@ -436,7 +439,7 @@
                         $("#zxQty").attr("readonly", "readonly");//鏁伴噺鍙
                         $("#zxQty").css("background-color", "#efefef4d");
                         $("#zxQty").css("box-shadow", "none");
-                      
+
                         pcmQty = zxQty;
                         $("#pcmQty").val(zxQty);//瀛愪欢鏉$爜鏁伴噺 榛樿涓� = 瑁呯鏁伴噺
                         $("#SubBarcode").removeAttr("readonly");//绉婚櫎瀛愪欢鏉$爜鍙
@@ -495,7 +498,7 @@
                 }
 
             });
-           
+
 
             //瀛愪欢鏉$爜鍥炶溅鏂规硶
             $('#SubBarcode').on('keydown', function (event) {   //鎵潯褰㈢爜
@@ -649,6 +652,7 @@
                                             , "HNumber": $("#HNumber").val()
                                             , "HName": $("#HMaterName").val()
                                             , "HModel": $("#HModel").val()
+                                            , "HOrgID": $("#HOrgID").val()
                                         },
                                         success: function (result) {
                                             var data = result.data;
@@ -660,7 +664,7 @@
                                                     $('#SubBarcode').val("");
                                                     $("#SubBarcode").focus();
                                                     table.reload('smjl-table', {
-                                                        url: GetWEBURL1() + '/LEMS/Update_HBillNo_SubBarcodeList_Json'
+                                                        url: GetWEBURL() + '/LEMS/Update_HBillNo_SubBarcodeList_Json'
                                                         , where: {
                                                             HBillNo: HBillNo2
                                                             , HBarCode: HBillNo
@@ -744,11 +748,11 @@
                 var BBM = $("#BBM").val();//
                 var HBarCode_White = $("#HBarCode_White").val();//鐧芥爣鍙�
 
-                if (HBarCode_White == "") {
-                    playSound();
-                    layer.alert("鐧芥爣鍙蜂笉鑳戒负绌�!", { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
-                    return;
-                }
+                //if (HBarCode_White == "") {
+                //    playSound();
+                //    layer.alert("鐧芥爣鍙蜂笉鑳戒负绌�!", { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+                //    return;
+                //}
 
                 //var BBMs = BBM.replace(/-/g, "");
                 //if (LDM != "鍏朵粬" && BBM != "鍏朵粬" && HBarCode_White.indexOf(BBMs) == -1) {
@@ -789,6 +793,7 @@
                         , "BBM": BBM
                         , "LDM": LDM
                         , "HMaterNumber": $("#HNumber").val()
+                        , "HOrgID": $("#HOrgID").val()
                     },
                     success: function (result) {
                         var data = result.data;
@@ -865,7 +870,11 @@
                         }
                     });
                 }
-                $("#Print2").click();
+                if (LDM == "AAA") {
+                    $("#Print2").click();
+                } else {
+                    $("#Print").click();
+                }
                 $("#HBarCode_White").val("");
                 //瀛愪欢鏉$爜鏁伴噺宸叉壂瀹� 鏉$爜鎵畬鍚�
                 if (pcmQty == pcmQtyFlag) {
@@ -890,7 +899,7 @@
                     $("#HMixedBox").val("");
                     $("input[name='HMixedBox']").prop("checked", false);
                     form.render('checkbox');
-                 
+
                     //鍙栨秷娴佽浆鍗″彿鍙(鍙栨秷鍚庝細鏁版嵁閲嶅)
                     //$("#HFbarcode").removeAttr("readonly", "readonly");//娴佽浆鍗″彿鍙
                     //$("#HFbarcode").css("background-color", "white");
@@ -906,19 +915,19 @@
                     $("#SubBarcode").focus();
                     $("#SubBarcode").css("box-shadow", "0 0 0 1px #00ff00");
                 }
-                layer.confirm(
-                    '淇濆瓨鎴愬姛锛佽缁х画閫夋嫨鎿嶄綔锛�',
-                    {
-                        skin: 'layui-layer-lan',
-                        closeBtn: 0,
-                        btn: ['鏂板', '鍏抽棴'],
-                        btn2: function () {//鏂板
-                            parent.layui.admin.events.closeThisTabs();
-                        }
-                    }, function () {//鍏抽棴
-                        window.location.reload();
-                    }
-                );
+                //layer.confirm(
+                //    '淇濆瓨鎴愬姛锛佽缁х画閫夋嫨鎿嶄綔锛�',
+                //    {
+                //        skin: 'layui-layer-lan',
+                //        closeBtn: 0,
+                //        btn: ['鏂板', '鍏抽棴'],
+                //        btn2: function () {//鏂板
+                //            parent.layui.admin.events.closeThisTabs();
+                //        }
+                //    }, function () {//鍏抽棴
+                //        window.location.reload();
+                //    }
+                //);
             });
 
             //澶辫触鎻愮ず闊�
@@ -974,7 +983,9 @@
                                 var parintName = $("#PrintName").val();
                                 if (parintName == "鏂帿灏�" && LDM != "AAA") {
                                     report1 = urlAddRandomNo("../../grf/鍖呰鍗曠墿鏂欐爣璇嗗崱(缃戦〉鐗�).grf");
-                                } else if (LDM == "AAA") {
+                                } else if (parintName == "澧ㄨタ鍝�" && LDM != "AAA") {
+                                    report1 = urlAddRandomNo("../../grf/鍖呰鍗曠墿鏂欐爣璇嗗崱(缃戦〉鐗�)_MXG.grf");
+                                }else if (LDM == "AAA") {
                                     report1 = urlAddRandomNo("../../grf/鍖呰鍗曠墿鏂欐爣璇嗗崱(缃戦〉鐗�)_MXG.grf");
                                 } else {
                                     report1 = urlAddRandomNo("../../grf/鍖呰鍗曠墿鏂欐爣璇嗗崱(缃戦〉鐗�)2.grf");
@@ -1011,9 +1022,10 @@
                 //鎵撳紑鎵撳嵃妯℃澘
                 var linterid = $("#HInterID").val();
                 var Type = "HBarCodePrint";
-                var OpenTmp = "鐧芥爣鎵撳嵃1";
+                var HOrgID = $("#HOrgID").val();
+                var OpenTmp = "鐧芥爣鎵撳嵃15";
                 //var ReportViewer = document.getElementById("ReportViewer");
-                window.open("../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/HBarPlanPrint.html?linterid=" + linterid.toString() + "&Type=" + Type.toString() + "&OpenTmp=" + OpenTmp.toString());
+                window.open("../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/HBarPlanPrint.html?linterid=" + linterid.toString() + "|" + HOrgID +  "&Type=" + Type.toString() + "&OpenTmp=" + OpenTmp.toString());
                 $("#Print2").click();
             });
 
@@ -1093,7 +1105,7 @@
                 var HFbarcode = $('#HFbarcode').val();
                 var HInterID = $("#HInterID").val();
                 var HBillNo2 = $("#HBillNo2").val();//鍗曟嵁鍙�
-              
+
                 icmoQty = 20;
                 icmoQtyNow = 20;
                 //
@@ -1105,7 +1117,8 @@
                         "sHBarcodeNo": $("#HSourceBillNo").val(),
                         "sHMaterID": $("#HMaterID").val(),
                         "sHUnitID": $("#HUnitID").val(),
-                        "sHMaterName": $("#HMaterName").val()
+                        "sHMaterName": $("#HMaterName").val(),
+                        "HOrgID": $("#HOrgID").val()
                     },
                     success: function (result) {
                         var data = result.data;
@@ -1135,6 +1148,7 @@
                         , "HNumber": $("#HNumber").val()
                         , "HName": $("#HMaterName").val()
                         , "HModel": $("#HModel").val()
+                        , "HOrgID": $("#HOrgID").val()
                     },
                     success: function (result) {
                         var data = result.data;

--
Gitblit v1.9.1