明树Git Lab

Commit b58d5257 authored by zfp1's avatar zfp1

!

parent e05f1657
......@@ -31,8 +31,8 @@ async function listDeepPlant(req, res, next) {
let ret = [];
for (let index = 0; index < list.length; index++) {
const element = list[index];
element.agrPlantBase = namemap(element.agrPlantBase);
element.workshop = namemap(element.workshop);
element.agrPlantBase = namemap[element.agrPlantBase];
element.workshop = namemap[element.workshop];
ret.push(element);
}
res.sendData({ count, list: ret });
......
......@@ -34,7 +34,7 @@ async function listDirectPlant(req, res, next) {
let ret = [];
for (let index = 0; index < list.length; index++) {
const element = list[index];
element.agrPlantBase = namemap(element.agrPlantBase);
element.agrPlantBase = namemap[element.agrPlantBase];
ret.push(element);
}
res.sendData({ count, list: ret });
......
......@@ -32,7 +32,7 @@ async function listPrePlant(req, res, next) {
let ret = [];
for (let index = 0; index < list.length; index++) {
const element = list[index];
element.agrPlantBase = namemap(element.agrPlantBase);
element.agrPlantBase = namemap[element.agrPlantBase];
ret.push(element);
}
res.sendData({ count, list: ret });
......
......@@ -50,14 +50,14 @@ async function listTraceCode(req, res, next) {
} else if (element.source && element.type == 4) {
element.source = await DB.ProductLt.findOne({ _id: element.source }).lean();
}
element.workshop = namemap(element.workshop);
element.agrPlantBase = namemap(element.agrPlantBase);
element.workshop = namemap[element.workshop];
element.agrPlantBase = namemap[element.agrPlantBase];
if (element.rawMatCul && element.rawMatCul.proAdr) {
element.rawMatCul.proAdr = namemap(element.rawMatCul.proAdr)
element.rawMatCul.proAdr = namemap[element.rawMatCul.proAdr]
}
if (element.proProcess && element.proProcess.proAdr) {
element.proProcess.proAdr = namemap(element.proProcess.proAdr)
element.proProcess.proAdr = namemap[element.proProcess.proAdr]
}
ret.push(element);
}
......@@ -158,16 +158,16 @@ async function getTraceCode2(req, res, next) {
traccode.source = source;
let namemap = await getSccjMap();
source.workshop = namemap(source.workshop);
source.agrPlantBase = namemap(source.agrPlantBase);
traccode.agrPlantBase = namemap(traccode.agrPlantBase);
traccode.agrPlantBase = namemap(traccode.agrPlantBase);
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)
traccode.rawMatCul.proAdr = namemap[traccode.rawMatCul.proAdr]
}
if (traccode.proProcess && traccode.proProcess.proAdr) {
traccode.proProcess.proAdr = namemap(traccode.proProcess.proAdr)
traccode.proProcess.proAdr = namemap[traccode.proProcess.proAdr]
}
/**
* 查询一次则给这条数据加1
......@@ -205,16 +205,16 @@ async function getsuyuanBase(req, res, next) {
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);
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)
traccode.rawMatCul.proAdr = namemap[traccode.rawMatCul.proAdr]
}
if (traccode.proProcess && traccode.proProcess.proAdr) {
traccode.proProcess.proAdr = namemap(traccode.proProcess.proAdr)
traccode.proProcess.proAdr = namemap[traccode.proProcess.proAdr]
}
traccode.source = source;
res.sendData(traccode);
......
......@@ -32,8 +32,8 @@ async function listlt(req, res, next) {
let ret = [];
for (let index = 0; index < list.length; index++) {
const element = list[index];
element.agrPlantBase = namemap(element.agrPlantBase);
element.workshop = namemap(element.workshop);
element.agrPlantBase = namemap[element.agrPlantBase];
element.workshop = namemap[element.workshop];
ret.push(element);
}
res.sendData({ count, list: ret });
......
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