Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,9 @@ table 5407 "Prod. Order Component"
begin
UpdateExpectedQuantity();

if IsTemporary() then
exit;

ProdOrderLine.Get(Status, "Prod. Order No.", "Prod. Order Line No.");

IsHandled := false;
Expand Down Expand Up @@ -1286,7 +1289,13 @@ table 5407 "Prod. Order Component"
ProdOrderLine: Record "Prod. Order Line";
ProdOrderRtngLine: Record "Prod. Order Routing Line";
NeededQty: Decimal;
IsHandled: Boolean;
begin
IsHandled := IsTemporary();
OnBeforeGetProdOrderNeeds(Rec, ProdOrderLine, IsHandled);
if IsHandled then
exit;

ProdOrderLine.Get(Status, "Prod. Order No.", "Prod. Order Line No.");

if "Due Date" = 0D then begin
Expand Down Expand Up @@ -1522,7 +1531,7 @@ table 5407 "Prod. Order Component"
ProdOrderLine: Record "Prod. Order Line";
IsHandled: Boolean;
begin
IsHandled := false;
IsHandled := IsTemporary();
OnBeforeCreateDim(Rec, DefaultDimSource, CurrFieldNo, IsHandled);
if IsHandled then
exit;
Expand Down Expand Up @@ -1747,10 +1756,16 @@ table 5407 "Prod. Order Component"
var
ProdOrderLine: Record "Prod. Order Line";
WMSManagement: Codeunit "WMS Management";
IsHandled: Boolean;
begin
OnBeforeGetDefaultConsumptionBin(Rec, ProdOrderRtngLine, BinCode);
IsHandled := IsTemporary();
OnBeforeGetDefaultConsumptionBin(Rec, ProdOrderRtngLine, BinCode, ProdOrderLine, IsHandled);

ProdOrderLine.Get(Status, "Prod. Order No.", "Prod. Order Line No.");
if IsHandled then
exit;

if not IsTemporary() then
ProdOrderLine.Get(Status, "Prod. Order No.", "Prod. Order Line No.");
if "Location Code" = ProdOrderLine."Location Code" then
if FindFirstRtngLine(ProdOrderRtngLine, ProdOrderLine) then
BinCode := GetBinCodeFromRtngLine(ProdOrderRtngLine);
Expand Down Expand Up @@ -1882,7 +1897,7 @@ table 5407 "Prod. Order Component"
ProdOrderComp2: Record "Prod. Order Component";
OverwriteBinCode, IsHandled : Boolean;
begin
IsHandled := false;
IsHandled := IsTemporary();
OnBeforeUpdateBin(ProdOrderComp, FieldNo, FieldCaption, IsHandled);
if IsHandled then
exit;
Expand Down Expand Up @@ -2194,6 +2209,8 @@ table 5407 "Prod. Order Component"
var
DefaultDimSource: List of [Dictionary of [Integer, Code[20]]];
begin
if IsTemporary() then
exit;
InitDefaultDimensionSources(DefaultDimSource);
CreateDim(DefaultDimSource);
end;
Expand Down Expand Up @@ -2460,7 +2477,7 @@ table 5407 "Prod. Order Component"
end;

[IntegrationEvent(false, false)]
local procedure OnBeforeGetDefaultConsumptionBin(var ProdOrderComponent: Record "Prod. Order Component"; var ProdOrderRoutingLine: Record "Prod. Order Routing Line"; var BinCode: Code[20])
local procedure OnBeforeGetDefaultConsumptionBin(var ProdOrderComponent: Record "Prod. Order Component"; var ProdOrderRoutingLine: Record "Prod. Order Routing Line"; var BinCode: Code[20]; var ProdOrderLine: Record "Prod. Order Line"; var IsHandled: Boolean)
begin
end;

Expand Down Expand Up @@ -2639,5 +2656,9 @@ table 5407 "Prod. Order Component"
local procedure OnBeforeCreateDim(var ProdOrderComponent: Record "Prod. Order Component"; var DefaultDimSource: List of [Dictionary of [Integer, Code[20]]]; CurrentFieldNo: Integer; var IsHandled: Boolean)
begin
end;
}

[IntegrationEvent(false, false)]
local procedure OnBeforeGetProdOrderNeeds(var ProdOrderComponent: Record "Prod. Order Component"; var ProdOrderLine: Record "Prod. Order Line"; var IsHandled: Boolean)
begin
end;
}
Original file line number Diff line number Diff line change
Expand Up @@ -1114,9 +1114,13 @@ table 5409 "Prod. Order Routing Line"

local procedure GetProdOrderLine()
begin
OnBeforeGetProdOrderLine(Rec, ProdOrderLine, ProdOrderLineRead);
if ProdOrderLineRead then
exit;

if Rec.IsTemporary() then
exit;

ProdOrderLine.SetRange(Status, Status);
ProdOrderLine.SetRange("Prod. Order No.", "Prod. Order No.");
ProdOrderLine.SetRange("Routing No.", "Routing No.");
Expand Down Expand Up @@ -1406,6 +1410,9 @@ table 5409 "Prod. Order Routing Line"
if IsHandled then
exit;

if IsTemporary() then
exit;

if "Routing Status" = "Routing Status"::Finished then
FieldError("Routing Status");

Expand Down Expand Up @@ -1824,6 +1831,9 @@ table 5409 "Prod. Order Routing Line"
TempProdOrderRoutingLine: Record "Prod. Order Routing Line" temporary;
ProdOrderRoutingLine: Record "Prod. Order Routing Line";
begin
if Rec.IsTemporary() then
exit;

if SkipUpdateOfCompBinCodes then
exit;

Expand Down Expand Up @@ -2052,6 +2062,30 @@ table 5409 "Prod. Order Routing Line"
exit("Next Operation No." <> '');
end;

internal procedure CheckPreviousAndNextForTemp()
var
TempAffectedRoutingLine: Record "Prod. Order Routing Line" temporary;
PrevOperNo: Code[30];
NextOperNo: Code[30];
begin
PrevOperNo := Rec."Previous Operation No.";
NextOperNo := Rec."Next Operation No.";

TempAffectedRoutingLine.Copy(Rec, true);

if PrevOperNo <> '' then
if TempAffectedRoutingLine.Get(Rec.Status, Rec."Prod. Order No.", Rec."Routing Reference No.", Rec."Routing No.", PrevOperNo) then begin
TempAffectedRoutingLine."Next Operation No." := NextOperNo;
TempAffectedRoutingLine.Modify();
end;

if NextOperNo <> '' then
if TempAffectedRoutingLine.Get(Rec.Status, Rec."Prod. Order No.", Rec."Routing Reference No.", Rec."Routing No.", NextOperNo) then begin
TempAffectedRoutingLine."Previous Operation No." := PrevOperNo;
TempAffectedRoutingLine.Modify();
end;
end;

[IntegrationEvent(false, false)]
local procedure OnAfterCalcStartingEndingDates(var ProdOrderRoutingLine: Record "Prod. Order Routing Line"; var xProdOrderRoutingLine: Record "Prod. Order Routing Line"; var ProdOrderLine: Record "Prod. Order Line"; CallingFieldNo: Integer)
begin
Expand Down Expand Up @@ -2243,5 +2277,9 @@ table 5409 "Prod. Order Routing Line"
local procedure OnCheckPreviousAndNextOnBeforeInsertTempRemainingProdOrderRtngLine(ProdOrderRoutingLine: Record "Prod. Order Routing Line"; var ProdOrderRoutingLineFiltered: Record "Prod. Order Routing Line"; var TempDeletedProdOrderRoutingLine: Record "Prod. Order Routing Line" temporary; var ErrorOnNext: Boolean; var ErrorOnPrevious: Boolean)
begin
end;
}

[IntegrationEvent(false, false)]
local procedure OnBeforeGetProdOrderLine(ProdOrderRoutingLine: Record "Prod. Order Routing Line"; var ProdOrderLine: Record "Prod. Order Line"; var ProdOrderLineRead: Boolean)
begin
end;
}
Original file line number Diff line number Diff line change
Expand Up @@ -245,6 +245,75 @@ page 99000768 "Manufacturing Setup"
}
}
#endif
group(ProductionDefinitionWizard)
{
Caption = 'Production Definition Wizard';

group(BOMRoutingDisplayGroup)
{
Caption = 'BOM/Routing Step Display';

field("Show Rtng BOM Select Both"; Rec."Show Rtng BOM Select Both")
{
ApplicationArea = Manufacturing;
}
field("Show Rtng BOM Select Partial"; Rec."Show Rtng BOM Select Partial")
{
ApplicationArea = Manufacturing;
}
field("Show Rtng BOM Select Nothing"; Rec."Show Rtng BOM Select Nothing")
{
ApplicationArea = Manufacturing;
}
}
group(ProdCompDisplayGroup)
{
Caption = 'Components/Routing Preview Step Display';

field("Show Prod Comp Select Both"; Rec."Show Prod Comp Select Both")
{
ApplicationArea = Manufacturing;
}
field("Show Prod Comp Select Partial"; Rec."Show Prod Comp Select Partial")
{
ApplicationArea = Manufacturing;
}
field("Show Prod Comp Select Nothing"; Rec."Show Prod Comp Select Nothing")
{
ApplicationArea = Manufacturing;
}
}
group(GeneralWizardOptions)
{
Caption = 'General Options';

field("Always Save Modified Versions"; Rec."Always Save Modified Versions")
{
ApplicationArea = Manufacturing;
}
field("Allow Edit UI Selection"; Rec."Allow Edit UI Selection")
{
ApplicationArea = Manufacturing;
}
}
group(WizardDefaults)
{
Caption = 'Defaults';

field("Def. Wiz. Work Center No."; Rec."Def. Wiz. Work Center No.")
{
ApplicationArea = Manufacturing;
}
field("Def. Wiz. Comp Item No."; Rec."Def. Wiz. Comp Item No.")
{
ApplicationArea = Manufacturing;
}
field("Def. Wiz. Flushing Method"; Rec."Def. Wiz. Flushing Method")
{
ApplicationArea = Manufacturing;
}
}
}
}
area(factboxes)
{
Expand Down Expand Up @@ -325,4 +394,13 @@ page 99000768 "Manufacturing Setup"

ManufacturingSetupNotif.ShowPlanningFieldsMoveNotification();
end;
<<<<<<< src/Layers/IT/BaseApp/Manufacturing/Setup/ManufacturingSetup.Page.al
}
||||||| Base: src/Layers/W1/BaseApp/Manufacturing/Setup/ManufacturingSetup.Page.al

}

=======

}
>>>>>>> src/Layers/W1/BaseApp/Manufacturing/Setup/ManufacturingSetup.Page.al
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ using Microsoft.Foundation.Calendar;
#endif
using Microsoft.Foundation.NoSeries;
using Microsoft.Inventory.BOM.Tree;
using Microsoft.Inventory.Item;
using Microsoft.Inventory.Location;
using Microsoft.Inventory.Planning;
#if not CLEAN27
Expand All @@ -19,6 +20,8 @@ using Microsoft.Manufacturing.Capacity;
using Microsoft.Manufacturing.Forecast;
using Microsoft.Manufacturing.MachineCenter;
using Microsoft.Manufacturing.ProductionBOM;
using Microsoft.Manufacturing.Wizard;
using Microsoft.Manufacturing.WorkCenter;
using System.Telemetry;
using System.Utilities;

Expand Down Expand Up @@ -336,6 +339,80 @@ table 99000765 "Manufacturing Setup"
InitValue = "Pick + Manual";
ToolTip = 'Specifies default flushing method assigned to new items. A different flushing method on item cards will override this default.';
}
field(301; "Show Rtng BOM Select Both"; Enum "Prod. Definition Display")
{
Caption = 'Show BOM/Routing (Both Available)';
DataClassification = CustomerContent;
InitValue = Edit;
ToolTip = 'Specifies whether the BOM/Routing selection step is shown when both a BOM and a Routing exist for the item. This setting only applies in Create Production Order mode. In Define Item Structure mode, the BOM and Routing steps are always shown in Edit mode.';
}
field(302; "Show Rtng BOM Select Partial"; Enum "Prod. Definition Display")
{
Caption = 'Show BOM/Routing (Partially Available)';
DataClassification = CustomerContent;
InitValue = Edit;
ToolTip = 'Specifies whether the BOM/Routing selection step is shown when only one of BOM or Routing exists. This setting only applies in Create Production Order mode. In Define Item Structure mode, the BOM and Routing steps are always shown in Edit mode.';
}
field(303; "Show Rtng BOM Select Nothing"; Enum "Prod. Definition Display")
{
Caption = 'Show BOM/Routing (None Available)';
DataClassification = CustomerContent;
InitValue = Edit;
ToolTip = 'Specifies whether the BOM/Routing selection step is shown when neither a BOM nor a Routing exists. This setting only applies in Create Production Order mode. In Define Item Structure mode, the BOM and Routing steps are always shown in Edit mode.';
}
field(304; "Show Prod Comp Select Both"; Enum "Prod. Definition Display")
{
Caption = 'Show Prod. Components (Both Available)';
DataClassification = CustomerContent;
InitValue = Edit;
ToolTip = 'Specifies whether the components/routing preview steps are shown when both a BOM and a Routing exist. This setting only applies in Create Production Order mode. In Define Item Structure mode, the components and production routing steps are never shown.';
}
field(305; "Show Prod Comp Select Partial"; Enum "Prod. Definition Display")
{
Caption = 'Show Prod. Components (Partially Available)';
DataClassification = CustomerContent;
InitValue = Edit;
ToolTip = 'Specifies whether the components/routing preview steps are shown when only one of BOM or Routing exists. This setting only applies in Create Production Order mode. In Define Item Structure mode, the components and production routing steps are never shown.';
}
field(306; "Show Prod Comp Select Nothing"; Enum "Prod. Definition Display")
{
Caption = 'Show Prod. Components (None Available)';
DataClassification = CustomerContent;
InitValue = Edit;
ToolTip = 'Specifies whether the components/routing preview steps are shown when neither BOM nor Routing exists. This setting only applies in Create Production Order mode. In Define Item Structure mode, the components and production routing steps are never shown.';
}
field(307; "Always Save Modified Versions"; Boolean)
{
Caption = 'Always Save Modified Versions';
DataClassification = CustomerContent;
ToolTip = 'Specifies that newly created BOM/Routing versions are always kept even when the Save option is set to Empty when using the production order creation wizard.';
}
field(308; "Allow Edit UI Selection"; Boolean)
{
Caption = 'Allow Edit UI Selection';
DataClassification = CustomerContent;
ToolTip = 'Specifies that users can override the step visibility settings (Show/Edit/Hide) on the wizard introduction step.';
}
field(309; "Def. Wiz. Work Center No."; Code[20])
{
Caption = 'Default Prod. Wiz. Work Center No.';
DataClassification = CustomerContent;
TableRelation = "Work Center";
ToolTip = 'Specifies the fallback work center to use when creating new routing lines without an explicit work center.';
}
field(310; "Def. Wiz. Comp Item No."; Code[20])
{
Caption = 'Default Prod. Wiz. Component Item No.';
DataClassification = CustomerContent;
TableRelation = Item;
ToolTip = 'Specifies the default item to use when initializing a new BOM from scratch through the production order creation wizard.';
}
field(311; "Def. Wiz. Flushing Method"; Enum "Flushing Method")
{
Caption = 'Default Prod. Wiz. Flushing Method';
DataClassification = CustomerContent;
ToolTip = 'Specifies the default flushing method applied to Production Order Components when creating a new production BOM from scratch through the production order creation wizard. This is only used for temporary BOM creation; existing BOMs retain their original flushing method.';
}
field(5500; "Preset Output Quantity"; Option)
{
Caption = 'Preset Output Quantity';
Expand Down Expand Up @@ -439,4 +516,4 @@ table 99000765 "Manufacturing Setup"
begin
exit(ManufacturingSetupFeatureTelemetryNameLbl);
end;
}
}
Loading