Skip to content

T
topjs3 study
Commit 96fd85fe authored by Scott Sun's avatar Scott Sun
Browse files
Options

scott

parent 85e0a5a7
Hide whitespace changes
Inline Side-by-side
Showing with 26 additions and 5 deletions
2019-12-31/scott/config.json
View file @ 96fd85fe
{"dirPath":"../xlsx","isUseing":false,"rdir":"../rxlsx","dbconfig":{"database_type":"pg","database_host":"139.196.104.13:5433","database_name":"PMO_TRAINING","database_user":"toplinker","database_pwd":"TopLinker0510"},"dataKeys":{"135aa36437beb6571531ca8e898ad57a":{"name":"Order\n生管投料单号","dbkey":"order_no"},"a1deefe94c73d05d2a3b247c23362042":{"name":"Confirmation\n总数量","dbkey":"confirmation"},"c46b4eb1d67a08b863072b33b646a810":{"name":"Plant\n厂别","dbkey":"plant"},"e5018abee57b7f610ef8bb4d9eecc112":{"name":"Material\n批号","dbkey":"material"},"f19e926ffab820b96d5a6aabf9aae616":{"name":"Material Description\n批次说明","dbkey":"material_description"},"7e51e12322207097a84891f9d7445ad4":{"name":"Posting Date\n生产时间","dbkey":"posting_date"},"8dba6faf3484a91f3b3940bb2e9ea459":{"name":"Confirmation Entry Time\n确认时间","dbkey":"confirmation_entry_time"},"ecfc2dffe568c10a67dbc6d3724cfde2":{"name":"Activity","dbkey":"activity"},"657a1d49f3e92290e56b692ff58a0a2d":{"name":"Work Center\n生产站别","dbkey":"work_center"},"62f5f57f24ea1d0bc12aa535d6add05d":{"name":"Confirmed Yield (GMEIN)","dbkey":"confirmed_yield"},"7c8590875b72ce8eca3c92f76b2c451b":{"name":"Base Unit of Measure (=GMEIN)","dbkey":"base_unit"},"37c9b123cc9f488d3f7f8480146795e9":{"name":"Confirmed scrap (MEINH)\n报废数量","dbkey":"confirmed_scrap"},"91b8b2e603be16c0a94658f0ced49c0b":{"name":"Reason for Variance\n报废代码","dbkey":"reason_for_variance"},"55979da7be6e74a5ce14bd81cd31028d":{"name":"Rework\n重工数量","dbkey":"rework"},"e820bdb5f699f28fb15c5d5e759f164b":{"name":"Confirmation text","dbkey":"confirmation_text"},"da01091b1f5ddb363d498e844449a961":{"name":"Entered by User","dbkey":"entered_by_user"},"664152bb1a151874f332b55ec47bc54d":{"name":"Ind.Final Confirmation","dbkey":"ind_final_confirmation"},"196c6ed505a0dabe34f0aed4e2800535":{"name":"Milestone confirmed","dbkey":"milestone_confirmed"},"0b9bf2967b86c25513ff839bcf3eab83":{"name":"Ind. delete doc.","dbkey":"ind_delete_doc"},"attr_data":{"e721078261b58ddd2a9956d8cbce6a06":{"name":"ybl 新的","dbkey":"ybl_e721078261"},"8191de2b5061888ea99973372e8e1a58":{"name":"中文字段","dbkey":"_8191de2b50"},"e53fd971e62213827ea253985dcf430b":{"name":"normal da","dbkey":"normal_da_e53fd971e6"}}}} {"dirPath":"../xlsx","isUseing":false,"rdir":"../rxlsx","dbconfig":{"database_type":"pg","database_host":"139.196.104.13:5433","database_name":"PMO_TRAINING","database_user":"toplinker","database_pwd":"TopLinker0510"},"dataKeys":{"135aa36437beb6571531ca8e898ad57a":{"name":"Order\n生管投料单号","dbkey":"order_no"},"a1deefe94c73d05d2a3b247c23362042":{"name":"Confirmation\n总数量","dbkey":"confirmation"},"c46b4eb1d67a08b863072b33b646a810":{"name":"Plant\n厂别","dbkey":"plant"},"e5018abee57b7f610ef8bb4d9eecc112":{"name":"Material\n批号","dbkey":"material"},"f19e926ffab820b96d5a6aabf9aae616":{"name":"Material Description\n批次说明","dbkey":"material_description"},"7e51e12322207097a84891f9d7445ad4":{"name":"Posting Date\n生产时间","dbkey":"posting_date"},"8dba6faf3484a91f3b3940bb2e9ea459":{"name":"Confirmation Entry Time\n确认时间","dbkey":"confirmation_entry_time"},"ecfc2dffe568c10a67dbc6d3724cfde2":{"name":"Activity","dbkey":"activity"},"657a1d49f3e92290e56b692ff58a0a2d":{"name":"Work Center\n生产站别","dbkey":"work_center"},"62f5f57f24ea1d0bc12aa535d6add05d":{"name":"Confirmed Yield (GMEIN)","dbkey":"confirmed_yield"},"7c8590875b72ce8eca3c92f76b2c451b":{"name":"Base Unit of Measure (=GMEIN)","dbkey":"base_unit"},"37c9b123cc9f488d3f7f8480146795e9":{"name":"Confirmed scrap (MEINH)\n报废数量","dbkey":"confirmed_scrap"},"91b8b2e603be16c0a94658f0ced49c0b":{"name":"Reason for Variance\n报废代码","dbkey":"reason_for_variance"},"55979da7be6e74a5ce14bd81cd31028d":{"name":"Rework\n重工数量","dbkey":"rework"},"e820bdb5f699f28fb15c5d5e759f164b":{"name":"Confirmation text","dbkey":"confirmation_text"},"da01091b1f5ddb363d498e844449a961":{"name":"Entered by User","dbkey":"entered_by_user"},"664152bb1a151874f332b55ec47bc54d":{"name":"Ind.Final Confirmation","dbkey":"ind_final_confirmation"},"196c6ed505a0dabe34f0aed4e2800535":{"name":"Milestone confirmed","dbkey":"milestone_confirmed"},"0b9bf2967b86c25513ff839bcf3eab83":{"name":"Ind. delete doc.","dbkey":"ind_delete_doc"},"attr_data":{"95ece258f033995937cbb19bef459b59":{"name":"yalie","dbkey":"yalie_95ece258f0"}}}}
\ No newline at end of file \ No newline at end of file
2019-12-31/scott/index.js
View file @ 96fd85fe
...@@ -131,7 +131,7 @@ Main.prototype.paytionType = function(props){ // 处理数据 ...@@ -131,7 +131,7 @@ Main.prototype.paytionType = function(props){ // 处理数据
this.insertAny(newData) // 插入数据库操作 this.insertAny(newData) // 插入数据库操作
} else { // 对旧的数据执行更新操作 对新的数据执行添加 } else { // 对旧的数据执行更新操作 对新的数据执行添加
console.log('要对字段扩展:') console.log('要对字段扩展:')
var res = this.filterOldData(props.datalist,dbDatas,"update") // 数据过滤 顺便更新旧的数据 var res = this.filterOldData(props.datalist,dbDatas,"newkey") // 数据过滤 顺便更新旧的数据
var newData = res.newData // 获取要插入的数据 var newData = res.newData // 获取要插入的数据
console.log("新的数据："+newData.length); console.log("新的数据："+newData.length);
console.log(newData[0]); console.log(newData[0]);
...@@ -202,10 +202,29 @@ Main.prototype.filterOldData = function (datas,dbdatas, type){ ...@@ -202,10 +202,29 @@ Main.prototype.filterOldData = function (datas,dbdatas, type){
var dataI = v["confirmation"] + v["plant"] + v["material"] + v["posting_date"] + v["confirmation_entry_time"] + v["activity"] var dataI = v["confirmation"] + v["plant"] + v["material"] + v["posting_date"] + v["confirmation_entry_time"] + v["activity"]
if(dbI.indexOf(dataI) >= 0){ if(dbI.indexOf(dataI) >= 0){
// 老数据 // 老数据
if(type === "update"){ var updateData = {}
this.UpdateKeys({"attr_data":v["attr_data"]},dbdatas[dbI.indexOf(dataI)]["id"]) // 更新 if(type === "newkey"){
updateData["attr_data"] = v["attr_data"]
// this.UpdateKeys({"attr_data":},dbdatas[dbI.indexOf(dataI)]["id"]) // 更新
} }
oldData.push(dbdatas[dbI.indexOf(dataI)]) // 判断老数据是否更新了
for(var key in v){
if(key==="attr_data"){
if(JSON.stringify(v[key]) !== JSON.stringify(dbdatas[dbI.indexOf(dataI)][key])){
updateData["attr_data"] = v["attr_data"]
}
} else {
if(v[key] != dbdatas[dbI.indexOf(dataI)][key]) {
updateData[key] = v[key]
}
}
}
if(JSON.stringify(updateData) !== "{}"){ // 有要更新的情况
console.log("更新...")
this.UpdateKeys(updateData,dbdatas[dbI.indexOf(dataI)]["id"])
}
oldData.push(v)
} else{ } else{
// 新数据 // 新数据
newData.push(v) newData.push(v)
...@@ -220,6 +239,8 @@ Main.prototype.filterOldData = function (datas,dbdatas, type){ ...@@ -220,6 +239,8 @@ Main.prototype.filterOldData = function (datas,dbdatas, type){
} }
// 更新数据 // 更新数据
Main.prototype.UpdateKeys = function(data,id){ Main.prototype.UpdateKeys = function(data,id){
console.log(data)
console.log(id)
// 执行更新操作 // 执行更新操作
this.query.begin() this.query.begin()
var that = this var that = this
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment