Index: UI/MB/UGLYPicking/dlgReceptieScanNadien.cls.xml =================================================================== diff -u --- UI/MB/UGLYPicking/dlgReceptieScanNadien.cls.xml (revision 0) +++ UI/MB/UGLYPicking/dlgReceptieScanNadien.cls.xml (revision 5093) @@ -0,0 +1,418 @@ + + + +serial +%Library.TMFormClass +0 + + +%String +04020101 + + + +%Library.TMForm + + + +%TMLabel + + + +%TMButton + + + +%TMButton + + + +%TMLabel + + + +%TMEdit + + + +%String + + + +%Integer + + + + + + +%String + + + +%String + + + +%String + + + +initvalue:%String +cache +0 +%Status +document +literal + + + + +RGID:%String,VolgNr:%String,lbTLNrs,UserID:%String,LocatieID:%String,PalletID:%String + + + + +%TMLabel + + + +%TMLabel + + + +cache +0 +document +literal + + + + +%TMEdit + + + +cache +0 +document +literal + + + + +initvalue:%String +cache +0 +MApplication +document +literal + + + + +initvalue:%String +cache +0 +%Status +document +literal + + + + +Args:%String +cache +0 +document +literal + + + + +Args:%String +cache +0 +document +literal + + + + +LocatieID:%String +0 + + + + +%Library.CacheSerialState + +"%Library.TMFormClass" + +Address + + +Form + + +Label1 + + +Label2 + + +btnBevestig + + +btnTransit + + +lblPallet + + +txtLocatieID + + +txtPalletID + + +LocatieID + + +PalletID + + +RGID + + +UserID + + +VolgNr + + +lbTLNrs + + +Label3 + + + + + Index: UI/MB/UGLYPicking/dlgReceptie.cls.xml =================================================================== diff -u -r1074 -r5093 --- UI/MB/UGLYPicking/dlgReceptie.cls.xml (.../dlgReceptie.cls.xml) (revision 1074) +++ UI/MB/UGLYPicking/dlgReceptie.cls.xml (.../dlgReceptie.cls.xml) (revision 5093) @@ -33,6 +33,11 @@ %TMLabel + +%Boolean +0 + + %Library.Boolean 0 @@ -552,35 +557,53 @@ Do $$$cmReceptie.RemoveZeroQtyDoneLines(..RGID,..VolgNr) ;Check of er gegevens in de buffer zitten... - If $$$cmReceptie.IsBufferEmpty(..RGID,..VolgNr) Do - . New Msg - . If ($G(^UPRCP("V",..RGID,..VolgNr)) = 1) Do - . . Set Msg="Alle gescande items zijn doorgestuurd!"_$C(13,10,13,10)_"Verwijderen uit het systeem?" - . Else Do - . . Set Msg="De huidige buffer bevat geen producten!"_$C(13,10,13,10)_"Verwijderen uit het systeem?" - . If $$pdaMsgBox^vhVisual(..Form.Caption,Msg,$$$MBICONQUESTION,1)=$$$mrOk Do - .. Do $$$cmReceptie.RemoveBuffer(..RGID,..VolgNr) - Else Do - . Quit:($$$cmReceptie.IsBufferClosed(..RGID,..VolgNr)) - . New Msg - . Set Msg="Wenst u de huidige lijst af te sluiten?" - . If $$pdaMsgBox^vhVisual(..Form.Caption,Msg,$$$MBICONQUESTION,1)=$$$mrOk Do - .. Set MApplication.ScreenCursor=$$$crHourGlass - .. New tmpStatus - .. Set tmpStatus=$$$cmReceptie.CloseAndHandleBuffer(..RGID,..VolgNr) - .. Set MApplication.ScreenCursor=$$$crDefault - .. If $LI(tmpStatus)<0 Do - ... Do pdaMsgBox^vhVisual(..Form.Caption,$LI(tmpStatus,2),$$$MBICONERROR) + If $$$cmReceptie.IsBufferEmpty(..RGID,..VolgNr) + { + New Msg + If ($G(^UPRCP("V",..RGID,..VolgNr)) = 1){ + Set Msg="Alle gescande items zijn doorgestuurd!"_$C(13,10,13,10)_"Verwijderen uit het systeem?" + }Else{ + Set Msg="De huidige buffer bevat geen producten!"_$C(13,10,13,10)_"Verwijderen uit het systeem?" + } + If $$pdaMsgBox^vhVisual(..Form.Caption,Msg,$$$MBICONQUESTION,1)=$$$mrOk { + Do $$$cmReceptie.RemoveBuffer(..RGID,..VolgNr) + } + } Else + { + Quit:($$$cmReceptie.IsBufferClosed(..RGID,..VolgNr)) + New Msg + Set Msg="Wenst u de huidige lijst af te sluiten?" + If $$pdaMsgBox^vhVisual(..Form.Caption,Msg,$$$MBICONQUESTION,1)=$$$mrOk + { + Set MApplication.ScreenCursor=$$$crHourGlass + New tmpStatus + Set tmpStatus=$$$cmReceptie.CloseAndHandleBuffer(..RGID,..VolgNr) + Set MApplication.ScreenCursor=$$$crDefault + If $LI(tmpStatus)<0 { + Do pdaMsgBox^vhVisual(..Form.Caption,$LI(tmpStatus,2),$$$MBICONERROR) + } + If (..LocatieScanNadien){ + New lbTLNrs + Set lbTLNrs=..GetToeleveringViaLastSel(1) + + New RForm + Set RForm=##class(UI.MB.UGLYPicking.dlgReceptieScanNadien).%New($LB(%this.Form.Address,0)) + Do RForm.Init(..RGID,..VolgNr,lbTLNrs,..UserID,..txtLocatie.Text,..txtPalletID.Text) + Do RForm.Form.ShowModal() + } + } + } ;Unlock stuff... - If '$$$cmReceptie.UnLockBuffer(..RGID,..VolgNr) Do - . Do pdaMsgBox^vhVisual(..Form.Caption,"Kan buffer '"_..RGID_"' met VolgNr '"_..VolgNr_"' niet vrijgeven.",$$$MBICONERROR) + If '$$$cmReceptie.UnLockBuffer(..RGID,..VolgNr) { + Do pdaMsgBox^vhVisual(..Form.Caption,"Kan buffer '"_..RGID_"' met VolgNr '"_..VolgNr_"' niet vrijgeven.",$$$MBICONERROR) + } ;Tijdelijke workaround voor bug in TListView Set Action=$$$caFree Set MApplication.OnActivate="" - + ;End of user code s Args=$lb(Sender,Action) q @@ -606,7 +629,7 @@ Do ..txtDossier.SetFocus() Set ..txtDossier.SelText=Key - Set:('..LocatieVast) ..txtLocatie.Text="" + Set:('(..LocatieVast||..LocatieScanNadien)) ..txtLocatie.Text="" Set:('..PalletVast) ..txtPalletID.Text="" ;End of user code @@ -676,7 +699,7 @@ Quit:('..dCOMPWRITElvProducts()) 0 Set:('..PalletVast) ..txtPalletID.Text="" - Set:('..LocatieVast) ..txtLocatie.Text="" + Set:('(..LocatieVast || ..LocatieScanNadien)) ..txtLocatie.Text="" Set ..txtDossier.Text="" Do ..txtDossier.SetFocus() @@ -968,15 +991,34 @@ document literal + - If Value Do + +Value:%Boolean +cache +0 +%Library.Status +document +literal + + + + +%Status + @@ -1066,7 +1108,7 @@ $$$UIMakovaBtnClickToLog Set ..Form.ModalResult=$$$mrOk - Do ##class(BL.MB.UGLYPicking.Receptie).ToeleveringIngescand(..RGID,..VolgNr) + Do ##class(BL.MB.UGLYPicking.Receptie).ToeleveringIngescand(..RGID,..VolgNr) ;End of user code s Args=$lb(Sender) @@ -1745,6 +1787,9 @@ ShowUnfinishedOnly + +LocatieScanNadien + Index: UI/MB/UGLYPicking/dlgReceptieSel.cls.xml =================================================================== diff -u -r1074 -r5093 --- UI/MB/UGLYPicking/dlgReceptieSel.cls.xml (.../dlgReceptieSel.cls.xml) (revision 1074) +++ UI/MB/UGLYPicking/dlgReceptieSel.cls.xml (.../dlgReceptieSel.cls.xml) (revision 5093) @@ -5,6 +5,7 @@ UglyPickingCNTs,KeyCodesCNTs,MakovaDrawTextCnts Default %Library.TMFormClass +0 RGID:%String,CheckOnly:%Boolean=0 @@ -361,6 +362,22 @@ ; TabOrder = 1 ; OnClick = txtLocatieVastClick ; end + ; object rdScanNadien: CRadioButton + ; Left = 94 + ; Top = 34 + ; Width = 113 + ; Height = 17 + ; Caption = 'Scan nadien' + ; Font.Charset = DEFAULT_CHARSET + ; Font.Color = clWindowText + ; Font.Height = -13 + ; Font.Name = 'MS Sans Serif' + ; Font.Style = [fsBold] + ; ParentFont = False + ; TabOrder = 3 + ; TabStop = True + ; OnClick = rbLocatieClick + ; end ; end ; object btnCancel: CButton ; Left = 4 @@ -454,6 +471,7 @@ d %this.cbbBuffer.%Close() d %this.btnSelect.%Close() d %this.btnCancel.%Close() + d %this.rdScanNadien.%Close() d %this.txtLocatieVast.%Close() d %this.rbLocatieInTeScannen.%Close() d %this.rbLocatieVast.%Close() @@ -530,7 +548,6 @@ Quit:(..cbbBuffer.Items.GetObjects(SelIndex)=..#ciDetail) ..cbbBuffer.SelectedGetKey() Quit "" - ]]> @@ -564,6 +581,7 @@ s %this.rbLocatieVast=##class(%TMRadioButton).%New($lb(%this.gbLocatie.Address,0)) s %this.rbLocatieInTeScannen=##class(%TMRadioButton).%New($lb(%this.gbLocatie.Address,0)) s %this.txtLocatieVast=##class(%TMEdit).%New($lb(%this.gbLocatie.Address,0)) + s %this.rdScanNadien=##class(%TMRadioButton).%New($lb(%this.gbLocatie.Address,0)) s %this.btnCancel=##class(%TMButton).%New($lb(%this.Form.Address,0)) s %this.btnSelect=##class(%TMButton).%New($lb(%this.Form.Address,0)) s %this.cbbBuffer=##class(UI.Lib.Ctrl.TComboBox).%New($lb(%this.Form.Address,0)) @@ -590,6 +608,8 @@ d %this.rbLocatieInTeScannen.Font.SetMultiProperty($lb("Charset","Color","Height","Name","Style"),$lb($$$DEFAULTCHARSET,$$$clWindowText,-13,"MS Sans Serif",$lb("fsBold"))) d %this.txtLocatieVast.SetMultiProperty($lb("Left","Top","Width","Height","Ctl3D","ParentCtl3D","ParentFont","TabOrder","OnClick"),$lb(14,31,73,22,"False","False","False",1,$lb(%this,"txtLocatieVastClick"))) d %this.txtLocatieVast.Font.SetMultiProperty($lb("Charset","Color","Height","Name","Style"),$lb($$$DEFAULTCHARSET,$$$clGreen,-13,"MS Sans Serif",$lb("fsBold"))) + d %this.rdScanNadien.SetMultiProperty($lb("Left","Top","Width","Height","Caption","ParentFont","TabOrder","TabStop","OnClick"),$lb(94,34,113,17,"Scan nadien","False",3,"True",$lb(%this,"rbLocatieClick"))) + d %this.rdScanNadien.Font.SetMultiProperty($lb("Charset","Color","Height","Name","Style"),$lb($$$DEFAULTCHARSET,$$$clWindowText,-13,"MS Sans Serif",$lb("fsBold"))) d %this.btnCancel.SetMultiProperty($lb("Left","Top","Width","Height","Anchors","Caption","ParentFont","TabOrder","OnClick"),$lb(4,198,75,40,$lb("akLeft","akBottom"),"&ESC","False",3,$lb(%this,"btnCancelClick"))) d %this.btnCancel.Font.SetMultiProperty($lb("Charset","Color","Height","Name","Style"),$lb($$$DEFAULTCHARSET,$$$clWindowText,-11,"MS Sans Serif",$lb("fsBold"))) d %this.btnSelect.SetMultiProperty($lb("Left","Top","Width","Height","Anchors","Caption","ParentFont","TabOrder","Visible","OnClick"),$lb(96,198,131,40,$lb("akLeft","akBottom"),"&SELECT","False",4,"False",$lb(%this,"btnSelectClick"))) @@ -702,11 +722,18 @@ . Set RForm.PalletVast=0 ;Interface: Locatie - If ..rbLocatieVast.Checked="True" Do - . Set RForm.LocatieVast=1 - . Set RForm.txtLocatie.Text=..txtLocatieVast.Text - Else Do - . Set RForm.LocatieVast=0 + If ..rbLocatieVast.Checked="True" { + Set RForm.LocatieVast=1 + Set RForm.LocatieScanNadien=0 + Set RForm.txtLocatie.Text=..txtLocatieVast.Text + }ElseIf ..rdScanNadien.Checked="True" { + Set RForm.LocatieScanNadien=1 + Set RForm.LocatieVast=0 + Set RForm.txtLocatie.Text=..txtLocatieVast.Text + }Else{ + Set RForm.LocatieScanNadien=0 + Set RForm.LocatieVast=0 + } ;Interface AutoAantal Set RForm.AutoPopupAantal=..AutoPopupAantal @@ -813,9 +840,11 @@ ;DEFAULT LOCATIE If DefaultLocatie="V" Do . Set ..rbLocatieVast.Checked="True" + . Set ..rdScanNadien.Checked="False" . Set ..txtLocatieVast.Text=LocatieVast Else If DefaultLocatie="ITS" Do . Set ..rbLocatieInTeScannen.Checked="True" + . Set ..rdScanNadien.Checked="False" ;End of user code s Args=$lb(Sender) @@ -982,6 +1011,10 @@ Else Do . Set ..txtLocatieVast.Visible="False" + If ..rdScanNadien.Checked="True" { + Set ..rbPalletInTeScannen.Checked="True" + } + ;End of user code s Args=$lb(Sender) q @@ -1101,6 +1134,10 @@ 0 + +%TMRadioButton + + %Library.CacheSerialState @@ -1256,6 +1293,12 @@ PalletScanPreamble + +rbNadienInscannen + + +rdScanNadien +