明树Git Lab

Commit 907ecaf3 authored by zfp1's avatar zfp1

1

parent 73962cd8
...@@ -46,6 +46,8 @@ async function listTraceCode(req, res, next) { ...@@ -46,6 +46,8 @@ async function listTraceCode(req, res, next) {
element.source = await DB.ProductPre.findOne({ _id: element.source }).lean(); 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 }).lean(); element.source = await DB.ProductDeep.findOne({ _id: element.source }).lean();
} else if (element.source && element.type == 4) {
element.source = await DB.ProductLt.findOne({ _id: element.source }).lean();
} }
ret.push(element); ret.push(element);
} }
...@@ -138,6 +140,8 @@ async function getTraceCode2(req, res, next) { ...@@ -138,6 +140,8 @@ async function getTraceCode2(req, res, next) {
source = await DB.ProductPre.findOne({ _id: sourceId }, { preProductName: 1, productSpec: 1, manufactureDate: 1, agrPlantBase: 1, homepageCarouselImgs: 1 }).populate({ path: "homepageCarouselImgs" }).lean(); source = await DB.ProductPre.findOne({ _id: sourceId }, { preProductName: 1, productSpec: 1, manufactureDate: 1, agrPlantBase: 1, homepageCarouselImgs: 1 }).populate({ path: "homepageCarouselImgs" }).lean();
} else if (traccode.type && traccode.type == 3) { } else if (traccode.type && traccode.type == 3) {
source = await DB.ProductDeep.findOne({ _id: sourceId }, { preProductName: 1, productSpec: 1, manufactureDate: 1, agrPlantBase: 1, homepageCarouselImgs: 1 }).populate({ path: "homepageCarouselImgs" }).lean(); source = await DB.ProductDeep.findOne({ _id: sourceId }, { preProductName: 1, productSpec: 1, manufactureDate: 1, agrPlantBase: 1, homepageCarouselImgs: 1 }).populate({ path: "homepageCarouselImgs" }).lean();
} else if (traccode.type && traccode.type == 4) {
source = await DB.ProductLt.findOne({ _id: sourceId }, { preProductName: 1, productSpec: 1, manufactureDate: 1, agrPlantBase: 1, homepageCarouselImgs: 1 }).populate({ path: "homepageCarouselImgs" }).lean();
} }
source.manufactureDate = traccode.manufactureDate || source.manufactureDate; source.manufactureDate = traccode.manufactureDate || source.manufactureDate;
source.agrPlantBase = traccode.workshop || source.agrPlantBase; source.agrPlantBase = traccode.workshop || source.agrPlantBase;
...@@ -171,6 +175,8 @@ async function getsuyuanBase(req, res, next) { ...@@ -171,6 +175,8 @@ async function getsuyuanBase(req, res, next) {
source = await DB.ProductPre.findOne({ _id: sourceId }, { preProductName: 1, productSpec: 1, manufactureDate: 1, batchNumber: 1, qualityInspector: 1, productUnit: 1, sellByDate: 1, sellByDateUnit: 1, productPhotos2: 1 }).populate({ path: "productPhotos2" }).populate({ path: "homepageCarouselImgs" }).lean(); source = await DB.ProductPre.findOne({ _id: sourceId }, { preProductName: 1, productSpec: 1, manufactureDate: 1, batchNumber: 1, qualityInspector: 1, productUnit: 1, sellByDate: 1, sellByDateUnit: 1, productPhotos2: 1 }).populate({ path: "productPhotos2" }).populate({ path: "homepageCarouselImgs" }).lean();
} else if (traccode.type && traccode.type == 3) { } else if (traccode.type && traccode.type == 3) {
source = await DB.ProductDeep.findOne({ _id: sourceId }, { preProductName: 1, productSpec: 1, manufactureDate: 1, batchNumber: 1, qualityInspector: 1, productUnit: 1, sellByDate: 1, sellByDateUnit: 1, productPhotos2: 1 }).populate({ path: "productPhotos2" }).populate({ path: "homepageCarouselImgs" }).lean(); source = await DB.ProductDeep.findOne({ _id: sourceId }, { preProductName: 1, productSpec: 1, manufactureDate: 1, batchNumber: 1, qualityInspector: 1, productUnit: 1, sellByDate: 1, sellByDateUnit: 1, productPhotos2: 1 }).populate({ path: "productPhotos2" }).populate({ path: "homepageCarouselImgs" }).lean();
} else if (traccode.type && traccode.type == 4) {
source = await DB.ProductLt.findOne({ _id: sourceId }, { preProductName: 1, productSpec: 1, manufactureDate: 1, batchNumber: 1, qualityInspector: 1, productUnit: 1, sellByDate: 1, sellByDateUnit: 1, productPhotos2: 1 }).populate({ path: "productPhotos2" }).populate({ path: "homepageCarouselImgs" }).lean();
} }
source.manufactureDate = traccode.manufactureDate || source.manufactureDate; source.manufactureDate = traccode.manufactureDate || source.manufactureDate;
source.batchNumber = traccode.batchNumber || source.batchNumber; source.batchNumber = traccode.batchNumber || source.batchNumber;
...@@ -198,6 +204,8 @@ async function getJiankong(req, res, next) { ...@@ -198,6 +204,8 @@ async function getJiankong(req, res, next) {
source = await DB.ProductPre.findOne({ _id: sourceId }, { monitorInfo: 1, monitorInfoForInt: 1 }).populate({ path: "monitorInfo.device" }).populate({ path: "monitorInfoForInt.device" }).lean(); source = await DB.ProductPre.findOne({ _id: sourceId }, { monitorInfo: 1, monitorInfoForInt: 1 }).populate({ path: "monitorInfo.device" }).populate({ path: "monitorInfoForInt.device" }).lean();
} else if (traccode.type && traccode.type == 3) { } else if (traccode.type && traccode.type == 3) {
source = await DB.ProductDeep.findOne({ _id: sourceId }, { monitorInfo: 1, monitorInfoForInt: 1 }).populate({ path: "monitorInfo.device" }).populate({ path: "monitorInfoForInt.device" }).lean(); source = await DB.ProductDeep.findOne({ _id: sourceId }, { monitorInfo: 1, monitorInfoForInt: 1 }).populate({ path: "monitorInfo.device" }).populate({ path: "monitorInfoForInt.device" }).lean();
} else if (traccode.type && traccode.type == 4) {
source = await DB.ProductLt.findOne({ _id: sourceId }, { monitorInfo: 1, monitorInfoForInt: 1 }).populate({ path: "monitorInfo.device" }).populate({ path: "monitorInfoForInt.device" }).lean();
} }
//查询一下土壤采集数据 //查询一下土壤采集数据
......
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