明树Git Lab

Commit 240d306f authored by zfp1's avatar zfp1

update

parent 3b188772
...@@ -39,6 +39,6 @@ ...@@ -39,6 +39,6 @@
"collectDeviceInfo": false, "collectDeviceInfo": false,
"collectDeviceInfo4": true, "collectDeviceInfo4": true,
"excel": false, "excel": false,
"plantearlywarning": true "plantearlywarning": false
} }
} }
\ No newline at end of file
...@@ -26,16 +26,16 @@ async function listTraceCode(req, res, next) { ...@@ -26,16 +26,16 @@ async function listTraceCode(req, res, next) {
search.batchNumber = {$regex: req.body.batchNumber} search.batchNumber = {$regex: req.body.batchNumber}
} }
const count = await DB.ProTraceCode.countDocuments(search); const count = await DB.ProTraceCode.countDocuments(search);
let list = await DB.ProTraceCode.find(search).sort({_id: -1}).skip(skip).limit(pageSize); let list = await DB.ProTraceCode.find(search).sort({_id: -1}).skip(skip).limit(pageSize).lean();
let ret = []; let ret = [];
for (let index = 0; index < list.length; index++) { for (let index = 0; index < list.length; index++) {
const element = list[index]; const element = list[index];
if(element.source && element.type == 1) { if(element.source && element.type == 1) {
element.source = await DB.ProductPlant.findOne({_id: element.source}); element.source = await DB.ProductPlant.findOne({_id: element.source}).lean();
} else if(element.source && element.type == 2) { } else if(element.source && element.type == 2) {
element.source = await DB.ProductPre.findOne({_id: element.source}); element.source = await DB.ProductPre.findOne({_id: element.source}).lean();
} else if (element.source && element.type == 3) { } else if (element.source && element.type == 3) {
element.source = await DB.ProductDeep.findOne({_id: element.source}); element.source = await DB.ProductDeep.findOne({_id: element.source}).lean();
} }
ret.push(element); ret.push(element);
} }
...@@ -75,24 +75,26 @@ async function getTraceCode(req, res, next) { ...@@ -75,24 +75,26 @@ async function getTraceCode(req, res, next) {
if(!req.body._id) { if(!req.body._id) {
return res.sendError(errorMessage.resourceNotFound); return res.sendError(errorMessage.resourceNotFound);
} }
let traccode = await DB.ProTraceCode.findOne({_id: req.body._id}); let traccode = await DB.ProTraceCode.findOne({_id: req.body._id}).lean();
if(!(traccode && traccode._id && traccode.source)) { if(!(traccode && traccode._id && traccode.source)) {
return res.sendError(errorMessage.resourceNotFound); return res.sendError(errorMessage.resourceNotFound);
} }
let sourceId = traccode.source; let sourceId = traccode.source;
let source = null; let source = null;
if(traccode.type && traccode.type == 1) { if(traccode.type && traccode.type == 1) {
source = await DB.ProductPlant.findOne({_id: sourceId}).populate({path: "productPhotos"}).populate({path: "plantPlan"}); source = await DB.ProductPlant.findOne({_id: sourceId}).populate({path: "productPhotos"}).populate({path: "plantPlan"}).lean();
if(source && source.plantPlan && source.plantPlan.land) { if(source && source.plantPlan && source.plantPlan.land) {
let devices = await Device.find({land: {$in: source.plantPlan.land}}); let devices = await Device.find({land: {$in: source.plantPlan.land}}).lean();
source.devices = devices; source.devices = devices;
} }
} else if(traccode.type && traccode.type == 2) { } else if(traccode.type && traccode.type == 2) {
source = await DB.ProductPre.findOne({_id: sourceId}); source = await DB.ProductPre.findOne({_id: sourceId}).lean();
} else if(traccode.type && traccode.type == 3) { } else if(traccode.type && traccode.type == 3) {
source = await DB.ProductDeep.findOne({_id: sourceId}); source = await DB.ProductDeep.findOne({_id: sourceId}).lean();
} }
traccode.source = source && sourceId; console.log(source, "==")
traccode.source = source;
res.sendData(traccode); res.sendData(traccode);
} catch (error) { } catch (error) {
next(error); next(error);
......
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