Commit 96cfbae550ceb5c887cc9ec5b1ff990f9d286ea7
1 parent
397a40fe
根据状态展示调机状态
Showing
2 changed files
with
2 additions
and
4 deletions
src/mes/common/siderInfoComponent/index.js
| ... | ... | @@ -651,7 +651,7 @@ const DeviceTargetInfoComponent = () => { |
| 651 | 651 | if (index > 4 && !bPushDiff) { |
| 652 | 652 | return '' |
| 653 | 653 | } |
| 654 | - if (index > 4 && bPushDiff && !['dPieceDefectBQty', 'dPieceDefectAQty'].includes(config?.sName)) { | |
| 654 | + if (index > 4 && bPushDiff && !['dPieceDefectBQty', 'dPieceDefectAQty', 'dTotalAdjust'].includes(config?.sName)) { | |
| 655 | 655 | return '' |
| 656 | 656 | } |
| 657 | 657 | if (config?.sName?.endsWith("Qty")) { | ... | ... |
src/mes/productionExec/productionExecMain/index.js
| ... | ... | @@ -559,9 +559,7 @@ const ProductionExecContentByType = props => { |
| 559 | 559 | !deviceTargetInfoData[0]?.sStatus |
| 560 | 560 | ) |
| 561 | 561 | return; |
| 562 | - const sStatusNameValue = deviceTargetInfoData[0]?.sStatus?.includes( | |
| 563 | - "adjustment" | |
| 564 | - ) | |
| 562 | + const sStatusNameValue = deviceTargetInfoData[0]?.dAdjustOrRun === 0 | |
| 565 | 563 | ? 0 |
| 566 | 564 | : 1; |
| 567 | 565 | ... | ... |