明树Git Lab

Commit e05f1657 authored by zfp1's avatar zfp1

update

parent f5f2cf07
...@@ -77,7 +77,7 @@ async function getSccjMap() { ...@@ -77,7 +77,7 @@ async function getSccjMap() {
let list = await DB.Sccj.find({ del: 0 }); let list = await DB.Sccj.find({ del: 0 });
let namemap = {}; let namemap = {};
list.map(o => { namemap[o.key] = o.name }); list.map(o => { namemap[o.key] = o.name });
return map; return namemap;
} }
module.exports = { module.exports = {
......
...@@ -114,7 +114,7 @@ async function getSccjMap() { ...@@ -114,7 +114,7 @@ async function getSccjMap() {
let list = await DB.Sccj.find({ del: 0 }); let list = await DB.Sccj.find({ del: 0 });
let namemap = {}; let namemap = {};
list.map(o => { namemap[o.key] = o.name }); list.map(o => { namemap[o.key] = o.name });
return map; return namemap;
} }
module.exports = { module.exports = {
......
...@@ -76,7 +76,7 @@ async function getSccjMap() { ...@@ -76,7 +76,7 @@ async function getSccjMap() {
let list = await DB.Sccj.find({ del: 0 }); let list = await DB.Sccj.find({ del: 0 });
let namemap = {}; let namemap = {};
list.map(o => { namemap[o.key] = o.name }); list.map(o => { namemap[o.key] = o.name });
return map; return namemap;
} }
module.exports = { module.exports = {
createPrePlant, createPrePlant,
......
...@@ -203,6 +203,19 @@ async function getsuyuanBase(req, res, next) { ...@@ -203,6 +203,19 @@ async function getsuyuanBase(req, res, next) {
} }
source.manufactureDate = traccode.manufactureDate || source.manufactureDate; source.manufactureDate = traccode.manufactureDate || source.manufactureDate;
source.batchNumber = traccode.batchNumber || source.batchNumber; source.batchNumber = traccode.batchNumber || source.batchNumber;
let namemap = await getSccjMap();
source.workshop = namemap(source.workshop);
source.agrPlantBase = namemap(source.agrPlantBase);
traccode.agrPlantBase = namemap(traccode.agrPlantBase);
traccode.agrPlantBase = namemap(traccode.agrPlantBase);
if (traccode.rawMatCul && traccode.rawMatCul.proAdr) {
traccode.rawMatCul.proAdr = namemap(traccode.rawMatCul.proAdr)
}
if (traccode.proProcess && traccode.proProcess.proAdr) {
traccode.proProcess.proAdr = namemap(traccode.proProcess.proAdr)
}
traccode.source = source; traccode.source = source;
res.sendData(traccode); res.sendData(traccode);
} catch (error) { } catch (error) {
...@@ -295,7 +308,7 @@ async function getSccjMap() { ...@@ -295,7 +308,7 @@ async function getSccjMap() {
let list = await DB.Sccj.find({ del: 0 }); let list = await DB.Sccj.find({ del: 0 });
let namemap = {}; let namemap = {};
list.map(o => { namemap[o.key] = o.name }); list.map(o => { namemap[o.key] = o.name });
return map; return namemap;
} }
module.exports = { module.exports = {
......
...@@ -112,7 +112,7 @@ async function getSccjMap() { ...@@ -112,7 +112,7 @@ async function getSccjMap() {
let list = await DB.Sccj.find({ del: 0 }); let list = await DB.Sccj.find({ del: 0 });
let namemap = {}; let namemap = {};
list.map(o => { namemap[o.key] = o.name }); list.map(o => { namemap[o.key] = o.name });
return map; return namemap;
} }
module.exports = { module.exports = {
createlt, createlt,
......
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