From 3ffbffba87bfe3a8a9acdc75e38be01db0d3cd1b Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期五, 17 十一月 2023 12:22:38 +0800
Subject: [PATCH] ../../Baseset/基础资料/Gy_SellStyle.html:单选改为复选,单击选中,双击返回

---
 WebTM/views/仓存管理/条码生成/Gy_BarCodeBill.html | 1237 +++++++++++++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 1,029 insertions(+), 208 deletions(-)

diff --git "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill.html" "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill.html"
index eea490c..e7ce3e2 100644
--- "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill.html"
+++ "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill.html"
@@ -2,7 +2,7 @@
 <html>
 <head>
     <meta charset="utf-8" />
-    <title>鏂板/缂栬緫鍣ㄥ叿閲囪喘鍏ュ簱鍗�</title>
+    <title>鏉$爜鐢熸垚</title>
     <meta name="renderer" content="webkit">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
     <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
@@ -13,6 +13,7 @@
     <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
     <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
     <script src="../../../layuiadmin/PubCustom.js"></script>
+    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
     <style type="text/css">
 
         /*begin 姝ゆ牱寮忕敤浜庢秷闄よ鍏冪礌涓竷灞�瀹藉害涓嶅鐨勯棶棰�*/
@@ -23,7 +24,11 @@
         }
         /*end*/
         .layui-table-cell .layui-form-checkbox[lay-skin="primary"] {
-            margin-left:35%;
+            margin-left: 35%;
+        }
+
+        .layui-input-block {
+            margin-left: 0px;
         }
     </style>
 </head>
@@ -34,22 +39,20 @@
                 <div class="layui-card">
                     <form id="form0" class="layui-form" lay-filter="component-form-group" action="">
                         <div class="layui-card-header">
-                            <div class="layui-btn-group">
-
-                                <button type="button" id="copy-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Copy">澶嶅埗</button>
-                                <button type="button" id="addnew-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Add">鏂板</button>
-                                <button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
-                                <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
-                                <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="planview">棰勮</button>
-                                <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="print">鎵撳嵃</button>
-
+                            <div class="layui-input-block">
+                                <button type="button" class="layui-btn" id="ToolPrint" lay-submit="" lay-filter="ToolPrint">棰勮鎵撳嵃</button>
+                                <button type="button" class="layui-btn" id="ToolCreate" lay-submit="" lay-filter="ToolCreate">鐢熸垚</button>
+                                <button type="button" class="layui-btn" id="ToolReset" lay-submit="" lay-filter="ToolReset">閲嶇疆</button>
+                                <button type="button" class="layui-btn" id="ToolStock" lay-submit="" lay-filter="ToolStock">搴撳瓨</button>
+                                <button type="button" class="layui-btn" id="ToolSynch" lay-submit="" lay-filter="ToolSynch">鍚屾璧勬枡</button>
+                                <button type="button" class="layui-btn" id="ToolBatch" lay-submit="" lay-filter="ToolBatch">鎵规</button>
+                                <button type="button" class="layui-btn" id="ToolExit" lay-submit="" lay-filter="ToolExit">閫�鍑�</button>
                             </div>
-
                         </div>
 
                         <div class="layui-card-body">
                             <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
-                                <h1 style="text-align:center;"><b>鏉$爜鐢熸垚</b></h1>
+                                <!--<h1 style="text-align:center;"><b>鏉$爜鐢熸垚</b></h1>-->
                                 <div class="layui-tab-content">
                                     <div class="layui-tab-item layui-show">
                                         <div class="layui-form-item">
@@ -57,7 +60,6 @@
                                                 <label class="layui-form-label">缁勭粐</label>
                                                 <div class="layui-input-inline">
                                                     <select name="HOrgID" id="HOrgID" lay-filter="HOrgID" class="layui-input" value="" style="float:left;width:150px">
-                                                        
                                                     </select>
                                                 </div>
                                             </div>
@@ -65,14 +67,13 @@
                                                 <label class="layui-form-label">宸ュ巶浠g爜</label>
                                                 <div class="layui-input-inline">
                                                     <select name="HWorksNumber" id="HWorksNumber" lay-filter="HWorksNumber" class="layui-input" value="" style="float:left;width:150px">
-                                                       
                                                     </select>
                                                 </div>
                                             </div>
                                             <div class="layui-inline">
                                                 <label class="layui-form-label">鏃ユ湡</label>
                                                 <div class="layui-input-inline">
-                                                    <input class="layui-input" name="HDate" id="HDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
+                                                    <input class="layui-input" name="HDate" id="HDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd" readonly>
                                                 </div>
                                             </div>
                                         </div>
@@ -86,19 +87,17 @@
                                                         <option value="3">閲囪喘璁㈠崟</option>
                                                         <option value="4">鏀舵枡閫氱煡鍗�</option>
                                                         <option value="5">濮斿璁㈠崟</option>
-                                                        <option value="6">閫�璐ч�氱煡鍗�</option>
-                                                        <option value="7">鍏朵粬鍏ュ簱鍗�</option>
-                                                        <option value="8">鐩存帴璋冩嫧鍗�</option>
-                                                        <option value="9">閲囪喘閫�鏂欏崟</option>
-                                                        <option value="10">鐢熶骇閫�鏂欏崟</option>
-                                                        <option value="11">缁勮鎷嗗嵏鍗�</option>
+                                                        <option value="6">鐢熶骇鍏ュ簱鍗�</option>
+                                                        <option value="7">閲囪喘鍏ュ簱鍗�</option>
+                                                        <option value="8">閿�鍞��璐у崟</option>
+                                                        <option value="9">鐢熶骇閫�鏂欏崟</option>
                                                     </select>
                                                 </div>
                                             </div>
                                             <div class="layui-inline">
                                                 <label class="layui-form-label">閫夊崟鍙�<label style="color:red"> * </label></label>
                                                 <div class="layui-input-inline">
-                                                    <input type="text" name="HSourceBillNo" id="HSourceBillNo" readonly class="layui-input" value="" style="float:left;width:150px;">
+                                                    <input type="text" name="HSourceBillNo" id="HSourceBillNo" readonly class="layui-input" value="" style="float: left; width: 150px; background-color: #efefef4d;">
                                                     <button type="button" lay-submit="" class="layui-btn" lay-filter="HSourceBillNoList" style="width:40px;">
                                                         <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                     </button>
@@ -108,7 +107,6 @@
                                                 <label class="layui-form-label">鏉$爜绫诲瀷</label>
                                                 <div class="layui-input-inline">
                                                     <select name="HBarCodeType" id="HBarCodeType" lay-filter="HBarCodeType" class="layui-input" value="" style="float:left;width:150px">
-                                                       
                                                     </select>
                                                 </div>
                                             </div>
@@ -119,10 +117,11 @@
                             </div>
                         </div>
 
-                        <div class="layui-tab layui-tab-card" lay-filter="TabTest">
+                        <div class="layui-tab layui-tab-card" lay-filter="tab-TabTest">
                             <ul class="layui-tab-title">
-                                <li class="layui-this">鐗╂枡淇℃伅</li>
-                                <li>鏉$爜淇℃伅</li>
+                                <li lay-id="1" class="layui-this">鐗╂枡淇℃伅</li>
+                                <li lay-id="2">鏉$爜淇℃伅</li>
+                                <li lay-id="3">妗f鍒楄〃</li>
                             </ul>
                             <div class="layui-tab-content">
                                 <div class="layui-tab-item layui-show">
@@ -131,15 +130,27 @@
                                 <div class="layui-tab-item">
                                     <table class="layui-hide" id="mainTable1" lay-filter="mainTable1"></table>
                                 </div>
+                                <div class="layui-tab-item">
+                                    <table class="layui-hide" id="mainTable2" lay-filter="mainTable2"></table>
+                                </div>
                             </div>
                         </div>
 
                         <script type="text/html" id="toolbarDemo">
                             <div class="layui-btn-container">
-
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button>
-
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+                            </div>
+                        </script>
+                        <script type="text/html" id="toolbarDemo1">
+                            <div class="layui-btn-container">
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn1"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+                            </div>
+                        </script>
+                        <script type="text/html" id="toolbarDemo2">
+                            <div class="layui-btn-container">
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn2"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
                             </div>
                         </script>
                         <script type="text/html" id="xuhao">
@@ -147,11 +158,15 @@
                         </script>
                         <script type="text/html" id="switchTpl">
                             <!-- 杩欓噷鐨� checked 鐨勭姸鎬佸彧鏄紨绀� -->
-                            <input type="checkbox" name="checkbox" lay-skin="primary" lay-filter="HGiveAwayFlag">
+                            <input type="checkbox" name="checkbox" value="{{d.HGiveAwayFlag}}" lay-skin="primary" lay-filter="HGiveAwayFlag" {{ d.HGiveAwayFlag == 1 ? 'checked' : '' }}>
                         </script>
                         <script type="text/html" id="switchTp2">
                             <!-- 杩欓噷鐨� checked 鐨勭姸鎬佸彧鏄紨绀� -->
-                            <input type="checkbox" name="checkbox" lay-skin="primary" lay-filter="HGiveAwayFlag">
+                            <input type="checkbox" name="checkbox" lay-skin="primary" lay-filter="HGiveAwayFlag1">
+                        </script>
+                        <script type="text/html" id="switchTp3">
+                            <!-- 杩欓噷鐨� checked 鐨勭姸鎬佸彧鏄紨绀� -->
+                            <input type="checkbox" name="checkbox" value="{{d.HExpirationDateFlag}}" lay-skin="primary" lay-filter="HExpirationDateFlag" {{ d.HExpirationDateFlag == 1 ? 'checked' : '' }}>
                         </script>
                     </form>
                 </div>
@@ -193,10 +208,51 @@
             //鏌ヨ鏉′欢
             var option = [];
             var option1 = [];
+            var option2 = [];
             var sWhere = "";
             var sBillType = "3801";
-            //#endregion
+            var HModName = "Gy_BarCodeBill";
+            var titleData = ["鐗╂枡ID", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�", "杈呭姪灞炴�D", "璁¢噺鍗曚綅ID", "瀹㈡埛ID", "HItemID", "hmainid", "hsubid", "HinterID", "杞﹂棿ID", "渚涘簲鍟咺D","HSTOCKORGID"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
 
+            var HMaterID = "";
+            var HBatchNo = "";
+            var BatchNoArray; //鐢ㄦ潵瀛樺偍鑾峰彇鍒扮殑鎵瑰彿锛屽湪鎵规鎸夐挳鍔熻兘涓敤鍒�
+            var HMinQty2 = 0; //鐢ㄦ潵瀛樺偍杈撳叆鐨勬渶灏忓寘瑁呮暟锛屽湪鎵规鎸夐挳鍔熻兘涓敤鍒�
+
+            var HMaterInfo = "";  //瀛樺偍鐗╂枡淇℃伅
+            var HBarInfo = ""; //瀛樺偍鏉$爜淇℃伅
+            var HFileList = "";  //瀛樺偍妗f鍒楄〃
+            //#endregion           
+
+            //鐩戝惉褰撳墠澶勪簬鍝竴涓〉绛撅紝浼� HModName 鍊�
+            element.on('tab(tab-TabTest)', function (data) {
+                HMaterInfo = table.cache['mainTable'];
+                var cur_title = data.elem.context.innerText;
+                if (cur_title == "鐗╂枡淇℃伅") {
+                    HModName = "Gy_BarCodeBill";
+                    //鍒锋柊琛ㄦ牸鏁版嵁
+                    DisPlay_HideColumn();
+                    table.reload('mainTable', {
+                        data: HMaterInfo // 璋冪敤table.reload 閲嶆柊娓叉煋鏄剧ず鍔犺浇杩藉姞浜嗘暟鎹殑琛ㄦ牸
+                    });
+                    
+                } else if (cur_title == "鏉$爜淇℃伅") {
+                    HModName = "Gy_BarCodeBill_1";
+                    //鍒锋柊琛ㄦ牸鏁版嵁
+                    DisPlay_HideColumn1();
+                    table.reload('mainTable1', {
+                        data: HBarInfo // 璋冪敤table.reload 閲嶆柊娓叉煋鏄剧ず鍔犺浇杩藉姞浜嗘暟鎹殑琛ㄦ牸
+                    });
+                } else if (cur_title == "妗f鍒楄〃") {
+                    HModName = "Gy_BarCodeBill_2";
+                    //鍒锋柊琛ㄦ牸鏁版嵁
+                    DisPlay_HideColumn2();
+                    //鍔犺浇妗f鍒楄〃
+                    table.reload('mainTable2', {
+                        data: HFileList // 璋冪敤table.reload 閲嶆柊娓叉煋鏄剧ず鍔犺浇杩藉姞浜嗘暟鎹殑琛ㄦ牸
+                    });    
+                }
+            })
 
             //#region 杩涘叆椤甸潰鏃㈠姞杞�
             //鍒濆鍖栬〃鍗曟彃浠�
@@ -206,14 +262,24 @@
             //鍔犺浇宸ュ巶浠g爜鏁版嵁
             set_HWorksNumber();
             //鍔犺浇鏉$爜绫诲瀷鏁版嵁
-            set_HBarCodeType();
+            set_HBarCodeType();                      
+
+            var rowdata = [{
+                "HMaterID": 0, "HMaterCode": "", "HMaterNumber": "", "HMaterName": "", "HMaterModel": "", "HMaterSpec": "", "HBatchNo": "", "HUnitID": 0, "HUnitNumber": "", "HUnitName": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HBQty": 0, "HMinQty": 0, "HPackQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HStockOrgID": sessionStorage["OrganizationID"], "HRemark": "", "HCoilNO": "", "HFurnaceNO": "", "HFactory": "",
+                "HAuxQty": 0, "HheatNO": "", "HProduceDate": Format(new Date(), "yyyy-MM-dd"), "HExpiryDate": Format(new Date(), "yyyy-MM-dd"), "HExpirationDateFlag": 0
+            }];
             //鍒濆鍖栬〃鏍�
             set_InitGrid();
             set_CountGrid();
+            set_InitGrid2();
+
             //鍒ゆ柇鎿嶄綔绫诲瀷
             if (OperationType == 1) {//鏃犳簮鏂板
+                //鍒濆鍩烘湰淇℃伅璧嬪��
+                $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));      //鍗曟嵁鏃ユ湡
                 set_AddFNew();
                 set_AddFNew1();
+                set_AddFNew2();
             }
             else if (OperationType == 3) {//缂栬緫
                 set_EditFromGrid(linterid);
@@ -221,16 +287,20 @@
             else {
                 layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
             }
-            //#endregion
+            //#endregion                     
 
             //#region 鐐瑰嚮浜嬩欢锛屽寘鎷琽n鍜宖orm浜嬩欢
             //澶村伐鍏锋爮
             table.on('toolbar(mainTable)', function (obj) {
                 var checkStatus = table.checkStatus('mainTable')
                     , data = checkStatus.data;;
-                var AddRow = table.cache['mainTable'];
-                var NewRow = { "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HBatchNo": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HStockOrgID": sessionStorage["OrganizationID"], "HRemark": "" };
-                console.log(NewRow);
+                var AddRow = table.cache['mainTable'];       
+
+                var NewRow = {
+                    "HMaterID": 0, "HMaterCode": "", "HMaterNumber": "", "HMaterName": "", "HMaterModel": "", "HMaterSpec": "", "HBatchNo": "", "HUnitID": 0, "HUnitNumber": "", "HUnitName": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HBQty": 0, "HMinQty": 0, "HPackQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HStockOrgID": sessionStorage["OrganizationID"], "HRemark": "", "HCoilNO": "", "HFurnaceNO": "", "HFactory": "",
+                    "HAuxQty": 0, "HheatNO": "", "HProduceDate": Format(new Date(), "yyyy-MM-dd"), "HExpiryDate": Format(new Date(), "yyyy-MM-dd"), "HExpirationDateFlag": 0
+                };                   
+                //console.log(NewRow);
                 switch (obj.event) {
                     //鏂板涓�琛�
                     case 'btn-AddLine': btnAddLine(NewRow);
@@ -238,13 +308,129 @@
                     //澶嶅埗涓�琛�
                     case 'btn-CopyLine': btnCopyLine(data);
                         break;
+                    //鍒楄缃�
+                    case 'set_HideColumn':
+                        get_HideColumn(0);
+                        break;
+                }
+            });
+
+            table.on('toolbar(mainTable1)', function (obj) {
+                switch (obj.event) {
+                    //鍒楄缃�
+                    case 'set_HideColumn1':
+                        get_HideColumn(1);
+                        break;
+                }
+            });
+
+            table.on('toolbar(mainTable2)', function (obj) {
+                switch (obj.event) {
+                    //鍒楄缃�
+                    case 'set_HideColumn2':
+                        get_HideColumn(2);
+                        break;
                 }
             });
             //琛屽唴浜嬩欢
             table.on('tool(mainTable)', function (obj) {
                 set_GridDelete(obj);   //琛屽唴鍒犻櫎
                 set_GridCellCheck(obj); //琛屽唴蹇嵎閿瓫閫�
+
+                //#region 淇敼琛� 鏃堕棿
+
+                var data = obj.data;
+                //鐢熶骇鏃ユ湡
+                if (obj.event == 'HProduceDate') {
+                    var field = $(this).data('field');
+                    laydate.render({
+                        elem: this.firstChild
+                        , show: true //鐩存帴鏄剧ず
+                        , closeStop: this
+                        , done: function (nowDate) {
+                            //鏃堕棿閫夋嫨瀹屾垚锛岃鏁版嵁鏇存柊
+                            data[field] = nowDate;
+                            obj.update(data);
+                            //鍒锋柊澶嶉�夋
+                            //checkRefresh();
+                        }
+                    });
+                }
+
+                //淇濊川鏈熻嚦
+                if (obj.event == 'HExpiryDate') {
+                    var field = $(this).data('field');
+                    laydate.render({
+                        elem: this.firstChild
+                        , show: true //鐩存帴鏄剧ず
+                        , closeStop: this
+                        , done: function (nowDate) {
+                            //鏃堕棿閫夋嫨瀹屾垚锛岃鏁版嵁鏇存柊
+                            data[field] = nowDate;
+                            obj.update(data);
+                            //鍒锋柊澶嶉�夋
+                            //checkRefresh();
+                        }
+                    });
+                }
+
+                //#endregion
             });
+
+            //鐩戝惉鍗曞厓鏍肩紪杈�  鍗曞厓鏍肩紪杈戝悗 鍙樻洿
+            table.on('edit(mainTable)', function (obj) {
+                // 鍗曞厓鏍肩紪杈戜箣鍓嶇殑鍊�
+                var oldText = $(this).prev().text();
+                var value = obj.value //寰楀埌淇敼鍚庣殑鍊�
+                    , data = obj.data //寰楀埌鎵�鍦ㄨ鎵�鏈夐敭鍊�
+                    , field = obj.field; //寰楀埌瀛楁
+                //layer.msg('[ID: ' + data.id + '] ' + field + ' 瀛楁鏇存敼涓猴細' + value);
+
+                switch (field) {
+                    case "HQty":  //鏁伴噺
+                        value = isNaN(value) ? 0 : value;
+                        var HMinQty = isNaN(data.HMinQty) ? 0 : data.HMinQty;
+                        if (HMinQty == 0) {
+                            //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+                            obj.update({
+                                HQty: value,                                   //鏁伴噺
+                                HBQty: 0,                                      //绠辨暟=鏁伴噺/鏈�灏忓寘瑁呮暟閲�
+                            });
+                        }
+                        else
+                        {
+                            //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+                            obj.update({
+                                HQty: value,                                   //鏁伴噺
+                                HBQty: Math.ceil(value / HMinQty),             //绠辨暟=鏁伴噺/鏈�灏忓寘瑁呮暟閲�
+                            });
+                        }
+                        break;
+                    case "HMinQty":  //鏈�灏忓寘瑁呮暟閲�
+                        value = isNaN(value) ? 0 : value;
+                        HMinQty2 = value;   //缁欐壒娆℃寜閽姛鑳戒腑鐨勬渶灏忓寘瑁呮暟璧嬪��
+                        var HQty = isNaN(data.HQty) ? 0 : data.HQty;
+                        if (HQty == 0) //闄ゆ暟涓�0 
+                        {
+                            //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+                            obj.update({
+                                HMinQty: value,                                //鏈�灏忓寘瑁呮暟閲�
+                                HBQty: 0,                                      //绠辨暟=鏁伴噺/鏈�灏忓寘瑁呮暟閲�
+                            });
+                        }
+                        else {
+                            //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+                            obj.update({
+                                HMinQty: value,                                //鏈�灏忓寘瑁呮暟閲�
+                                HBQty: Math.ceil(HQty / value),                //绠辨暟=鏁伴噺/鏈�灏忓寘瑁呮暟閲�
+                            });
+                        }
+                      
+                        break;
+                    default:
+                }
+            });
+
             //涓嬫媺妗嗕簨浠堕�夋嫨瑙﹀彂
             form.on('select(HSourceBillType)', function (data) {
                 $("#HSourceBillNo").val("");
@@ -269,25 +455,20 @@
                         return "濮斿璁㈠崟";
                         break;
                     case '6':
-                        return "閫�璐ч�氱煡鍗�";
+                        return "鐢熶骇鍏ュ簱鍗�";
                         break;
                     case '7':
-                        return "鍏朵粬鍏ュ簱鍗�";
+                        return "閲囪喘鍏ュ簱鍗�";
                         break;
                     case '8':
-                        return "鐩存帴璋冩嫧鍗�";
+                        return "閿�鍞��璐у崟";
                         break;
                     case '9':
-                        return "閲囪喘閫�鏂欏崟";
-                        break;
-                    case '10':
                         return "鐢熶骇閫�鏂欏崟";
-                        break;
-                    case '11':
-                        return "缁勮鎷嗗嵏鍗�";
                         break;
                 }
             }
+
             //琛ㄥご淇℃伅婧愬崟淇℃伅寮圭獥
             form.on('submit(HSourceBillNoList)', function () {
                 if ($("#HSourceBillType").val() == 0 || $("#HSourceBillType").val() == null) {
@@ -296,13 +477,13 @@
                 //鑾峰彇缁勭粐ID
                 var SetHOrgID = $("#HOrgID").find("option:selected").val();
                 //椤甸潰灞�-鑷畾涔�
-                var url = '../../PublicPage/HSourceReportHtml.html?OperationType=3&linterid=' + SetHOrgID + '&HSouceBillType=' + getSupType() + '';
+                var url = '../../PublicPage/HSourceReportHtml.html?OperationType=3&HOrgID=' + SetHOrgID + '&HSouceBillType=' + getSupType() + '';
                 url = encodeURI(url);
                 //alert(url);
                 layer.open({
                     type: 2,
                     skin: 'layui-layer-rim', //鍔犱笂杈规
-                    title: '' + getSupType()+'鍒楄〃',
+                    title: '' + getSupType() + '鍒楄〃',
                     closeBtn: 1,
                     shift: 2,
                     area: ['95%', '80%'],
@@ -310,8 +491,67 @@
                     content: [url, 'yes'],
                     btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('layTable');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鍗曟嵁鏁版嵁');
+                        }
+                        var list = [];
+                        var BillSelect = [];
+                        for (var i = 0; i < checkStatus.data.length; i++) {
+                            if (checkStatus.data[i].閮ㄩ棬 != "" && checkStatus.data[i].閮ㄩ棬 != null) {
+                                list.push(checkStatus.data[i].閮ㄩ棬)
+                            }
+                            BillSelect.push({ BillType: checkStatus.data[i].HBillType, BillTitle: getSupType(), BillNo: checkStatus.data[i].鍗曟嵁鍙�, "BillMainID": checkStatus.data[i].HMainID, "BillSubID": checkStatus.data[i].HSubID, "SPID": 0, "BatchNo": "", "HAuxPropID": 0 });
+                        }
+                        if (isAllEqual(list))  //涓嶅厑璁搁�夋嫨涓嶅悓閮ㄩ棬
+                        {
+                            //鑾峰彇閫変腑鏁版嵁
+                            var GrdSelectData = JSON.stringify(BillSelect);
+                            //鑾峰彇閫夋嫨鐨勬簮鍗曠被鍨�
+                            var HSourceBillType = $("#HSourceBillType").find("option:selected").html();
+                            //鑾峰彇閫夋嫨鐨勬潯鐮佺被鍨�
+                            var HBarCodeType = $("#HBarCodeType").find("option:selected").html();
+                            //鑾峰彇褰撳墠鐧诲綍浜哄憳
+                            var UserName = sessionStorage["HUserName"];
+                            var Str = GrdSelectData + ";" + HSourceBillType + ";" + HBarCodeType + ";" + UserName;
+                            //閫氳繃閫夋嫨鐨勬簮鍗曚富瀛愬唴鐮佹煡鎵捐缁嗕俊鎭�
+                            $.ajax({
+                                type: "post",
+                                url: GetWEBURL() + "/Sc_BarCode/SelectReportFromBillList",
+                                //contentType: 'application/json',
+                                async: true,
+                                dataType: "json",
+                                data: { "msg": Str },
+                                //traditional: true,
+                                success: function (result) {
+                                    HMaterID = result.list[0].HMaterID;
+                                    HBatchNo = result.list[0].HBatchNo;
+                                    if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                        for (let i = 0; i < result.list.length; i++) {
+                                            result.list[i].HQty = result.list[i].HQty.toString().match(/^\d+(?:\.\d{0,6})?/)[0]  //淇濈暀灏忔暟鐐瑰悗鍏綅灏忔暟 
+                                            if (result.list[i].HMinQty != 0) {
+                                                result.list[i].HBQty = Math.ceil(result.list[i].HQty / result.list[i].HMinQty)            
+                                            }                                            
+                                        }
+                                                                             
+                                        BatchNoArray = result.list;  //鑾峰彇鎵瑰彿锛岀敤鏉ョ粰鎵规鎸夐挳鍔熻兘涓殑鎵瑰彿璧嬪��
+                                        //for (let i = 0; i < result.list.length; i++) {
+                                        //    result.list[i].HMinQty = '';//鐐瑰嚮鍗曞厓鏍肩殑鏃跺�欓粯璁ゅ��0涓嶄細娓呴櫎锛屽鎴风湅浜嗕細瑙夊緱寰堟�紝鎵�浠ュ厛鐢ㄧ┖瀛楃涓插彇浠�;
+                                        //}
+                                        table.reload('mainTable', {
+                                            data: result.list // 璋冪敤table.reload 閲嶆柊娓叉煋鏄剧ず鍔犺浇杩藉姞浜嗘暟鎹殑琛ㄦ牸
+                                        });
+                                        //鍏抽棴褰撳墠frame
+                                        layer.close(index);
+                                    }
+                                }
+                            })
+                        }
+                        else {
+                            layer.msg("涓嶅厑璁搁�夋嫨涓嶅悓鐨勯儴闂ㄦ暟鎹�!", { time: 1 * 2000, icon: 5 });
+                        }
 
-                       
                     }
                     , btn2: function (index, layero) {
                         //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
@@ -325,7 +565,179 @@
                     }
                 });
             });
-           
+
+            function isAllEqual(array) {
+                if (array.length > 0) {
+                    return !array.some(function (value, index) {
+                        return value !== array[0];
+                    });
+                } else {
+                    return true;
+                }
+            }
+
+            //鎵撳嵃
+            form.on('submit(ToolPrint)', function (data) {
+                get_PrintReport();
+            })
+
+            //鏉$爜鐢熸垚
+            form.on('submit(ToolCreate)', function (data) {
+                $('#ToolCreate').addClass("layui-btn-disabled").attr("disabled", true);//鐢熸垚鎸夐挳绂佺敤
+                var sSubStr = JSON.stringify(table.cache['mainTable']);
+                HMaterInfo = table.cache['mainTable'];
+                //鐗╂枡鏄庣粏淇℃伅涓嶄负绌哄垽鏂�
+                if (!AllowLoadData(sSubStr))//鏁版嵁楠岃瘉
+                {
+                    $('#ToolCreate').removeClass("layui-btn-disabled").attr("disabled", false);//鐢熸垚鎸夐挳鍚敤
+                    return false;
+                }
+                //鑾峰彇閫夋嫨鐨勭粍缁�
+                var HOrgType = $("#HOrgID").find("option:selected").html();
+                //鑾峰彇閫夋嫨鐨勫伐鍘備唬鐮�
+                var CampanyName = $("#HWorksNumber").find("option:selected").html();
+                if (CampanyName == "" || CampanyName == null)
+                {
+                    CampanyName = "xxx";
+                }
+                //鑾峰彇閫夋嫨鐨勬簮鍗曠被鍨�
+                var HSourceBillType = $("#HSourceBillType").find("option:selected").html();
+                //鑾峰彇閫夋嫨鐨勬潯鐮佺被鍨�
+                var HSelectBarCodeType = $("#HBarCodeType").find("option:selected").html();
+                //鑾峰彇褰撳墠鐧诲綍浜哄憳
+                var UserName = sessionStorage["HUserName"];
+                //var UserName = "Admin";
+                var sMainSub = sSubStr + ';' + HOrgType + ';' + HSourceBillType + ';' + HSelectBarCodeType + ';' + CampanyName + ';' + UserName;
+                SaveBarCodeCreate(sMainSub);
+            })
+
+            //閲嶇疆
+            form.on('submit(ToolReset)', function (data) {
+                layer.confirm('纭畾瑕佹竻绌哄綋鍓嶇晫闈俊鎭紝閲嶇疆鐣岄潰锛�',{
+                    btn: ['纭畾', '鍙栨秷'],
+                    title: "鎻愮ず",
+                    icon: 3,
+                }, function (index) {
+                    $("#HOrgID").find("option").remove(); //娓呴櫎婧愬崟绫诲瀷閫夋嫨涓嬫媺妗嗕腑鐨勫��
+                    set_HOrg(); //璋冪敤鑾峰彇婧愬崟绫诲瀷閫夋嫨涓嬫媺妗嗙殑鍊�
+                    $("#HDate").val(Format(new Date(), "yyyy-MM-dd")); //鍗曟嵁鏃ユ湡
+                    $("#HSourceBillType").val('1'); //閫夋嫨涓嬫媺妗嗛粯璁ょ涓�涓�夐」
+                    $("#HBarCodeType").val('0');
+                    var arr = [{ HBillNo: '', HMaterNumber: '', HMaterName: '', HMaterModel: '', HAuxPropNumber: '', HAuxPropName: '', HUnitNumber: '', HUnitName: '', HBatchNo: '', HGiveAwayFlag: '0', HQty: '0', HMinQty: '0', HPackQty: '0', HBQty: '0', HDate: '', HCusNumber: '', HCusName: '', HSeOrderBillNo: '', HRemark: '' }]
+                    table.reload('mainTable', {
+                        data: arr // 璋冪敤table.reload 閲嶆柊娓叉煋鏄剧ず鍔犺浇杩藉姞浜嗘暟鎹殑琛ㄦ牸
+                    });
+                    var arr1 = [{
+                        "HBarCode": "", "HMaterNumber": "", "HMaterName": "", "HMaterModel": "", "HAuxPropNumber": "", "HAuxPropName": ""
+                        , "HGiveAwayFlag": "", "HUnitCode": "", "HUnitName": "", "HQty": 0, "HDate": "", "HCusNumber": "", "HCusName": ""
+                        , "HSourceBillNo": "", "HSeOrderBillNo": "", "HRemark": "", "HMTONo": "", "HShowDate": "", "HInnerBillNo": "", "HMaker": ""
+                    }]
+                    table.reload('mainTable1', {
+                        data: arr1 // 璋冪敤table.reload 閲嶆柊娓叉煋鏄剧ず鍔犺浇杩藉姞浜嗘暟鎹殑琛ㄦ牸
+                    });
+
+                    //鐢熸垚鎴愬姛璺宠浆鍒版潯鐮佷俊鎭爣绛鹃〉
+                    element.tabChange('tab-TabTest', '1');
+                    //鍔犺浇妗f鍒楄〃
+                    table.reload('mainTable2', {
+                        data: [] // 璋冪敤table.reload 閲嶆柊娓叉煋鏄剧ず鍔犺浇杩藉姞浜嗘暟鎹殑琛ㄦ牸
+                    });
+                        layer.close(index)
+                })
+            })
+
+            //搴撳瓨
+            form.on('submit(ToolStock)', function (data) {
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '鐗╂枡璧勬枡',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['80%', '80%'],
+                    maxmin: true,
+                    content: ['../../PublicPage/MaterialInfo.html', 'yes'],
+                    btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {
+
+                        //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        var arr = [{ HBillNo: '', HMaterNumber: checkStatus.data[0].鐗╂枡浠g爜, HMaterName: checkStatus.data[0].鐗╂枡鍚嶇О, HMaterModel: '', HAuxPropNumber: '', HAuxPropName: '', HUnitNumber: checkStatus.data[0].璁¢噺鍗曚綅浠g爜, HUnitName: checkStatus.data[0].璁¢噺鍗曚綅, HBatchNo: '', HGiveAwayFlag: '0', HQty: checkStatus.data[0].鏁伴噺.toString("#0.00"), HMinQty: checkStatus.data[0].鏈�灏忓寘瑁呮暟, HPackQty: '0', HBQty: '0', HDate: '', HCusNumber: '', HCusName: '', HSeOrderBillNo: '', HRemark: '' }]
+                        //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+                        table.reload('mainTable', {
+                            data: arr // 璋冪敤table.reload 閲嶆柊娓叉煋鏄剧ず鍔犺浇杩藉姞浜嗘暟鎹殑琛ㄦ牸
+                        });
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                    end: function () {
+
+                    }
+                });
+            });
+
+            //鍚屾璧勬枡
+            form.on('submit(ToolSynch)', function (data) {
+                $.ajax({
+                    url: GetWEBURL() + '/Sc_BarCode/Sync_data',
+                    type: "GET",
+                    //data: { "sWhere": SeachFilter(sWhere1) },
+                    success: function (data1) {
+                        if (data1.code == 1) {
+                            layer.alert(data1.Message)
+                        } 
+                    }, error: function () {
+                        layer.close(index);
+                        layer.alert(data1.Message, { icon: 5 });
+                    }
+                });
+            });
+
+            //鎵规
+            form.on('submit(ToolBatch)', function (data) {
+                if (HMinQty2 == 0 && HMaterID) {
+                    $.ajax({
+                        url: GetWEBURL() + '/Sc_BarCode/Batch',
+                        type: "GET",
+                        data: { "HMaterID": HMaterID, "HBatchNo": HBatchNo },
+                        success: function (data1) {
+                            if (data1.code == 1) {
+                                BatchNoArray[0].HBatchNo = data1.data
+                                BatchNoArray[0].HMinQty = HMinQty2
+                                console.log(BatchNoArray)
+                                table.reload('mainTable', {
+                                    data: BatchNoArray // 璋冪敤table.reload 閲嶆柊娓叉煋鏄剧ず鍔犺浇杩藉姞浜嗘暟鎹殑琛ㄦ牸
+                                });
+                                layer.alert(data1.Message)
+                            }
+                        }, error: function () {
+                            layer.alert(data1.Message, { icon: 5 });
+                        }
+                    });
+                } else {
+                    layer.alert('璇锋偍鍦ㄨ幏鍙栨壒鍙峰悗鍦ㄨ緭鍏ユ渶灏忓寘瑁呮暟 ^_^||')
+                }
+            });
+
+            //閫�鍑�
+            form.on('submit(ToolExit)', function (data) {
+                if (linterid == undefined) {
+                    //鍏抽棴椤电
+                    Pub_Close(2);
+                }
+                else {
+                    //鍏抽棴椤电
+                    Pub_Close(1);
+                }
+            });
+
             //#endregion
 
             //#region 姝ら〉闈㈡墍鏈夋柟娉�
@@ -352,15 +764,14 @@
                             $("#HOrgID").append(Organization);
                             form.render('select');
                         }
-                        $('#HOrgID').find("option[value=" + result.data[0].ID + "]").attr("selected", true);
+                        $('#HOrgID').find("option[value=" + sessionStorage["OrganizationID"] + "]").attr("selected", true);
                         form.render('select') //鍐嶆娓叉煋
                         layer.closeAll("loading");
                     }
                 })
             }
             //鑾峰彇宸ュ巶浠g爜
-            function set_HWorksNumber()
-            {
+            function set_HWorksNumber() {
                 //鑾峰彇宸ュ巶浠g爜
                 var Organization = '';
                 $.ajax({
@@ -374,8 +785,7 @@
                             }
                             $("#HWorksNumber").append(Organization);
                             form.render('select');
-                            if (result.list[0] != "" && result.list[0] != null)
-                            {
+                            if (result.list[0] != "" && result.list[0] != null) {
                                 $('#HWorksNumber').find("option[value=" + result.list[0] + "]").attr("selected", true);
                                 form.render('select') //鍐嶆娓叉煋
                             }
@@ -385,8 +795,7 @@
                 })
             }
             //鑾峰彇鏉$爜绫诲瀷
-            function set_HBarCodeType()
-            {
+            function set_HBarCodeType() {
                 //鑾峰彇鏉$爜绫诲瀷浠g爜
                 var Organization = '';
                 $.ajax({
@@ -396,12 +805,12 @@
                         if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
                             var data = result.list;
                             for (var i = 0; i < data.length; i++) {
-                                Organization += '<option  style="color:blue;" value="' + i+ '">' + data[i] + '</option>';
+                                Organization += '<option  style="color:blue;" value="' + i + '">' + data[i] + '</option>';
                             }
                             $("#HBarCodeType").append(Organization);
                             form.render('select');
                         }
-                        $('#HBarCodeType').find("option[value=" + result.list[0]+ "]").attr("selected", true);
+                        $('#HBarCodeType').find("option[value=" + result.list[0] + "]").attr("selected", true);
                         form.render('select') //鍐嶆娓叉煋
                         layer.closeAll("loading");
                     }
@@ -412,32 +821,40 @@
             function set_InitGrid() {
                 columns = [
                     { type: 'checkbox', fixed: 'left' }
-                    , { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe", width: 100 }
-                    , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', edit: 'text', width: 100, hide: true }
-                    , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', edit: 'text', width: 100, hide: true }
-                    , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', edit: 'text', event: 'HMaterCode', width: 100 }
-                    , { field: 'HMaterID', title: '鐗╂枡ID', edit: 'text', width: 100, hide: true }
-                    , { field: 'HMaterNumber', title: '鐗╂枡浠g爜', edit: 'text', width: 100 }
-                    , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', edit: 'text', width: 100 }
-                    , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', edit: 'text', width: 100 }
-                    , { field: 'HAuxPropID', title: '杈呭姪灞炴�D', edit: 'text', width: 100, hide: true }
-                    , { field: 'HAuxPropNumber', title: '杈呭姪灞炴�т唬鐮�', edit: 'text', event: 'HUnitCode', width: 100 }
-                    , { field: 'HAuxPropName', title: '杈呭姪灞炴�у悕绉�', edit: 'text', width: 100 }
-                    , { field: 'HUnitID', title: '璁¢噺鍗曚綅ID', edit: 'text', width: 100, hide: true }
-                    , { field: 'HUnitCode', title: '璁¢噺鍗曚綅浠g爜', edit: 'text', event: 'HUnitCode', width: 100 }
-                    , { field: 'HUnitName', title: '璁¢噺鍗曚綅', edit: 'text', width: 100 }
+                    , { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe", width: 75 }
+                    , { field: 'HMainID', title: '婧愬崟涓诲唴鐮�',  width: 100, hide: true }
+                    , { field: 'HSubID', title: '婧愬崟瀛愬唴鐮�',  width: 100, hide: true }
+                    , { field: 'HBillNo', title: '婧愬崟鍗曞彿', width: 200 }
+                    , { field: 'HMaterID', title: '鐗╂枡ID',  width: 100, hide: true }
+                    , { field: 'HMaterNumber', title: '鐗╂枡浠g爜', edit: 'text', event: 'HMaterNumber', width: 200 }
+                    , { field: 'HMaterName', title: '鐗╂枡鍚嶇О',  width: 200 }
+                    , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 200 }
                     , { field: 'HBatchNo', title: '鎵瑰彿', edit: 'text', width: 100 }
-                    , { field: 'HGiveAwayFlag', title: '鏄惁璧犲搧', width: 100, templet: '#switchTpl', unresize: false }
                     , { field: 'HQty', title: '鏁伴噺', edit: 'text', width: 100 }
                     , { field: 'HMinQty', title: '鏈�灏忓寘瑁呮暟', edit: 'text', width: 100 }
-                    , { field: 'HBQty', title: '绠辨暟', edit: 'text', width: 100 }
+                    , { field: 'HBQty', title: '绠辨暟', width: 100 }
                     , { field: 'HPackQty', title: '澶栫鏁�', edit: 'text', width: 100 }
-                    , { field: 'HDate', title: '杩涙枡鏃ユ湡', edit: 'text', width: 100 }
-                    , { field: 'HCusID', title: '瀹㈡埛ID', edit: 'text', width: 100, hide: true }
-                    , { field: 'HCusNumber', title: '瀹㈡埛浠g爜', edit: 'text', event: 'HWHCode', width: 120 }
-                    , { field: 'HCusName', title: '瀹㈡埛鍚嶇О', edit: 'text', width: 120 }
+                    , { field: 'HCoilNO', title: '閽㈠嵎鎹嗗寘鍙�', edit: 'text', width: 100 }
+                    , { field: 'HFurnaceNO', title: '鐐夊彿', edit: 'text', width: 100 }
+                    , { field: 'HFactory', title: '鍘傚晢', edit: 'text', width: 100 }
+                    , { field: 'HCusID', title: '瀹㈡埛ID',  width: 100, hide: true }
+                    , { field: 'HCusNumber', title: '瀹㈡埛浠g爜', edit: 'text', event: 'HCusNumber', width: 120 }
+                    , { field: 'HCusName', title: '瀹㈡埛鍚嶇О', width: 120 }
                     , { field: 'HSeOrderBillNo', title: '閿�鍞鍗曞彿', width: 200 }
                     , { field: 'HRemark', title: '澶囨敞', edit: 'text', width: 100 }
+                    , { field: 'HProduceDate', title: '鐢熶骇鏃ユ湡', event: 'HProduceDate', width: 100 }
+                    , { field: 'HExpiryDate', title: '淇濊川鏈熻嚦', event: 'HExpiryDate', width: 100 }
+                    , { field: 'HheatNO', title: '鐑鐞�', edit: 'text', width: 100 }
+                    , { field: 'HAuxPropID', title: '杈呭姪灞炴�D',  width: 100, hide: true }
+                    , { field: 'HAuxPropNumber', title: '杈呭姪灞炴�т唬鐮�', edit: 'text', event: 'HAuxPropNumber', width: 100 }
+                    , { field: 'HAuxPropName', title: '杈呭姪灞炴�у悕绉�',  width: 100 }
+                    , { field: 'HUnitID', title: '璁¢噺鍗曚綅ID', width: 100, hide: true }
+                    , { field: 'HUnitNumber', title: '璁¢噺鍗曚綅浠g爜', edit: 'text', event: 'HUnitNumber', width: 100 }
+                    , { field: 'HUnitName', title: '璁¢噺鍗曚綅',width: 100 }
+                    , { field: 'HAuxQty', title: '杈呭崟浣嶆暟閲�', edit: 'text', width: 100 }
+                    , { field: 'HExpirationDateFlag', title: '鏄惁鍚敤淇濊川鏈�', width: 100, templet: '#switchTp3', unresize: false }
+                    , { field: 'HGiveAwayFlag', title: '鏄惁璧犲搧', width: 100, templet: '#switchTpl', unresize: false }
+                    , { field: 'HDate', title: '杩涙枡鏃ユ湡',  width: 100 }
                     , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
                 ];
                 option = {
@@ -445,64 +862,138 @@
                     , elem: '#mainTable'
                     , toolbar: '#toolbarDemo'
                     , page: false
-                    , cellMinWidth: 120
-                    , height: 650
+                    , cellMinWidth: 75
+                    , height: 'full-325'
                     , cols: [columns]
                     , limit: 500 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
                     , done: function (res, curr, count) {
                     }
                 };
+                option.data = rowdata;
+                table.render(option);              
             }
             //鍒濆鏉$爜淇℃伅琛ㄦ牸
             function set_CountGrid() {
                 //琛ㄥご
                 columns = [
-                    { type: 'checkbox', fixed: 'left' }
-                    , { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe", width: 100 }
-                    , { field: '閫夋嫨', title: '閫夋嫨', width: 100 }
-                    , { field: 'HBarCode', title: '鏉$爜缂栧彿',  width: 100 }
-                    , { field: 'HMaterNumber', title: '鐗╂枡浠g爜', width: 100 }
-                    , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 100 }
-                    , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 100 }
-                    , { field: 'HAuxPropNumber', title: '杈呭姪灞炴�т唬鐮�', width: 100 }
-                    , { field: 'HAuxPropName', title: '杈呭姪灞炴��', event: 'HWHCode', width: 120 }
-                    , { field: 'HGiveAwayFlag', title: '鏄惁璧犲搧', width: 120, templet: '#switchTpl', unresize: false }
-                    , { field: 'HUnitCode', title: '璁¢噺鍗曚綅浠g爜', width: 120 }
-                    , { field: 'HUnitName', title: '璁¢噺鍗曚綅', width: 120 }
-                    , { field: 'HQty', title: '鏁伴噺', width: 120 }
-                    , { field: 'HDate', title: '杩涙枡鏃ユ湡', width: 120 }
-                    , { field: 'HCusNumber', title: '瀹㈡埛浠g爜', width: 120 }
-                    , { field: 'HCusName', title: '瀹㈡埛', width: 120 }
-                    , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 120 }
-                    , { field: 'HSeOrderBillNo', title: '閿�鍞鍗曞彿', width: 120 }
-                    , { field: 'HRemark', title: '澶囨敞', width: 120 }
-                    , { field: 'HMTONo', title: '璁″垝璺熻釜鍙�', width: 120 }
-                    , { field: 'HShowDate', title: '鏃ユ湡', width: 100 }
-                    , { field: 'HInnerBillNo', title: '鍐呴儴閲囪喘璁㈠崟鍙�', width: 100 }
-                    , { field: 'HMaker', title: '鍒跺崟浜�', width: 100 }
+                    { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe", width: 100 }
+                    , { field: 'HBarCode2', title: '鏉$爜缂栧彿', width: 100 }
+                    , { field: 'HMaterNumber2', title: '鐗╂枡浠g爜', width: 100 }
+                    , { field: 'HMaterName2', title: '鐗╂枡鍚嶇О', width: 100 }
+                    , { field: 'HMaterModel2', title: '瑙勬牸鍨嬪彿', width: 100 }
+                    , { field: 'HAuxPropNumber2', title: '杈呭姪灞炴�т唬鐮�', width: 100 }
+                    , { field: 'HAuxPropName2', title: '杈呭姪灞炴��', event: 'HWHCode', width: 120 }
+                    , { field: 'HGiveAwayFlag2', title: '鏄惁璧犲搧', width: 120, templet: '#switchTpl', unresize: false }
+                    , { field: 'HUnitCode2', title: '璁¢噺鍗曚綅浠g爜', width: 120 }
+                    , { field: 'HUnitName2', title: '璁¢噺鍗曚綅', width: 120 }
+                    , { field: 'HQty2', title: '鏁伴噺', width: 120 }
+                    , { field: 'HDate2', title: '杩涙枡鏃ユ湡', width: 120 }
+                    , { field: 'HCusNumber2', title: '瀹㈡埛浠g爜', width: 120 }
+                    , { field: 'HCusName2', title: '瀹㈡埛', width: 120 }
+                    , { field: 'HSourceBillNo2', title: '婧愬崟鍗曞彿', width: 120 }
+                    , { field: 'HSeOrderBillNo2', title: '閿�鍞鍗曞彿', width: 120 }
+                    , { field: 'HRemark2', title: '澶囨敞', width: 120 }
+                    , { field: 'HMTONo2', title: '璁″垝璺熻釜鍙�', width: 120 }
+                    , { field: 'HShowDate2', title: '鏃ユ湡', width: 100 }
+                    , { field: 'HInnerBillNo2', title: '鍐呴儴閲囪喘璁㈠崟鍙�', width: 100 }
+                    , { field: 'HMaker2', title: '鍒跺崟浜�', width: 100 }
                 ];
                 option1 = {
                     id: 'mainTable1'
                     , elem: '#mainTable1'
-                    , height: 500
+                    , toolbar: '#toolbarDemo1'                   
                     , page: false
                     , limit: 500
                     , cellMinWidth: 120
-                    , height: 650
+                    , height: 'full-325'
                     , cols: [columns]
                     , done: function (res, curr, count) {
                     }
                 };
             }
-
+            //鍒濆鍖栨。妗堝垪琛ㄤ俊鎭〃鏍�
+            function set_InitGrid2() {
+                //琛ㄥご
+                columns = [
+                    { type: 'checkbox', fixed: 'left' }
+                    , { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe", width: 100 }
+                    , { field: 'HItemID', title: 'HItemID', width: 100, hide: true }
+                    , { field: 'hmainid', title: 'hmainid', width: 100, hide: true }
+                    , { field: 'hsubid', title: 'hsubid', width: 100, hide: true }
+                    , { field: 'HinterID', title: 'HinterID', width: 100, hide: true }
+                    , { field: '鏉$爜绫诲瀷', title: '鏉$爜绫诲瀷', width: 100 }
+                    , { field: '鏉$爜缂栧彿', title: '鏉$爜缂栧彿', width: 120 }
+                    , { field: 'HMaterID', title: '鐗╂枡ID', width: 100, hide: true }
+                    , { field: '鐗╂枡浠g爜', title: '鐗╂枡浠g爜', width: 120 }
+                    , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 120 }
+                    , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 120 }
+                    , { field: 'HUnitID', title: '璁¢噺鍗曚綅ID', width: 100, hide: true }
+                    , { field: '璁¢噺鍗曚綅浠g爜', title: '璁¢噺鍗曚綅浠g爜', width: 120 }
+                    , { field: '璁¢噺鍗曚綅', title: '璁¢噺鍗曚綅', width: 120 }
+                    , { field: 'HAuxPropID', title: '杈呭姪灞炴�D', width: 100, hide: true }
+                    , { field: '杈呭姪灞炴�т唬鐮�', title: '杈呭姪灞炴�т唬鐮�', width: 120 }
+                    , { field: '杈呭姪灞炴��', title: '杈呭姪灞炴��', width: 120 }
+                    , { field: '鎵瑰彿', title: '鎵瑰彿', width: 120 }
+                    , { field: '鏁伴噺', title: '鏁伴噺', width: 100 }
+                    , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 120 }
+                    , { field: '璁″垝璺熻釜鍙�', title: '璁″垝璺熻釜鍙�', width: 120 }
+                    , { field: '鏄惁璧犲搧', title: '鏄惁璧犲搧', width: 100 }
+                    , { field: 'DeptID', title: '杞﹂棿ID', width: 100, hide: true }
+                    , { field: '杞﹂棿', title: '杞﹂棿', width: 120 }
+                    , { field: 'HSupID', title: '渚涘簲鍟咺D', width: 100, hide: true }
+                    , { field: '渚涘簲鍟嗕唬鐮�', title: '渚涘簲鍟嗕唬鐮�', width: 120 }
+                    , { field: '渚涘簲鍟�', title: '渚涘簲鍟�', width: 120 }
+                    , { field: '瀹㈡埛鏉$爜缂栧彿', title: '瀹㈡埛鏉$爜缂栧彿', width: 120 }
+                    , { field: '瀹㈡埛鍨嬪彿', title: '瀹㈡埛鍨嬪彿', width: 120 }
+                    , { field: '寰�鏉ュ崟浣�', title: '寰�鏉ュ崟浣�', width: 120 }
+                    , { field: '閿�鍞鍗曞彿', title: '閿�鍞鍗曞彿', width: 120 }
+                    , { field: '閿�鍞鍗曡鍙�', title: '閿�鍞鍗曡鍙�', width: 120 }
+                    , { field: '鎵樺彿', title: '鎵樺彿', width: 120 }
+                    , { field: '鎬绘墭鏁�', title: '鎬绘墭鏁�', width: 100 }
+                    , { field: '鏉$爜鏃ユ湡', title: '鏉$爜鏃ユ湡', width: 120 }
+                    , { field: '鐢熶骇鍏ュ簱鏃ユ湡', title: '鐢熶骇鍏ュ簱鏃ユ湡', width: 120 }
+                    , { field: '鐢熶骇鍏ュ簱鍗曞彿', title: '鐢熶骇鍏ュ簱鍗曞彿', width: 120 }
+                    , { field: '鐢熶骇鍏ュ簱娆℃暟', title: '鐢熶骇鍏ュ簱娆℃暟', width: 100 }
+                    , { field: '閿�鍞嚭搴撴棩鏈�', title: '閿�鍞嚭搴撴棩鏈�', width: 120 }
+                    , { field: '閿�鍞嚭搴撳崟鍙�', title: '閿�鍞嚭搴撳崟鍙�', width: 120 }
+                    , { field: '閿�鍞嚭搴撴鏁�', title: '閿�鍞嚭搴撴鏁�', width: 100 }
+                    , { field: '浣滃簾鏍囪', title: '浣滃簾鏍囪', width: 100 }
+                    , { field: '浣滃簾浜�', title: '浣滃簾浜�', width: 100 }
+                    , { field: '澶囨敞', title: '澶囨敞', width: 120 }
+                    , { field: '鍒朵綔浜�', title: '鍒朵綔浜�', width: 100 }
+                    , { field: '鏃ユ湡', title: '鏃ユ湡', width: 120 }
+                    , { field: '璁″垝瀹屽伐鏃ユ湡', title: '璁″垝瀹屽伐鏃ユ湡', width: 120 }
+                    , { field: '鎵撳嵃娆℃暟', title: '鎵撳嵃娆℃暟', width: 100 }
+                    , { field: 'HSTOCKORGID', title: 'HSTOCKORGID', width: 100, hide: true }
+                    , { field: '鐢熸垚缁勭粐', title: '鐢熸垚缁勭粐', width: 120 }
+                ];
+                option2 = {
+                    id: 'mainTable2'
+                    , elem: '#mainTable2'
+                    , toolbar: '#toolbarDemo2'                    
+                    , page: false
+                    , limit: 500
+                    , cellMinWidth: 120
+                    , height: 'full-325'
+                    , cols: [columns]
+                    , done: function (res, curr, count) {
+                    }
+                };
+            }
             //鏃犳簮鍗曟柊澧�
             function set_AddFNew() {
                 option.data = [{
-                    "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": "", "HMaterID": 0, "HMaterNumber": "", "HMaterName": "", "HMaterModel": ""
-                    , "HAuxPropID": 0, "HAuxPropNumber": "", "HAuxPropName": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "", "HBatchNo": "", "HGiveAwayFlag": 0
-                    , "HQty": 0, "HMinQty": 0, "HBQty": 0, "HPackQty": 0, "HDate": "", "HCusID": 0, "HCusNumber": "", "HCusName": "", "HSeOrderBillNo": "", "HRemark": ""
+                    "HMainID": 0, "HSubID": 0, "HBillNo": "", "HMaterID": 0, "HMaterNumber": "", "HMaterName": "", "HMaterModel": ""
+                    , "HAuxPropID": 0, "HAuxPropNumber": "", "HAuxPropName": "", "HUnitID": 0, "HUnitNumber": "", "HUnitName": "", "HBatchNo": "", "HGiveAwayFlag": 0
+                    , "HQty": 0, "HMinQty": '', "HBQty": 0, "HPackQty": 0, "HDate": "", "HCusID": 0, "HCusNumber": "", "HCusName": "", "HSeOrderBillNo": "", "HRemark": ""
+                    , "HCoilNO": "", "HFurnaceNO": "", "HFactory": "",
+                    "HAuxQty": 0, "HheatNO": "", "HProduceDate": Format(new Date(), "yyyy-MM-dd"), "HExpiryDate": Format(new Date(), "yyyy-MM-dd"), "HExpirationDateFlag": 0
                 }];
                 table.render(option);
+                //鍒锋柊琛ㄦ牸鏁版嵁
+                DisPlay_HideColumn();
+                DisPlay_HideColumn1();
+                DisPlay_HideColumn2();
             }
 
             function set_AddFNew1() {
@@ -510,9 +1001,24 @@
                     "HBarCode": "", "HMaterNumber": "", "HMaterName": "", "HMaterModel": "", "HAuxPropNumber": "", "HAuxPropName": ""
                     , "HGiveAwayFlag": "", "HUnitCode": "", "HUnitName": "", "HQty": 0, "HDate": "", "HCusNumber": "", "HCusName": ""
                     , "HSourceBillNo": "", "HSeOrderBillNo": "", "HRemark": "", "HMTONo": "", "HShowDate": "", "HInnerBillNo": "", "HMaker": ""
+                    , "HExpirationDateFlag": 0
                 }];
                 table.render(option1);
+                //鍒锋柊琛ㄦ牸鏁版嵁
+                DisPlay_HideColumn();
+                DisPlay_HideColumn1();
+                DisPlay_HideColumn2();
             }
+
+            function set_AddFNew2() {
+                option2.data = [];
+                table.render(option2);
+                //鍒锋柊琛ㄦ牸鏁版嵁
+                DisPlay_HideColumn();
+                DisPlay_HideColumn1();
+                DisPlay_HideColumn2();
+            }
+
             //鏃ユ湡鏍煎紡鍖�
             function formatDate(date) {
                 var d = new Date(date),
@@ -540,11 +1046,12 @@
                 table.cache["mainTable"].push(NewRow);
                 option.data = table.cache["mainTable"];
                 table.render(option);
-                rows++;
+                //rows++;
                 layer.msg('澧炲姞涓�琛屾寜閽紒')
             }
             //澶嶅埗涓�琛�
             function btnCopyLine(data) {
+                data[0].HQty = '';
                 var copydata = JSON.stringify(data);
                 if (data.length <= 0) {
                     layer.msg("璇烽�夋嫨闇�瑕佸鍒剁殑涓�琛岋紒");
@@ -560,6 +1067,318 @@
                     table.render(option);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
                 }
             }
+
+            //闅愯棌鍒楄缃�
+            function get_HideColumn(value) {
+                var colName = "";
+                if (value == 0) {
+                    HModName = "Gy_BarCodeBill";
+                    for (var i = 1; i < option.cols[0].length - 1; i++) {
+                        colName += option.cols[0][i]["title"] + ",";
+                    }
+                } else if (value == 1) {
+                    HModName = "Gy_BarCodeBill_1";
+                    for (var i = 1; i < option1.cols[0].length - 1; i++) {
+                        colName += option1.cols[0][i]["title"] + ",";
+                    }
+                } else if (value == 2) {
+                    HModName = "Gy_BarCodeBill_2";
+                    for (var i = 1; i < option2.cols[0].length - 1; i++) {
+                        colName += option2.cols[0][i]["title"] + ",";
+                    }
+                }
+               
+                var contentUrl = "";
+                var urlStr = window.document.location.pathname;//鑾峰彇鏂囦欢璺緞
+                var urlLen = urlStr.split('/');
+                for (var i = 0; i < urlLen.length - 4; i++) {
+                    contentUrl += "../";
+                }
+                colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+
+                contentUrl += '鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName;
+
+                layer.open({
+                    type: 2
+                    , skin: "layui-layer-rim" //鍔犱笂杈规
+                    , title: "闅愯棌鍒楄缃�"  //鏍囬
+                    , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                    , shift: 2 //寮瑰嚭鍔ㄧ敾
+                    , area: ["50%", "90%"] //绐椾綋澶у皬
+                    , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                    , content: [contentUrl, "yes"]
+                    , btn: ["纭畾", "鍙栨秷"]
+                    , btn1: function (index, laero) {
+                        if (value == 0) {
+                            //鍒锋柊琛ㄦ牸鏁版嵁
+                            DisPlay_HideColumn();
+                        } else if (value == 1) {
+                            //鍒锋柊琛ㄦ牸鏁版嵁
+                            DisPlay_HideColumn1();
+                        } else if (value == 2) {
+                            //鍒锋柊琛ㄦ牸鏁版嵁
+                            DisPlay_HideColumn2();
+                        }
+                        //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+                        layer.close(index);//鍏抽棴寮圭獥
+                    }
+                })
+            }
+
+            //鏄剧ず鍒楁暟鎹� 鐗╂枡淇℃伅
+            function DisPlay_HideColumn() {
+                $.ajax({
+                    url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+                    type: "GET",
+                    data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+                    async: false,
+                    success: function (data1) {
+                        if (data1.data.length != 0) {
+
+
+                            var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+                          
+
+                            dataCol = data1.data[0].HGridString.split(',');
+
+                            for (var i = 0; i < option.cols[0].length - 2; i++) {
+                                var dataCols = dataCol[i].split('|');
+                                //闅愯棌鍒�
+                                if (dataCols[1] == 1) {
+                                    option.cols[0][i + 1]["hide"] = true;
+                                }
+                                //璁剧疆鍒楀
+                                if (dataCols[3] > 0) {
+                                    option.cols[0][i + 1]["width"] = dataCols[3];
+                                }
+                                //璁剧疆鍐呭瀛椾綋澶у皬
+                                if (data1.data[0].HFontSize != 0) {
+                                    option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+                                } else {
+                                    option.cols[0][i + 1]["style"] = "font-size:100%";
+                                }
+                                //璁剧疆鍒楀
+                                //if (data1.data[0].HColumnWidth != 0) {
+                                //    option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
+                                //} else {
+                                //    option.cols[0][i + 1]["width"] = "";
+                                //}
+                                //鏄剧ず鍒�
+                                if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
+                                    option.cols[0][i + 1]["hide"] = false;
+                                }
+                                //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+                                switch (dataCols[2]) {
+                                    case "L":
+                                        option.cols[0][i + 1]["align"] = "left";
+                                        break;
+                                    case "M":
+                                        option.cols[0][i + 1]["align"] = "center";
+                                        break;
+                                    case "R":
+                                        option.cols[0][i + 1]["align"] = "right";
+                                        break;
+                                }
+                            }
+
+                            //鍙栨秷鍐荤粨鍒�
+                            for (var i = 1; i < option.cols[0].length - 1; i++) {
+                                if (option.cols[0][i]["fixed"] != null) {
+                                    option.cols[0][i]["fixed"] = null;
+                                }
+                                else {
+                                    break;
+                                }
+                            }
+                            //鍐荤粨鍒�
+                            if (data1.data[0].HFixCols != 0) {
+                                for (var i = 0; i < data1.data[0].HFixCols; i++) {
+                                    if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
+                                        data1.data[0].HFixCols += 1;
+                                    }
+                                    option.cols[0][i + 1]["fixed"] = "left";
+                                }
+                            }
+                            table.render(option);
+                        } else {
+                            table.render(option);
+                        }
+                    }, error: function () {
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                })
+            }
+
+            //鏄剧ず鍒楁暟鎹� 鏉$爜淇℃伅
+            function DisPlay_HideColumn1() {
+                $.ajax({
+                    url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+                    type: "GET",
+                    data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+                    async: false,
+                    success: function (data1) {
+                        if (data1.data.length != 0) {
+
+
+                            var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+
+
+                            dataCol = data1.data[0].HGridString.split(',');
+
+                            for (var i = 0; i < option1.cols[0].length - 2; i++) {
+                                var dataCols = dataCol[i].split('|');
+                                //闅愯棌鍒�
+                                if (dataCols[1] == 1) {
+                                    option1.cols[0][i + 1]["hide"] = true;
+                                }
+                                //璁剧疆鍒楀
+                                if (dataCols[3] > 0) {
+                                    option1.cols[0][i + 1]["width"] = dataCols[3];
+                                }
+                                //璁剧疆鍐呭瀛椾綋澶у皬
+                                if (data1.data[0].HFontSize != 0) {
+                                    option1.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+                                } else {
+                                    option1.cols[0][i + 1]["style"] = "font-size:100%";
+                                }
+                                //璁剧疆鍒楀
+                                //if (data1.data[0].HColumnWidth != 0) {
+                                //    option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
+                                //} else {
+                                //    option.cols[0][i + 1]["width"] = "";
+                                //}
+                                //鏄剧ず鍒�
+                                if (dataCols[1] == 0 && $.inArray(option1.cols[0][i + 1]["title"], titleData) == -1) {
+                                    option1.cols[0][i + 1]["hide"] = false;
+                                }
+                                //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+                                switch (dataCols[2]) {
+                                    case "L":
+                                        option1.cols[0][i + 1]["align"] = "left";
+                                        break;
+                                    case "M":
+                                        option1.cols[0][i + 1]["align"] = "center";
+                                        break;
+                                    case "R":
+                                        option1.cols[0][i + 1]["align"] = "right";
+                                        break;
+                                }
+                            }
+
+                            //鍙栨秷鍐荤粨鍒�
+                            for (var i = 1; i < option1.cols[0].length - 1; i++) {
+                                if (option1.cols[0][i]["fixed"] != null) {
+                                    option1.cols[0][i]["fixed"] = null;
+                                }
+                                else {
+                                    break;
+                                }
+                            }
+                            //鍐荤粨鍒�
+                            if (data1.data[0].HFixCols != 0) {
+                                for (var i = 0; i < data1.data[0].HFixCols; i++) {
+                                    if ($.inArray(option1.cols[0][i + 1]["title"], titleData) != -1) {
+                                        data1.data[0].HFixCols += 1;
+                                    }
+                                    option1.cols[0][i + 1]["fixed"] = "left";
+                                }
+                            }
+                            table.render(option1);
+                        } else {
+                            table.render(option1);
+                        }
+                    }, error: function () {
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                })
+            }
+
+            //鏄剧ず鍒楁暟鎹� 妗f鍒楄〃
+            function DisPlay_HideColumn2() {
+                $.ajax({
+                    url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+                    type: "GET",
+                    data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+                    async: false,
+                    success: function (data1) {
+                        if (data1.data.length != 0) {
+
+
+                            var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+
+
+                            dataCol = data1.data[0].HGridString.split(',');
+
+                            for (var i = 0; i < option2.cols[0].length - 2; i++) {
+                                if (dataCol[i]) {
+                                    var dataCols = dataCol[i].split('|');
+                                }
+                                //闅愯棌鍒�
+                                if (dataCols[1] == 1) {
+                                    option2.cols[0][i + 1]["hide"] = true;
+                                }
+                                //璁剧疆鍒楀
+                                if (dataCols[3] > 0) {
+                                    option2.cols[0][i + 1]["width"] = dataCols[3];
+                                }
+                                //璁剧疆鍐呭瀛椾綋澶у皬
+                                if (data1.data[0].HFontSize != 0) {
+                                    option2.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+                                } else {
+                                    option2.cols[0][i + 1]["style"] = "font-size:100%";
+                                }
+                                //璁剧疆鍒楀
+                                //if (data1.data[0].HColumnWidth != 0) {
+                                //    option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
+                                //} else {
+                                //    option.cols[0][i + 1]["width"] = "";
+                                //}
+                                //鏄剧ず鍒�
+                                if (dataCols[1] == 0 && $.inArray(option2.cols[0][i + 1]["title"], titleData) == -1) {
+                                    option2.cols[0][i + 1]["hide"] = false;
+                                }
+                                //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+                                switch (dataCols[2]) {
+                                    case "L":
+                                        option2.cols[0][i + 1]["align"] = "left";
+                                        break;
+                                    case "M":
+                                        option2.cols[0][i + 1]["align"] = "center";
+                                        break;
+                                    case "R":
+                                        option2.cols[0][i + 1]["align"] = "right";
+                                        break;
+                                }
+                            }
+
+                            //鍙栨秷鍐荤粨鍒�
+                            for (var i = 1; i < option2.cols[0].length - 1; i++) {
+                                if (option2.cols[0][i]["fixed"] != null) {
+                                    option2.cols[0][i]["fixed"] = null;
+                                }
+                                else {
+                                    break;
+                                }
+                            }
+                            //鍐荤粨鍒�
+                            if (data1.data[0].HFixCols != 0) {
+                                for (var i = 0; i < data1.data[0].HFixCols; i++) {
+                                    if ($.inArray(option2.cols[0][i + 1]["title"], titleData) != -1) {
+                                        data1.data[0].HFixCols += 1;
+                                    }
+                                    option2.cols[0][i + 1]["fixed"] = "left";
+                                }
+                            }
+                            table.render(option2);
+                        } else {
+                            table.render(option2);
+                        }
+                    }, error: function () {
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                })
+            }
+
             // 琛ㄦ牸琛屽唴浜嬩欢鍒犻櫎
             function set_GridDelete(obj) {
                 var data = obj.data;
@@ -585,18 +1404,18 @@
                 $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
                     if (event.key == "F7") {
                         //妯″叿淇℃伅  濡傛灉鍦ㄦā鍏蜂唬鐮佸垪 鎸塅7
-                        if (obj.event === 'HMaterCode')  //妯″叿淇℃伅  濡傛灉鍦ㄦā鍏蜂唬鐮佸垪 鎸塅7
+                        if (obj.event === 'HMaterNumber')  //妯″叿淇℃伅  濡傛灉鍦ㄦā鍏蜂唬鐮佸垪 鎸塅7
                         {
                             //椤甸潰灞�-鑷畾涔�  //F7閫夋嫨妯″叿
                             layer.open({
                                 type: 2,
                                 skin: 'layui-layer-rim', //鍔犱笂杈规
-                                title: '鍣ㄥ叿鍒楄〃',
+                                title: '鐗╂枡鍒楄〃',
                                 closeBtn: 1,
                                 shift: 2,
                                 area: ['80%', '80%'],
                                 maxmin: true,
-                                content: ['../../PublicPage/MouldInformation.html', 'yes'],
+                                content: ['../../Baseset/鍩虹璧勬枡/Gy_MaterialList.html', 'yes'],
                                 btn: ['纭畾', '鍙栨秷']
                                 , btn1: function (index, layero) {
 
@@ -610,16 +1429,21 @@
                                     //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
                                     obj.update({
                                         HMaterID: checkStatus.data[0].HItemID,
-                                        HMaterCode: checkStatus.data[0].HNumber,
+                                        HMaterNumber: checkStatus.data[0].HNumber,
                                         HMaterName: checkStatus.data[0].HName,
-                                        HMaterSpec: checkStatus.data[0].HModel,
-
-                                        HDesignLife: 0,  //璁捐瀵垮懡
-                                        HLeaveLife: 0,   //鍓╀綑瀵垮懡
-                                        HQty: 1,         //瀹炴敹鏁伴噺
-                                        HMoney: 0,       //閲戦
+                                        HMaterModel: checkStatus.data[0].HModel,
+                                        HUnitID: checkStatus.data[0].HUnitID,
+                                        HUnitNumber: checkStatus.data[0].HUnitNumber,
+                                        HUnitName: checkStatus.data[0].HUnitName
                                     });
 
+                                    if ($("#HBarCodeType").find("option:selected").html() == '鎵樼洏鏉$爜') {
+                                        obj.update({
+                                            HQty: 1,    //鏁伴噺
+                                            HMinQty: 1, //鏈�灏忓寘瑁呮暟閲�
+                                            HBQty: 1    //绠辨暟
+                                        });
+                                    }
                                     layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                                 }
                                 , btn2: function (index, layero) {
@@ -632,7 +1456,7 @@
                             });
                         }
                         //杈呭姪灞炴�т俊鎭�
-                        if (obj.event === 'HPropertyCode')  //杈呭姪灞炴�т俊鎭�
+                        if (obj.event === 'HAuxPropNumber')  //杈呭姪灞炴�т俊鎭�
                         {
                             //椤甸潰灞�-鑷畾涔�
                             layer.open({
@@ -656,9 +1480,9 @@
 
                                     //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
                                     obj.update({
-                                        HPropertyID: checkStatus.data[0].HItemID,
-                                        HPropertyCode: checkStatus.data[0].HNumber,
-                                        HPropertyName: checkStatus.data[0].HName,
+                                        HAuxPropID: checkStatus.data[0].HItemID,
+                                        HAuxPropNumber: checkStatus.data[0].HNumber,
+                                        HAuxPropName: checkStatus.data[0].HName,
                                     });
 
                                     layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
@@ -674,7 +1498,7 @@
                         }
 
                         //璁¢噺鍗曚綅浠g爜
-                        if (obj.event === 'HUnitCode')  //璁¢噺鍗曚綅浠g爜
+                        if (obj.event === 'HUnitNumber')  //璁¢噺鍗曚綅浠g爜
                         {
                             //椤甸潰灞�-鑷畾涔�
                             layer.open({
@@ -699,7 +1523,7 @@
                                     //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
                                     obj.update({
                                         HUnitID: checkStatus.data[0].HItemID,
-                                        HUnitCode: checkStatus.data[0].HNumber,
+                                        HUnitNumber: checkStatus.data[0].HNumber,
                                         HUnitName: checkStatus.data[0].HName,
                                     });
 
@@ -714,19 +1538,19 @@
                                 }
                             });
                         }
-                        //浠撳簱浠g爜
-                        if (obj.event === 'HWHCode')  //浠撳簱浠g爜
+                        //瀹㈡埛浠g爜
+                        if (obj.event === 'HCusNumber')  //瀹㈡埛浠g爜
                         {
                             //椤甸潰灞�-鑷畾涔�
                             layer.open({
                                 type: 2,
                                 skin: 'layui-layer-rim', //鍔犱笂杈规
-                                title: '浠撳簱鍒楄〃',
+                                title: '瀹㈡埛鍒楄〃',
                                 closeBtn: 1,
                                 shift: 2,
                                 area: ['80%', '80%'],
                                 maxmin: true,
-                                content: ['../../PublicPage/WareHouseInformation.html', 'yes'],
+                                content: ['../../PublicPage/CustomerInformation.html', 'yes'],
                                 btn: ['纭畾', '鍙栨秷']
                                 , btn1: function (index, layero) {
 
@@ -739,60 +1563,10 @@
 
                                     //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
                                     obj.update({
-                                        HWHID: checkStatus.data[0].HItemID,
-                                        HWHCode: checkStatus.data[0].HNumber,
-                                        HWHName: checkStatus.data[0].HName,
-                                        HSPID: "",
-                                        HSPCode: "",
-                                        HSPName: "",
-
+                                        HCusID: checkStatus.data[0].HItemID,
+                                        HCusNumber: checkStatus.data[0].HNumber,
+                                        HCusName: checkStatus.data[0].HName
                                     });
-                                    ////琛ㄥご浠撳簱涓虹┖鏃� 缁戝畾鏄庣粏琛屼粨搴撲俊鎭�
-                                    //if ($("#HWHID").val() == '' || $("#HWHID").val() == null) {
-                                    //    $("#HWHName").val(checkStatus.data[0].HName);
-                                    //    $("#HWHID").val(checkStatus.data[0].HItemID);
-                                    //}
-                                    layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
-                                }
-                                , btn2: function (index, layero) {
-                                    //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
-                                    //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
-                                },
-                                end: function () {
-
-                                }
-                            });
-                        }
-                        //浠撲綅浠g爜
-                        if (obj.event === 'HSPCode')  //浠撲綅浠g爜
-                        {
-                            //椤甸潰灞�-鑷畾涔�
-                            layer.open({
-                                type: 2,
-                                skin: 'layui-layer-rim', //鍔犱笂杈规
-                                title: '浠撲綅鍒楄〃',
-                                closeBtn: 1,
-                                shift: 2,
-                                area: ['80%', '80%'],
-                                maxmin: true,
-                                content: ['../../PublicPage/WareLocationInformation.html', 'yes'],
-                                btn: ['纭畾', '鍙栨秷']
-                                , btn1: function (index, layero) {
-
-                                    //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
-                                    var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
-                                    var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
-                                    if (checkStatus.data.length === 0) {
-                                        return layer.msg('璇烽�夋嫨鏁版嵁');
-                                    }
-
-                                    //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
-                                    obj.update({
-                                        HSPID: checkStatus.data[0].HItemID,
-                                        HSPCode: checkStatus.data[0].HNumber,
-                                        HSPName: checkStatus.data[0].HName,
-                                    });
-
                                     layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                                 }
                                 , btn2: function (index, layero) {
@@ -814,26 +1588,73 @@
                 layer.alert(sMsg, { icon: 5 });
 
             }
+
+            //鏉$爜鐢熸垚
+            function SaveBarCodeCreate(sMainSub, CampanyName) {
+                $.ajax(
+                    {
+                        type: "POST",
+                        url: GetWEBURL() + "/Sc_BarCode/Sub_SaveBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        async: true,
+                        data: { "msg": sMainSub, "CampanyName": CampanyName },
+                        dataType: "json",
+                        success: function (result) {
+                            if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                table.reload('mainTable1', {
+                                    data: result.list // 璋冪敤table.reload 閲嶆柊娓叉煋鏄剧ず鍔犺浇杩藉姞浜嗘暟鎹殑琛ㄦ牸
+                                });
+                                HBarInfo = result.list;
+                                //鐢熸垚鎴愬姛璺宠浆鍒版潯鐮佷俊鎭爣绛鹃〉
+                                element.tabChange('tab-TabTest', '3'); 
+                                //鍔犺浇妗f鍒楄〃
+                                table.reload('mainTable2', {
+                                    data: result.data // 璋冪敤table.reload 閲嶆柊娓叉煋鏄剧ず鍔犺浇杩藉姞浜嗘暟鎹殑琛ㄦ牸
+                                });
+                                HFileList = result.data; 
+                            }
+                            else {
+                                $('#ToolCreate').removeClass("layui-btn-disabled").attr("disabled", false);//鐢熸垚鎸夐挳鍚敤
+                                layer.alert(result.Message, { icon: 5 });
+                            }
+                            layer.closeAll("loading");
+                        },
+                        error: function (err) {
+                            layer.alert(err.Message, { icon: 5 });
+                        }
+                    });
+            }
+
+            //鏉$爜鎵撳嵃
+            function get_PrintReport() {
+                var checkStatus = table.checkStatus('mainTable2')
+                    , dataArr = checkStatus.data;
+
+                //鐢变簬鏉$爜淇℃伅鍒楄〃涓病鏈� HItemID 瀛楁锛屾墍浠ラ噰鍙栦簡鐢� 鏉$爜缂栧彿 鍘昏幏鍙� HItemID 鐨勬柟寮�
+                if (checkStatus.data.length>0) {
+                    var rows = [];
+                    for (var i = 0; i < dataArr.length; i++) {
+                        rows.push(dataArr[i].HItemID.toString());
+                    }
+                    //rows = rows.substring(rows.length - 1, 0);
+                    layer.open({
+                        type: 2
+                        , area: ['50%', '50%']
+                        , title: '鎵撳嵃妯$増閫夋嫨'
+                        , shade: 0.6 //閬僵閫忔槑搴�
+                        , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+                        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                        , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + rows.toString() + '&MyMsg=' + rows.toString() + '&Type=HGy_BarCodeBill', 'yes']
+                        , resize: false
+                    })
+                }
+                else {
+                    layer.msg('璇烽�夋嫨瑕佹墦鍗扮殑鏉$爜鏁版嵁锛�');
+                }
+            }
+
             //闈炵┖楠岃瘉
             function AllowLoadData(sSubStr) {
                 var Result = true;
-                if ($("#HWHID").val() == '' || $("#HWHID").val() == null) {
-                    layer.msg("浠撳簱涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                    return Result = false;
-                }
-                if ($("#HSecManagerID").val() == '' || $("#HSecManagerID").val() == null) {
-                    layer.msg("楠屾敹鍛樹笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                    return Result = false;
-                }
-                if ($("#HKeeperID").val() == '' || $("#HKeeperID").val() == null) {
-                    layer.msg("淇濈鍛樹笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                    return Result = false;
-                }
-                if ($("#HDeptID").val() == '' || $("#HDeptID").val() == null) {
-                    layer.msg("閮ㄩ棬涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                    return Result = false;
-                }
-
                 if (typeof (sSubStr) == "undefined" || sSubStr == "") {
                     layer.msg("娌℃湁鐗╂枡鏄庣粏璁板綍", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                     return Result = false;
@@ -841,16 +1662,16 @@
                 if (typeof (sSubStr) != "undefined" && typeof (sSubStr) != "") {
                     sSubStr = JSON.parse(sSubStr);
                     for (var i = 0; i < sSubStr.length; i++) {
+                        //if (sSubStr[i].HMainID == "") {
+                        //    layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,婧愬崟淇℃伅涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        //    return Result = false;
+                        //}
                         if (sSubStr[i].HMaterID == "") {
-                            layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鍣ㄥ叿淇℃伅涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鐗╂枡淇℃伅涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                             return Result = false;
                         }
-                        if (sSubStr[i].HUnitID == "") {
-                            layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,璁¢噺鍗曚綅涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                            return Result = false;
-                        }
-                        if (sSubStr[i].HWHID == "") {
-                            layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鏀舵枡浠撳簱涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        if (sSubStr[i].HQty == "") {
+                            layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鏁伴噺涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                             return Result = false;
                         }
                     }

--
Gitblit v1.9.1