明树Git Lab

Commit 40aaeb21 authored by zfp1's avatar zfp1

update

parent bdac899a
...@@ -163,7 +163,7 @@ async function getsuyuanBase(req, res, next) { ...@@ -163,7 +163,7 @@ async function getsuyuanBase(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 }, { type: 1, source: 1, _id: 1, rawMatCul: 1, proProcess: 1 }).populate({ path: "proProcess.proSteps.img" }).populate({ path: "rawMatCul.proSteps.img" }).lean(); let traccode = await DB.ProTraceCode.findOne({ _id: req.body._id }, { type: 1, source: 1, _id: 1, manufactureDate:1 ,rawMatCul: 1, proProcess: 1 }).populate({ path: "proProcess.proSteps.img" }).populate({ path: "rawMatCul.proSteps.img" }).lean();
if (!(traccode && traccode._id && traccode.source)) { if (!(traccode && traccode._id && traccode.source)) {
return res.sendError(errorMessage.resourceNotFound); return res.sendError(errorMessage.resourceNotFound);
} }
...@@ -177,7 +177,7 @@ async function getsuyuanBase(req, res, next) { ...@@ -177,7 +177,7 @@ async function getsuyuanBase(req, res, next) {
} 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, 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, productPhotos2: 1 }).populate({ path: "productPhotos2" }).populate({ path: "homepageCarouselImgs" }).lean();
} }
source.manufactureDate = traccode.manufactureDate || source.manufactureDate;
traccode.source = source; traccode.source = source;
res.sendData(traccode); res.sendData(traccode);
} catch (error) { } catch (error) {
......
...@@ -93,11 +93,9 @@ const letianProTraceCodeSchema = new Schema({ ...@@ -93,11 +93,9 @@ const letianProTraceCodeSchema = new Schema({
}, },
agrOnOff: { // 农业数据开关 agrOnOff: { // 农业数据开关
type: Boolean, type: Boolean,
default: true,
}, },
indEnvOnOff: { //工业环境开关 indEnvOnOff: { //工业环境开关
type: Boolean, type: Boolean,
default: true,
}, },
creator: { creator: {
......
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