Index: OBJTimpl/WMSOrder/PrintKlantEtiket.cls.xml =================================================================== diff -u -r67729 -r71371 --- OBJTimpl/WMSOrder/PrintKlantEtiket.cls.xml (.../PrintKlantEtiket.cls.xml) (revision 67729) +++ OBJTimpl/WMSOrder/PrintKlantEtiket.cls.xml (.../PrintKlantEtiket.cls.xml) (revision 71371) @@ -44,12 +44,28 @@ + +KlantEtiketRequestMOP:OBJTimpl.WMSOrder.dtoKlantEtiketRequestMOP +%String + + + KlantEtiketRequest:OBJTimpl.WMSOrder.dtoKlantEtiketRequest %String @@ -93,6 +109,17 @@ +ConsNr:%String,VertrekPlaats:%String,LPN:%String,PickerUserId:%String + + + + KlantEtiketRequest:OBJTimpl.WMSOrder.dtoKlantEtiketRequest,PickerUserId:%String="" + + +TECH.DataTransferObject + + +%String + + + +%String + + + +%String + + + + + Index: vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.OBJT.WMSService.txt =================================================================== diff -u -r71034 -r71371 --- vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.OBJT.WMSService.txt (.../WS.OBJT.WMSService.txt) (revision 71034) +++ vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.OBJT.WMSService.txt (.../WS.OBJT.WMSService.txt) (revision 71371) @@ -62,6 +62,56 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -110,6 +160,12 @@ + + + + + + @@ -131,6 +187,10 @@ + + + + @@ -160,6 +220,15 @@ + + + + + + + + + Index: WS/OBJT/WMSService.cls.xml =================================================================== diff -u -r71034 -r71371 --- WS/OBJT/WMSService.cls.xml (.../WMSService.cls.xml) (revision 71034) +++ WS/OBJT/WMSService.cls.xml (.../WMSService.cls.xml) (revision 71371) @@ -77,6 +77,16 @@ ]]> + +KlantEtiketRequestMOP:OBJTimpl.WMSOrder.dtoKlantEtiketRequestMOP +%String +1 + + + LPN:%String,CentralePrinter:%String %String Index: OBJTimpl/WMSOrder/dtoKlantEtiketRequestMOP.cls.xml =================================================================== diff -u --- OBJTimpl/WMSOrder/dtoKlantEtiketRequestMOP.cls.xml (revision 0) +++ OBJTimpl/WMSOrder/dtoKlantEtiketRequestMOP.cls.xml (revision 71371) @@ -0,0 +1,16 @@ + + + +TECH.DataTransferObject + + +%String + + + +OBJTimpl.WMSOrder.dtoKlantEtiketRequestMOPTopLPN + + + + + Index: FLOWBON4.mac.rou =================================================================== diff -u -r67345 -r71371 --- FLOWBON4.mac.rou (.../FLOWBON4.mac.rou) (revision 67345) +++ FLOWBON4.mac.rou (.../FLOWBON4.mac.rou) (revision 71371) @@ -143,11 +143,12 @@ Do:'Extern REFRESH^vhTERMINA() Quit -EXTERN(BONNr,Magazijn,LPN,UserIdPicker) +EXTERN(BONNr,Magazijn,LPN,UserIdPicker,LPNMOP) New Printer Set Printer = "" Set LPN=$Get(LPN) Set UserIdPicker= $Get(UserIdPicker) Set Magazijn = $G(Magazijn) + Set LPNMOP = $Get(LPNMOP) If Magazijn = "" { Set Printer = $$SelectPrinter // indien geen magazijn opgegeven vragen naar printer }ElseIf(Printer = "") { @@ -162,17 +163,18 @@ Do ##class(vhLib.Logger).%New().ErrorMail("EXTERN^FLOWBON4",Bericht) } - do PrintLabel(BONNr,Printer,1,##class(APPS.MAG.UGLYPicking.enu.Magazijn).DisplayToLogical(Magazijn),LPN,UserIdPicker) + do PrintLabel(BONNr,Printer,1,##class(APPS.MAG.UGLYPicking.enu.Magazijn).DisplayToLogical(Magazijn),LPN,UserIdPicker,LPNMOP) Quit -PrintLabel(BONNR,Printer,Aantal,MagazijnID,LPN,UserIdPicker) +PrintLabel(BONNR,Printer,Aantal,MagazijnID,LPN,UserIdPicker,LPNMOP) Set Aantal = $G(Aantal,1) Set LPN = $Get(LPN) Set UserIdPicker=$Get(UserIdPicker) + Set LPNMOP = $Get(LPNMOP) new blLabel Set blLabel=##class(BL.Flow.Levering.Label).Instantiate() Do blLabel.Init(BONNr,,LPN) - Do blLabel.PrintLabelKlantAdres(Printer,Aantal,.MagazijnID,UserIdPicker) + Do blLabel.PrintLabelKlantAdres(Printer,Aantal,.MagazijnID,UserIdPicker,LPNMOP) Quit Index: BL/Flow/Levering/sub/pxKlantPallet.cls.xml =================================================================== diff -u -r70571 -r71371 --- BL/Flow/Levering/sub/pxKlantPallet.cls.xml (.../pxKlantPallet.cls.xml) (revision 70571) +++ BL/Flow/Levering/sub/pxKlantPallet.cls.xml (.../pxKlantPallet.cls.xml) (revision 71371) @@ -85,6 +85,11 @@ + +%String + + + %Status @@ -132,6 +138,7 @@ Write "PalID", $$$TAB Write "MagazijnID", $$$TAB Write "UserIDPicker", $$$TAB + Write "LPNMOP", $$$TAB ]]> Index: OBJTimpl/WMSOrder/dtoKlantEtiketRequestMOPTopLPN.cls.xml =================================================================== diff -u --- OBJTimpl/WMSOrder/dtoKlantEtiketRequestMOPTopLPN.cls.xml (revision 0) +++ OBJTimpl/WMSOrder/dtoKlantEtiketRequestMOPTopLPN.cls.xml (revision 71371) @@ -0,0 +1,20 @@ + + + +TECH.DataTransferObject + + +%String + + + +OBJTimpl.WMSOrder.dtoKlantEtiketRequestMOPSubLPN +list + + + + + + + + Index: BL/Flow/Levering/Label.cls.xml =================================================================== diff -u -r70605 -r71371 --- BL/Flow/Levering/Label.cls.xml (.../Label.cls.xml) (revision 70605) +++ BL/Flow/Levering/Label.cls.xml (.../Label.cls.xml) (revision 71371) @@ -126,7 +126,7 @@ Afdruk van een label voor een klantpallet -Printer:%String="0",Aantal:%Numeric=1,MagazijnID:%String="",UserIdPicker:%String="" +Printer:%String="0",Aantal:%Numeric=1,MagazijnID:%String="",UserIdPicker:%String="",LPNMOP:%String="" %Status