From e18d66cac7fbf43b0d341ee8976d6550a9a4f1af Mon Sep 17 00:00:00 2001
From: xiaoding721 <33130084+xiaoding721@users.noreply.github.com>
Date: 星期四, 21 十一月 2024 14:11:45 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.101.211.7:10101/r/VWED into dev
---
_Main/Sys/Repr/Global/NewOfflinePlanCell.qrp | 8 ++++++++
_Main/BL/Type_NewOfflinePlanCell/StaticMethod_SynchronizeToNewSupply.qbl | 4 ++--
_Main/Sys/Repr/Global/NewAssemblyOnlinePlanCell.qrp | 8 --------
3 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/_Main/BL/Type_NewOfflinePlanCell/StaticMethod_SynchronizeToNewSupply.qbl b/_Main/BL/Type_NewOfflinePlanCell/StaticMethod_SynchronizeToNewSupply.qbl
index d00ed54..befdd60 100644
--- a/_Main/BL/Type_NewOfflinePlanCell/StaticMethod_SynchronizeToNewSupply.qbl
+++ b/_Main/BL/Type_NewOfflinePlanCell/StaticMethod_SynchronizeToNewSupply.qbl
@@ -21,11 +21,11 @@
o := select( macroPlan, Unit.Operation, tempO, tempO.ID() = cell.NewOfflinePlanRow().OperationID() );
up := select( macroPlan, Unit.UnitPeriod, tempUP, tempUP.UnitID() = cell.NewOfflinePlanRow().ProductionLine() and tempUP.StartDate() = cell.NewOfflinePlanColumn().StartDate() );
if ( not isnull( o ) and not isnull( up ) ) {
- PeriodTaskOperation::Create( o, up, cell.Quantity(), false );
+ PeriodTaskOperation::Create( o, up, cell.Quantity(), true );
}
} else if ( not isnull( pto ) ) {
if ( [Number]cell.Quantity() <> [Number]pto.Quantity() ) {
- pto.Update( cell.Quantity(), false );
+ pto.Update( cell.Quantity(), true );
}
}
diff --git a/_Main/Sys/Repr/Global/NewAssemblyOnlinePlanCell.qrp b/_Main/Sys/Repr/Global/NewAssemblyOnlinePlanCell.qrp
index 59a9871..c8ae0df 100644
--- a/_Main/Sys/Repr/Global/NewAssemblyOnlinePlanCell.qrp
+++ b/_Main/Sys/Repr/Global/NewAssemblyOnlinePlanCell.qrp
@@ -25,14 +25,6 @@
DefaultBackgroundColor: false
InheritConversion: false
}
- DataRepresentation.Conditional
- {
- BackgroundColor: '$FF0066'
- ConditionBody: 'object.Quantity() < 0.0'
- ConversionBody: ''
- DefaultBackgroundColor: false
- InheritConversion: false
- }
]
}
AttributeRepresentation ShiftPatternEnd
diff --git a/_Main/Sys/Repr/Global/NewOfflinePlanCell.qrp b/_Main/Sys/Repr/Global/NewOfflinePlanCell.qrp
index 35f26fa..5dda34e 100644
--- a/_Main/Sys/Repr/Global/NewOfflinePlanCell.qrp
+++ b/_Main/Sys/Repr/Global/NewOfflinePlanCell.qrp
@@ -20,6 +20,14 @@
DefaultBackgroundColor: false
InheritConversion: false
}
+ DataRepresentation.Conditional
+ {
+ BackgroundColor: 'Red'
+ ConditionBody: 'object.Quantity() < 0.0'
+ ConversionBody: ''
+ DefaultBackgroundColor: false
+ InheritConversion: false
+ }
]
}
AttributeRepresentation ShiftPatternEnd
--
Gitblit v1.9.3