From e57b2edbffff5a653ba9eda65eae100ceb2e7822 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期一, 01 九月 2025 16:16:41 +0800
Subject: [PATCH] 乔一:客户物料即时库存报表、客户手工抄包报表

---
 WebTM/views/生产管理/宝工排产/JIT_DayPlanPlatForm.html |  826 ++++++++++++++++++++++++++++++++++++++++++++++------------
 1 files changed, 652 insertions(+), 174 deletions(-)

diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\256\235\345\267\245\346\216\222\344\272\247/JIT_DayPlanPlatForm.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\256\235\345\267\245\346\216\222\344\272\247/JIT_DayPlanPlatForm.html"
index 32e4160..a5288ca 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\256\235\345\267\245\346\216\222\344\272\247/JIT_DayPlanPlatForm.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\256\235\345\267\245\346\216\222\344\272\247/JIT_DayPlanPlatForm.html"
@@ -13,6 +13,26 @@
     <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
     <script src="../../../layuiadmin/soulTable.slim.js"></script>
     <script src="../../../layuiadmin/SetColumn.js"></script>
+    <style>
+        .loader {
+            border: 8px solid #f3f3f3; /* Light grey */
+            border-top: 8px solid #3498db; /* Blue */
+            border-radius: 50%;
+            width: 50px;
+            height: 50px;
+            animation: spin 2s linear infinite;
+        }
+
+        @keyframes spin {
+            0% {
+                transform: rotate(0deg);
+            }
+
+            100% {
+                transform: rotate(360deg);
+            }
+        }
+    </style>
 </head>
 <body>
     <div class="layui-fluid">
@@ -22,17 +42,22 @@
                     <form class="layui-form" action="" lay-filter="component-form-group">
                         <div style="padding: 10px; ">
                             <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="ExcelImport" id="ExcelImport">Excel瀵煎叆</button>
-                            <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSave" id="btnSave">淇濆瓨</button>
-                            <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnLock" id="btnLock">閿佸畾</button>
-                            <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnUnlock" id="btnUnlock">瑙i攣</button>
-                            <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnCompleteSetAnalysis" id="btnCompleteSetAnalysis">榻愬鍒嗘瀽</button>
-                            <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnTLYS" id="btnTLYS">鎻愭枡杩愮畻</button>
+                            <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Excel_DayImport" id="Excel_DayImport">鏃ヨ鍒掓粴鍔ㄥ鍏�</button>
                             <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnICMOBill" id="btnICMOBill">鐢熶骇璁㈠崟閫夊崟</button>
+                            <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnAddICMO" id="btnAddICMO">娣诲姞璁㈠崟</button>
+                            <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSave" id="btnSave">淇濆瓨</button>
                             <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnReady" id="btnReady">鍑嗗</button>
                             <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnProPC" id="btnProPC">鎺掍骇</button>
+                            <!--<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnLock" id="btnLock">閿佸畾</button>
+                            <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnUnlock" id="btnUnlock">瑙i攣</button>-->
+                            <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnLockRequest" id="btnLock">閿佸畾鐢宠</button>
+                            <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnUnlockRequest" id="btnUnlock">瑙i攣鐢宠</button>
+                            <!--<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnLockOrder" id="btnLockOrder">閿佸畾宸ュ崟</button>
+                            <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnUnlockOrder" id="btnUnlockOrder">瑙i攣宸ュ崟</button>-->
+                            <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnCompleteSetAnalysis" id="btnCompleteSetAnalysis">榻愬鍒嗘瀽</button>
+                            <!--<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnTLYS" id="btnTLYS">鎻愭枡杩愮畻</button>
+                            <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btn_Calculate" id="btn_Calculate">娆犳枡杩愮畻</button>-->
                             <!--<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnRoutEdit" id="btnRoutEdit">宸ヨ壓璺嚎</button>-->
-                            <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnLockOrder" id="btnLockOrder">閿佸畾宸ュ崟</button>
-                            <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnUnlockOrder" id="btnUnlockOrder">瑙i攣宸ュ崟</button>
                         </div>
                         <div class="layui-collapse resizable-container">
                             <div class="layui-colla-item">
@@ -365,6 +390,14 @@
         //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
         var titleData = [];
         var titleData_ICMO = ["hmainid", "HEntryID", "HEmpID", "HPRDORGID", "hsubid", "HMaterID", "HUnitID", "HDeptID", "HEntryCusID", "HCenterID", "HSourceID"];
+        var params = get_UrlVars();
+        var HType = "";
+        var HWorkShopID = 0;
+        if (params[params[0]] != undefined) {
+            HType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇
+            HWorkShopID = params[params[1]]; //浠庡弬鏁颁腑鑾峰彇
+            set_HWorkShop();
+        }
         //#endregion
 
         //#region 杩涘叆椤甸潰鍗冲姞杞�
@@ -548,7 +581,7 @@
                     break;
                 //鍒楄缃�
                 case 'set_HideColumn':
-                    get_HideColumnNoPage(HModName, sessionStorage["HUserName"], option, get_FastQuery);
+                    get_HideColumnNoPageForPlan(HModName,option, get_FastQuery);
                     break;
                 //鍒犻櫎琛�
                 case 'set_DeleteBill':
@@ -632,6 +665,11 @@
             btnExcelImport();
         });
 
+        //鏃ヨ鍒掓粴鍔ㄥ鍏�
+        form.on('submit(Excel_DayImport)', function () {
+            btnExcel_DayImport();
+        });
+
         //淇濆瓨
         form.on('submit(btnSave)', function (data) {
             var HWorkShopID = $("#HWorkShopID").val();//鐢熶骇杞﹂棿
@@ -649,7 +687,7 @@
                     }
                 }
                 if (HYxjQty > 0) {
-                    layer.confirm('褰撳墠鎺掍骇椤甸潰瀛樺湪浼樺厛绾т负0鐨勭敓浜ц鍗曪紝鏄惁缁х画杩涜鎺掍骇锛�', {
+                    layer.confirm('褰撳墠鎺掍骇椤甸潰瀛樺湪浼樺厛绾т负0鐨勭敓浜ц鍗曪紝鏄惁缁х画杩涜淇濆瓨锛�', {
                         title: "鎿嶄綔鎻愮ず",
                         icon: 0,
                         btn: ['纭', '鍙栨秷']
@@ -698,35 +736,59 @@
 
         //榻愬鍒嗘瀽
         form.on('submit(btnCompleteSetAnalysis)', function (data) {
-            layer.confirm('浣犵‘瀹氳鎵ц鎿嶄綔鍚楋紝璇峰厛纭繚鎺掍骇鏁版嵁宸蹭繚瀛橈紵', {
-                btn: ['纭畾', '鍙栨秷'] //鎸夐挳
-                , btn1: function () {
-                    get_btnCompleteSetAnalysis();
-                }
-            })
+            if (set_ModCheck("Sc_WorkBillSortBill_qtfx") == true) {
+                layer.confirm('浣犵‘瀹氳鎵ц鎿嶄綔鍚楋紝璇峰厛纭繚鎺掍骇鏁版嵁宸蹭繚瀛橈紵', {
+                    btn: ['纭畾', '鍙栨秷'] //鎸夐挳
+                    , btn1: function (index, layero) {
+                        get_btnCompleteSetAnalysis();
+                        layer.close(index);
+                    }
+                })
+            }
         })
 
         //鎻愭枡杩愮畻
         form.on('submit(btnTLYS)', function (data) {
-            layer.confirm('浣犵‘瀹氳鎵ц鎿嶄綔鍚楋紝璇峰厛纭繚鎺掍骇鏁版嵁宸蹭繚瀛橈紵', {
-                btn: ['纭畾', '鍙栨秷'] //鎸夐挳
-                , btn1: function () {
-                    get_btnTLYS();
-                }
-            })
+            if (set_ModCheck("Sc_WorkBillSortBill_tlys") == true) {
+                layer.confirm('浣犵‘瀹氳鎵ц鎿嶄綔鍚楋紝璇峰厛纭繚鎺掍骇鏁版嵁宸蹭繚瀛橈紵', {
+                    btn: ['纭畾', '鍙栨秷'] //鎸夐挳
+                    , btn1: function (index, layero) {
+                        get_btnTLYS();
+                        layer.close(index);
+                    }
+                })
+            }
+            
         })
-
+        //娆犳枡杩愮畻
+        form.on('submit(btn_Calculate)', function (data) {
+            if (set_ModCheck("Sc_WorkBillSortBill_qlys") == true) {
+                layer.confirm('浣犵‘瀹氳鎵ц鎿嶄綔鍚楋紝璇峰厛纭繚鎺掍骇鏁版嵁宸蹭繚瀛橈紵', {
+                    btn: ['纭畾', '鍙栨秷'] //鎸夐挳
+                    , btn1: function (index, layero) {
+                        set_Calculate();
+                        layer.close(index);
+                    }
+                })
+            }
+            
+        });
         //鐢熶骇璁㈠崟閫夊崟
         form.on('submit(btnICMOBill)', function (data) {
             get_btnICMOBill();
+        })
+        //娣诲姞鐢熶骇璁㈠崟
+        form.on('submit(btnAddICMO)', function (data) {
+            get_btnAddICMO();
         })
 
         //鍑嗗
         form.on('submit(btnReady)', function (data) {
             layer.confirm('浣犵‘瀹氳鎵ц鎿嶄綔鍚楋紝璇峰厛纭繚鎺掍骇鏁版嵁宸蹭繚瀛橈紵', {
                 btn: ['纭畾', '鍙栨秷'] //鎸夐挳
-                , btn1: function () {
+                , btn1: function (index, layero) {
                     get_btnReady();
+                    layer.close(index);
                 }
             })
         })
@@ -735,7 +797,7 @@
         form.on('submit(btnProPC)', function (data) {
             layer.confirm('浣犵‘瀹氳鎵ц鎺掍骇鍚楋紵', {
                 btn: ['纭畾', '鍙栨秷'] //鎸夐挳
-                , btn1: function () {
+                , btn1: function (index1, layero) {
                     var HWorkShopID = $("#HWorkShopID").val();//鐢熶骇杞﹂棿
                     if (HWorkShopID == 0) {
                         return layer.msg("鐢熶骇杞﹂棿涓嶈兘涓虹┖!");
@@ -747,11 +809,12 @@
                             shadeClose: false, // 鐐瑰嚮閬僵鍖哄煙锛屼笉鍏抽棴寮瑰眰
                             maxmin: false, // 涓嶅厑璁稿叏灞忔渶灏忓寲
                             anim: 0, // 0-6 鐨勫姩鐢诲舰寮忥紝-1 涓嶅紑鍚�
-                            content: '<div style="padding: 12px;">姝e湪杩愮畻,璇疯�愬績绛夊緟!!!</div>'
+                            content: '<div style="padding: 12px;">姝e湪杩愮畻,璇疯�愬績绛夊緟!!!<div class="loader" style="height:10px;width:10px;"></div></div>'
                         });
                         setTimeout(function () {
                             get_btnProPC(HWorkShopID);
                             layer.close(index);
+                            layer.close(index1);
                         }, 1000)
                     }
                 }
@@ -792,31 +855,78 @@
 
         //閿佸畾
         form.on('submit(btnLock)', function (data) {
-            var HWorkShopID = $("#HWorkShopID").val();//鐢熶骇杞﹂棿
-            if (HWorkShopID == 0) {
-                return layer.msg("鐢熶骇杞﹂棿涓嶈兘涓虹┖!");
-            } else {
-                layer.confirm('浣犵‘瀹氳鎵ц鎿嶄綔鍚楋紝璇峰厛纭繚鎺掍骇鏁版嵁宸蹭繚瀛橈紵', {
-                    btn: ['纭畾', '鍙栨秷'] //鎸夐挳
-                    , btn1: function () {
-                        get_btnLock(HWorkShopID);
-                    }
-                })
-                
+            if (set_ModCheck("Sc_WorkBillSortBill_Lock") == true) {
+                var HWorkShopID = $("#HWorkShopID").val();//鐢熶骇杞﹂棿
+                if (HWorkShopID == 0) {
+                    return layer.msg("鐢熶骇杞﹂棿涓嶈兘涓虹┖!");
+                } else {
+                    layer.confirm('浣犵‘瀹氳鎵ц鎿嶄綔鍚楋紝璇峰厛纭繚鎺掍骇鏁版嵁宸蹭繚瀛橈紵', {
+                        btn: ['纭畾', '鍙栨秷'] //鎸夐挳
+                        , btn1: function (index, layero) {
+                            get_btnLock(HWorkShopID);
+                            layer.close(index);
+                        }
+                    })
+                }
             }
+            
 
         })
 
         //瑙i攣
         form.on('submit(btnUnlock)', function (data) {
-            var HWorkShopID = $("#HWorkShopID").val();//鐢熶骇杞﹂棿
+            if (set_ModCheck("Sc_WorkBillSortBill_Lock") == true) {
+                var HWorkShopID = $("#HWorkShopID").val();//鐢熶骇杞﹂棿
+                if (HWorkShopID == 0) {
+                    return layer.msg("鐢熶骇杞﹂棿涓嶈兘涓虹┖!");
+                } else {
+                    layer.confirm('浣犵‘瀹氳鎵ц鎿嶄綔鍚楋紝璇峰厛纭繚鎺掍骇鏁版嵁宸蹭繚瀛橈紵', {
+                        btn: ['纭畾', '鍙栨秷'] //鎸夐挳
+                        , btn1: function (index, layero) {
+                            get_btnUnlock(HWorkShopID);
+                            layer.close(index);
+                        }
+                    })
+                }
+            }
+            
+        })
+
+        //閿佸畾鐢宠
+        form.on('submit(btnLockRequest)', function (data) {
+            var HWorkShopID = $("#HWorkShopID").val();                      //鐢熶骇杞﹂棿鍐呯爜
+            var HWorkShopIDName = encodeURIComponent($("#HWorkShopIDName").val());              //鐢熶骇杞﹂棿
+            var HLockedDay = $("#HLockedDay").val();                         //閿佸畾澶╂暟
+            var HEmpName = encodeURIComponent(sessionStorage["HUserName"]);                     //鐢宠浜�
             if (HWorkShopID == 0) {
                 return layer.msg("鐢熶骇杞﹂棿涓嶈兘涓虹┖!");
             } else {
                 layer.confirm('浣犵‘瀹氳鎵ц鎿嶄綔鍚楋紝璇峰厛纭繚鎺掍骇鏁版嵁宸蹭繚瀛橈紵', {
                     btn: ['纭畾', '鍙栨秷'] //鎸夐挳
-                    , btn1: function () {
-                        get_btnUnlock(HWorkShopID);
+                    , btn1: function (index, layero) {
+                        get_btnLockRequest(HWorkShopID, HWorkShopIDName, HLockedDay, HEmpName);
+                        layer.close(index);
+                    }
+                })
+
+            }
+
+        })
+
+        //瑙i攣鐢宠
+        form.on('submit(btnUnlockRequest)', function (data) {
+            var HWorkShopID = $("#HWorkShopID").val();                      //鐢熶骇杞﹂棿鍐呯爜
+            var HWorkShopIDName = encodeURIComponent($("#HWorkShopIDName").val());              //鐢熶骇杞﹂棿
+            var HLockedDay = $("#HLockedDay").val();                         //閿佸畾澶╂暟
+            var HEmpName = encodeURIComponent(sessionStorage["HUserName"]);                     //鐢宠浜�
+            if (HWorkShopID == 0) {
+                return layer.msg("鐢熶骇杞﹂棿涓嶈兘涓虹┖!");
+            } else {
+                layer.confirm('浣犵‘瀹氳鎵ц鎿嶄綔鍚楋紝璇峰厛纭繚鎺掍骇鏁版嵁宸蹭繚瀛橈紵', {
+                    btn: ['纭畾', '鍙栨秷'] //鎸夐挳
+                    , btn1: function (index, layero) {
+                        get_btnUnlockRequest(HWorkShopID, HWorkShopIDName, HLockedDay, HEmpName);
+                        layer.close(index);
                     }
                 })
             }
@@ -824,22 +934,29 @@
 
         //閿佸畾宸ュ崟
         form.on('submit(btnLockOrder)', function (data) {
-            layer.confirm('浣犵‘瀹氳鎵ц鎿嶄綔鍚楋紝璇峰厛纭繚鎺掍骇鏁版嵁宸蹭繚瀛橈紵', {
-                btn: ['纭畾', '鍙栨秷'] //鎸夐挳
-                , btn1: function () {
-                    get_btnLockOrder();
-                }
-            })
+            if (set_ModCheck("Sc_WorkBillSortBill_Lock") == true) {
+                layer.confirm('浣犵‘瀹氳鎵ц鎿嶄綔鍚楋紝璇峰厛纭繚鎺掍骇鏁版嵁宸蹭繚瀛橈紵', {
+                    btn: ['纭畾', '鍙栨秷'] //鎸夐挳
+                    , btn1: function (index, layero) {
+                        get_btnLockOrder();
+                    }
+                })
+            }
+            
         })
 
         //瑙i攣宸ュ崟
         form.on('submit(btnUnlockOrder)', function (data) {
-            layer.confirm('浣犵‘瀹氳鎵ц鎿嶄綔鍚楋紝璇峰厛纭繚鎺掍骇鏁版嵁宸蹭繚瀛橈紵', {
-                btn: ['纭畾', '鍙栨秷'] //鎸夐挳
-                , btn1: function () {
-                    get_btnUnlockOrder();
-                }
-            })
+            if (set_ModCheck("Sc_WorkBillSortBill_Lock") == true) {
+                layer.confirm('浣犵‘瀹氳鎵ц鎿嶄綔鍚楋紝璇峰厛纭繚鎺掍骇鏁版嵁宸蹭繚瀛橈紵', {
+                    btn: ['纭畾', '鍙栨秷'] //鎸夐挳
+                    , btn1: function (index, layero) {
+                        get_btnUnlockOrder();
+                        layer.close(index);
+                    }
+                })
+            }
+            
         })
 
         //#region 涓嬫媺鍒楄〃鐩戝惉-鎺掍骇鏃堕棿
@@ -865,7 +982,7 @@
                     }
                 }
                 if (HYxjQty > 0) {
-                    layer.confirm('褰撳墠鎺掍骇椤甸潰瀛樺湪浼樺厛绾т负0鐨勭敓浜ц鍗曪紝鏄惁缁х画杩涜鎺掍骇锛�', {
+                    layer.confirm('褰撳墠鎺掍骇椤甸潰瀛樺湪浼樺厛绾т负0鐨勭敓浜ц鍗曪紝鏄惁缁х画杩涜淇濆瓨锛�', {
                         title: "鎿嶄綔鎻愮ず",
                         icon: 0,
                         btn: ['纭', '鍙栨秷']
@@ -894,6 +1011,51 @@
         //#endregion
 
         //#region 鏈〉闈㈣璋冪敤鐨勬墍鏈夋柟娉�
+        //鏉冮檺鍒ゅ畾
+        function set_ModCheck(ModRightNameCheck) {
+            var Permission = false;
+            $.ajax({
+                type: "GET",
+                url: GetWEBURL() + "/LMES/getReportByModRightNameCheck", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                async: false,
+                data: { "ModRightNameCheck": ModRightNameCheck, "user": sessionStorage["HUserName"] },
+                success: function (result) {
+                    if (result.count == 1) {
+                        Permission = true;
+                    } else {
+                        layer.alert("褰撳墠妯″潡娌℃湁鏌ヨ鏉冮檺!", { icon: 5 });
+                    }
+                }, error: function () {
+                    layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                }
+            });
+            return Permission;
+        }
+
+        function set_HWorkShop() {
+            var ajaxLoad = layer.load();
+            //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+            $.ajax({
+                url: GetWEBURL() + '/Gy_Department/list',
+                type: "GET",
+                async: false,
+                data: { "sWhere": "and HItemID = " + HWorkShopID, "user": sessionStorage["HUserName"], "Organization": sessionStorage["Organization"] },
+                success: function (data1) {
+                    if (data1.count == 1) {
+                        $("#HWorkShopID").val(HWorkShopID);
+                        $("#HWorkShopIDName").val(data1.data[0].閮ㄩ棬鍚嶇О);
+                        $("#btnHWorkShopID").addClass('layui-btn-disabled');
+                        layer.close(ajaxLoad);
+                    } else {
+                        layer.close(ajaxLoad);
+                        layer.alert(data1.code + data1.Message, { icon: 5 });
+                    }
+                }, error: function () {
+                    layer.close(ajaxLoad);
+                    layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                }
+            });
+        }
 
         //#region 鍒濆鍖栫晫闈�
         function set_ClearBill() {
@@ -921,8 +1083,8 @@
             var lastDay = new Date(year, month, 0).getDate();               //褰撴湀鏈�鍚庝竴澶�
             var thisDay = new Date().getDay();                              //褰撳ぉ鏄湰鏈堢鍑犲ぉ
 
-            var valueList = [7, lastDay - thisDay+1,31,34];
-            var titleList = ["7澶�", "鏈湀","31澶�","34澶�"];
+            var valueList = [7, lastDay - thisDay+1,31,40,50];
+            var titleList = ["7澶�", "鏈湀","31澶�","40澶�","50澶�"];
 
             var HArrangeProductDayQty_ArrayList = '';
             for (var i = 0; i < valueList.length; i++) {
@@ -933,7 +1095,7 @@
             $("#HArrangeProductDayQty").append(HArrangeProductDayQty_ArrayList);
             form.render('select');
 
-            $("#HArrangeProductDayQty").val("7");
+            $("#HArrangeProductDayQty").val("40");
         }
         //#endregion
 
@@ -944,175 +1106,272 @@
             var oneday = 1000 * 60 * 60 * 24;
 
             columns.push({
-                field: Format(myDate.getTime() + 0 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 0 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
+                field: Format(myDate.getTime() + 0 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 0 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
                     return DayColor(d[Format(myDate.getTime() + 0 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 0 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 0 * oneday, 'yyyy-MM-dd'));
                 }
             })//0
             columns.push({
-                field: Format(myDate.getTime() + 1 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 1 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
+                field: Format(myDate.getTime() + 1 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 1 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
                     return DayColor(d[Format(myDate.getTime() + 1 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 1 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 1 * oneday, 'yyyy-MM-dd'));
                 }
             })//0
             columns.push({
-                field: Format(myDate.getTime() + 2 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 2 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
+                field: Format(myDate.getTime() + 2 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 2 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
                     return DayColor(d[Format(myDate.getTime() + 2 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 2 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 2 * oneday, 'yyyy-MM-dd'));
                 }
             })//0
             columns.push({
-                field: Format(myDate.getTime() + 3 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 3 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
+                field: Format(myDate.getTime() + 3 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 3 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
                     return DayColor(d[Format(myDate.getTime() + 3 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 3 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 3 * oneday, 'yyyy-MM-dd'));
                 }
             })//0
             columns.push({
-                field: Format(myDate.getTime() + 4 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 4 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
+                field: Format(myDate.getTime() + 4 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 4 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
                     return DayColor(d[Format(myDate.getTime() + 4 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 4 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 4 * oneday, 'yyyy-MM-dd'));
                 }
             })//0
             columns.push({
-                field: Format(myDate.getTime() + 5 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 5 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
+                field: Format(myDate.getTime() + 5 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 5 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
                     return DayColor(d[Format(myDate.getTime() + 5 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 5 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 5 * oneday, 'yyyy-MM-dd'));
                 }
             })//0
             columns.push({
-                field: Format(myDate.getTime() + 6 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 6 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
+                field: Format(myDate.getTime() + 6 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 6 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
                     return DayColor(d[Format(myDate.getTime() + 6 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 6 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 6 * oneday, 'yyyy-MM-dd'));
                 }
             })//0
             columns.push({
-                field: Format(myDate.getTime() + 7 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 7 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
+                field: Format(myDate.getTime() + 7 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 7 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
                     return DayColor(d[Format(myDate.getTime() + 7 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 7 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 7 * oneday, 'yyyy-MM-dd'));
                 }
             })//0
             columns.push({
-                field: Format(myDate.getTime() + 8 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 8 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
+                field: Format(myDate.getTime() + 8 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 8 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
                     return DayColor(d[Format(myDate.getTime() + 8 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 8 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 8 * oneday, 'yyyy-MM-dd'));
                 }
             })//0
             columns.push({
-                field: Format(myDate.getTime() + 9 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 9 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
+                field: Format(myDate.getTime() + 9 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 9 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
                     return DayColor(d[Format(myDate.getTime() + 9 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 9 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 9 * oneday, 'yyyy-MM-dd'));
                 }
             })//0
             columns.push({
-                field: Format(myDate.getTime() + 10 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 10 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
+                field: Format(myDate.getTime() + 10 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 10 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
                     return DayColor(d[Format(myDate.getTime() + 10 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 10 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 10 * oneday, 'yyyy-MM-dd'));
                 }
             })//0
             columns.push({
-                field: Format(myDate.getTime() + 11 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 11 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
+                field: Format(myDate.getTime() + 11 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 11 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
                     return DayColor(d[Format(myDate.getTime() + 11 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 11 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 11 * oneday, 'yyyy-MM-dd'));
                 }
             })//0
             columns.push({
-                field: Format(myDate.getTime() + 12 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 12 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
+                field: Format(myDate.getTime() + 12 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 12 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
                     return DayColor(d[Format(myDate.getTime() + 12 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 12 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 12 * oneday, 'yyyy-MM-dd'));
                 }
             })//0
             columns.push({
-                field: Format(myDate.getTime() + 13 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 13 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
+                field: Format(myDate.getTime() + 13 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 13 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
                     return DayColor(d[Format(myDate.getTime() + 13 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 13 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 13 * oneday, 'yyyy-MM-dd'));
                 }
             })//0
             columns.push({
-                field: Format(myDate.getTime() + 14 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 14 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
+                field: Format(myDate.getTime() + 14 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 14 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
                     return DayColor(d[Format(myDate.getTime() + 14 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 14 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 14 * oneday, 'yyyy-MM-dd'));
                 }
             })//0
             columns.push({
-                field: Format(myDate.getTime() + 15 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 15 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
+                field: Format(myDate.getTime() + 15 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 15 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
                     return DayColor(d[Format(myDate.getTime() + 15 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 15 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 15 * oneday, 'yyyy-MM-dd'));
                 }
             })//0
             columns.push({
-                field: Format(myDate.getTime() + 16 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 16 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
+                field: Format(myDate.getTime() + 16 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 16 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
                     return DayColor(d[Format(myDate.getTime() + 16 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 16 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 16 * oneday, 'yyyy-MM-dd'));
                 }
             })//0
             columns.push({
-                field: Format(myDate.getTime() + 17 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 17 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
+                field: Format(myDate.getTime() + 17 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 17 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
                     return DayColor(d[Format(myDate.getTime() + 17 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 17 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 17 * oneday, 'yyyy-MM-dd'));
                 }
             })//0
             columns.push({
-                field: Format(myDate.getTime() + 18 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 18 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
+                field: Format(myDate.getTime() + 18 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 18 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
                     return DayColor(d[Format(myDate.getTime() + 18 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 18 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 18 * oneday, 'yyyy-MM-dd'));
                 }
             })//0
             columns.push({
-                field: Format(myDate.getTime() + 19 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 19 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
+                field: Format(myDate.getTime() + 19 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 19 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
                     return DayColor(d[Format(myDate.getTime() + 19 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 19 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 19 * oneday, 'yyyy-MM-dd'));
                 }
             })//0
             columns.push({
-                field: Format(myDate.getTime() + 20 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 20 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
+                field: Format(myDate.getTime() + 20 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 20 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
                     return DayColor(d[Format(myDate.getTime() + 20 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 20 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 20 * oneday, 'yyyy-MM-dd'));
                 }
             })//0
             columns.push({
-                field: Format(myDate.getTime() + 21 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 21 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
+                field: Format(myDate.getTime() + 21 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 21 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
                     return DayColor(d[Format(myDate.getTime() + 21 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 21 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 21 * oneday, 'yyyy-MM-dd'));
                 }
             })//0
             columns.push({
-                field: Format(myDate.getTime() + 22 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 22 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
+                field: Format(myDate.getTime() + 22 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 22 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
                     return DayColor(d[Format(myDate.getTime() + 22 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 22 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 22 * oneday, 'yyyy-MM-dd'));
                 }
             })//0
             columns.push({
-                field: Format(myDate.getTime() + 23 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 23 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
+                field: Format(myDate.getTime() + 23 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 23 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
                     return DayColor(d[Format(myDate.getTime() + 23 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 23 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 23 * oneday, 'yyyy-MM-dd'));
                 }
             })//0
             columns.push({
-                field: Format(myDate.getTime() + 24 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 24 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
+                field: Format(myDate.getTime() + 24 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 24 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
                     return DayColor(d[Format(myDate.getTime() + 24 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 24 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 24 * oneday, 'yyyy-MM-dd'));
                 }
             })//0
             columns.push({
-                field: Format(myDate.getTime() + 25 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 25 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
+                field: Format(myDate.getTime() + 25 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 25 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
                     return DayColor(d[Format(myDate.getTime() + 25 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 25 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 25 * oneday, 'yyyy-MM-dd'));
                 }
             })//0
             columns.push({
-                field: Format(myDate.getTime() + 26 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 26 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
+                field: Format(myDate.getTime() + 26 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 26 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
                     return DayColor(d[Format(myDate.getTime() + 26 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 26 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 26 * oneday, 'yyyy-MM-dd'));
                 }
             })//0
             columns.push({
-                field: Format(myDate.getTime() + 27 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 27 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
+                field: Format(myDate.getTime() + 27 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 27 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
                     return DayColor(d[Format(myDate.getTime() + 27 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 27 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 27 * oneday, 'yyyy-MM-dd'));
                 }
             })//0
             columns.push({
-                field: Format(myDate.getTime() + 28 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 28 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
+                field: Format(myDate.getTime() + 28 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 28 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
                     return DayColor(d[Format(myDate.getTime() + 28 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 28 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 28 * oneday, 'yyyy-MM-dd'));
                 }
             })//0
             columns.push({
-                field: Format(myDate.getTime() + 29 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 29 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
+                field: Format(myDate.getTime() + 29 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 29 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
                     return DayColor(d[Format(myDate.getTime() + 29 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 29 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 29 * oneday, 'yyyy-MM-dd'));
                 }
             })//0
             columns.push({
-                field: Format(myDate.getTime() + 30 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 30 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
+                field: Format(myDate.getTime() + 30 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 30 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
                     return DayColor(d[Format(myDate.getTime() + 30 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 30 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 30 * oneday, 'yyyy-MM-dd'));
                 }
             })//0
             columns.push({
-                field: Format(myDate.getTime() + 31 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 31 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
+                field: Format(myDate.getTime() + 31 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 31 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
                     return DayColor(d[Format(myDate.getTime() + 31 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 31 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 31 * oneday, 'yyyy-MM-dd'));
                 }
             })//0
             columns.push({
-                field: Format(myDate.getTime() + 32 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 32 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
+                field: Format(myDate.getTime() + 32 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 32 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
                     return DayColor(d[Format(myDate.getTime() + 32 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 32 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 32 * oneday, 'yyyy-MM-dd'));
                 }
             })//0
             columns.push({
-                field: Format(myDate.getTime() + 33 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 33 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
+                field: Format(myDate.getTime() + 33 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 33 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
                     return DayColor(d[Format(myDate.getTime() + 33 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 33 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 33 * oneday, 'yyyy-MM-dd'));
                 }
             })//0
+
+
+
+
+            columns.push({
+                field: Format(myDate.getTime() + 34 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 34 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
+                    return DayColor(d[Format(myDate.getTime() + 34 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 34 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 34 * oneday, 'yyyy-MM-dd'));
+                }
+            })//0
+            columns.push({
+                field: Format(myDate.getTime() + 35 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 35 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
+                    return DayColor(d[Format(myDate.getTime() + 35 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 35 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 35 * oneday, 'yyyy-MM-dd'));
+                }
+            })//0
+
+            columns.push({
+                field: Format(myDate.getTime() + 36 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 36 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
+                    return DayColor(d[Format(myDate.getTime() + 36 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 36 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 36 * oneday, 'yyyy-MM-dd'));
+                }
+            })//0
+
+            columns.push({
+                field: Format(myDate.getTime() + 37 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 37 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
+                    return DayColor(d[Format(myDate.getTime() + 37 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 37 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 37 * oneday, 'yyyy-MM-dd'));
+                }
+            })//0
+
+            columns.push({
+                field: Format(myDate.getTime() + 38 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 38 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
+                    return DayColor(d[Format(myDate.getTime() + 38 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 38 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 38 * oneday, 'yyyy-MM-dd'));
+                }
+            })//0
+
+            columns.push({
+                field: Format(myDate.getTime() + 39 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 39 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
+                    return DayColor(d[Format(myDate.getTime() + 39 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 39 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 39 * oneday, 'yyyy-MM-dd'));
+                }
+            })//0
+
+            columns.push({
+                field: Format(myDate.getTime() + 40 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 40 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
+                    return DayColor(d[Format(myDate.getTime() + 40 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 40 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 40 * oneday, 'yyyy-MM-dd'));
+                }
+            })//0
+
+            columns.push({
+                field: Format(myDate.getTime() + 41 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 41 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
+                    return DayColor(d[Format(myDate.getTime() + 41 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 41 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 41 * oneday, 'yyyy-MM-dd'));
+                }
+            })//0
+            columns.push({
+                field: Format(myDate.getTime() + 42 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 42 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
+                    return DayColor(d[Format(myDate.getTime() + 42 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 42 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 42 * oneday, 'yyyy-MM-dd'));
+                }
+            })//0
+            columns.push({
+                field: Format(myDate.getTime() + 43 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 43 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
+                    return DayColor(d[Format(myDate.getTime() + 43 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 43 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 43 * oneday, 'yyyy-MM-dd'));
+                }
+            })//0
+            columns.push({
+                field: Format(myDate.getTime() + 44 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 44 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
+                    return DayColor(d[Format(myDate.getTime() + 44 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 44 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 44 * oneday, 'yyyy-MM-dd'));
+                }
+            })//0
+            columns.push({
+                field: Format(myDate.getTime() + 45 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 45 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
+                    return DayColor(d[Format(myDate.getTime() + 45 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 45 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 45 * oneday, 'yyyy-MM-dd'));
+                }
+            })//0
+            columns.push({
+                field: Format(myDate.getTime() + 46 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 46 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
+                    return DayColor(d[Format(myDate.getTime() + 46 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 46 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 46 * oneday, 'yyyy-MM-dd'));
+                }
+            })//0
+            columns.push({
+                field: Format(myDate.getTime() + 47 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 47 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
+                    return DayColor(d[Format(myDate.getTime() + 47 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 47 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 47 * oneday, 'yyyy-MM-dd'));
+                }
+            })//0
+            columns.push({
+                field: Format(myDate.getTime() + 48 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 48 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
+                    return DayColor(d[Format(myDate.getTime() + 48 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 48 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 48 * oneday, 'yyyy-MM-dd'));
+                }
+            })//0
+            columns.push({
+                field: Format(myDate.getTime() + 49 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 49 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
+                    return DayColor(d[Format(myDate.getTime() + 49 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 49 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 49 * oneday, 'yyyy-MM-dd'));
+                }
+            })//0
+            columns.push({
+                field: Format(myDate.getTime() + 50 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 50 * oneday, 'MM-dd'), edit: 'text', width: 70, templet: function (d) {
+                    return DayColor(d[Format(myDate.getTime() + 50 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 50 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 50 * oneday, 'yyyy-MM-dd'));
+                }
+            })//0
+            
+
             return columns;
         }
         //#endregion
@@ -1230,7 +1489,19 @@
 
                         console.log(table.cache["mainTable"]) // 鏀瑰姩鍚庢暟鎹储寮�
 
-                        option.data = table.cache["mainTable"];
+
+                        var data = table.cache["mainTable"];
+                        for (var i = 0; i < data.length; i++) {
+                            data[i]["浼樺厛绾�"] = ((i + 1) * 5);
+                        }
+                        option.data = data;
+
+                        table.reload('mainTable', {
+                            data: option.data
+                        });
+
+                        //table.render(option);
+                        //option.data = table.cache["mainTable"];
                     }
                 }
                 , sort: function (obj) { // 鎺掑簭浜嬩欢
@@ -1318,7 +1589,7 @@
                     if (data1.count == 1) {
                         option.data = data1.data;
                         //鍒楄缃�
-                        DisPlay_HideColumn(HModName, sessionStorage["HUserName"], option);
+                        DisPlay_HideColumnForPlan(HModName, sessionStorage["HUserName"], option);
                         ins = table.render(option);
                         var HinterID_S = [];
                         for (var i = 0; i < data1.data.length; i++) {
@@ -1532,6 +1803,22 @@
             })
         }
 
+        //鏃ヨ鍒掓粴鍔ㄥ鍏�
+        function btnExcel_DayImport() {
+            layer.open({
+                type: 2
+                , skin: 'layui-layer-rim' //鍔犱笂杈规
+                , area: ['100%', '100%']
+                , title: '鏃ヨ鍒掓粴鍔ㄥ鍏�'
+                , shift: 0//寮瑰嚭鍔ㄧ敾
+                , content: '../瀹濆伐鎺掍骇/JIT_DayPlanPlatForm_DayImport.html?OperationType=1'
+                , end: function () {
+                    //鍒锋柊椤甸潰,
+                    location.reload();
+                }
+            })
+        }
+
         //鐗╂枡鍒楄〃
         function btnHMaterID() {
             layer.open({
@@ -1592,8 +1879,10 @@
             var data = localStorage.getItem("JIT_DayPlanPlatForm_HWorkShop");
             if (data != null) {
                 var data2 = JSON.parse(data);
-                $("#HWorkShopID").val(data2["HWorkShopID"]);
-                $("#HWorkShopIDName").val(data2["HWorkShopIDName"]);
+                if (HType == "") {
+                    $("#HWorkShopID").val(data2["HWorkShopID"]);
+                    $("#HWorkShopIDName").val(data2["HWorkShopIDName"]);
+                }
                 $("#HArrangeProductDayQty").val(data2["HArrangeProductDayQty"]);
                 form.render('select');
             }
@@ -1749,7 +2038,7 @@
             if (HICMOBillNo_ICMO) {
                 sWhere_ICMO += " and 鍗曟嵁鍙� like '%" + HICMOBillNo_ICMO + "%'";
             }
-
+            sWhere_ICMO += " and 鐘舵�� like '%寮�宸�%'";
             get_Display2(sWhere_ICMO);
             sWhere_ICMO = ""//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
         }
@@ -1878,6 +2167,43 @@
                 }
             });
         }
+        //娆犳枡杩愮畻
+        function set_Calculate() {
+            if ($("#HWorkShopID").val() == 0) {
+                return layer.msg("鐢熶骇杞﹂棿涓嶈兘涓虹┖!");
+            }
+            var ajaxLoad = layer.load();
+            //娆犳枡杩愮畻
+            var sql = "exec h_p_JIT_MaterialLevelShorAnalysisReportList " + $("#HWorkShopID").val() + ",'" + sessionStorage["HMaker"] + "'," + sessionStorage["OrganizationID"];
+            var startTime = new Date().getTime();
+            $.ajax({
+                url: GetWEBURL() + '/Gy_SOPBillList/WindowPrintList',
+                type: "GET",
+                async: false,
+                data: { "sWhere": sql },
+                success: function (data1) {
+                    // 璁$畻璇锋眰鑺辫垂鐨勬椂闂�
+                    var endTime = new Date().getTime();
+                    var executionTime = endTime - startTime; // 姣
+                    var executionTimeInSeconds = (executionTime / 1000).toFixed(2); // 杞崲涓虹骞朵繚鐣欎袱浣嶅皬鏁�
+                    if (data1.count == 1) {
+                        layer.msg(data1.data[0]["HRemark"]);
+                        // 鍚屾牱浣跨敤setTimeout寤惰繜鏄剧ず鎵ц鏃堕棿锛堝湪閿欒澶勭悊涓篃璁$畻鏃堕棿锛�
+                        setTimeout(function () {
+                            layer.msg("鎵ц鏃堕棿: " + executionTimeInSeconds + " 绉�");
+                            layer.close(ajaxLoad);
+                        }, 1000);
+                        layer.close(ajaxLoad);
+                    } else {
+                        layer.alert(data1.code + data1.Message, { icon: 5 });
+                        layer.close(ajaxLoad);
+                    }
+                }, error: function () {
+                    layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    layer.close(ajaxLoad);
+                }
+            });
+        }
 
         //鐢熶骇璁㈠崟閫夊崟
         function get_btnICMOBill() {
@@ -1914,10 +2240,81 @@
             })
         }
 
+        function get_btnAddICMO() {
+            var HDeptID = $("#HWorkShopID").val() == "" ? 0 : $("#HWorkShopID").val();
+
+            var ajaxLoad = layer.load();
+            $.ajax({
+                url: GetWEBURL() + '/JIT_DayPlanPlatFormBill/JIT_ICMOBillListByDept',
+                type: "GET",
+                data: { "HDeptID": HDeptID },
+                success: function (data1) {
+                    if (data1.count == 1) {
+                        var dataPush = [];
+                        var tableBak = table.cache["mainTable"]; //鑾峰彇涔嬪墠缂栬緫杩囩殑琛ㄦ牸鏁版嵁
+                        buttonArr = [];//娓呯┖鏁扮粍
+                        for (var i = 0; i < tableBak.length; i++) {
+                            dataPush.push(tableBak[i]);  //灏嗕箣鍓嶇殑鏁版嵁瀛樺偍
+                        }
+
+                        for (var i = 0; i < dataPush.length; i++) {
+                            if (dataPush[i]["鍗曟嵁鍙�"] == "") {
+                                for (var j = 0; j < data1.data.length; j++) {
+                                    if (data1.data[j]["婧愬崟涓诲唴鐮�"] == dataPush[i]["婧愬崟涓诲唴鐮�"] && data1.data[j]["婧愬崟瀛愬唴鐮�"] == dataPush[i]["婧愬崟瀛愬唴鐮�"]) {
+                                        layer.close(ajaxLoad);
+                                        return layer.alert("鐢熶骇鏄庣粏琛岄噸澶�,閲嶅鐨勭敓浜ц鍗曞彿:" + dataPush[i]["鐢熶骇璁㈠崟鍙�"] + ",鏄庣粏琛屽彿:" + dataPush[i]["鐢熶骇璁㈠崟鏄庣粏琛屽彿"], { icon: 5 });
+
+                                    }
+                                }
+                            }
+                        }
+                        //瀛樺偍鏁版嵁
+                        for (var i = 0; i < data1.data.length; i++) {
+                            dataPush.push(data1.data[i]);
+                        }
+                        option.data = dataPush;
+                        table.render(option);
+
+                        //鑾峰彇涓婃柟鎺掍骇鍒楄〃鏁版嵁,鐢ㄤ簬瀵规瘮涓嬫柟鐢熶骇璁㈠崟鍒楄〃锛屽皢涓嬫柟鐢熶骇璁㈠崟鍒楄〃鐩稿悓鐨勬暟鎹笉鏄剧ず
+                        //var compareList = [];
+                        //for (var i = 0; i < option.data.length; i++) {
+                        //    var temp = option.data[i]["婧愬崟涓诲唴鐮�"] + "|" + option.data[i]["婧愬崟瀛愬唴鐮�"];
+                        //    compareList.push(temp);
+                        //}
+
+                        ////鍓旈櫎涓婃柟鎺掍骇鍒楄〃涓凡缁忓姞鍏ョ殑鐢熶骇璁㈠崟
+                        //var tables = [];
+                        //for (var i = 0; i < option2.data.length; i++) {
+                        //    var temp = option2.data[i]["hmainid"] + "|" + option2.data[i]["HEntryID"];
+                        //    if ($.inArray(temp, compareList) == -1) {
+                        //        tables.push(option2.data[i]);
+                        //    }
+                        //}
+                        //option2.data = tables;
+
+                        ////閲嶆柊娓叉煋瀛愯〃2
+                        //table.render(option2);
+
+                        layer.close(ajaxLoad);
+                    } else {
+                        layer.close(ajaxLoad);
+                        layer.alert(data1.Message, { icon: 5 });
+                    }
+                }, error: function () {
+                    layer.close(ajaxLoad);
+                    layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                }
+            });
+        }
+
+
         //鍑嗗
         function get_btnReady() {
             var data = table.cache["mainTable"];
-            var HICOMNum = [];
+            var HTotalDataList = [[]];
+
+            var index = 0;
+            var countEveryGroup = 50;
             for (var i = 0; i < data.length; i++) {
                 if (isNaN(data[i]["HICMOInterID"])) {
                     return layer.msg("璇峰厛杩涜淇濆瓨!!")
@@ -1925,86 +2322,101 @@
                 if (isNaN(data[i]["HSourceID"])) {
                     return layer.msg("閫夋嫨鐢熶骇璧勬簮!!")
                 }
-                HICOMNum.push(data[i]["HICMOInterID"] + ";" + data[i]["HICMOEntryID"] + ";" + data[i]["HSourceID"]);
+
+                if ((index / countEveryGroup).toFixed(0)*1 == HTotalDataList.length) {
+                    HTotalDataList.push([]);
+                }
+                HTotalDataList[(index / countEveryGroup).toFixed(0) * 1].push(data[i]["HICMOInterID"] + ";" + data[i]["HICMOEntryID"] + ";" + data[i]["HSourceID"]);
+                index++;
             }
 
-            $('#HProgressBar').html(`
-    <div class="layui-progress" lay-filter="demo-filter-progress">
-      <div class="layui-progress-bar" lay-percent="40%"></div>
-    </div>
-  `);
-            // 娓叉煋杩涘害鏉$粍浠�
-            element.render('progress', 'demo-filter-progress');
-            $.ajax({
-                url: GetWEBURL() + '/JIT_DayPlanPlatFormBill/ReadyData',
-                type: "GET",
-                data: { "SWhere": HICOMNum.toString() },
-                success: function (data1) {
-                    if (data1.count == 1) {
-                        for (var i = 0; i < data1.data.length; i++) {
-                            for (var j = 0; j < option.data.length; j++) {
-                                if (data1.data[i]["HICMOInterID"] == option.data[j]["HICMOInterID"] && data1.data[i]["HICMOEntryID"] == option.data[j]["HICMOEntryID"]) {
-                                    option.data[j]["灏忔椂浜ц兘"] = data1.data[i]["灏忔椂浜ц兘"];
-                                    option.data[j]["鐢熶骇鍛ㄦ湡"] = data1.data[i]["鐢熶骇鍛ㄦ湡"];
-                                    option.data[j]["寮�宸ヤ綑閲�"] = data1.data[i]["寮�宸ヤ綑閲�"];
-                                    option.data[j]["鏈�杩熷紑宸ユ棩鏈�"] = data1.data[i]["鏈�杩熷紑宸ユ棩鏈�"];
-                                    option.data[j]["鏈�杩熷畬宸ユ棩鏈�"] = data1.data[i]["鏈�杩熷畬宸ユ棩鏈�"];
-                                    option.data[j]["璁㈠崟闇�姹傛暟閲�"] = data1.data[i]["璁㈠崟闇�姹傛暟閲�"];
-                                    option.data[j]["璁㈠崟浜よ揣鏈�"] = data1.data[i]["璁㈠崟浜よ揣鏈�"] < "2020-01-01 0:00:00" ? "1900-01-01" : data1.data[i]["璁㈠崟浜よ揣鏈�"];
-                                    break;
-                                }
-                            }
-                        }
+            var msg = "";
+            for (var t = 0; t < HTotalDataList.length; t++) {
+                $('#HProgressBar').html('');
+                var str = '<div class="layui-progress" lay-filter="demo-filter-progress"> <div class="layui-progress-bar" lay-percent="' + (t / HTotalDataList.length)*100 +  '%"></div></div>';
+                $('#HProgressBar').html(str);
+                // 娓叉煋杩涘害鏉$粍浠�
+                element.render('progress', 'demo-filter-progress');
 
-                        for (var i = 0; i < option.data.length - 1; i++) {
-                            for (var j = 0; j < option.data.length - i - 1; j++) {
-                                var tables = [];
-                                //璁剧疆浠诲姟鍗曚紭鍏堟帓搴忥紝骞惰缃紭鍏�(鏈�杩熷畬宸ユ棩鏈�+璁㈠崟浜よ揣鏈�)  灏佽
-                                if (option.data[j]["鏈�杩熷畬宸ユ棩鏈�"] > option.data[j + 1]["鏈�杩熷畬宸ユ棩鏈�"]) {
-
-                                    tables.push(option.data[j + 1]);
-                                    option.data[j + 1] = option.data[j];
-                                    option.data[j] = tables[0];
-
-                                } else if (option.data[j]["鏈�杩熷畬宸ユ棩鏈�"] == option.data[j + 1]["鏈�杩熷畬宸ユ棩鏈�"]) {
-                                    if (option.data[j]["璁㈠崟浜よ揣鏈�"] > option.data[j + 1]["璁㈠崟浜よ揣鏈�"]) {
-
-                                        tables.push(option.data[j + 1]);
-                                        option.data[j + 1] = option.data[j];
-                                        option.data[j] = tables[0];
-
-                                    } else if (option.data[j]["璁㈠崟浜よ揣鏈�"] == option.data[j + 1]["璁㈠崟浜よ揣鏈�"]) {
-                                        if (option.data[j]["璁㈠崟闇�姹傛暟"] < option.data[j + 1]["璁㈠崟闇�姹傛暟"]) {
-
-                                            tables.push(option.data[j + 1]);
-                                            option.data[j + 1] = option.data[j];
-                                            option.data[j] = tables[0];
-
-                                        }
+                HICOMNum = HTotalDataList[t];
+                $.ajax({
+                    url: GetWEBURL() + '/JIT_DayPlanPlatFormBill/ReadyData',
+                    async: false,
+                    type: "GET",
+                    data: { "SWhere": HICOMNum.toString() },
+                    success: function (data1) {
+                        if (data1.count == 1) {
+                            for (var i = 0; i < data1.data.length; i++) {
+                                for (var j = 0; j < option.data.length; j++) {
+                                    if (data1.data[i]["HICMOInterID"] == option.data[j]["HICMOInterID"] && data1.data[i]["HICMOEntryID"] == option.data[j]["HICMOEntryID"]) {
+                                        option.data[j]["灏忔椂浜ц兘"] = data1.data[i]["灏忔椂浜ц兘"];
+                                        option.data[j]["鐢熶骇鍛ㄦ湡"] = data1.data[i]["鐢熶骇鍛ㄦ湡"];
+                                        option.data[j]["寮�宸ヤ綑閲�"] = data1.data[i]["寮�宸ヤ綑閲�"];
+                                        option.data[j]["鏈�杩熷紑宸ユ棩鏈�"] = data1.data[i]["鏈�杩熷紑宸ユ棩鏈�"];
+                                        option.data[j]["鏈�杩熷畬宸ユ棩鏈�"] = data1.data[i]["鏈�杩熷畬宸ユ棩鏈�"];
+                                        option.data[j]["璁㈠崟闇�姹傛暟閲�"] = data1.data[i]["璁㈠崟闇�姹傛暟閲�"];
+                                        option.data[j]["璁㈠崟浜よ揣鏈�"] = data1.data[i]["璁㈠崟浜よ揣鏈�"] < "2020-01-01 0:00:00" ? "1900-01-01" : data1.data[i]["璁㈠崟浜よ揣鏈�"];
+                                        break;
                                     }
                                 }
                             }
-                        }
-                        $('#HProgressBar').html('')
 
-                        table.render(option);
-                        set_Priority();
-                        data = table.cache["mainTable"];
-                        for (var i = 0; i < data.length; i++) {
-                            if (parseFloat(data[i]["灏忔椂浜ц兘"]) == 0 || parseFloat(data[i]["灏忔椂浜ц兘"]) == null || parseFloat(data[i]["灏忔椂浜ц兘"]) == undefined) {
-                                return layer.alert("绗�" + (i + 1) + '琛岋紝灏忔椂浜ц兘鏈缃紝璇锋牳瀵规暟鎹��' + '</br>' + '1.鐗╂枡鏈坊鍔犲伐鑹鸿矾绾�' + '</br>' + '2.宸ヨ壓璺嚎涓湭璁剧疆灏忔椂浜ц兘' + '</br>' + '3.鐢熶骇璧勬簮鏈缃崟鐝伐鏃�' + '</br>' + '4.鐢熶骇璧勬簮涓粦瀹氬伐浣滀腑蹇冧笌宸ヨ壓璺嚎涓缃殑宸ヤ綔涓績涓嶄竴鑷�');
-                            }
-                        }
+                            //for (var i = 0; i < option.data.length - 1; i++) {
+                            //    for (var j = 0; j < option.data.length - i - 1; j++) {
+                            //        var tables = [];
+                            //        //璁剧疆浠诲姟鍗曚紭鍏堟帓搴忥紝骞惰缃紭鍏�(鏈�杩熷畬宸ユ棩鏈�+璁㈠崟浜よ揣鏈�)  灏佽
+                            //        if (option.data[j]["鏈�杩熷畬宸ユ棩鏈�"] > option.data[j + 1]["鏈�杩熷畬宸ユ棩鏈�"]) {
 
-                    } else {
-                        //layer.close(ajaxLoad);
-                        layer.alert(data1.code + data1.Message, { icon: 5 });
+                            //            tables.push(option.data[j + 1]);
+                            //            option.data[j + 1] = option.data[j];
+                            //            option.data[j] = tables[0];
+
+                            //        } else if (option.data[j]["鏈�杩熷畬宸ユ棩鏈�"] == option.data[j + 1]["鏈�杩熷畬宸ユ棩鏈�"]) {
+                            //            if (option.data[j]["璁㈠崟浜よ揣鏈�"] > option.data[j + 1]["璁㈠崟浜よ揣鏈�"]) {
+
+                            //                tables.push(option.data[j + 1]);
+                            //                option.data[j + 1] = option.data[j];
+                            //                option.data[j] = tables[0];
+
+                            //            } else if (option.data[j]["璁㈠崟浜よ揣鏈�"] == option.data[j + 1]["璁㈠崟浜よ揣鏈�"]) {
+                            //                if (option.data[j]["璁㈠崟闇�姹傛暟"] < option.data[j + 1]["璁㈠崟闇�姹傛暟"]) {
+
+                            //                    tables.push(option.data[j + 1]);
+                            //                    option.data[j + 1] = option.data[j];
+                            //                    option.data[j] = tables[0];
+
+                            //                }
+                            //            }
+                            //        }
+                            //    }
+                            //}
+                            
+                        } else {
+                            //layer.close(ajaxLoad);
+                            //layer.alert(data1.code + data1.Message, { icon: 5 });
+
+                            msg += data1.Message;
+                        }
+                    }, error: function (e) {
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                        return;
                     }
-                }, error: function () {
-                    layer.close(ajaxLoad);
-                    layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                });
+            }
+
+            table.render(option);
+            set_Priority();
+            data = table.cache["mainTable"];
+            for (var i = 0; i < data.length; i++) {
+                if (parseFloat(data[i]["灏忔椂浜ц兘"]) == 0 || parseFloat(data[i]["灏忔椂浜ц兘"]) == null || parseFloat(data[i]["灏忔椂浜ц兘"]) == undefined) {
+                    msg += "绗�" + (i + 1) + '琛岋紝灏忔椂浜ц兘鏈缃紝璇锋牳瀵规暟鎹��' + '</br>' + '1.鐗╂枡鏈坊鍔犲伐鑹鸿矾绾�' + '</br>' + '2.宸ヨ壓璺嚎涓湭璁剧疆灏忔椂浜ц兘' + '</br>' + '3.鐢熶骇璧勬簮鏈缃崟鐝伐鏃�' + '</br>' + '4.鐢熶骇璧勬簮涓粦瀹氬伐浣滀腑蹇冧笌宸ヨ壓璺嚎涓缃殑宸ヤ綔涓績涓嶄竴鑷�';
                 }
-            });
+            }
+
+            if (msg != "") {
+                layer.alert(msg, { icon: 5 });
+            }
+            $('#HProgressBar').html('')
         }
 
         //宸ヨ壓璺嚎缂栬緫
@@ -2084,6 +2496,11 @@
             JDTLen = (100 / option.data.length).toFixed(2);
             var HJDLen = 0;
             var HReportQty = 0;
+
+            if (set_ModCheck("Sc_WorkBillSortBill_Edit") == false) {
+                return layer.msg("鏃犳帓浜ф潈闄�!!!")
+            }
+
 
             //濡傛灉閿佸畾璁″垝锛屽垯涓嶉渶瑕佸啀鎺掔▼
             //鏌ヨ鏈溅闂存槸鍚︽湁閿佸畾璁″垝鐨勬暟鎹�
@@ -2829,24 +3246,25 @@
 
         //浼樺厛绾�
         function set_Priority() {
-            layer.confirm('浣犵‘瀹氳鎵ц鎿嶄綔鍚楋紝璇峰厛纭繚鎺掍骇鏁版嵁宸蹭繚瀛橈紵', {
+            layer.confirm('浣犵‘瀹氳鎵ц浼樺厛绾ф搷浣滃悧锛�', {
                 btn: ['纭畾', '鍙栨秷'] //鎸夐挳
-                , btn1: function () {
+                , btn1: function (index, layero) {
                     var data = table.cache["mainTable"];
                     for (var i = 0; i < data.length; i++) {
                         data[i]["浼樺厛绾�"] = ((i + 1) * 5);
                     }
                     option.data = data;
                     table.render(option);
+                    layer.close(index);
                 }
             })
         }
 
         //鍑嗗鎺掑簭
         function set_ReadyAsc() {
-            layer.confirm('浣犵‘瀹氳鎵ц鎿嶄綔鍚楋紝璇峰厛纭繚鎺掍骇鏁版嵁宸蹭繚瀛橈紵', {
+            layer.confirm('浣犵‘瀹氳鎵ц鎺掑簭鎿嶄綔鍚楋紵', {
                 btn: ['纭畾', '鍙栨秷'] //鎸夐挳
-                , btn1: function () {
+                , btn1: function (index, layero) {
                     if (option.data.length != 0) {
                         for (var i = 0; i < option.data.length - 1; i++) {
                             for (var j = 0; j < option.data.length - i - 1; j++) {
@@ -2882,6 +3300,7 @@
                     else {
                         return layer.msg("鏃犳暟鎹�!")
                     }
+                    layer.close(index);
                 }
             })
             
@@ -3047,7 +3466,7 @@
             var sSubStr = "["+JSON.stringify(num)+"]";
             var sMainSub = sSubStr + "&鍜�" + sessionStorage["HUserName"];
 
-            var index = layer.load();
+            //var index = layer.load();
             $.ajax({
                 type: "POST",
                 url: GetWEBURL() + "/JIT_DayPlanPlatFormBill/JIT_DayPlanPlatFormBill_btnSave",
@@ -3056,16 +3475,16 @@
                 dataType: "json",
                 success: function (data) {
                     if (data.count == 1) {
-                        layer.msg("淇濆瓨鎴愬姛");
-                        layer.close(index);
+                        //layer.msg("淇濆瓨鎴愬姛");
+                        //layer.close(index);
                     }
                     else {
-                        layer.close(index);
+                        //layer.close(index);
                         layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                     }
                 },
                 error: function (err) {
-                    layer.close(index);
+                    //layer.close(index);
                     layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                 }
             });
@@ -3259,6 +3678,65 @@
             }
         }
 
+        //閿佸畾鐢宠
+        function get_btnLockRequest(HWorkShopID, HWorkShopIDName, HLockedDay, HEmpName) {
+            var data = table.cache["mainTable"];
+
+            if (data.length == 0) {
+                return layer.msg("鏃犳暟鎹�,鏃犳硶杩涜閿佸畾!")
+            } else {
+                layer.open({
+                    type: 2//寮圭獥绫诲瀷
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '鎺掍骇閿佸畾鐢宠鍗�'//鏍囬
+                    , shift: 2//寮瑰嚭鍔ㄧ敾
+                    , content: ['../../鐢熶骇绠$悊/瀹濆伐鎺掍骇/JIT_LockRequestBill.html?HOperationType=4&HLockDays=' + HLockedDay + '& HEmpName=' + HEmpName + '& HDeptID=' + HWorkShopID + '&HDeptName=' + HWorkShopIDName + "'", '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('璇烽�夋嫨鏁版嵁');
+                    //    }
+                    //    $("#HDeptName").val(checkStatus.data[0].閮ㄩ棬鍚嶇О);
+                    //    $("#HDeptID").val(checkStatus.data[0].HItemID);
+                    //    layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    //}
+                    //, btn2: function (index, layero) { }
+                })
+            }
+        }
+
+        //瑙i攣鐢宠
+        function get_btnUnlockRequest(HWorkShopID, HWorkShopIDName, HLockedDay, HEmpName) {
+            var data = table.cache["mainTable"];
+            if (data.length == 0) {
+                return layer.msg("鏃犳暟鎹�,鏃犳硶杩涜瑙i攣!")
+            } else {
+                layer.open({
+                    type: 2//寮圭獥绫诲瀷
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '鎺掍骇瑙i攣鐢宠鍗�'//鏍囬
+                    , shift: 2//寮瑰嚭鍔ㄧ敾
+                    , content: ['../../鐢熶骇绠$悊/瀹濆伐鎺掍骇/JIT_UnLockRequestBill.html?HOperationType=4&HEmpName=' + HEmpName + '& HDeptID=' + HWorkShopID + '&HDeptName=' + HWorkShopIDName + "'", '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('璇烽�夋嫨鏁版嵁');
+                    //    }
+                    //    $("#HDeptName").val(checkStatus.data[0].閮ㄩ棬鍚嶇О);
+                    //    $("#HDeptID").val(checkStatus.data[0].HItemID);
+                    //    layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    //}
+                    //, btn2: function (index, layero) { }
+                })
+            }
+        }
+
         //閿佸畾宸ュ崟
         function get_btnLockOrder() {
             var checkStatus = table.checkStatus('mainTable')

--
Gitblit v1.9.1