From 5e9c87d9524a3a31b7691e61d8da9a757377e9bd Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期三, 20 八月 2025 10:51:09 +0800
Subject: [PATCH] 条码生成转换特殊字符;标准包装添加控制;

---
 WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBill_Edit.html |  774 +++++++++++++++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 669 insertions(+), 105 deletions(-)

diff --git a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBill_Edit.html b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBill_Edit.html
index c5f9182..929325e 100644
--- a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBill_Edit.html
+++ b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBill_Edit.html
@@ -21,12 +21,16 @@
         <div class="layui-row layui-col-space15">
             <div class="layui-col-md12">
                 <div class="layui-card">
-                    <form id="form0" class="layui-form" action="">
+                    <form id="form0" class="layui-form" action="" lay-filter="formData">
                         <div class="layui-card-header">
                             <div class="layui-btn-group">
-                                <button type="button" 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="Aduit">瀹℃牳</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" id="aduit-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Aduit">瀹℃牳</button>
                                 <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Print">鎵撳嵃</button>
+                                <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Print_Convenient">涓�閿墦鍗�</button>
+                                <button type="button" id="ChooseSource-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="ChooseSource">閫夋簮鍗�</button>
+                                <!--<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="BuildBarcode">鐢熸垚鏉$爜</button>-->
+                                <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="MergeBuildBarcode">鍚堝苟鐢熸垚鏉$爜</button>
                                 <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
                             </div>
                         </div>
@@ -45,6 +49,7 @@
                                                     <label class="layui-form-label">鍗� 鎹� 鍙凤細</label>
                                                     <div class="layui-input-inline">
                                                         <input class="layui-input" name="HBillNo" lay-verify="HBillNo" id="HBillNo" readonly="readonly" autocomplete="off">
+                                                        <input class="layui-input" name="HInterID" lay-verify="HInterID" id="HInterID" readonly="readonly" autocomplete="off" style="display:none;">
                                                     </div>
                                                 </div>
                                                 <div class="layui-col-xs3">
@@ -54,13 +59,26 @@
                                                     </div>
                                                 </div>
                                                 <div class="layui-col-xs3">
+                                                    <label class="layui-form-label"> 渚� 搴� 鍟嗭細</label>
+                                                    <div class="layui-input-inline">
+                                                        <input class="layui-input" name="HSupName" lay-verify="HSupName" id="HSupName" readonly="readonly" autocomplete="off">
+                                                        <input id="HSupID" name="HSupID" type="hidden" />
+                                                    </div>
+                                                </div>
+                                                <div class="layui-col-xs3">
+                                                    <label class="layui-form-label"> 棰勮鍒拌揣鏃ユ湡锛�</label>
+                                                    <div class="layui-input-inline">
+                                                        <input class="layui-input" name="HDHDate" lay-verify="HDHDate" id="HDHDate">
+                                                    </div>
+                                                </div>
+                                                <div class="layui-col-xs3" style="display:none">
                                                     <label class="layui-form-label">涓�    绠★細</label>
                                                     <div class="layui-input-inline">
                                                         <input class="layui-input" name="HManagerName" id="HManagerName" readonly="readonly" autocomplete="off" disabled>
                                                         <input id="HManagerID" name="HManagerID" type="hidden" />
                                                     </div>
                                                 </div>
-                                                <div class="layui-col-xs3">
+                                                <div class="layui-col-xs3" style="display:none">
                                                     <label class="layui-form-label">涓� 鍔� 鍛橈細</label>
                                                     <div class="layui-input-inline">
                                                         <input class="layui-input" name="HEmpName" id="HEmpName" readonly="readonly" autocomplete="off">
@@ -72,20 +90,14 @@
                                         </div>
                                         <div class="layui-form-item">
                                             <div class="layui-row">
-                                                <div class="layui-col-xs3">
+                                                <div class="layui-col-xs3" style="display:none">
                                                     <label class="layui-form-label">鍗曟嵁鐘舵�侊細</label>
                                                     <div class="layui-input-inline">
                                                         <input class="layui-input" name="HStatus" id="HStatus" readonly="readonly" autocomplete="off">
                                                     </div>
                                                 </div>
-                                                <div class="layui-col-xs3">
-                                                    <label class="layui-form-label"> 渚� 搴� 鍟嗭細</label>
-                                                    <div class="layui-input-inline">
-                                                        <input class="layui-input" name="HSupName" lay-verify="HSupName" id="HSupName" readonly="readonly" autocomplete="off">
-                                                        <input id="HSupID" name="HSupID" type="hidden" />
-                                                    </div>
-                                                </div>
-                                                <div class="layui-col-xs3">
+
+                                                <div class="layui-col-xs3" style="display:none;">
                                                     <label class="layui-form-label"> 閮�    闂細</label>
                                                     <div class="layui-input-inline">
                                                         <input class="layui-input" name="HDeptName" lay-verify="HDeptName" id="HDeptName" readonly="readonly" autocomplete="off">
@@ -93,20 +105,10 @@
                                                     </div>
                                                 </div>
                                                 <div class="layui-col-xs3">
-                                                    <label class="layui-form-label"> 棰勮鍒拌揣鏃ユ湡锛�</label>
+                                                    <label class="layui-form-label"> 閲囪喘缁勭粐锛�</label>
                                                     <div class="layui-input-inline">
-                                                        <input class="layui-input" name="HDHDate" lay-verify="HDHDate" id="HDHDate">
-                                                    </div>
-                                                </div>
-
-                                            </div>
-                                        </div>
-                                        <div class="layui-form-item">
-                                            <div class="layui-row">
-                                                <div class="layui-col-xs3">
-                                                    <label class="layui-form-label"> 閫佽揣鍗曞彿锛�</label>
-                                                    <div class="layui-input-inline">
-                                                        <input class="layui-input" name="HInnerBillNo" id="HInnerBillNo" autocomplete="off">
+                                                        <input class="layui-input" name="HPURCHASEORGName" lay-verify="HPURCHASEORGName" id="HPURCHASEORGName" readonly="readonly" autocomplete="off">
+                                                        <input id="HPURCHASEORGID" name="HPURCHASEORGID" type="hidden" />
                                                     </div>
                                                 </div>
                                                 <div class="layui-col-xs3">
@@ -115,10 +117,68 @@
                                                         <input class="layui-input" name="HDeliveryNo" id="HDeliveryNo" autocomplete="off">
                                                     </div>
                                                 </div>
+                                                <div class="layui-col-xs3">
+                                                    <label class="layui-form-label"> 鐗╂祦鍏徃锛�</label>
+                                                    <div class="layui-input-inline">
+                                                        <input class="layui-input" name="HExpressSupplier" id="HExpressSupplier" autocomplete="off">
+                                                    </div>
+                                                </div>
                                             </div>
-                                               
                                         </div>
-                                            
+                                        <div class="layui-form-item">
+                                            <div class="layui-row">
+                                                <div class="layui-col-xs3" style="display:none">
+                                                    <label class="layui-form-label"> 閫佽揣鍗曞彿锛�</label>
+                                                    <div class="layui-input-inline">
+                                                        <input class="layui-input" name="HInnerBillNo" id="HInnerBillNo" autocomplete="off">
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="layui-form-item">
+                                            <div class="layui-row">
+                                                <div class="layui-col-xs3">
+                                                    <label class="layui-form-label"> 鏀惰揣浜猴細</label>
+                                                    <div class="layui-input-inline">
+                                                        <input class="layui-input" name="HReceiveGoodsMan" id="HReceiveGoodsMan" autocomplete="off">
+                                                    </div>
+                                                </div>
+                                                <div class="layui-col-xs3">
+                                                    <label class="layui-form-label"> 鏀惰揣鍦板潃锛�</label>
+                                                    <div class="layui-input-inline">
+                                                        <input class="layui-input" name="HAddress" id="HAddress" autocomplete="off">
+                                                    </div>
+                                                </div>
+                                                <div class="layui-col-xs3">
+                                                    <label class="layui-form-label"> 鑱旂郴鏂瑰紡(鏀�)锛�</label>
+                                                    <div class="layui-input-inline">
+                                                        <input class="layui-input" name="HReceiveGoodsLink" id="HReceiveGoodsLink" autocomplete="off">
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="layui-form-item">
+                                            <div class="layui-row">
+                                                <div class="layui-col-xs3">
+                                                    <label class="layui-form-label"> 閫佽揣浜猴細</label>
+                                                    <div class="layui-input-inline">
+                                                        <input class="layui-input" name="HSendGoodsMan" id="HSendGoodsMan" autocomplete="off">
+                                                    </div>
+                                                </div>
+                                                <div class="layui-col-xs3">
+                                                    <label class="layui-form-label"> 閫佽揣鍦板潃锛�</label>
+                                                    <div class="layui-input-inline">
+                                                        <input class="layui-input" name="HSendGoodsAddr" id="HSendGoodsAddr" autocomplete="off">
+                                                    </div>
+                                                </div>
+                                                <div class="layui-col-xs3">
+                                                    <label class="layui-form-label"> 鑱旂郴鏂瑰紡(閫�)锛�</label>
+                                                    <div class="layui-input-inline">
+                                                        <input class="layui-input" name="HSendGoodsLink" id="HSendGoodsLink" autocomplete="off">
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
                                     </div>
                                     <div class="layui-tab-item">
                                         <div class="layui-form-item">
@@ -175,6 +235,7 @@
                             <div class="layui-btn-container">
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-add"><i class="layui-icon layui-icon-addition"></i>鎷嗗垎</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-del"><i class="layui-icon layui-icon-subtraction"></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>
                     </form>
@@ -188,6 +249,7 @@
     <script src="../../layuiadmin/Scripts/jquery-1.4.1.js" type="text/javascript"></script>
     <!--<script src="../../../../Scripts/jquery-1.8.2.js"></script>-->
     <script src="../../../../Scripts/webConfig.js"></script>
+    <script src="../../layuiadmin/Scripts/general.js"></script>
     <script>
         function getUrlVars() {
             var vars = [], hash;
@@ -203,44 +265,59 @@
         var linterid = params[params[0]];
         var lentryid = params[params[1]];
         var lSourceBillType = params[params[2]];
+        var HType = params[params[3]];
         // debugger;
-        $.ajax({
-            url: GetWEBURL() + "GetNewPOInStockBillNo",
-            type: "GET",
-            data: { "sMsg": linterid, "sMsg3": lSourceBillType },
-            success: function (d) {
-                //console.log(d.data);
-                $("#HBillNo").val(d.data[0].HBillNo);
-                $("#HInnerBillNo").val(d.data[0].HInnerBillNo);
-                $("#HDate").val(d.data[0].HDate);
-            }
-        });
-        $.ajax({
-            url: GetWEBURL() + "GetNewPOInStockShowBillMain",
-            type: "GET",
-            data: { "sMsg": linterid, "sMsg3": lSourceBillType },
-            success: function (d) {
-                //console.log(d.data);
-                //$("#HDate").val(d.)
-                $("#HInterID").val(d.data[0].HInterID);
-                //$("#HBillNo").val(d.data[0].HBillNo);
-                $("#HRemark").val(d.data[0].HRemark);
-                //$("#HDate").val(d.data[0].HDateForWeb);
-                $("#HMaker").val(sessionStorage["HUserName"]);
-                //$("#HMakerDate").val(d.data[0].HMakerDate)
-                //$("#HChecker").val(d.data[0].HChecker);
-                //$("#HCheckDate").val(d.data[0].HCheckDate);
-                $("#HSupID").val(d.data[0].HSupID);
-                $("#HSupName").val(d.data[0].HSupName);
-                $("#HDeptID").val(d.data[0].HDeptID);
-                $("#HDeptName").val(d.data[0].HDeptName);
-                $("#HEmpID").val(d.data[0].HEmpID);
-                $("#HEmpName").val(d.data[0].HEmpName);
-                $("#HManagerID").val(d.data[0].HManagerID);
-                $("#HManagerName").val(d.data[0].HManagerName);
-            }
-        });
 
+        if (HType == "edit") {
+            //缂栬緫           
+
+        } else {
+            //鏂板
+            $.ajax({
+                url: GetWEBURL() + "GetNewPOInStockBillNo",
+                type: "GET",
+                data: { "sMsg": linterid, "sMsg3": lSourceBillType },
+                async: false,
+                success: function (d) {
+                    //console.log(d.data);
+                    $("#HInterID").val(d.data[0].HInterID);
+                    $("#HBillNo").val(d.data[0].HBillNo);
+                    $("#HInnerBillNo").val(d.data[0].HInnerBillNo);
+                    $("#HDate").val(d.data[0].HDate);
+                }
+            });
+            $.ajax({
+                url: GetWEBURL() + "GetNewPOInStockShowBillMain",
+                type: "GET",
+                data: { "sMsg": linterid, "sMsg3": lSourceBillType },
+                success: function (d) {
+                    //console.log(d.data);
+                    //$("#HDate").val(d.)
+                    //$("#HInterID").val(d.data[0].HInterID);
+                    //$("#HBillNo").val(d.data[0].HBillNo);
+                    $("#HRemark").val(d.data[0].HRemark);
+                    //$("#HDate").val(d.data[0].HDateForWeb);
+                    $("#HMaker").val(sessionStorage["HUserName"]);
+                    //$("#HMakerDate").val(d.data[0].HMakerDate)
+                    //$("#HChecker").val(d.data[0].HChecker);
+                    //$("#HCheckDate").val(d.data[0].HCheckDate);
+                    $("#HSupID").val(d.data[0].HSupID);
+                    $("#HSupName").val(d.data[0].HSupName);
+                    $("#HDeptID").val(d.data[0].HDeptID);
+                    $("#HDeptName").val(d.data[0].HDepName);
+                    $("#HEmpID").val(d.data[0].HEmpID);
+                    $("#HEmpName").val(d.data[0].HEmpName);
+                    $("#HManagerID").val(d.data[0].HManagerID);
+                    $("#HManagerName").val(d.data[0].HManagerName);
+                    $("#HPURCHASEORGID").val(d.data[0].FPURCHASEORGID);
+                    $("#HPURCHASEORGName").val(d.data[0].HOrgName);
+                    $("#HReceiveGoodsMan").val(d.data[0].HReceiveGoodsMan);
+                    $("#HAddress").val(d.data[0].HAddress);
+                    //$("#HSendGoodsAddr").val(d.data[0].HPROVIDERADDRESS);
+                }
+            });
+        }
+        
 
         layui.config({
             base: '../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
@@ -253,59 +330,85 @@
                 , layer = layui.layer
                 , laydate = layui.laydate
                 , element = layui.element; //Tab鐨勫垏鎹㈠姛鑳斤紝鍒囨崲浜嬩欢鐩戝惉绛夛紝闇�瑕佷緷璧杄lement妯″潡
+            window.table = layui.table
             //甯歌鐢ㄦ硶
             laydate.render({
                 elem: '#HDHDate'
             });
-            RoadHBillSub();
+
+            if (HType == "edit") {
+                //缂栬緫
+                RoadBillMain_Edit(linterid);
+            } else {
+                //鏂板
+                RoadHBillSub();
+            }
+           
             layer.load(3)
-            table.render({
+
+            var HIsAduit = false;
+            var HModName = "SRM_POInStockBill_Edit";
+            var option = ""
+            window.HSubData = "";//鍏ㄥ眬鍙橀噺
+            var option = {
                 elem: '#mainTable'
                 , toolbar: '#toolbarDemo'
                 , cols: [[
-                    { type: 'checkbox', fixed: 'left' }
+                    { type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' }
                     , { field: 'sorderid', title: '搴忓彿', width: 80, hide: true, fixed: true }
                     , { field: 'HMTONO', title: '璁″垝璺熻釜鍗曞彿', width: 100, fixed: true, edit: 'text', hide: true }
                     , { field: 'HMaterID', title: '鐗╂枡ID', width: 100, hide: true }
-                    , { field: 'HMaterNumber', title: '鐗╂枡缂栫爜', width: 120 }
-                    , { field: 'HOldMaterNumber', title: '鏃х墿鏂欑紪鐮�', width: 120 }
-                    , { field: 'HMaterShortNumber', title: '鐗╂枡浠g爜', width: 120 }
+                    , { field: 'HMaterNumber', title: '鐗╂枡缂栫爜', width: 120, hide: true }
+                    , { field: 'HOldMaterNumber', title: '鏃х墿鏂欑紪鐮�', width: 120, hide: true }
+                    , { field: 'HMaterShortNumber', title: '鐗╂枡缂栫爜', width: 120 }//鍘熷懡鍚嶄负鐗╂枡浠g爜
                     , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 120 }
                     , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 120 }
                     , { field: 'HUnitName', title: '璁¢噺鍗曚綅', width: 100 }
                     , { field: 'HUnitNumber', title: '璁¢噺鍗曚綅浠g爜', width: 100, hide: true }
                     , { field: 'HUnitID', title: '璁¢噺鍗曚綅ID', width: 100, hide: true }
-                    , { field: 'FPrintCount', title: '鎵撳嵃鏉$爜鏁伴噺', width: 120 }
-                    , { field: 'HQty', title: '閫佽揣鏁伴噺', width: 100, edit: 'text' , event: "inputHQty"}
-                    , { field: 'HRQty', title: '鏈叆搴撴暟閲�', width: 100 }
-                    , { field: 'HSQty', title: '婧愬崟鏁伴噺', width: 100 }
-                    , { field: 'HBatchNo', title: '鎵规', width: 120,edit: 'text',}
+                    , { field: 'FPrintCount', title: '鎵撳嵃鏉$爜鏁伴噺', width: 120, hide: true }
+                    , { field: 'HQty', title: '閫佽揣鏁伴噺*', width: 100, edit: 'text', event: "inputHQty", totalRow: true}
+                    , { field: 'HRQty', title: '鍓╀綑鍙彂璐ф暟閲�', width: 100, totalRow: true }
+                    , { field: 'HSQty', title: '婧愬崟鏁伴噺', width: 100, totalRow: true }
+                    , { field: 'HBatchNo', title: '鎵瑰彿', width: 120, edit: 'text' }
+                    , { field: 'HBatchManager', title: '鍚敤鎵规绠$悊', width: 120, hide: true }
+                    , { field: 'HOrderType', title: '璁㈠崟绫诲瀷', width: 120, hide: true }
                     , { field: 'HKFDate', title: '鐢熶骇鏃ユ湡', align: 'center', width: 150, data_field: 'HKFDate', event: "chooseHKFDate" }
-                    , { field: 'HKFPeriod', title: '淇濊川鏈�', width: 100 }
+                    , { field: 'HKFPeriod', title: '淇濊川鏈�', width: 100, hide: true }
                     , { field: 'HDate', title: '棰勮鍒拌揣鏃ユ湡', align: 'center', width: 150, data_field: 'HDate', event: "chooseHDate", hide: true }
                     , { field: 'HPrice', title: '鍗曚环', width: 100, hide: true }
                     , { field: 'HMoney', title: '閲戦', width: 100, hide: true }
+                    , { field: 'HRemark', title: '澶囨敞', width: 200, edit: true }
+                    , { field: 'HTAXPRICE_T', title: '鍚◣閲嶉噺鍗曚环/鍚�', width: 200, edit: true, hide: true }
                     //, { field: 'HRemark', title: '澶囨敞', width: 100 }
                     , { field: 'HPOOrderInterID', title: '閲囪喘璁㈠崟涓诲唴鐮�', width: 150, hide: true }
                     , { field: 'HPOOrderEntryID', title: '閲囪喘璁㈠崟瀛愬唴鐮�', width: 150, hide: true }
                     , { field: 'HPOOrderBillNo', title: '閲囪喘璁㈠崟鍙�', width: 200 }
                     , { field: 'HWWOrderInterID', title: '濮斿璁㈠崟涓诲唴鐮�', width: 150, hide: true }
                     , { field: 'HWWOrderEntryID', title: '濮斿璁㈠崟瀛愬唴鐮�', width: 150, hide: true }
-                    , { field: 'HWWOrderBillNo', title: '濮斿璁㈠崟鍙�', width: 200 }
+                    , { field: 'HWWOrderBillNo', title: '濮斿璁㈠崟鍙�', width: 200, hide: true }
                     , { field: 'HBillType', title: '鍗曟嵁绫诲瀷', width: 100, hide: true }
                     , { field: 'HSourceBillType', title: '婧愬崟绫诲瀷', width: 100, hide: true }
-                    , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 200 }
+                    , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 200, hide: true }
+                    , { field: 'HSupMaterNumber', title: '渚涘簲鍟嗘枡鍙�', width: 200, edit: 'text' }
+                    , { field: 'HSupBatchNo', title: '渚涘簲鍟嗘壒娆�', width: 200, edit: 'text' }
+                    , { field: 'HExpressNumberSub', title: '鐗╂祦鍗曞彿', width: 200, edit: true, hide: true }//鐟炵惇,鍑礉
+                    , { field: 'HExpressSupplierSub', title: '鐗╂祦鍏徃', width: 200, edit: true, hide: true }//鐟炵惇锛屽嚡璐�
+                    , { field: 'HPlanArrivalDate', title: '鍒拌揣鏃ユ湡', width: 200, data_field: 'HPlanArrivalDate', event: "PlanArrivalDate", hide: true }//鐟炵惇
+                    , { field: 'HBoxNumber', title: '绠卞彿', width: 200, edit: true, hide: true }//鐟炵惇
                     , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 150, hide: true }
                     , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 150, hide: true }
                 ]]
                 // , data: [linterid]
                 // , page: true
                 , limit: 500 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
-                //, height: 500
+                , totalRow: true
+                , height: 'full-1000'
                 , done: function () {
                     layer.closeAll("loading");
                 }
-            });
+            };
+            table.render(option);
             //澶村伐鍏锋爮浜嬩欢
             table.on('toolbar(mainTable)', function (obj) {
                 var checkStatus = table.checkStatus(obj.config.id);
@@ -345,34 +448,44 @@
                                                     //dataindex = dataindex + x;
                                                     data1 = {
                                                         "sorderid": oldData.length + 1
+                                                        , "HMTONO": data[i].HMTONO
                                                         , "HMaterID": data[i].HMaterID
                                                         , "HMaterNumber": data[i].HMaterNumber
+                                                        , "HOldMaterNumber": data[i].HOldMaterNumber
+                                                        , "HMaterShortNumber": data[i].HMaterShortNumber
                                                         , "HMaterName": data[i].HMaterName
                                                         , "HMaterModel": data[i].HMaterModel
                                                         , "HUnitName": data[i].HUnitName
                                                         , "HUnitNumber": data[i].HUnitNumber
                                                         , "HUnitID": data[i].HUnitID
+                                                        , "FPrintCount": data[i].FPrintCount
                                                         , "HQty": data[i].HQty
                                                         , "HRQty": data[i].HRQty
                                                         , "HSQty": data[i].HSQty
                                                         , "HBatchNo": data[i].HBatchNo
                                                         , "HKFDate": data[i].HKFDate
                                                         , "HKFPeriod": data[i].HKFPeriod
+                                                        , "HDate": data[i].HDate
                                                         , "HPrice": data[i].HPrice
                                                         , "HMoney": data[i].HMoney
+                                                        , "HRemark": data[i].HRemark
                                                         , "HPOOrderInterID": data[i].HPOOrderInterID
                                                         , "HPOOrderEntryID": data[i].HPOOrderEntryID
                                                         , "HPOOrderBillNo": data[i].HPOOrderBillNo
                                                         , "HWWOrderInterID": data[i].HWWOrderInterID
                                                         , "HWWOrderEntryID": data[i].HWWOrderEntryID
                                                         , "HWWOrderBillNo": data[i].HWWOrderBillNo
+                                                        , "HWWOrderDetaiLID": data[i].HWWOrderDetaiLID
                                                         , "HBillType": data[i].HBillType
                                                         , "HSourceBillType": data[i].HSourceBillType
                                                         , "HSourceBillNo": data[i].HSourceBillNo
+                                                        //, "HExpressNumberSub": data[i].HExpressNumberSub
+                                                        //, "HExpressSupplierSub": data[i].HExpressSupplierSub
                                                         , "HSourceInterID": data[i].HSourceInterID
                                                         , "HSourceEntryID": data[i].HSourceEntryID
-                                                        , "HMTONO": data[i].HMTONO
-                                                        , "HDate": data[i].HDate
+                                                        , "FSHDD": data[i].FSHDD
+                                                        , "F_xbkf_Combo": data[i].F_xbkf_Combo
+                                                        , "HPlanArrivalDate": data[i].HPlanArrivalDate
                                                     }
                                                     //oldData.push(data1);
                                                     oldData.splice(dataindex, 0, data1);
@@ -425,6 +538,10 @@
                             });
                         }
                         break;
+                    //鍒楄缃�
+                    case 'set_HideColumn':
+                        get_HideColumn();
+                        break;
                 };
             });
             //鐩戝惉琛屽伐鍏蜂簨浠�
@@ -458,12 +575,27 @@
                     });
 
                 }
+                else if (obj.event === 'PlanArrivalDate') {
+                    var field = $(this).data('field');
+                    laydate.render({
+                        elem: this.firstChild
+                        , show: true //鐩存帴鏄剧ず
+                        , closeStop: this
+                        , done: function (value, date) {
+                            data[field] = value;
+                            obj.update(data);
+
+                        }
+                    });
+
+                }
                 else if (obj.event == 'inputHQty') {
                     $(obj.tr).find(".layui-table-edit").keyup(function () {
                         var $input = $(this), val = $input.val();
                         if (!val) val = "0";
-                        $input.val(val.replace(/[^\d]/g, ''));
-                    });
+                        //$input.val(parseInt(val.replace(/[^\d*\.?\d*]/g, '')));
+                        $input.val(val.replace(/[^\d*\.?\d*]/g, ''));
+                    });                    
                 }
 
             });
@@ -478,7 +610,7 @@
                         HQty = parseFloat(obj.data.HQty);
                     }
                     if (parseFloat(obj.value) > obj.data.HRQty) {
-                        layer.msg("閿欒:" + "涓嬫帹閫佽揣鍗曪紝閫佽揣鏁伴噺涓嶈兘瓒呰繃鏈叆搴撴暟閲忥紒", { icon: 5 });
+                        layer.msg("閿欒:" + "涓嬫帹閫佽揣鍗曪紝閫佽揣鏁伴噺涓嶈兘瓒呰繃鍓╀綑鍙彂璐ф暟閲忥紒", { icon: 5 });
                     }
                     else {
                         var bresult = true;
@@ -498,9 +630,10 @@
                             });
                         }
                         else {
-                            layer.msg("閿欒:" + "涓嬫帹閫佽揣鍗曪紝鍚堣閫佽揣鏁伴噺涓嶈兘瓒呰繃鏈叆搴撴暟閲忥紒", { icon: 5 });
+                            layer.msg("閿欒:" + "涓嬫帹閫佽揣鍗曪紝鍚堣閫佽揣鏁伴噺涓嶈兘瓒呰繃鍓╀綑鍙彂璐ф暟閲忥紒", { icon: 5 });
                         }
                     }
+                    table.reload('mainTable');//鍒锋柊琛ㄦ牸淇℃伅锛屽悎璁℃暟閲�
                 }
 
             });
@@ -512,27 +645,52 @@
                     async: true,
                     data: { sMsg: linterid, sMsg2: lentryid, sMsg3: lSourceBillType },
                     success: function (result) {
-                        ajaxReturnData = JSON.parse(JSON.stringify(result)).data;
-                        table.reload('mainTable', {
-                            data: ajaxReturnData
-                            , height: 'full-10'
-                            , loading: false
-                            , done: function (index, res) {
-                                layer.closeAll("loading");
+                        if (result.count == 10000) {
+                            for (let i = 0; i < result.data.length; i++) {
+                                if (sessionStorage["Organization"] == "浜嬩笟涓�澶�") {
+                                    result.data[i].HBatchNo = result.data[i].HBatchNo.substring(0, 6);
+                                }                                
                             }
-                        });
+                            ajaxReturnData = JSON.parse(JSON.stringify(result)).data;
+                            HSubData = ajaxReturnData;
+                            console.log(ajaxReturnData);
+                            table.reload('mainTable', {
+                                data: ajaxReturnData
+                                , height: 'full-10'
+                                , loading: false
+                                , done: function (index, res) {
+                                    layer.closeAll("loading");
+                                }
+                            });
+                        } else {
+                            layer.closeAll("loading");
+                            layer.msg(result.Message, { icon: 2, time: 4000 });
+                        }
+
                     },
                     error: function (result) {
                         console.log(result);
+                        layer.closeAll("loading");
                         //layer.msg('鑾峰彇濮斿璁㈠崟鍑虹幇寮傚父', { icon: 2, time: 2000 });
                     }
                 });
             };
             form.on('submit(Saver)', function (data) {//淇濆瓨
                 //debugger;
+
+                for (var i = 0; i < table.cache["mainTable"].length; i++) {
+                    if (table.cache["mainTable"][i].HMaterName.indexOf("\"") != -1 || table.cache["mainTable"][i].HMaterName.indexOf(";") != -1) {
+                        table.cache["mainTable"][i].HMaterName = table.cache["mainTable"][i].HMaterName.replace("\"", "鈥�").replace(";", "锛�")
+                    }
+                    if (table.cache["mainTable"][i].HMaterModel.indexOf("\"") != -1 || table.cache["mainTable"][i].HMaterModel.indexOf(";") != -1) {
+                        table.cache["mainTable"][i].HMaterModel = table.cache["mainTable"][i].HMaterModel.replace("\"", "鈥�").replace(";", "锛�")
+                    }
+                }
+
                 var sMainStr = JSON.stringify(data.field);
                 var sSubStr = JSON.stringify(table.cache['mainTable']);
-                var sMainSub = sMainStr + ';' + sSubStr;
+                var sMainSub = sMainStr + ';' + sSubStr + ';' + HType;
+
                 if (!AllowLoadData(sSubStr))//鏁版嵁楠岃瘉
                 {
                     return false;
@@ -547,6 +705,8 @@
                         success: function (data) {
                             if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
                                 layer.msg(data.Message, { icon: 1 });
+                                $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
+                                $('#ChooseSource-btn').addClass("layui-btn-disabled").attr("disabled", true);
                             }
                             else {
                                 f_alert(data.Message);
@@ -568,6 +728,8 @@
                         dataType: "json",
                         success: function (data) {
                             if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                HIsAduit = true;
+                                $('#aduit-btn').addClass("layui-btn-disabled").attr("disabled", true);
                                 layer.msg(data.Message, { icon: 1 });
                             }
                             else {
@@ -580,7 +742,11 @@
                         }
                     });
             });
-            form.on('submit(Print)', function (data) {//瀹℃牳
+            form.on('submit(Print)', function (data) {//鎵撳嵃
+                if (HIsAduit == false) {
+                    layer.msg("璇峰鏍搁�佽揣鍗曞悗鍦ㄨ繘琛屾墦鍗�( 麓鈼旓笌 鈥糕棓锔巂)", { icon: 5 });
+                    return;
+                }
                 $.ajax(
                     {
                         type: "GET",
@@ -592,7 +758,7 @@
                             if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
                                 layer.open({
                                     type: 2
-                                    , area: ['50%', '50%']
+                                    , area: ['40%', '80%']
                                     , title: '鎵撳嵃妯$増閫夋嫨'
                                     , shade: 0.6 //閬僵閫忔槑搴�
                                     , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
@@ -614,7 +780,90 @@
                         }
                     });
             });
-            form.on('submit(Exit)', function (data) {//淇濆瓨
+
+            //涓�閿墦鍗�
+            form.on('submit(Print_Convenient)', function (data) {
+                if (HIsAduit == false) {
+                    layer.msg("璇峰鏍搁�佽揣鍗曞悗鍦ㄨ繘琛屾墦鍗�( 麓鈼旓笌 鈥糕棓锔巂)", { icon: 5 });
+                    return;
+                }
+                $.ajax({
+                    type: "GET",
+                    url: GetWEBURL() + "/GetHinterID", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                    async: true,
+                    data: { "HBillNo": $("#HBillNo").val() },
+                    dataType: "json",
+                    success: function (data) {
+                        if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            $.ajax({
+                                type: "get",
+                                url: GetWEBURL() + "/Open_PrintTem/GetDefaultOpenTmp_Json",
+                                async: true,
+                                data: { "HNumber": 'SRM_POInStockBillList' },
+                                //data: { "Value": Value },
+                                success: function (result) {
+                                    if (result.count == 1) {
+                                        var OpenTmp = result.data[0].妯℃澘鍚嶇О
+                                        window.open("../../views/SRM/HBarPlanPrint.html?linterid=" + data.data.toString() + "&Type=SRM_POInStockBillList" + "&OpenTmp=" + OpenTmp.toString());
+                                    } else {
+                                        layer.msg(result.Message);
+                                    }
+                                },
+                                error: function (result) {
+                                    console.log(result);
+                                }
+                            });
+                        }
+                        else {
+                            f_alert(data.Message);
+                        }
+                        layer.closeAll("loading");
+                    },
+                    error: function (err) {
+                        f_alert("閿欒:" + err);
+                    }
+                });
+            });           
+
+            form.on('submit(ChooseSource)', function (data) {
+                var HOrderType = HSubData[0].HOrderType == undefined ? HSubData[0].璁㈠崟绫诲瀷 : HSubData[0].HOrderType
+                
+                layer.open({
+                    type: 2
+                    , area: ['95%', '95%']
+                    , title: '閲囪喘璁㈠崟鍒楄〃'
+                    , shade: 0.6 //閬僵閫忔槑搴�
+                    , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                    , content: ['../../views/SRM/SRM_POOrderBillList.html?Type=AddRow&HSupName=' + $("#HSupName").val() + '&HOrderType=' + HOrderType, 'yes']
+                    , resize: false
+                    //, cancel: function () {
+                    //    $(".layui-btn").removeClass("layui-btn-disabled");
+                    //}
+                })
+            });
+            
+            form.on('submit(MergeBuildBarcode)', function (data) {
+                if (HIsAduit == false) {
+                    layer.msg("璇峰鏍搁�佽揣鍗曞悗鍦ㄧ敓鎴愭潯鐮�( 麓鈼旓笌 鈥糕棓锔巂)", { icon: 5 });
+                    return;
+                }
+                layer.open({
+                    type: 2
+                    , area: ['95%', '95%']
+                    , title: '鏉$爜鐢熸垚'
+                    , shade: 0.6 //閬僵閫忔槑搴�
+                    , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                    , content: ['../../views/SRM/SRM_BarCodeBill.html?linterid=' + $("#HInterID").val() + '&lentryid=0' + '&type=0' + '&mergeTags=1', 'yes']
+                    , resize: false
+                    //, done: function () {
+                    //    layer.closeAll("loading");
+                    //}
+                })
+            });
+
+            form.on('submit(Exit)', function (data) {//閫�鍑�
                 var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
                 parent.layer.close(index); //鍐嶆墽琛屽叧闂�
             });
@@ -657,17 +906,43 @@
                             layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,閫佽揣鏁伴噺涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                             return Result = false;
                         }
-                        if (sSubStr[i].FPrintCount == 0) {
-                            layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,娌℃湁杩涜鏉$爜鎵撳嵃锛屼笉鑳界敓鎴愰�佽揣鍗�!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        ////鐟炵惇娌℃湁杩欓」鎺у埗
+                        //if (sSubStr[i].FPrintCount == 0) {
+                        //    layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,娌℃湁杩涜鏉$爜鎵撳嵃锛屼笉鑳界敓鎴愰�佽揣鍗�!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        //    return Result = false;
+                        //}
+                        ////閫佽揣鏁伴噺 + 锛堟簮鍗曟暟閲�-鍓╀綑鍙彂璐ф暟閲� = 宸茬敓鎴愰�佽揣鍗曟暟閲忥級 > 鎵撳嵃鏉$爜鏁伴噺 鏃堕檺鍒�
+                        //if (parseFloat(sSubStr[i].HQty) > parseFloat(sSubStr[i].FPrintCount)) {
+                        //    layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,閫佽揣鍗曟暟閲忎笉鑳借秴杩囧凡鐢熸垚鏉$爜鏁伴噺!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        //    return Result = false;
+                        //}
+                        //閫佽揣鏁伴噺
+                        if (parseFloat(sSubStr[i].HQty) > parseFloat(sSubStr[i].HRQty)) {
+                            layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,閫佽揣鍗曟暟閲忎笉鑳借秴杩囧墿浣欏彲鍙戣揣鏁伴噺!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                             return Result = false;
                         }
-                        //閫佽揣鏁伴噺 + 锛堟簮鍗曟暟閲�-鏈叆搴撴暟閲� = 宸茬敓鎴愰�佽揣鍗曟暟閲忥級 > 鎵撳嵃鏉$爜鏁伴噺 鏃堕檺鍒�
-                        if (parseFloat(sSubStr[i].HQty) + parseFloat(sSubStr[i].HSQty) - parseFloat(sSubStr[i].HRQty) > parseFloat(sSubStr[i].FPrintCount)) {
-                            layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,閫佽揣鍗曟暟閲忎笉鑳借秴杩囧凡鐢熸垚鏉$爜鏁伴噺!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        //////閫佽揣鏁伴噺
+                        //if (parseFloat(sSubStr[i].HQty) > parseFloat(sSubStr[i].FPrintCount)) {
+                        //    layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,閫佽揣鍗曟暟閲忎笉鑳借秴杩囨墦鍗版潯鐮佹暟閲�!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        //    return Result = false;
+                        //}
+                        ////閫佽揣鏁伴噺 + 锛堟簮鍗曟暟閲�-鍓╀綑鍙彂璐ф暟閲� = 宸茬敓鎴愰�佽揣鍗曟暟閲忥級 > 鎵撳嵃鏉$爜鏁伴噺 鏃堕檺鍒�
+                        //if (parseFloat(sSubStr[i].HQty) + parseFloat(sSubStr[i].HSQty) - parseFloat(sSubStr[i].HRQty) > parseFloat(sSubStr[i].FPrintCount)) {
+                        //    layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,閫佽揣鍗曟暟閲忎笉鑳借秴杩囧凡鐢熸垚鏉$爜鏁伴噺!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        //    return Result = false;
+                        //}
+                        if (sSubStr[i].HBatchNo == "" && sSubStr[i].HBatchManager == "鏄�") {
+                            layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鐗╂枡鍚敤鎵规绠$悊锛屾壒娆′负绌猴紝璇峰~鍐欐壒娆′俊鎭�!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                             return Result = false;
                         }
-                        if (sSubStr[i].HBatchNo == "") {
-                            layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鎵规涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        if (sSubStr[i].HKFDate == "") {
+                            //鍑礉
+                            layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鐢熶骇鏃ユ湡涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            return Result = false;
+                        }
+                        if (sSubStr[i].HKFDate > Format(new Date(), "yyyy-MM-dd")) {
+                            //鍑礉
+                            layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鐢熶骇鏃ユ湡澶т簬褰撳墠鏃ユ湡锛岃閲嶆柊閫夋嫨锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                             return Result = false;
                         }
                     }
@@ -677,7 +952,296 @@
                 }
                 return Result;
             }
+
+            //缂栬緫閫佽揣鍗曞姞杞借〃澶磋〃浣撴暟鎹�
+            function RoadBillMain_Edit(linterid) {
+                $.ajax({
+                    url: GetWEBURL() + "/Cg_POInStockBill/cx",
+                    type: "GET",
+                    data: { "HInterID": linterid },
+                    success: function (data) {
+                        if (data.code == 1) {
+                            var data = data.data;
+
+                            ajaxReturnData = JSON.parse(JSON.stringify(data));
+                            HSubData = ajaxReturnData;
+
+                            //涓昏〃
+                            form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+                                "HInterID": data[0].hmainid
+                                , "HBillNo": data[0].鍗曟嵁鍙�
+                                , "HDate": Format(new Date(data[0].鍗曟嵁鏃ユ湡), "yyyy-MM-dd")
+                                , "HSupName": data[0].渚涘簲鍟嗗悕绉�
+                                , "HSupID": data[0].HSupID
+                                , "HDHDate": Format(new Date(data[0].棰勮鍒拌揣鏃ユ湡), "yyyy-MM-dd")
+                                , "HManagerName": data[0].涓荤鍚嶇О
+                                , "HManagerID": data[0].HManagerID
+                                , "HEmpName": data[0].涓氬姟鍛樺悕绉�
+                                , "HEmpID": data[0].HEmpID
+                                , "HDeptName": data[0].閮ㄩ棬鍚嶇О
+                                , "HDeptID": data[0].HDeptID
+                                , "HPURCHASEORGName": data[0].閲囪喘缁勭粐鍚嶇О
+                                , "HPURCHASEORGID": data[0].HPURCHASEORGID
+                                , "HDeliveryNo": data[0].鐗╂祦鍗曞彿
+                                , "HExpressSupplier": data[0].鐗╂祦鍏徃
+                                , "HInnerBillNo": data[0].閫佽揣鍗曞彿
+                                , "HReceiveGoodsMan": data[0].鏀惰揣浜�
+                                , "HAddress": data[0].鏀惰幏鍦板潃
+                                , "HReceiveGoodsLink": data[0].鏀惰揣浜鸿仈绯绘柟寮�
+                                , "HSendGoodsMan": data[0].閫佽揣浜�
+                                , "HSendGoodsAddr": data[0].閫佽揣鍦板潃
+                                , "HSendGoodsLink": data[0].閫佽揣浜鸿仈绯绘柟寮�
+                                  //鍏朵粬淇℃伅
+                                //, "HMaker": data[0].鍒跺崟浜�
+                                //, "HChecker": data[0].
+                                //, "HUpDater": data[0].
+                                //, "HMakeDate": data[0].
+                                //, "HCheckDate": data[0].
+                                //, "HUpDateDate": data[0].                              
+                            });
+                            //瀛愯〃  璧嬪��
+                            var rowdata = [];
+                            for (var i = 0; i < data.length; i++) {
+                                rowdata.push(
+                                    {
+                                        "sorderid": (i + 1),"HMTONO": data[i].璁″垝璺熻釜鍗曞彿, "HMaterID": data[i].HMaterID, "HMaterNumber": data[i].鐗╂枡浠g爜
+                                        , "HOldMaterNumber": data[i].鐗╂枡浠g爜, "HMaterShortNumber": data[i].鐗╂枡浠g爜, "HMaterName": data[i].鐗╂枡鍚嶇О
+                                        , "HMaterModel": data[i].瑙勬牸鍨嬪彿, "HUnitName": data[i].璁¢噺鍗曚綅鍚嶇О, "HUnitNumber": data[i].璁¢噺鍗曚綅浠g爜
+                                        , "HUnitID": data[i].HUnitID, "FPrintCount": data[i].鎵撳嵃鏉$爜鏁伴噺, "HQty": data[i].閫佽揣鏁伴噺
+                                        , "HRQty": data[i].鍓╀綑鍙彂璐ф暟閲�, "HSQty": data[i].婧愬崟鏁伴噺, "HBatchNo": data[i].鎵瑰彿
+                                        , "HBatchManager": data[i].鍚敤鎵规绠$悊, "HOrderType": data[i].璁㈠崟绫诲瀷, "HKFDate": Format(new Date(data[i].鐢熶骇鏃ユ湡), "yyyy-MM-dd")
+                                        , "HKFPeriod": data[i].淇濊川鏈�, "HDate": data[i].瀛愰璁″埌璐ф棩鏈�, "HPrice": data[i].鍗曚环
+                                        , "HMoney": data[i].閲戦, "HRemark": data[i].瀛愬娉�, "HTAXPRICE_T": data[i].鍚◣閲嶉噺鍗曚环鍚�
+                                        , "HPOOrderInterID": data[i].HPOOrderInterID, "HPOOrderEntryID": data[i].HPOOrderEntryID
+                                        , "HPOOrderBillNo": data[i].閲囪喘璁㈠崟鍙�, "HWWOrderInterID": data[i].HWWOrderInterID
+                                        , "HWWOrderEntryID": data[i].HWWOrderEntryID, "HWWOrderBillNo": data[i].濮斿璁㈠崟鍙�, "HBillType": data[i].鍗曟嵁绫诲瀷
+                                        , "HSourceBillType": data[i].HSourceBillType, "HSourceBillNo": data[i].婧愬崟鍗曞彿, "HSupMaterNumber": data[i].渚涘簲鍟嗘枡鍙�
+                                        , "HSupBatchNo": data[i].渚涘簲鍟嗘壒娆�, "HExpressNumberSub": data[i].瀛愮墿娴佸崟鍙�, "HExpressSupplierSub": data[i].瀛愮墿娴佸叕鍙�
+                                        , "HPlanArrivalDate": data[i].鍒拌揣鏃ユ湡, "HBoxNumber": data[i].绠卞彿, "HSourceInterID": data[i].HSourceInterID
+                                        , "HSourceEntryID": data[i].HSourceEntryID, "FSHDD": "", "F_xbkf_Combo": ""
+                                    }
+                                )
+                            }
+                            //鍒锋柊琛ㄤ綋鏁版嵁
+                            table.reload('mainTable', {
+                                data: rowdata
+                                , height: 'full-10'
+                                , loading: false
+                                , done: function (index, res) {
+                                    layer.closeAll("loading");
+                                }
+                            });
+
+                            //option.data = rowdata;
+                            //table.render(option);
+                        }
+                        else {
+                            layer.msg(data.Message, { icon: 2, time: 3000 });
+                        }
+
+                        layer.closeAll("loading");
+                    },
+                    error: function (result) {
+                        layer.closeAll("loading");
+                        layer.msg(data.Message, { icon: 2, time: 3000 });
+                    }
+                });                
+            }
+
+            ////闅愯棌鍒楄缃�
+            //function get_HideColumn() {
+            //    var colName = "";
+            //    var contentUrl = "";
+            //    for (var i = 1; i < option.cols[0].length - 1; i++) {
+            //        colName += option.cols[0][i]["title"] + ",";
+            //    }
+            //    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 += 'views/鍩虹璧勬枡/闅愯棌鍒楄缃�/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) {
+            //            //鍒锋柊琛ㄦ牸鏁版嵁
+            //            DisPlay_HideColumn();
+            //            //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+            //            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 = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+            //                var titleData = [];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+
+            //                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);
+            //                layer.closeAll("loading");
+            //            } else {
+            //                table.render(option);
+            //                layer.closeAll("loading");
+            //            }
+            //        }, error: function () {
+            //            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+            //            layer.closeAll("loading");
+            //        }
+            //    })
+            //}
+
         });
+
+        function GetPoorderValue(obj) {
+            var Batchno = Format(new Date(), "yyyy-MM-dd").replaceAll('-', '').substr(2, 6);//6浣嶆暟褰撳墠鏃ユ湡
+
+            var HSubLen = HSubData.length + 1;
+            var a = [];
+            var HOrderType = HSubData[0].璁㈠崟绫诲瀷 == undefined ? HSubData[0].HOrderType : HSubData[0].璁㈠崟绫诲瀷
+            var HSupNum = HSubData[0].HOrderType
+            var HError = "";
+
+            //for (let i = 0; i < HSubData.length; i++) {
+            //    if (obj[i].hmaterid == HSubData[i].HMaterID) {
+            //        obj[i].HBatchNo = HSubData[i].HBatchNo
+            //        Batchno = HSubData[i].HBatchNo
+            //        break;
+            //    }
+            //}
+
+            var HData_Sub = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
+
+            for (let i = 0; i < obj.length; i++) {
+                for (let j = 0; j < HSubData.length; j++) {
+                    if (obj[i].hmaterid == HSubData[j].HMaterID) {
+                        obj[i].HBatchNo = HSubData[j].鎵瑰彿
+                        Batchno = HSubData[j].HBatchNo
+                    }
+                }
+            }
+
+            for (let i = 0; i < obj.length; i++) {
+                if (obj[i].璁㈠崟绫诲瀷 != HOrderType) {
+                    HError += obj[i].璁㈠崟绫诲瀷;
+                }
+                var row_options = {
+                    //"sorderid": HSubLen, "HPOOrderInterID": obj[i].hmainid, "HPOOrderEntryID": obj[i].hentryid, "HPOOrderBillNo": obj[i].鍗曟嵁鍙�, "HWWOrderInterID": 0,
+                    //"HWWOrderEntryID": 0, "HWWOrderDetaiLID": 0., "HWWOrderBillNo": '', "HBillType": "1102", "HBatchNo": obj[i].HBatchNo, "HMaterID": obj[i].hmaterid,
+                    //"HMaterNumber": obj[i].鐗╂枡浠g爜, "HOldMaterNumber": obj[i].鏃х墿鏂欑紪鐮�, "HMaterShortNumber": obj[i].鐗╂枡缂栫爜, "HMaterName": obj[i].鐗╂枡鍚嶇О,
+                    //"HMaterModel": obj[i].瑙勬牸鍨嬪彿, "HUnitID": obj[i].hunitid, "HUnitNumber": obj[i].璁¢噺鍗曚綅浠g爜, "HUnitName": obj[i].璁¢噺鍗曚綅, "HQty": obj[i].鍙彂璐ф暟閲�,
+                    //"HRQty": obj[i].鍙彂璐ф暟閲�, "HSQty": obj[i].璁㈠崟鏁伴噺, "HPrice": obj[i].鍗曚环, "HMoney": obj[i].閲戦, "HDate": new Date(), "HKFDate": new Date(),
+                    //"HKFPeriod": 0, "HSourceInterID": obj[i].hmainid, "HSourceEntryID": obj[i].hentryid, "HSourceBillType": "1102", "HSourceBillNo": obj[i].鍗曟嵁鍙�,
+                    //"HMTONO": obj[i].HBatchNo, "F_xbkf_Combo": '', "FSHDD": '', "FPrintCount": obj[i].鎵撳嵃鏉$爜鏁伴噺, "HPlanArrivalDate": new Date()
+
+                    "sorderid": HSubLen, "HPOOrderInterID": obj[i].hmainid, "HPOOrderEntryID": obj[i].hsubid, "HPOOrderBillNo": obj[i].璁㈠崟鍗曞彿, "HWWOrderInterID": 0,
+                    "HWWOrderEntryID": 0, "HWWOrderDetaiLID": 0., "HWWOrderBillNo": '', "HBillType": "1102", "HBatchNo": obj[i].HBatchNo, "HMaterID": obj[i].hmaterid,
+                    "HMaterNumber": obj[i].鐗╂枡浠g爜, "HOldMaterNumber": obj[i].鏃х墿鏂欑紪鐮�, "HMaterShortNumber": obj[i].鐗╂枡缂栫爜, "HMaterName": obj[i].鐗╂枡鍚嶇О,
+                    "HMaterModel": obj[i].瑙勬牸鍨嬪彿, "HUnitID": obj[i].hunitid, "HUnitName": obj[i].璁¢噺鍗曚綅, "HUnitNumber": obj[i].璁¢噺鍗曚綅浠g爜, "HUnitName": obj[i].閲囪喘鍗曚綅, "HQty": obj[i].鍙彂璐ф暟閲�,
+                    "HRQty": obj[i].鍙彂璐ф暟閲�, "HSQty": obj[i].閲囪喘鏁伴噺, "HPrice": obj[i].鍗曚环, "HMoney": obj[i].閲戦, "HDate": Format(new Date(), "yyyy-MM-dd"), "HKFDate": new Date().toISOString().slice(0, 10),
+                    "HKFPeriod": 0, "HSourceInterID": obj[i].hmainid, "HSourceEntryID": obj[i].hsubid, "HSourceBillType": "1102", "HSourceBillNo": obj[i].璁㈠崟鍗曞彿,
+                    "HMTONO": obj[i].HBatchNo, "F_xbkf_Combo": '', "FSHDD": '', "FPrintCount": obj[i].鎵撳嵃鏉$爜鏁伴噺, "HPlanArrivalDate": new Date(),
+                    "HTAXPRICE_T": obj[i].鍚◣閲嶉噺鍗曚环鍚�
+                };
+                HSubData.push(row_options);
+                HData_Sub.push(row_options);
+                HSubLen++;
+
+                //var NewRow = {
+                //    "HMTONO": "", "HMaterID": 0, "HMaterNumber": "", "HOldMaterNumber": "", "HMaterShortNumber": "", "HMaterName": 0, "HMaterModel": "", "HUnitName": "0", "HUnitNumber": "",
+                //    "HUnitID": "0", "FPrintCount": "0", "HRQty": "0", "HSQty": "", "HBatchNo": "", "HKFDate": "", "HKFPeriod": "", "HDate": "", "HPrice": "", "HMoney": "", "HRemark": "", "HPOOrderInterID": "", "HPOOrderEntryID": "", "HPOOrderBillNo": "", "HWWOrderInterID": "", "HWWOrderEntryID": "", "HWWOrderBillNo": "", "HBillType": "", "HSourceBillType": "", "HSourceBillNo": "", "HSupMaterNumber": "", "HSupBatchNo": "", "HExpressNumberSub": "", "HExpressSupplierSub": "", "HPlanArrivalDate": "", "HBoxNumber": "", "HSourceInterID": "", "HSourceEntryID": ""
+                //};
+            };
+            if (HError != "") {
+                return layer.msg('閲囪喘璁㈠崟璁㈠崟绫诲瀷涓嶅悓锛屼笉鍏佽鍚堝苟涓嬫帹鐢熸垚閫佽揣鍗曪紒')
+            }
+            table.reload('mainTable', {
+                data: HData_Sub
+                , height: 'full-10'
+                , loading: false
+                , done: function (index, res) {
+                    layer.closeAll("loading");
+                }
+            });
+        }
+
     </script>
 </body>
 </html>
\ No newline at end of file

--
Gitblit v1.9.1