From e7dd12d55e8c6aae18e2f3d5512340fcce1d8d4d Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期二, 06 八月 2024 17:29:11 +0800
Subject: [PATCH] 1.报工台里,点击 当前工单 汇报时, 根据 选择的工单 找到正在使用的 模具内码(在 生产状态表 里查), 填入到 出站汇报单 界面上,显示 模具编码,名称,型号 。保存时 保存进去 2.开班单 增加 子表网格 Sc_MESBeginWorkBillSub_RelationBill 点击 可选择 相同物料 相同工序的 非本单 的流转卡 记录

---
 WebTM/views/销售管理/销售订单/Add_Edit_Xs_SeOrderBillList.html |  298 +++++++++++++++++++++++++++++++++++++++++++----------------
 1 files changed, 217 insertions(+), 81 deletions(-)

diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Add_Edit_Xs_SeOrderBillList.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Add_Edit_Xs_SeOrderBillList.html"
index d82c1c8..0812ae9 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Add_Edit_Xs_SeOrderBillList.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Add_Edit_Xs_SeOrderBillList.html"
@@ -91,7 +91,7 @@
                                         <div class="layui-inline">
                                             <label class="layui-form-label">閿�鍞憳</label>
                                             <div class="layui-input-inline">
-                                                <input type="text" name="HEmpName" id="HEmpName" " class="layui-input" value="" style="float: left; width: 150px; background-color: #efefef4d;" readonly>
+                                                <input type="text" name="HEmpName" id="HEmpName" class="layui-input" value="" style="float: left; width: 150px; background-color: #efefef4d;" readonly>
                                                 <input type="hidden" name="HEmpID" id="HEmpID" class="layui-input" value="0" style="float:left;width:150px;">
                                                 <button type="button" lay-submit="" class="layui-btn" lay-filter="HEmpList" style="width:40px;">
                                                     <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
@@ -145,6 +145,8 @@
                                                 </select>
                                             </div>
                                         </div>
+                                    </div>
+                                    <div class="layui-row">
                                         <div class="layui-inline">
                                             <label class="layui-form-label">閿�鍞鍗曠被鍨�</label>
                                             <div class="layui-input-inline">
@@ -154,8 +156,6 @@
                                                 </select>
                                             </div>
                                         </div>
-                                    </div>
-                                    <div class="layui-row">
                                         <div class="layui-inline">
                                             <label class="layui-form-label">缁撶畻鏂瑰紡<label style="color:red"> * </label></label>
                                             <div class="layui-input-inline">
@@ -166,7 +166,7 @@
                                                 </button>
                                             </div>
                                         </div>
-                                        <div class="layui-inline">
+                                        <div class="layui-inline" style="display:none;">
                                             <label class="layui-form-label">閿�鍞柟寮�</label>
                                             <div class="layui-input-inline">
                                                 <input type="text" name="HSellSName" id="HSellSName" class="layui-input" value="" style="float: left; width: 150px; background-color: #efefef4d;" readonly>
@@ -224,7 +224,7 @@
                                             </div>
                                         </div>
                                     </div>
-                                    <div class="layui-row">
+                                    <div class="layui-row" style="display:none;">
                                         <div class="layui-inline">
                                             <label class="layui-form-label">椤圭洰浠g爜</label>
                                             <div class="layui-input-inline">
@@ -245,7 +245,7 @@
                                             <label class="layui-form-label">浠撳簱</label>
                                             <div class="layui-input-inline">
                                                 <input type="text" name="HWHName" id="HWHName" class="layui-input" value="" style="float:left;width:150px;">
-                                                <input type="hidden" name="HWHID" id="HWHID" class="layui-input" value=0 style="float:left;width:150px;">
+                                                <input type="hidden" name="HWHID" id="HWHID" class="layui-input" value="0" style="float:left;width:150px;">
                                                 <button type="button" lay-submit="" class="layui-btn" lay-filter="HWHList" style="width:40px;">
                                                     <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                 </button>
@@ -413,6 +413,8 @@
                             <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Up"><i class="layui-icon layui-icon-form"></i>涓婄Щ</button>
                             <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Under"><i class="layui-icon layui-icon-form"></i>涓嬬Щ</button>
                             <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-batchDelete"><i class="layui-icon layui-icon-form"></i>鎵归噺鍒犻櫎</button>
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Inventory" id="get_Inventory"><i class="layui-icon layui-icon-form"></i>搴撳瓨鏌ヨ</button>
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="get_InOutSum" id="get_InOutSum"><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>
@@ -498,14 +500,7 @@
                 set_InitGrid();
                 //鍔犺浇琛ㄤ綋鍜岃〃浣撴暟鎹�
                 RoadBillMain(linterid);
-                //鏍规嵁閿�鍞鍗曠被鍨嬭缃瓙琛ㄦ槸鍚﹀彇搴撳瓨閫夐」
-                setHisStockGoodsByHBillSubType_For_RoadBillMain();
-
-                //鏍规嵁鏄惁鍙栧簱瀛樿幏鍙栧畾閲戞瘮渚�
-                setHEarnestRateByHisStockGoods();
-
-                //璁剧疆琛ㄥご鎵�闇�閲戦
-                set_HBillMoney($("#HEarnestRate").val() * 1);
+                
 
                 //鐢熸垚骞惰缃富琛ㄧ殑鍐呯爜鍜屽崟鎹彿
                 createBillNo();
@@ -523,14 +518,6 @@
                 set_InitGrid();
                 //鍔犺浇琛ㄤ綋鍜岃〃浣撴暟鎹�
                 RoadBillMain(linterid);
-                //鏍规嵁閿�鍞鍗曠被鍨嬭缃瓙琛ㄦ槸鍚﹀彇搴撳瓨閫夐」
-                setHisStockGoodsByHBillSubType_For_RoadBillMain();
-
-                //鏍规嵁鏄惁鍙栧簱瀛樿幏鍙栧畾閲戞瘮渚�
-                setHEarnestRateByHisStockGoods();
-
-                //璁剧疆琛ㄥご鎵�闇�閲戦
-                set_HBillMoney($("#HEarnestRate").val() * 1);
             }
             //#endregion
 
@@ -543,7 +530,7 @@
             //#endregion
 
             //#region 鍒楄缃細瀛愯〃1
-            //DisPlay_HideColumn();
+            DisPlay_HideColumn();
             //#endregion
             //#endregion
 
@@ -664,7 +651,7 @@
                     "瑙勬牸鍨嬪彿": "",
                     "HUnitID": "0",
                     "璁¢噺鍗曚綅": "",
-                    "HWHID": "",
+                    "HWHID": "0",
                     "浠撳簱":"",
                     "HQty": "0",
                     "HPrice": "0",
@@ -680,6 +667,8 @@
                     "HisStockGoods": "false",
                     "HOutStockQty": "0",
                     "HInvoiceQty": "0",
+                    "HRemark_TL": "",
+                    "HRemark_SJG": "",
                     "HRemark": "",
                     "HCusMaterNumber": "",
                     "HCusModel": "",
@@ -716,6 +705,12 @@
                     //鍒楄缃�
                     case 'set_HideColumn':
                         get_HideColumn();
+                        break;
+                    //搴撳瓨鏌ヨ
+                    case 'get_Inventory': get_Inventory();
+                        break;
+                    //鍑哄叆搴撹褰曟煡璇�
+                    case 'get_InOutSum': get_InOutSum();
                         break;
                 }
             });
@@ -1241,7 +1236,9 @@
                         , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 150, style: 'background-color:#efefef4d;' }
                         , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 100, style: 'background-color:#efefef4d;' }
                         , { field: 'HUnitID', title: 'HUnitID', width: 100, hide: true, style: 'background-color:#efefef4d;' }
-                        , { field: '璁¢噺鍗曚綅', title: '璁¢噺鍗曚綅', width: 100, style: 'background-color:#efefef4d;' }//f7
+                        , { field: '璁¢噺鍗曚綅', title: '璁¢噺鍗曚綅', width: 100, style: 'background-color:#efefef4d;', edit: 'text', event:"HUnitID" }//f7
+                        , { field: 'HRemark_TL', title: '鎶曟枡', width: 100, edit: 'text', event: "HRemark_TL" }
+                        , { field: 'HRemark_SJG', title: '娣卞姞宸�', width: 100, edit: 'text', event: "HRemark_SJG" }
                         , { field: 'HWHID ', title: 'HWHID ', width: 100, hide: true }
                         , { field: '浠撳簱', title: '浠撳簱', width: 100, style: 'background-color:#efefef4d;' ,edit: 'text' ,event: "HWHID" }//f7
                         , { field: 'HisStockGoods', title: '鏄惁鍙栧簱瀛�', width: 120, templet: '#HisStockGoods' }
@@ -1297,7 +1294,7 @@
                     "瑙勬牸鍨嬪彿": "",
                     "HUnitID": "0",
                     "璁¢噺鍗曚綅": "",
-                    "HWHID": "",
+                    "HWHID": "0",
                     "浠撳簱":"",
                     "HQty": "0",
                     "HPrice": "0",
@@ -1313,6 +1310,8 @@
                     "HisStockGoods": "false",
                     "HOutStockQty": "0",
                     "HInvoiceQty": "0",
+                    "HRemark_TL": "",
+                    "HRemark_SJG": "",
                     "HRemark": "",
                     "HCusMaterNumber": "",
                     "HCusModel": "",
@@ -1461,6 +1460,8 @@
                                         "HDate": formatDate(result.data[i]["浜よ揣鏃ユ湡"]),
                                         "HOutStockQty": result.data[i]["鍑哄簱鏁伴噺"],
                                         "HInvoiceQty": result.data[i]["寮�绁ㄦ暟閲�"],
+                                        "HRemark_TL": result.data[i]["鎶曟枡"],
+                                        "HRemark_SJG": result.data[i]["娣卞姞宸�"],
                                         "HRemark": result.data[i]["琛ㄤ綋澶囨敞"],
                                         "HCusMaterNumber": result.data[i]["瀹㈡埛鐗╂枡缂栫爜"],
                                         "HCusModel": result.data[i]["瀹㈡埛瑙勬牸鍨嬪彿"],
@@ -1476,20 +1477,18 @@
                             }
                             option.data = rowdata;
 
-                            //鍑哄簱鏁伴噺銆佸紑绁ㄦ暟閲忎笉鍙紪杈�
-                            //option.cols[0][22].edit = null;
-                            //option.cols[0][23].edit = null;
-
                             table.render(option);
 
                             //鑾峰彇涓存椂瀹氶噾姣斾緥
-                            HEarnestRateTemp = data.瀹氶噾姣斾緥 + "" == "0" ? "50" : data.瀹氶噾姣斾緥 + "";
+                            HEarnestRateTemp = data.瀹氶噾姣斾緥;
 
-                            //鍒锋柊琛ㄦ牸鍚屾椂鏍规嵁option涓璈isStockGoods鍊艰缃笅鎷夊垪琛�
-                            setSelectHisStockGoodsByTableRender();
+                            //鏍规嵁閿�鍞鍗曠被鍨嬭缃瓙琛ㄦ槸鍚﹀彇搴撳瓨閫夐」
+                            setHisStockGoodsByHBillSubType_For_RoadBillMain();
 
                             //鏍规嵁鏄惁鍙栧簱瀛樿幏鍙栧畾閲戞瘮渚�
                             setHEarnestRateByHisStockGoods();
+
+                            $("#HEarnestRate").val(data.瀹氶噾姣斾緥);
 
                             //璁剧疆琛ㄥご鎵�闇�閲戦
                             set_HBillMoney($("#HEarnestRate").val() * 1);
@@ -1541,6 +1540,7 @@
             //#endregion
 
             //#region 瀹㈡埛閫夋嫨椤甸潰
+            //#region 瀹㈡埛閫夋嫨椤甸潰
             function get_checkCus() {
                 var HEmpID = $("#HEmpID").val();
                 layer.open({
@@ -1566,6 +1566,35 @@
                     , btn2: function (index, layero) { }
                 })
             }
+            //#endregion
+
+            //#region 瀹㈡埛閫夋嫨椤甸潰-鍩虹璧勬枡
+            //function get_checkCus() {
+            //    var HEmpID = $("#HEmpID").val();
+            //    layer.open({
+            //        type: 2//寮圭獥绫诲瀷
+            //        , skin: 'layui-layer-rim' //鍔犱笂杈规
+            //        , area: ['90%', '90%']//澶у皬
+            //        , title: '瀹㈡埛鍒楄〃'//鏍囬
+            //        , shift: 2//寮瑰嚭鍔ㄧ敾
+            //        , content: ['../../鍩虹璧勬枡/閿�鍞熀纭�璧勬枡/Gy_Customer.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('璇烽�夋嫨鏁版嵁');
+            //            }
+            //            getCustomerByCusID(checkStatus.data[0].HItemID);
+            //            //鏍规嵁瀹㈡埛鑾峰彇瀹㈡埛浣欓
+            //            getCustomerBalance(checkStatus.data[0].HItemID);
+
+            //            layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+            //        }
+            //        , btn2: function (index, layero) { }
+            //    })
+            //}
+            //#endregion
             //#endregion
 
             //#region 缁撶畻鏂归�夋嫨椤甸潰
@@ -1935,6 +1964,7 @@
                 //#region 瀛愯〃 鏁版嵁妫�楠�
                 var RowCount = 0;
                 for (var i = 0; i < option.data.length; i++) {
+
                     if (option.data[i]["HMaterID"] == "0") {
                         continue;
                     }
@@ -2175,7 +2205,7 @@
                                         "瑙勬牸鍨嬪彿": "",
                                         "HUnitID": "0",
                                         "璁¢噺鍗曚綅": "",
-                                        "HWHID": "",
+                                        "HWHID": "0",
                                         "浠撳簱": "",
                                         "HQty": "0",
                                         "HPrice": "0",
@@ -2191,6 +2221,8 @@
                                         "HisStockGoods": "false",
                                         "HOutStockQty": "0",
                                         "HInvoiceQty": "0",
+                                        "HRemark_TL": "",
+                                        "HRemark_SJG": "",
                                         "HRemark": "",
                                         "HCusMaterNumber": "",
                                         "HCusModel": "",
@@ -2236,7 +2268,7 @@
                                     "瑙勬牸鍨嬪彿": "",
                                     "HUnitID": "0",
                                     "璁¢噺鍗曚綅": "",
-                                    "HWHID": "",
+                                    "HWHID": "0",
                                     "浠撳簱": "",
                                     "HQty": "0",
                                     "HPrice": "0",
@@ -2252,6 +2284,8 @@
                                     "HisStockGoods": "false",
                                     "HOutStockQty": "0",
                                     "HInvoiceQty": "0",
+                                    "HRemark_TL": "",
+                                    "HRemark_SJG": "",
                                     "HRemark": "",
                                     "HCusMaterNumber": "",
                                     "HCusModel": "",
@@ -2540,10 +2574,6 @@
                                     var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
                                     var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
 
-                                    //if (checkStatus.data.length != 1) {
-                                    //    return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
-                                    //}
-
                                     var rowIndex = $(obj.tr).attr("data-index") * 1;
                                     for (var i = 0; i < checkStatus.data.length; i++) {
                                         if (rowIndex + i >= option.data.length) {
@@ -2638,7 +2668,7 @@
                                 , shift: 2 //寮瑰嚭鍔ㄧ敾
                                 , area: ["90%", "90%"] //绐椾綋澶у皬
                                 , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
-                                , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html', 'yes']
+                                , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html?type=AuxiliaryUnit', 'yes']
                                 , btn: ["纭畾", "鍙栨秷"]
                                 , btn1: function (index, laero) {
                                     //鎸夐挳涓�  鐨勫洖璋�
@@ -2696,10 +2726,14 @@
                                     layer.close(index);//鍏抽棴寮圭獥
                                 }
                                 , end: function () {
-                                    obj.update({
-                                        "HWHID": OptionData.HItemID
-                                        , "浠撳簱": OptionData.浠撳簱鍚嶇О
-                                    })
+                                    if (typeof (HDataEmp.HItemID) != "undefined") {
+                                        //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+                                        obj.update({
+                                            "HWHID": HDataEmp.HItemID
+                                            , "浠撳簱": HDataEmp.浠撳簱鍚嶇О
+                                        })
+                                        HDataEmp = {};
+                                    }
                                 }
                             })
 
@@ -3066,6 +3100,45 @@
                             set_HBillMoney($("#HEarnestRate").val() * 1);
                         }
 
+                        //鎶曟枡
+                        if (obj.event == "HRemark_TL") {
+                            var oldText = table.cache["mainTable"][rowIndex].HRemark_TL;
+                            var value = e.target.value; //寰楀埌淇敼鍚庣殑鍊�
+
+                            //鏁版嵁鏍¢獙鍚堟牸锛岄噸绠楄褰�
+                            for (var i = rowIndex * 1; i < option.data.length; i++) {
+                                option.data[i].HRemark_TL = value;
+                            }
+
+                            table.render(option);
+
+                            //鍒锋柊琛ㄦ牸鍚屾椂鏍规嵁option涓璈isStockGoods鍊艰缃笅鎷夊垪琛�
+                            setSelectHisStockGoodsByTableRender();
+
+                            //璁剧疆琛ㄥご鎵�闇�閲戦
+                            set_HBillMoney($("#HEarnestRate").val() * 1);
+                        }
+
+                        //娣卞姞宸�
+                        if (obj.event == "HRemark_SJG") {
+                            var oldText = table.cache["mainTable"][rowIndex].HRemark_SJG;
+                            var value = e.target.value; //寰楀埌淇敼鍚庣殑鍊�
+
+                            //鏁版嵁鏍¢獙鍚堟牸锛岄噸绠楄褰�
+                            for (var i = rowIndex * 1; i < option.data.length; i++) {
+                                option.data[i].HRemark_SJG = value;
+                            }
+
+                            table.render(option);
+
+                            //鍒锋柊琛ㄦ牸鍚屾椂鏍规嵁option涓璈isStockGoods鍊艰缃笅鎷夊垪琛�
+                            setSelectHisStockGoodsByTableRender();
+
+                            //璁剧疆琛ㄥご鎵�闇�閲戦
+                            set_HBillMoney($("#HEarnestRate").val() * 1);
+                        }
+
+
                         obj.event = "";
                         return false;
                     }
@@ -3074,6 +3147,57 @@
                 })
             }
             //#endregion
+
+            //#region 搴撳瓨鏌ヨ
+            function get_Inventory() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1 && data[0].HMaterID != 0) {
+                    var HMaterID = data[0].HMaterID.toString();
+                    //寮圭獥鏂规硶
+                    layer.open({
+                        type: 2//寮圭獥绫诲瀷
+                        , skin: 'layui-layer-rim' //鍔犱笂杈规
+                        , area: ['90%', '90%']//澶у皬
+                        , title: '搴撳瓨鏌ヨ鍒楄〃'//鏍囬
+                        , shift: 2//寮瑰嚭鍔ㄧ敾
+                        , content: ['../../浠撳瓨绠$悊/鏉$爜鎶ヨ〃/Kf_ICinventoryQueryReport.html?Type=1&HMaterID=' + HMaterID, 'yes']
+                        , btn: ['鍙栨秷']
+                        , btn1: function (index, layero) {
+                            layer.close(index);
+                        }
+                    })
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾湁鐗╂枡鏁版嵁鏌ヨ锛�');
+                }
+            }
+            //#endregion
+            //#region 鍑哄叆搴撹褰曟煡璇�
+            function get_InOutSum() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1 && data[0].HMaterID != 0) {
+                    var HMaterID = data[0].HMaterID.toString();
+                    layer.open({
+                        type: 2//寮圭獥绫诲瀷
+                        , skin: 'layui-layer-rim' //鍔犱笂杈规
+                        , area: ['90%', '90%']//澶у皬
+                        , title: '鍑哄叆搴撹褰曞垪琛�'//鏍囬
+                        , shift: 2//寮瑰嚭鍔ㄧ敾
+                        , content: ['../../浠撳瓨绠$悊/鏉$爜鎶ヨ〃/Kf_StockInOutSumQueryReport.html?Type=1&HMaterID=' + HMaterID, 'yes']
+                        , btn: ['鍙栨秷']
+                        , btn1: function (index, layero) {
+                            layer.close(index);
+                        }
+                    })
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾湁鐗╂枡鏁版嵁鏌ヨ锛�');
+                }
+            }
+            //#endregion
+
 
             //#region 瀛愯〃1锛氶殣钘忓垪璁剧疆
             function get_HideColumn() {
@@ -3447,6 +3571,16 @@
             getEmpInfoByHEmpID(obj[0].HItemID)
         }
 
+        function GetHCusNameValue(obj)  //杩斿洖瀹㈡埛
+        {
+            //$("#HCusName").val(obj[0].HName);
+            //$("#HCusID").val(obj[0].HItemID);
+            //鏍规嵁瀹㈡埛鑾峰彇鐩稿叧淇℃伅
+            getCustomerByCusID(obj[0].HItemID);
+            //鏍规嵁瀹㈡埛鑾峰彇瀹㈡埛浣欓
+            getCustomerBalance(obj[0].HItemID);
+        }
+
         function GetHSupValue(obj)  //杩斿洖瀹㈡埛
         {
             //$("#HCusName").val(obj[0].HName);
@@ -3459,7 +3593,7 @@
 
         function GetHManagerValue(obj)  //杩斿洖涓荤
         {
-            $("#HManagerName").val(obj[0].HName);
+            $("#HManagerName").val(obj[0].鑱屽憳鍚嶇О);
             $("#HManagerID").val(obj[0].HItemID);
         }
 
@@ -3481,12 +3615,12 @@
             $("#HSellSID").val(obj[0].HItemID);
         }
 
-        function GetMaterValue(obj)           //鐗╂枡鍚嶇О
+        function GetGyMaterial(obj)           //鐗╂枡鍚嶇О
         {
-            HDataEmp = obj[0];
+            HDataEmp = obj;
         }
 
-        function GetUnitValue(obj)           //璁¢噺鍗曚綅
+        function GetAuxiliaryUnitValue(obj)           //璁¢噺鍗曚綅
         {
             HDataEmp = obj[0];
         }
@@ -3495,6 +3629,39 @@
         {
             HDataEmp = obj[0];
         }
+
+        //椤圭洰浠g爜
+        function GetProjectBillValue(obj) {
+            if (obj[0].鍏抽棴浜� == null || obj[0].鍏抽棴浜� == "") {
+                $("#HProjectID").val(obj[0].HInterID);
+                $("#HProjectNumber").val(obj[0].椤圭洰浠g爜);//宸ョ▼椤圭洰浠g爜
+                $("#HProjectName").val(obj[0].椤圭洰鍚嶇О);//宸ョ▼椤圭洰浠g爜
+
+            } else {
+                layer.msg("璇ラ」鐩凡鍏抽棴锛屼笉鍙�夋嫨锛�");
+            }
+        }
+
+        //鍙屽嚮杩斿洖浠撳簱
+        function GetHWHSubValue(data) {
+            HDataEmp = data[0]
+        }
+
+        function GetHWHValue(obj)  //杩斿洖浠撳簱
+        {
+            $("#HWHName").val(obj[0].浠撳簱鍚嶇О);
+            $("#HWHID").val(obj[0].HItemID);
+            if (option.data.length > 0) {
+                for (var i = 0; i < option.data.length; i++) {
+                    if (option.data[i]["HWHID"] == 0 || option.data[i]["浠撳簱"] == undefined) {
+                        option.data[i]["HWHID"] = obj[0].HItemID;
+                        option.data[i]["浠撳簱"] = obj[0].浠撳簱鍚嶇О;
+                    }
+                }
+            }
+            layui.table.render(option);
+        }
+
 
         //#region 鏍规嵁瀹㈡埛鑾峰彇甯佸埆銆佹眹鐜囥�佺粨绠楁柟寮忋�佸鎴蜂俊鐢ㄩ搴︺�佽仈绯讳汉銆佽仈绯荤數璇�
         function getCustomerByCusID(HCusID) {
@@ -3547,7 +3714,7 @@
                         subHTaxRate = data.HTaxRate;
 
                     } else {
-                        layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+                        layer.alert(result.Message, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
                     }
                 }, error: function () {
                     layer.alert("鍙戠敓閿欒!", { icon: 5 });
@@ -3614,38 +3781,7 @@
         }
         //#endregion
 
-        //椤圭洰浠g爜
-        function GetProjectBillValue(obj) {
-            if (obj[0].鍏抽棴浜� == null || obj[0].鍏抽棴浜� == "") {
-                $("#HProjectID").val(obj[0].HInterID);
-                $("#HProjectNumber").val(obj[0].椤圭洰浠g爜);//宸ョ▼椤圭洰浠g爜
-                $("#HProjectName").val(obj[0].椤圭洰鍚嶇О);//宸ョ▼椤圭洰浠g爜
-
-            } else {
-                layer.msg("璇ラ」鐩凡鍏抽棴锛屼笉鍙�夋嫨锛�");
-            }
-        }
-
-        //鍙屽嚮杩斿洖浠撳簱
-        function GetHWHSubValue(data) {
-            OptionData = data[0]
-        }
-
-        function GetHWHValue(obj)  //杩斿洖浠撳簱
-        {
-            $("#HWHName").val(obj[0].浠撳簱鍚嶇О);
-            $("#HWHID").val(obj[0].HItemID);
-            if (option.data.length > 0) {
-                for (var i = 0; i < option.data.length; i++) {
-                    if (option.data[i]["HWHID"] == 0 || option.data[i]["浠撳簱"] == undefined) {
-                        option.data[i]["HWHID"] = obj[0].HItemID;
-                        option.data[i]["浠撳簱"] = obj[0].浠撳簱鍚嶇О;
-                    }
-                }
-            }
-            layui.table.render(option);
-        }
-
+       
         //#region 澶勭悊灏忔暟鏄剧ず浣嶆暟锛坉ata锛氶渶瑕佸鐞嗙殑鏁版嵁锛沶um锛氭暟鎹殑绫诲瀷(濡�1:鏁伴噺锛�2:閲戦锛�3:鍗曚环)锛�
         function dealDoubleToFixed(data, num) {
             //鐢ㄤ簬璁剧疆灏忔暟浣嶆暟

--
Gitblit v1.9.1