chr
2024-10-09 1f645778ae80a3a8801b8bb4d0fcf8feb244ad43
PdmSwPlugin.Common/Entity/Pdm/PdmBom.cs
@@ -271,10 +271,14 @@
                if (lost) return false;
                // 不在物料明细表中不审核
                if (ExcludeFromBOM) return false;
                // 模组不审核
                if (produceWay == "模组") return false;
                // 待审核的不冲突提交
                if (drawStatus == "submitted" || drawStatus == "resubmitted") return false;
                if (IsHistoryData)
                {
                    // 历史图纸只审核一致性不通过的
                    return _drawInfo.checkRuleResult == 2;
                    // 历史图纸只审核一致性不通过的 和被驳回的
                    return _drawInfo.checkRuleResult == 2 || drawStatus == "rejected";
                }
                else
                {
@@ -294,9 +298,16 @@
        {
            if (produceWay == "模组") return null;
            if (ExcludeFromBOM) return null;
            if (IsHistoryData && localDocChanged)
            if (IsHistoryData)
            {
                return $"历史图纸【{partModel}】变更后未重新审核";
                if (localDocChanged)
                {
                    return $"历史图纸【{partModel}】变更后未重新审核";
                }
                else if (drawStatus == "rejected" || drawStatus == "submitted" || drawStatus == "resubmitted")
                {
                    return $"历史图纸【{partModel}】未通过审核";
                }
            }
            if (!IsHistoryData)
            {