From 96cfbae550ceb5c887cc9ec5b1ff990f9d286ea7 Mon Sep 17 00:00:00 2001
From: chenxt <10125295+chen-xintao97@user.noreply.gitee.com>
Date: Wed, 7 Jan 2026 10:57:27 +0800
Subject: [PATCH] 根据状态展示调机状态

---
 src/mes/common/siderInfoComponent/index.js         | 2 +-
 src/mes/productionExec/productionExecMain/index.js | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

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;
 
--
libgit2 0.22.2