diff --git a/src/components/Common/CommonInstructSet.js b/src/components/Common/CommonInstructSet.js index 563df75..69f47df 100644 --- a/src/components/Common/CommonInstructSet.js +++ b/src/components/Common/CommonInstructSet.js @@ -251,7 +251,7 @@ const instructSetInit = async props => { ...resultData }; } - + } catch (error) { props.btnConfig.error? props.btnConfig.error(error) : ''; throw new Error(error); @@ -1883,7 +1883,12 @@ const handlePoprepair = async (props, instruct) => { index = tableData.findIndex(item => item.sId === record.sId); } + const oDTrayQty = document.querySelector("#MesDynamicNum_dTrayQty"); + const dQty = (!oDTrayQty) ? 0 : Number(oDTrayQty.innerHTML?.replace(/\,/g, "")); const fieldNameList = fieldNames.split(","); + if(dQty && !record.bAdvance && title.includes("跨班提前下料")){ + record.dAdvanceReportQty = dQty; /* 跨班提前下料产量 */ + } const filterConfig = config?.gdsconfigformslave?.filter(item => { return fieldNameList.includes(item.sName); @@ -2513,7 +2518,7 @@ const utils = { return tableData[0]; } else if (filterType === "last") { return tableData[tableData.length - 1]; - } + } return tableData; },