From 16fb2995c39f0b2ee0329530843e3002ab95da8d Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期五, 20 五月 2022 15:26:44 +0800
Subject: [PATCH] 功能完善

---
 WebTM/views/生产管理/生产日计划工单/JIT_DayPlanBillEdit.html |   68 +++++++++++++++++-----------------
 1 files changed, 34 insertions(+), 34 deletions(-)

diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\227\245\350\256\241\345\210\222\345\267\245\345\215\225/JIT_DayPlanBillEdit.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\227\245\350\256\241\345\210\222\345\267\245\345\215\225/JIT_DayPlanBillEdit.html"
index a479d5e..1dee345 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\227\245\350\256\241\345\210\222\345\267\245\345\215\225/JIT_DayPlanBillEdit.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\227\245\350\256\241\345\210\222\345\267\245\345\215\225/JIT_DayPlanBillEdit.html"
@@ -582,11 +582,9 @@
             var OperationType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鏁版嵁绫诲瀷  娣诲姞 淇濆瓨
             var linterid = params[params[1]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
             var lSourceBillType = params[params[2]];  //浠庡崟鎹幏鍙� 婧愬崟绫诲瀷
-            var linteridSub = params[params[3]];  //浠庡弬鏁拌幏鍙� 瀛愯〃绾у埆
 
             //鍒ゆ柇鏄惁鏂板
             if (linterid == null || linterid == -1) {
-                linteridSub = -1;
                 OperationType = 1;
                 $.ajax({
                     url: GetWEBURL() + "/Web/GetMAXNum",
@@ -601,7 +599,7 @@
                 });
             }
             else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
-                RoadBillMain(linterid, linteridSub);
+                RoadBillMain(linterid);
                 //RoadBillSub(linterid);
             }
 
@@ -1191,7 +1189,7 @@
                     if (table.cache["mainTable"][i] != "") {
                         //鍒濆鍖栧叧闂椂闂�(绌哄�肩姸鎬佷笅 璧嬪��)
                         if (table.cache["mainTable"][i].HEntryCloseDate == "") {
-                            table.cache["mainTable"][i].HEntryCloseDate ="1900-01-01 00:00:00.000"
+                            table.cache["mainTable"][i].HEntryCloseDate ="1900-01-01"
                         }
 
                         table.cache["mainTable"][i].LAY_TABLE_INDEX = i;
@@ -1201,8 +1199,7 @@
 
                 var sMainStr = JSON.stringify(data.field);
                 var sSubStr = JSON.stringify(num);
-                var hentryid = linteridSub;//瀛愯〃 鎺掑簭id
-                var sMainSub = sMainStr + ';' + sSubStr + ';' + hentryid + ';' + OperationType + ";" + sessionStorage["HUserName"];
+                var sMainSub = sMainStr + ';' + sSubStr + ';' + OperationType + ";" + sessionStorage["HUserName"];
                 
                 var index = layer.load();
                 $.ajax({
@@ -1229,15 +1226,14 @@
             }
 
             //缂栬緫 椤甸潰璧嬪��
-            function RoadBillMain(linterid, linteridSub)//鍔犺浇琛ㄥご
+            function RoadBillMain(linterid)//鍔犺浇琛ㄥご
             {
-                var sWhere = " and hmainid='" + linterid + "' and hsubid='" + linteridSub + "'";
+                var sWhere = " and hmainid='" + linterid + "'";
                 $.ajax({
                     url: GetWEBURL() + "/Sc_WorkBillSortBill/Sc_WorkBillSortBillList",
                     type: "GET",
                     data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
                     success: function (d) {
-                      
                         //涓昏〃
                         form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
                             "HBillNo": d.data[0].鍗曟嵁鍙�
@@ -1293,7 +1289,7 @@
                             , "HSourceBillNo": d.data[0].婧愬崟缂栧彿
                             , "HICMOEntryID": d.data[0].鐢熶骇璁㈠崟鏄庣粏鍐呯爜
                             , "HMainInterID": d.data[0].瀵煎叆鎺掍骇ID
-                            , "HProdORGID": d.data[0].鐢熶骇缁勭粐
+                            , "HProdORGID": d.data[0].HProdORGID
                             , "HLeftPlanQty": d.data[0].鏈帓鏁伴噺
                             , "HEmpID": d.data[0].HEmpID
                             , "HEmpIDName": d.data[0].鑱屽憳
@@ -1309,15 +1305,17 @@
                             , "HHangUp": d.data[0].鎸傝捣鏍囪 == "0" ? false : true
                         });
 
-                        //瀛愯〃  璧嬪��
-                        var rowdata = [{
-                            "HMasterDate": Format(new Date(d.data[0].鏃ヨ鍒掔敓浜ф棩鏈�), "yyyy-MM-dd"), "HQty": d.data[0].瀛愭棩璁″垝鏁伴噺, "HRptFinishQty": d.data[0].姹囨姤瀹屾垚鏁伴噺
-                            , "HTimes": d.data[0].鍓╀綑宸ユ椂, "HUseTimes": d.data[0].鍗犵敤宸ユ椂, "HBTimes": Format(new Date(d.data[0].寮�濮嬫椂闂�), "yyyy-MM-dd"), "HETimes": Format(new Date(d.data[0].缁撴潫鏃堕棿), "yyyy-MM-dd")
-                            , "HRemark": d.data[0].琛ㄤ綋澶囨敞, "HDateSub": Format(new Date(d.data[0].鎺掍骇鏃ユ湡), "yyyy-MM-dd"), "HCloseMan": d.data[0].瀛愬叧闂汉, "HEntryCloseDate":Format(new Date(d.data[0].瀛愬叧闂椂闂�), "yyyy-MM-dd")
-                            , "HCloseTypeSub": d.data[0].鏄惁鎵嬪伐鍏抽棴 == 0 ? false : true, "HColumn": d.data[0].Excel鍒楀ご, "HLockedSub": d.data[0].瀛愰攣瀹氭爣璁� == 0 ? false : true, "HComplete": d.data[0].鏄惁榻愬
-                            , "HStatusTag": d.data[0].鐘舵�佹爣璁� == 0 ? false : true, "HIsHandModify": d.data[0].鎵嬪伐淇敼鏍囪 == 0 ? false : true
-                        }];
-
+                         //瀛愯〃  璧嬪��
+                        var rowdata = [];
+                        for (var i = 0; i < d.data.length; i++) {
+                            rowdata.push({
+                                "HMasterDate": Format(new Date(d.data[i].鏃ヨ鍒掔敓浜ф棩鏈�), "yyyy-MM-dd"), "HQty": d.data[i].瀛愭棩璁″垝鏁伴噺, "HRptFinishQty": d.data[i].姹囨姤瀹屾垚鏁伴噺
+                                , "HTimes": d.data[i].鍓╀綑宸ユ椂, "HUseTimes": d.data[i].鍗犵敤宸ユ椂, "HBTimes": Format(new Date(d.data[i].寮�濮嬫椂闂�), "yyyy-MM-dd"), "HETimes": Format(new Date(d.data[i].缁撴潫鏃堕棿), "yyyy-MM-dd")
+                                , "HRemark": d.data[i].琛ㄤ綋澶囨敞, "HDateSub": Format(new Date(d.data[i].鎺掍骇鏃ユ湡), "yyyy-MM-dd"), "HCloseMan": d.data[i].瀛愬叧闂汉, "HEntryCloseDate": Format(new Date(d.data[i].瀛愬叧闂椂闂�), "yyyy-MM-dd")
+                                , "HCloseTypeSub": d.data[i].鏄惁鎵嬪伐鍏抽棴 == 0 ? false : true, "HColumn": d.data[i].Excel鍒楀ご, "HLockedSub": d.data[i].瀛愰攣瀹氭爣璁� == 0 ? false : true, "HComplete": d.data[i].鏄惁榻愬
+                                , "HStatusTag": d.data[i].鐘舵�佹爣璁� == 0 ? false : true, "HIsHandModify": d.data[i].鎵嬪伐淇敼鏍囪 == 0 ? false : true
+                            });
+                        }
                         option.data = rowdata;
                         table.render(option);
 
@@ -1329,25 +1327,27 @@
                         if (d.data[0].鎸傝捣鏍囪 == "1") {
                             $("#checkboxHHangUp").attr("checked", true);
                         }
+                        for (var i = 0; i < d.data.length; i++) {
 
-                        //鏄惁鎵嬪伐鍏抽棴
-                        if (d.data[0].鏄惁鎵嬪伐鍏抽棴=="1") {
-                            $('#HCloseTypeSub1').attr("checked", true);
-                        }
+                            //鏄惁鎵嬪伐鍏抽棴
+                            if (d.data[i].鏄惁鎵嬪伐鍏抽棴 == "1") {
+                                $('#HCloseTypeSub' + (i + 1)).attr("checked", true);
+                            }
 
-                        //閿佸畾鏍囪
-                        if (d.data[0].瀛愰攣瀹氭爣璁� == "1") {
-                            $('#HLockedSub1').attr("checked", true);
-                        }
+                            //閿佸畾鏍囪
+                            if (d.data[i].瀛愰攣瀹氭爣璁� == "1") {
+                                $('#HLockedSub' + (i + 1)).attr("checked", true);
+                            }
 
-                         //鐘舵�佹爣璁�
-                        if (d.data[0].鐘舵�佹爣璁� == "1") {
-                            $('#HStatusTag1').attr("checked", true);
-                        }
+                            //鐘舵�佹爣璁�
+                            if (d.data[i].鐘舵�佹爣璁� == "1") {
+                                $('#HStatusTag' + (i + 1)).attr("checked", true);
+                            }
 
-                        //鎵嬪伐淇敼鏍囪
-                        if (d.data[0].鎵嬪伐淇敼鏍囪 == "1") {
-                            $('#HIsHandModify1').attr("checked", true);
+                            //鎵嬪伐淇敼鏍囪
+                            if (d.data[i].鎵嬪伐淇敼鏍囪 == "1") {
+                                $('#HIsHandModify' + (i + 1)).attr("checked", true);
+                            }
                         }
                         form.render('checkbox');
                     }

--
Gitblit v1.9.1