Merge branch 'dev' of http://47.101.211.7:10101/r/VWED into dev
已重命名5个文件
已修改12个文件
已添加3个文件
| | |
| | | Quintiq file version 2.0 |
| | | #parent: #root |
| | | StaticMethod Generate ( |
| | | MacroPlan macroplan, |
| | | InterfaceDataset interfaceDataset, |
| | | Date date, |
| | | String partno, |
| | |
| | | if( isnull( iid ) ){ |
| | | iid := interfaceDataset.InventoryInterfaceData( relnew, Date := date, PartNumber := partno ); |
| | | } |
| | | product := selectobject( macroplan, Product_MP, product, product.ID() = partno ); |
| | | if( not isnull( product ) and exists( product.GetAllParent(), Elements, proparent, proparent.ID() = 'PL' ) ){ |
| | | quantitiy := floor( [Real]quantitiy / 4 ); |
| | | } |
| | | iidl := selectobject( iid, InventoryInterfaceDataDetail, detail, detail.InventoryPoint() = inventory and detail.Fac() = fac ); |
| | | if( isnull( iidl ) ){ |
| | | iid.InventoryInterfaceDataDetail( relnew, Date := date, PartNumber := partno, InventoryPoint := inventory, Fac := fac, Quantity := quantitiy ); |
| | | }else{ |
| | | iidl.Quantity( ); |
| | | } |
| | | *] |
| | | } |
| | |
| | | // è·åæå®æ¥æåºåæ¥å£æ°æ® |
| | | //å卿ºæååºå |
| | | traverse( inventorys, Elements, inventory ){ |
| | | InventoryInterfaceData::Generate( owner, inventory.DDay(), inventory.FourCode(), inventory.BIPlace(), inventory.Fac(), [Number]inventory.Total() ); |
| | | InventoryInterfaceData::Generate( macroplan, owner, inventory.DDay(), inventory.FourCode(), inventory.BIPlace(), inventory.Fac(), [Number]inventory.Total() ); |
| | | } |
| | | *] |
| | | } |
| | |
| | | Quintiq file version 2.0 |
| | | #parent: #root |
| | | StaticMethod SynchronizeInventory ( |
| | | const MacroPlan macroPlan, |
| | | MacroPlan macroPlan, |
| | | InterfaceDataset interfaceDataset |
| | | ) |
| | | { |
| | |
| | | if( inventory.Fac() = 'DL' and inventory.Lgort() = 'All' ){ |
| | | inventoryname := inventory.LineType(); |
| | | } |
| | | InventoryInterfaceData::Generate( interfaceDataset, inventory.DDay(), inventory.MaterialNo(), inventoryname, inventory.Fac(), [Number]inventory.Total() ); |
| | | InventoryInterfaceData::Generate( macroPlan, interfaceDataset, inventory.DDay(), inventory.MaterialNo(), inventoryname, inventory.Fac(), [Number]inventory.Total() ); |
| | | } |
| | | //å卿ºæååºå |
| | | traverse( loginfo, FinishedEngineInventory, inventory ){ |
| | | InventoryInterfaceData::Generate( interfaceDataset, inventory.DDay(), inventory.FourCode(), inventory.BIPlace(), inventory.Fac(), [Number]inventory.Total() ); |
| | | InventoryInterfaceData::Generate( macroPlan, interfaceDataset, inventory.DDay(), inventory.FourCode(), inventory.BIPlace(), inventory.Fac(), [Number]inventory.Total() ); |
| | | } |
| | | } |
| | | *] |
| | |
| | | if( inventory.Fac() = 'DL' and inventory.Lgort() = 'All' ){ |
| | | inventoryname := inventory.LineType(); |
| | | } |
| | | InventoryInterfaceData::Generate( owner, inventory.DDay(), inventory.MaterialNo(), inventoryname, inventory.Fac(), [Number]inventory.Total() ); |
| | | options := DatasetFindOptions::Construct( 'MacroPlan' ).IncludeOffline( true ); //to load we must search offline datasets. |
| | | mdskey := DatasetController::FindUnique( options ); |
| | | |
| | | MDSMacroPlan::Root( mdskey ) -> InventoryInterfaceData::Generate( owner, inventory.DDay(), inventory.MaterialNo(), inventoryname, inventory.Fac(), [Number]inventory.Total() ); |
| | | // sadatalist.Add( sadata ); |
| | | } |
| | | } |
¶Ô±ÈÐÂÎļþ |
| | |
| | | Quintiq file version 2.0 |
| | | #parent: #root |
| | | Attribute Note |
| | | { |
| | | #keys: '3[413988.1.211533432][413988.1.211533431][413988.1.211533433]' |
| | | Description: '夿³¨' |
| | | ValueType: String |
| | | } |
¶Ô±ÈÐÂÎļþ |
| | |
| | | Quintiq file version 2.0 |
| | | #parent: #root |
| | | Attribute Note |
| | | { |
| | | #keys: '3[413988.1.211533287][413988.1.211533286][413988.1.211533288]' |
| | | Description: '夿³¨' |
| | | ValueType: String |
| | | } |
| | |
| | | allProductionLines := selectuniquevalues( newNOPT, NewOfflinePlanRow, tempNOPR, true, tempNOPR.ProductionLine() ); |
| | | |
| | | traverse ( allProductionLines, Elements, pl |
| | | // , pl = "CC MoMo" |
| | | // , pl = "CC ZKG" |
| | | ) |
| | | { |
| | | // ä¸çº¿è®¡åå½å产线ä¸çè¡ |
| | |
| | | preNOPCell := null( NewOfflinePlanCell ); |
| | | |
| | | traverse ( newNOPT, NewOfflinePlanColumn, nopc |
| | | // , nopc.StartDate() >= macroPlan.StartOfPlanning().Date() and nopc.StartDate() <= Date::Construct( 2025, 1, 16 ) // æµè¯æ¶å¯ä»¥è¿æ»¤æ¶é´ |
| | | // , nopc.StartDate() >= macroPlan.StartOfPlanning().Date() and nopc.StartDate() <= Date::Construct( 2025, 1, 7 ) // æµè¯æ¶å¯ä»¥è¿æ»¤æ¶é´ |
| | | ) |
| | | { |
| | | for ( i := 1; i < 10; i++ ) { |
| | | nopcell := select( noprs, Elements.NewOfflinePlanCell, tempNOPC, tempNOPC.NewOfflinePlanColumn() = nopc and tempNOPC.OrderNr() = i and tempNOPC.Order() <> "" ); |
| | | |
| | | // æ¢åæå¤±åæ° |
| | | cls := select( macroPlan, ChangeLossSetting, tempCLS, |
| | | cls := select( macroPlan, ChangeLossSetting, tempCLS, |
| | | tempCLS.Unit().ID() = pl and |
| | | tempCLS.ProductFirst().ID() = guard( preNOPCell.NewOfflinePlanRow().ProductID(), "" ) and |
| | | tempCLS.ProductSecond().ID() = guard( nopcell.NewOfflinePlanRow().ProductID(), "" ) and |
| | | tempCLS.StartDate() <= nopc.StartDate() and |
| | |
| | | Alignment: 'Right' |
| | | AttributeKey: '[415754.0.554840209]' |
| | | } |
| | | AttributeRepresentation Note |
| | | { |
| | | Alignment: 'Right' |
| | | AttributeKey: '[413988.1.211533431]' |
| | | Synonym: '夿³¨' |
| | | } |
| | | AttributeRepresentation Order |
| | | { |
| | | Alignment: 'Right' |
| | |
| | | #parent: #root |
| | | TypeRepresentation NewOfflinePlanCell |
| | | { |
| | | AttributeRepresentation Note |
| | | { |
| | | Alignment: 'Right' |
| | | AttributeKey: '[413988.1.211533286]' |
| | | Synonym: '夿³¨' |
| | | } |
| | | AttributeRepresentation Order |
| | | { |
| | | Alignment: 'Right' |
| | |
| | | Taborder: 8 |
| | | ] |
| | | } |
| | | Component bTransferPlan id:bTransferPlan_697 |
| | | { |
| | | #keys: '[413988.1.207593018]' |
| | | BaseType: 'WebButton' |
| | | Properties: |
| | | [ |
| | | Image: 'HAND_TRUCK_BOX' |
| | | Label: 'Transfer plan' |
| | | Taborder: 9 |
| | | ] |
| | | } |
| | | Component bNewOfflinePlan id:bNewOfflinePlan_667 |
| | | { |
| | | #keys: '[413988.1.207593152]' |
| | | BaseType: 'WebButton' |
| | | Properties: |
| | | [ |
| | | Image: 'LIGHTBULB' |
| | | Label: 'Output plan' |
| | | Taborder: 10 |
| | | ] |
| | | } |
| | | Component bNewAssemblyOnlinePlan id:bNewAssemblyOnlinePlan_670 |
| | | { |
| | | #keys: '[413988.1.207593219]' |
| | | BaseType: 'WebButton' |
| | | Properties: |
| | | [ |
| | | Description: 'æ°çä¸çº¿è®¡å' |
| | | Image: 'PALM_TREE' |
| | | Label: 'Filing plan' |
| | | Taborder: 11 |
| | | ] |
| | | } |
| | | Component bPackagingPlan id:bPackagingPlan_368 |
| | | { |
| | | #keys: '[413988.1.207540470]' |
| | | BaseType: 'WebButton' |
| | | Properties: |
| | | [ |
| | | Image: 'SIXPACK_BEER' |
| | | Label: 'Packaging plan' |
| | | Taborder: 12 |
| | | ] |
| | | } |
| | | Component bShippingActualData id:bShippingActualData_957 |
| | | { |
| | | #keys: '[413988.1.207540537]' |
| | | BaseType: 'WebButton' |
| | | Properties: |
| | | [ |
| | | Image: 'TABLE_CONNECTION' |
| | | Label: 'Shipping data' |
| | | Taborder: 13 |
| | | ] |
| | | } |
| | | ] |
| | | } |
| | |
| | | BaseType: 'WebActionBarGroup' |
| | | Children: |
| | | [ |
| | | Component bTransferPlan |
| | | { |
| | | #keys: '[413988.0.1290300652]' |
| | | BaseType: 'WebButton' |
| | | Properties: |
| | | [ |
| | | Image: 'HAND_TRUCK_BOX' |
| | | Label: 'Transfer plan' |
| | | Taborder: 0 |
| | | ] |
| | | } |
| | | Component bBlank |
| | | { |
| | | #keys: '[413988.0.1291640400]' |
| | | BaseType: 'WebButton' |
| | | Properties: |
| | | [ |
| | | Taborder: 7 |
| | | ] |
| | | } |
| | | Component bOfflinePlan |
| | | { |
| | | #keys: '[413988.0.1296872738]' |
| | | BaseType: 'WebButton' |
| | | Properties: |
| | | [ |
| | | Image: 'LIGHTBULB' |
| | | Label: 'Output plan' |
| | | Taborder: 1 |
| | | Visible: false |
| | | Taborder: 2 |
| | | ] |
| | | } |
| | | Component bAssemblyOnlinePlan |
| | |
| | | Description: 'AssemblyOnlinePlan' |
| | | Image: 'PALM_TREE' |
| | | Label: 'Filing plan' |
| | | Taborder: 3 |
| | | Taborder: 1 |
| | | Visible: false |
| | | ] |
| | | } |
| | | Component bPackagingPlan |
| | | Component bOfflinePlan |
| | | { |
| | | #keys: '[413988.0.1291640400]' |
| | | BaseType: 'WebButton' |
| | | Properties: |
| | | [ |
| | | Image: 'SIXPACK_BEER' |
| | | Label: 'Packaging plan' |
| | | Taborder: 5 |
| | | ] |
| | | } |
| | | Component bShippingActualData |
| | | { |
| | | #keys: '[415136.0.905520117]' |
| | | BaseType: 'WebButton' |
| | | Properties: |
| | | [ |
| | | Image: 'TABLE_CONNECTION' |
| | | Label: 'Shipping data' |
| | | Taborder: 6 |
| | | ] |
| | | } |
| | | Component bNewOfflinePlan |
| | | { |
| | | #keys: '[413988.0.1607471411]' |
| | | #keys: '[413988.1.207540403]' |
| | | BaseType: 'WebButton' |
| | | Properties: |
| | | [ |
| | | Image: 'LIGHTBULB' |
| | | Label: 'Output plan' |
| | | Taborder: 2 |
| | | ] |
| | | } |
| | | Component bNewAssemblyOnlinePlan |
| | | { |
| | | #keys: '[413988.0.1701710485]' |
| | | BaseType: 'WebButton' |
| | | Properties: |
| | | [ |
| | | Description: 'æ°çä¸çº¿è®¡å' |
| | | Image: 'PALM_TREE' |
| | | Label: 'Filing plan' |
| | | Taborder: 4 |
| | | Taborder: 0 |
| | | Visible: false |
| | | ] |
| | | } |
| | | ] |
ÎļþÃû´Ó _Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Response_MacroPlanner_abgSecondDevelopmentPlan_bNewAssemblyOnlinePlan_OnClic.def ÐÞ¸Ä |
| | |
| | | Quintiq file version 2.0 |
| | | #parent: abgSecondDevelopmentPlan/bNewAssemblyOnlinePlan |
| | | Response OnClick () id:Response_MacroPlanner_abgSecondDevelopmentPlan_bNewAssemblyOnlinePlan_OnClick |
| | | #parent: ActionBarGroupPlanViews/bNewAssemblyOnlinePlan_670 |
| | | Response OnClick () id:Response_MacroPlanner_abgSecondDevelopmentPlan_bNewAssemblyOnlinePlan_OnClick_171 |
| | | { |
| | | #keys: '[413988.0.1699330508]' |
| | | #keys: '[413988.1.207593218]' |
| | | CanBindMultiple: false |
| | | DefinitionID: 'Responsedef_WebButton_OnClick' |
| | | GroupServerCalls: true |
ÎļþÃû´Ó _Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Response_MacroPlanner_abgSecondDevelopmentPlan_bNewOfflinePlan_OnClick.def ÐÞ¸Ä |
| | |
| | | Quintiq file version 2.0 |
| | | #parent: abgSecondDevelopmentPlan/bNewOfflinePlan |
| | | Response OnClick () id:Response_MacroPlanner_abgSecondDevelopmentPlan_bNewOfflinePlan_OnClick |
| | | #parent: ActionBarGroupPlanViews/bNewOfflinePlan_667 |
| | | Response OnClick () id:Response_MacroPlanner_abgSecondDevelopmentPlan_bNewOfflinePlan_OnClick_653 |
| | | { |
| | | #keys: '[413988.0.1607471572]' |
| | | #keys: '[413988.1.207593151]' |
| | | CanBindMultiple: false |
| | | DefinitionID: 'Responsedef_WebButton_OnClick' |
| | | GroupServerCalls: true |
ÎļþÃû´Ó _Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Response_MacroPlanner_abgSecondDevelopmentPlan_bPackagingPlan_OnClick.def ÐÞ¸Ä |
| | |
| | | Quintiq file version 2.0 |
| | | #parent: abgSecondDevelopmentPlan/bPackagingPlan |
| | | Response OnClick () id:Response_MacroPlanner_abgSecondDevelopmentPlan_bPackagingPlan_OnClick |
| | | #parent: ActionBarGroupPlanViews/bPackagingPlan_368 |
| | | Response OnClick () id:Response_MacroPlanner_abgSecondDevelopmentPlan_bPackagingPlan_OnClick_832 |
| | | { |
| | | #keys: '[413988.0.1400700759]' |
| | | #keys: '[413988.1.207540469]' |
| | | CanBindMultiple: false |
| | | DefinitionID: 'Responsedef_WebButton_OnClick' |
| | | GroupServerCalls: true |
ÎļþÃû´Ó _Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Response_MacroPlanner_abgSecondDevelopmentPlan_bShippingActualData_OnClick.def ÐÞ¸Ä |
| | |
| | | Quintiq file version 2.0 |
| | | #parent: abgSecondDevelopmentPlan/bShippingActualData |
| | | Response OnClick () id:Response_MacroPlanner_abgSecondDevelopmentPlan_bShippingActualData_OnClick |
| | | #parent: ActionBarGroupPlanViews/bShippingActualData_957 |
| | | Response OnClick () id:Response_MacroPlanner_abgSecondDevelopmentPlan_bShippingActualData_OnClick_778 |
| | | { |
| | | #keys: '[415136.0.905520217]' |
| | | #keys: '[413988.1.207540536]' |
| | | CanBindMultiple: false |
| | | DefinitionID: 'Responsedef_WebButton_OnClick' |
| | | QuillAction |
ÎļþÃû´Ó _Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Response_MacroPlanner_abgSecondDevelopmentPlan_bTransferPlan_OnClick.def ÐÞ¸Ä |
| | |
| | | Quintiq file version 2.0 |
| | | #parent: abgSecondDevelopmentPlan/bTransferPlan |
| | | Response OnClick () id:Response_MacroPlanner_abgSecondDevelopmentPlan_bTransferPlan_OnClick |
| | | #parent: ActionBarGroupPlanViews/bTransferPlan_697 |
| | | Response OnClick () id:Response_MacroPlanner_abgSecondDevelopmentPlan_bTransferPlan_OnClick_100 |
| | | { |
| | | #keys: '[413988.0.1290322113]' |
| | | #keys: '[413988.1.207593017]' |
| | | CanBindMultiple: false |
| | | DefinitionID: 'Responsedef_WebButton_OnClick' |
| | | GroupServerCalls: true |
| | |
| | | Quintiq file version 2.0 |
| | | #parent: abgSecondDevelopmentPlan/bOfflinePlan |
| | | Response OnClick () id:Response_MacroPlanner_abgSecondDevelopmentPlan_bOfflinePlan_OnClick |
| | | Response OnClick () id:Response_MacroPlanner_ActionBarGroupPlanViews_bOfflinePlan_OnClick |
| | | { |
| | | #keys: '[413988.0.1296872869]' |
| | | #keys: '[413988.1.207540402]' |
| | | CanBindMultiple: false |
| | | DefinitionID: 'Responsedef_WebButton_OnClick' |
| | | GroupServerCalls: true |
| | |
| | | ] |
| | | Properties: |
| | | [ |
| | | Attributes: 'Quantity;Order' |
| | | Attributes: 'Quantity;Order;Note' |
| | | Column: 'NewAssemblyOnlinePlanColumn' |
| | | Row: 'NewAssemblyOnlinePlanRow' |
| | | Taborder: 0 |
| | |
| | | ] |
| | | Properties: |
| | | [ |
| | | Attributes: 'TotalQuantity;ShiftPatternName;ShiftPatternStart;ShiftPatternEnd' |
| | | Attributes: 'TotalQuantity;ShiftPatternName;ShiftPatternStart;ShiftPatternEnd;Note' |
| | | Column: 'NewOfflinePlanColumn' |
| | | Row: 'NewOfflinePlanRow' |
| | | Taborder: 0 |
| | |
| | | AllowMultipleAttributes: true |
| | | Columns: 'MatrixEditorColumns473' |
| | | ContextMenu: 'matrixeditorContextMenu267' |
| | | Editable: false |
| | | Rows: 'MatrixEditorRows569' |
| | | Taborder: 0 |
| | | ] |
¶Ô±ÈÐÂÎļþ |
| | |
| | | Quintiq file version 2.0 |
| | | #parent: MatrixEditor583 |
| | | Response OnCheckEditability () id:Response_MatrixEditor583_OnCheckEditability |
| | | { |
| | | #keys: '[413988.1.216511947]' |
| | | CanBindMultiple: false |
| | | DefinitionID: 'Responsedef_WebMatrixEditor_OnCheckEditability' |
| | | QuillAction |
| | | { |
| | | Body: |
| | | [* |
| | | feedback := "ä¸è½ç¼è¾"; |
| | | |
| | | cond := focusedattribute = "Note"; |
| | | |
| | | editinfo.CanEdit( cond ); |
| | | editinfo.UserHint( feedback ); |
| | | *] |
| | | GroupServerCalls: false |
| | | } |
| | | } |