生产订单导出添加特殊符号转换；工艺路线新增约当系数字段(添康)

yusijie

8 天以前 967f2f7e6cfa3d1a4e5be4064b1b5afc6ac73fdc

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

@@ -589,7 +589,7 @@
                , "HQCSchemeID_Proc": 0, "HQCSchemeNumber_Proc": "", "HQCSchemeName_Proc": ""
                , "HQCSchemeID_Patrol": 0, "HQCSchemeNumber_Patrol": "", "HQCSchemeName_Patrol": ""
                , "HQCFst": false, "HQCProc": false, "HQCPatrol": false, "HMaterToSourceCtrl": false
                , "HSubStdEmpAvg_S": 0, "标准工价": 0
                , "HSubStdEmpAvg_S": 0, "标准工价": 0,"HYDCoefficient": 0
            }];
            var HModName = "Gy_RoutingBill";
            //#endregion
@@ -618,6 +618,7 @@
                    , { field: 'HTechnologyParameter', title: '工艺参数', edit: 'text' }
                    , { field: 'HProcPrice', title: '工价', edit: 'text' }
                    , { field: '标准工价', title: '标准工价' }
                    , { field: 'HYDCoefficient', title: '约当系数', edit: 'text' }
                    , { field: 'HRemark', title: '备注', edit: 'text' }
                    , { field: 'HSupID', title: '供应商ID', hide: true }
                    , { field: '供应商代码', title: '供应商代码', edit: 'text', width: 110, event: "CheckHSupID" }
@@ -1210,7 +1211,7 @@
                    , "HQCSchemeID_Proc": 0, "HQCSchemeNumber_Proc": "", "HQCSchemeName_Proc": ""
                    , "HQCSchemeID_Patrol": 0, "HQCSchemeNumber_Patrol": "", "HQCSchemeName_Patrol": ""
                    , "HQCFst": false, "HQCProc": false, "HQCPatrol": false, "HMaterToSourceCtrl": false
                    , "HSubStdEmpAvg_S": 0, "标准工价": 0
                    , "HSubStdEmpAvg_S": 0, "标准工价": 0, "HYDCoefficient": 0
                };
                switch (obj.event) {
                    case 'btn-AddLine':
@@ -1399,13 +1400,14 @@
                            //table.render(option)
                        }
                        break;
                    case 'HProcPrice': //工价
                        if (data.HProcPrice != 0) {
                    case 'HWorkQty': //约当系数
                        if (localStorage["HBenchmarkValue"] != undefined && localStorage["HBenchmarkValue"] != null && data.HWorkQty > 0) {
                            obj.update({
                                HWorkQty: (data.标准工价 / value).toFixed(2)
                                HYDCoefficient: (localStorage["HBenchmarkValue"] / data.HWorkQty).toFixed(6)
                            });
                        }
                        break;

                }
            })

@@ -2257,7 +2259,7 @@
                                                , "HQCSchemeID_Proc": 0, "HQCSchemeNumber_Proc": "", "HQCSchemeName_Proc": ""
                                                , "HQCSchemeID_Patrol": 0, "HQCSchemeNumber_Patrol": "", "HQCSchemeName_Patrol": ""
                                                , "HQCFst": false, "HQCProc": false, "HQCPatrol": false, "HMaterToSourceCtrl": false
                                                , "HSubStdEmpAvg_S": 0, "标准工价": 0
                                                , "HSubStdEmpAvg_S": 0, "标准工价": 0, "HYDCoefficient": 0
                                            })
                                            j++;
                                        }
@@ -2275,6 +2277,7 @@
                                            option.data[i]["工段"] = checkStatus.data[j]["工段名称"];
                                            option.data[i]["标准工价"] = checkStatus.data[j]["标准工价"];
                                            option.data[i]["HWorkQty"] = option.data[i]["HProcPrice"] != 0 ? (checkStatus.data[j]["标准工价"] / option.data[i]["HProcPrice"]).toFixed(2) : option.data[i]["HWorkQty"];
                                            option.data[i]["HYDCoefficient"] = (localStorage["HBenchmarkValue"] / (option.data[i]["HProcPrice"] != 0 ? (checkStatus.data[j]["标准工价"] / option.data[i]["HProcPrice"]).toFixed(2) : option.data[i]["HWorkQty"])).toFixed(6)//约当系数=基准值/小时产能
                                            j++;
                                        }
                                    }
@@ -2309,6 +2312,8 @@
                                            , "工段": OptionData[0].工段名称
                                            , "标准工价": OptionData[0].标准工价
                                            , "HWorkQty": obj.data.HProcPrice != 0 ? (OptionData[0].标准工价 / obj.data.HProcPrice).toFixed(2) : obj.data.HWorkQty
                                            , "HYDCoefficient": (localStorage["HBenchmarkValue"] / (obj.data.HProcPrice != 0 ? (OptionData[0].标准工价 / obj.data.HProcPrice).toFixed(2) : obj.data.HWorkQty)).toFixed(6)

                                        })
                                        OptionData = [];
                                    }
@@ -2707,6 +2712,7 @@
                                option.data[i]["HProcID_S"] = data.data[j]["HProcMulID"];
                                option.data[i]["工段"] = data.data[j]["工段名称"];
                                option.data[i]["标准工价"] = WorkCente[j]["标准工价"];
                                option.data[i]["HYDCoefficient"] = (localStorage["HBenchmarkValue"] / option.data[i]["HWorkQty"]).toFixed(6);

                                j++;
                            }
@@ -2730,7 +2736,7 @@
                                    , "HQCSchemeID_Proc": 0, "HQCSchemeNumber_Proc": "", "HQCSchemeName_Proc": ""
                                    , "HQCSchemeID_Patrol": 0, "HQCSchemeNumber_Patrol": "", "HQCSchemeName_Patrol": ""
                                    , "HQCFst": false, "HQCProc": false, "HQCPatrol": false, "HMaterToSourceCtrl": false
                                    , "HSubStdEmpAvg_S": 0, "标准工价": 0
                                    , "HSubStdEmpAvg_S": 0, "标准工价": 0, "HYDCoefficient": 0
                                })
                                j++;
                            }
@@ -2747,6 +2753,7 @@
                                option.data[i]["HProcID_S"] = data.data[j]["HProcMulID"];
                                option.data[i]["工段"] = data.data[j]["工段名称"];
                                option.data[i]["标准工价"] = WorkCente[j]["标准工价"];
                                option.data[i]["HYDCoefficient"] = (localStorage["HBenchmarkValue"] / option.data[i]["HWorkQty"]).toFixed(6);
                                j++;
                            }
                        }
@@ -2851,7 +2858,7 @@
                                    , "HQCSchemeID_Proc": d.data[i].HQCSchemeID_Proc, "HQCSchemeNumber_Proc": d.data[i].转序检验方案代码, "HQCSchemeName_Proc": d.data[i].转序检验方案
                                    , "HQCSchemeID_Patrol": d.data[i].HQCSchemeID_Patrol, "HQCSchemeNumber_Patrol": d.data[i].巡检检验方案代码, "HQCSchemeName_Patrol": d.data[i].巡检检验方案
                                    , "HQCFst": d.data[i].HQCFst == 1 ? true : false, "HQCProc": d.data[i].HQCProc == 1 ? true : false, "HQCPatrol": d.data[i].HQCPatrol == 1 ? true : false, "HMaterToSourceCtrl": d.data[i].HMaterToSourceCtrl == 1 ? true : false
                                    , "HSubStdEmpAvg_S": d.data[i].人均产能, "标准工价": d.data[i].标准工价
                                    , "HSubStdEmpAvg_S": d.data[i].人均产能, "标准工价": d.data[i].标准工价, "HYDCoefficient": d.data[i].约当系数
                                }
                            )
                        }