From f8d325f163f1aa7b968a0c9f1ffc03b3c86c00c2 Mon Sep 17 00:00:00 2001
From: xiaoding721 <33130084+xiaoding721@users.noreply.github.com>
Date: 星期一, 30 十二月 2024 12:01:38 +0800
Subject: [PATCH] 修复一些bug
---
_Main/BL/Type_SingleShiftConfig/StaticMethod_Import.qbl | 5 +++--
_Main/BL/Type_DispatchShiftSchedulingInformation/StaticMethod_GenerateDispatchData.qbl | 4 ++--
_Main/BL/EDI/Broker_MP_ExportSingleShiftConfigBroker.qbl | 3 +++
_Main/UI/MacroPlannerWebApp/Component_FormSingleShiftConfig/Component_ListSingleShiftConfig.def | 2 +-
_Main/BL/Type_SingleShiftConfig/Attribute_MaintenanceDeduction.qbl | 8 ++++++++
5 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/_Main/BL/EDI/Broker_MP_ExportSingleShiftConfigBroker.qbl b/_Main/BL/EDI/Broker_MP_ExportSingleShiftConfigBroker.qbl
index 182e9e1..c586fb5 100644
--- a/_Main/BL/EDI/Broker_MP_ExportSingleShiftConfigBroker.qbl
+++ b/_Main/BL/EDI/Broker_MP_ExportSingleShiftConfigBroker.qbl
@@ -14,6 +14,7 @@
TypeIndex: SingleShiftConfigTypeIndex
EDIMLColumn FirstSingleShiftQuantity { Attribute: FirstSingleShiftQuantity ValueType: Real }
EDIMLColumn ID { Attribute: ID ValueType: String }
+ EDIMLColumn MaintenanceDeduction { Attribute: MaintenanceDeduction ValueType: Real }
EDIMLColumn SecondSingleShiftQuantity { Attribute: SecondSingleShiftQuantity ValueType: Real }
EDIMLColumn ShiftName { Attribute: ShiftName ValueType: String }
EDIMLColumn ThirdSingleShiftQuantity { Attribute: ThirdSingleShiftQuantity ValueType: Real }
@@ -28,6 +29,7 @@
OutputTable: SingleShiftConfig
EDIColumnMatch { InputColumn: FirstSingleShiftQuantity OutputColumn: FirstSingleShiftQuantity }
EDIColumnMatch { InputColumn: ID OutputColumn: ID }
+ EDIColumnMatch { InputColumn: MaintenanceDeduction OutputColumn: MaintenanceDeduction }
EDIColumnMatch { InputColumn: SecondSingleShiftQuantity OutputColumn: SecondSingleShiftQuantity }
EDIColumnMatch { InputColumn: ShiftName OutputColumn: ShiftName }
EDIColumnMatch { InputColumn: ThirdSingleShiftQuantity OutputColumn: ThirdSingleShiftQuantity }
@@ -47,6 +49,7 @@
EDIXLSLinkColumn FirstSingleShiftQuantity { ValueType: Real }
EDIXLSLinkColumn SecondSingleShiftQuantity { ValueType: Real }
EDIXLSLinkColumn ThirdSingleShiftQuantity { ValueType: Real }
+ EDIXLSLinkColumn MaintenanceDeduction { ValueType: Real }
]
}
}
diff --git a/_Main/BL/Type_DispatchShiftSchedulingInformation/StaticMethod_GenerateDispatchData.qbl b/_Main/BL/Type_DispatchShiftSchedulingInformation/StaticMethod_GenerateDispatchData.qbl
index e64130f..5ccc782 100644
--- a/_Main/BL/Type_DispatchShiftSchedulingInformation/StaticMethod_GenerateDispatchData.qbl
+++ b/_Main/BL/Type_DispatchShiftSchedulingInformation/StaticMethod_GenerateDispatchData.qbl
@@ -170,7 +170,7 @@
singleShiftConfig := select( unit,SingleShiftConfig,config,config.ShiftName() = "3" );
if( not isnull( singleShiftConfig ) ){
if( line.Tips().LikeUserLocale( "淇濆吇" )){
- singleShiftVolume1 := 0.0;
+ singleShiftVolume1 := singleShiftConfig.FirstSingleShiftQuantity() - singleShiftConfig.MaintenanceDeduction();
singleShiftVolume2 := singleShiftConfig.SecondSingleShiftQuantity();
singleShiftVolume3 := singleShiftConfig.ThirdSingleShiftQuantity();
}else{
@@ -230,7 +230,7 @@
singleShiftConfig := select( unit,SingleShiftConfig,config,config.ShiftName() = line.ShiftName() );
if( not isnull( singleShiftConfig )){
if( line.Tips().LikeUserLocale( "淇濆吇" )){
- singleShiftVolume1 := 0.0;
+ singleShiftVolume1 := singleShiftConfig.FirstSingleShiftQuantity() - singleShiftConfig.MaintenanceDeduction();
singleShiftVolume2 := singleShiftConfig.SecondSingleShiftQuantity();
}else{
singleShiftVolume1 := singleShiftConfig.FirstSingleShiftQuantity();
diff --git a/_Main/BL/Type_SingleShiftConfig/Attribute_MaintenanceDeduction.qbl b/_Main/BL/Type_SingleShiftConfig/Attribute_MaintenanceDeduction.qbl
new file mode 100644
index 0000000..25ab41a
--- /dev/null
+++ b/_Main/BL/Type_SingleShiftConfig/Attribute_MaintenanceDeduction.qbl
@@ -0,0 +1,8 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute MaintenanceDeduction
+{
+ #keys: '3[414996.1.280050054][414996.1.280050053][414996.1.280050055]'
+ Description: '淇濆吇鎵ｉ櫎鏁伴噺'
+ ValueType: Real
+}
diff --git a/_Main/BL/Type_SingleShiftConfig/StaticMethod_Import.qbl b/_Main/BL/Type_SingleShiftConfig/StaticMethod_Import.qbl
index 8f345c5..3a13ff0 100644
--- a/_Main/BL/Type_SingleShiftConfig/StaticMethod_Import.qbl
+++ b/_Main/BL/Type_SingleShiftConfig/StaticMethod_Import.qbl
@@ -33,7 +33,7 @@
firstSingleShiftQuantityCell := select( row, GeneralExcelImportAndExportDataCell, tempGEIAEDC, tempGEIAEDC.GeneralExcelImportAndExportDataColumn().ColumnIndex() = 3 );
secondSingleShiftQuantityCell := select( row, GeneralExcelImportAndExportDataCell, tempGEIAEDC, tempGEIAEDC.GeneralExcelImportAndExportDataColumn().ColumnIndex() = 4 );
thirdSingleShiftQuantityCell := select( row, GeneralExcelImportAndExportDataCell, tempGEIAEDC, tempGEIAEDC.GeneralExcelImportAndExportDataColumn().ColumnIndex() = 5 );
-
+ maintenanceDeduction := select( row, GeneralExcelImportAndExportDataCell, tempGEIAEDC, tempGEIAEDC.GeneralExcelImportAndExportDataColumn().ColumnIndex() = 6 );
unitID := guard( unitIDCell.Value(), "" );
if( unitID = "" ){
@@ -48,7 +48,8 @@
ShiftName := guard( shiftNameCell.Value(), "" ),
FirstSingleShiftQuantity := guard( [Real]firstSingleShiftQuantityCell.Value(), 0.0 ),
SecondSingleShiftQuantity := guard( [Real]secondSingleShiftQuantityCell.Value(), 0.0 ),
- ThirdSingleShiftQuantity := guard( [Real]thirdSingleShiftQuantityCell.Value(), 0.0 ) );
+ ThirdSingleShiftQuantity := guard( [Real]thirdSingleShiftQuantityCell.Value(), 0.0 ),
+ MaintenanceDeduction := guard( [Real]maintenanceDeduction.Value(), 0.0 ) );
}else{
error( "鏃犳硶鍦ㄣ��" + macroPlan.MDSMacroPlan().Description() + "銆戝唴鎵惧埌浜х嚎銆�" + unitID + "銆戙��");
}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormSingleShiftConfig/Component_ListSingleShiftConfig.def b/_Main/UI/MacroPlannerWebApp/Component_FormSingleShiftConfig/Component_ListSingleShiftConfig.def
index 1e427fd..8354b0b 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormSingleShiftConfig/Component_ListSingleShiftConfig.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormSingleShiftConfig/Component_ListSingleShiftConfig.def
@@ -28,7 +28,7 @@
]
Properties:
[
- Columns: '[{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"Unit.ID","title":"浜х嚎","subtotals":"","tooltip":"","width":-1,"display":"always","attribute":"Unit.ID"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"ShiftName","title":"鐝鍚嶇О","subtotals":"","tooltip":"","width":-1,"display":"always","editable":false,"attribute":"ShiftName"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"FirstSingleShiftQuantity","title":"鐧界彮","subtotals":"","tooltip":"","width":-1,"display":"always","editable":false,"attribute":"FirstSingleShiftQuantity"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"SecondSingleShiftQuantity","title":"浜岀彮","subtotals":"","tooltip":"","width":-1,"display":"always","editable":false,"attribute":"SecondSingleShiftQuantity"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"ThirdSingleShiftQuantity","title":"涓夌彮","subtotals":"","tooltip":"","width":-1,"display":"always","editable":false,"attribute":"ThirdSingleShiftQuantity"}}]'
+ Columns: '[{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"Unit.ID","title":"浜х嚎","subtotals":"","tooltip":"","width":-1,"display":"always","attribute":"Unit.ID"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"ShiftName","title":"鐝鍚嶇О","subtotals":"","tooltip":"","width":-1,"display":"always","editable":false,"attribute":"ShiftName"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"FirstSingleShiftQuantity","title":"鐧界彮","subtotals":"","tooltip":"","width":-1,"display":"always","editable":false,"attribute":"FirstSingleShiftQuantity"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"SecondSingleShiftQuantity","title":"浜岀彮","subtotals":"","tooltip":"","width":-1,"display":"always","editable":false,"attribute":"SecondSingleShiftQuantity"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"ThirdSingleShiftQuantity","title":"涓夌彮","subtotals":"","tooltip":"","width":-1,"display":"always","editable":false,"attribute":"ThirdSingleShiftQuantity"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"MaintenanceDeduction","title":"淇濆吇鎵ｉ櫎鏁伴噺","subtotals":"","tooltip":"","width":-1,"display":"always","editable":false,"attribute":"MaintenanceDeduction"}}]'
ContextMenu: 'listContextMenuSingleShiftConfig'
Taborder: 2
]
--
Gitblit v1.9.3