|
@@ -90,14 +90,19 @@ function generateRationName(ration,gljList) {
|
|
|
caption = caption.replace('%s',ass.actualValue);
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
+ let reNameList = [];
|
|
|
for(let g of gljList){
|
|
|
//glj._doc.createType=='replace'&&glj.rcode!=glj.code
|
|
|
if(g.createType=='replace'&&g.rcode!=g.code){ //是替换工料机
|
|
|
- caption = caption + ' '+g.name;
|
|
|
- if(!_.isEmpty(g.specs)) caption = caption + ' '+g.specs
|
|
|
+ let reName = g.name;
|
|
|
+ if(!_.isEmpty(g.specs)) reName = reName + ' '+g.specs;
|
|
|
+ reNameList.push(reName);
|
|
|
}
|
|
|
}
|
|
|
+ if(reNameList.length > 0){
|
|
|
+ let reNameString = reNameList.join(" ");
|
|
|
+ caption = caption + " 换为【"+ reNameString + "】";
|
|
|
+ }
|
|
|
return caption;
|
|
|
}
|
|
|
|