合并

yangle

2025-04-02 7a0ae6ead96c7c68f949cf1f2b6bfaec7f301e6a

 WebTM/views/¼Æ»®¹ÜÀí/¹¤ÒÕ·Ïß/Gy_RoutingBill.html

@@ -2234,6 +2234,7 @@
                                            option.data[i]["工段"] = checkStatus.data[j]["工段名称"];
                                            option.data[i]["标准工价"] = checkStatus.data[j]["标准工价"];


                                            j++;
                                        }

@@ -2670,7 +2671,7 @@

                        //查询工作中心的数据
                        var WorkCente = [];
                        var sWhere = "select  isnull(a.HItemID,'') HCenterID, isnull(a.HNumber,'') å·¥ä½œä¸­å¿ƒä»£ç , isnull(a.HName,'') å·¥ä½œä¸­å¿ƒåç§° ,p.HItemID HProcID,p.HName å·¥åºåç§°  from Gy_Process p left join Gy_WorkCenter a on p.HWorkCenterID=a.HItemID  where p.HNumber in (" + ProcessNumber.toString() + ") order by p.HNumber ";
                        var sWhere = "select  isnull(a.HItemID,'') HCenterID, isnull(a.HNumber,'') å·¥ä½œä¸­å¿ƒä»£ç , isnull(a.HName,'') å·¥ä½œä¸­å¿ƒåç§° ,p.HItemID HProcID,p.HName å·¥åºåç§°,p.HStandardWages æ ‡å‡†å·¥ä»·  from Gy_Process p left join Gy_WorkCenter a on p.HWorkCenterID=a.HItemID  where p.HNumber in (" + ProcessNumber.toString() + ") order by p.HNumber ";
                        $.ajax({
                            type: "GET",
                            url: GetWEBURL() + "/Gy_SOPBillList/WindowPrintList", //方法所在页面和方法名
@@ -2705,6 +2706,8 @@
                                option.data[i]["工作中心代码"] = WorkCente[j]["工作中心代码"];
                                option.data[i]["HProcID_S"] = data.data[j]["HProcMulID"];
                                option.data[i]["工段"] = data.data[j]["工段名称"];
                                option.data[i]["标准工价"] = WorkCente[j]["标准工价"];

                                j++;
                            }

@@ -2743,6 +2746,7 @@
                                option.data[i]["工作中心代码"] = WorkCente[j]["工作中心代码"];
                                option.data[i]["HProcID_S"] = data.data[j]["HProcMulID"];
                                option.data[i]["工段"] = data.data[j]["工段名称"];
                                option.data[i]["标准工价"] = WorkCente[j]["标准工价"];
                                j++;
                            }
                        }