Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in / Register
Toggle navigation
T
topjs3 study
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Locked Files
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Scott Sun
topjs3 study
Commits
e2252da2
Commit
e2252da2
authored
5 years ago
by
Scott Sun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
scott
parent
96fd85fe
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
10 deletions
+15
-10
confirmation-201912270900(1).XLSX
2019-12-31/rxlsx/confirmation-201912270900(1).XLSX
+0
-0
config.json
2019-12-31/scott/config.json
+1
-1
index.js
2019-12-31/scott/index.js
+14
-9
No files found.
2019-12-31/rxlsx/confirmation-201912270900(1).XLSX
View file @
e2252da2
No preview for this file type
This diff is collapsed.
Click to expand it.
2019-12-31/scott/config.json
View file @
e2252da2
{
"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
{
"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"
:{}}}
\ No newline at end of file
This diff is collapsed.
Click to expand it.
2019-12-31/scott/index.js
View file @
e2252da2
...
...
@@ -118,15 +118,15 @@ Main.prototype.paytionType = function(props){ // 处理数据
if
(
!
dbDatas
){
return
}
console
.
log
(
"数据库的数据数量:"
+
dbDatas
.
length
)
if
(
this
.
newkeys
.
length
===
0
){
// 不存在新的字段 只要新增就行
// console.log(this.query.deleteRow({
// table:'sec_production_order_confirmation_2',
// where: ["id >= 0"]
// })) // 删除所有数据
console
.
log
(
"插入操作"
);
var
res
=
this
.
filterOldData
(
props
.
datalist
,
dbDatas
)
// 数据过滤
var
newData
=
res
.
newData
// 获取要插入的数据
console
.
log
(
"新的数据:"
+
newData
.
length
);
console
.
log
(
newData
[
0
]);
// console.log(this.query.deleteRow({
// table:'sec_production_order_confirmation_2',
// where: ["id >= 0"]
// })) // 删除所有数据
if
(
newData
.
length
===
0
)
{
return
}
this
.
insertAny
(
newData
)
// 插入数据库操作
}
else
{
// 对旧的数据执行更新操作 对新的数据执行添加
...
...
@@ -205,12 +205,17 @@ Main.prototype.filterOldData = function (datas,dbdatas, type){
var
updateData
=
{}
if
(
type
===
"newkey"
){
updateData
[
"attr_data"
]
=
v
[
"attr_data"
]
// this.UpdateKeys({"attr_data":},dbdatas[dbI.indexOf(dataI)]["id"]) // 更新
}
// 判断老数据是否更新了
for
(
var
key
in
v
){
if
(
key
===
"attr_data"
){
if
(
JSON
.
stringify
(
v
[
key
])
!==
JSON
.
stringify
(
dbdatas
[
dbI
.
indexOf
(
dataI
)][
key
])){
var
tempflag
=
false
for
(
var
tempdbkey
in
dbdatas
[
dbI
.
indexOf
(
dataI
)][
key
]){
if
(
v
[
key
][
tempdbkey
]
&&
dbdatas
[
dbI
.
indexOf
(
dataI
)][
key
][
tempdbkey
]
!=
v
[
key
][
tempdbkey
]){
tempflag
=
true
}
}
if
(
tempflag
){
updateData
[
"attr_data"
]
=
v
[
"attr_data"
]
}
}
else
{
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment