diff --git a/src/mes/common/siderInfoComponent/index.js b/src/mes/common/siderInfoComponent/index.js index 2bed777..c90bf75 100644 --- a/src/mes/common/siderInfoComponent/index.js +++ b/src/mes/common/siderInfoComponent/index.js @@ -651,7 +651,7 @@ const DeviceTargetInfoComponent = () => { if (index > 4 && !bPushDiff) { return '' } - if (index > 4 && bPushDiff && !['dPieceDefectBQty', 'dPieceDefectAQty'].includes(config?.sName)) { + if (index > 4 && bPushDiff && !['dPieceDefectBQty', 'dPieceDefectAQty', 'dTotalAdjust'].includes(config?.sName)) { return '' } if (config?.sName?.endsWith("Qty")) { diff --git a/src/mes/productionExec/productionExecMain/index.js b/src/mes/productionExec/productionExecMain/index.js index 9741f0d..d04d3c9 100644 --- a/src/mes/productionExec/productionExecMain/index.js +++ b/src/mes/productionExec/productionExecMain/index.js @@ -559,9 +559,7 @@ const ProductionExecContentByType = props => { !deviceTargetInfoData[0]?.sStatus ) return; - const sStatusNameValue = deviceTargetInfoData[0]?.sStatus?.includes( - "adjustment" - ) + const sStatusNameValue = deviceTargetInfoData[0]?.dAdjustOrRun === 0 ? 0 : 1;