Index: vhUnitTest/APPS/MAG/Inventaris/TestInventarisService.cls.xml =================================================================== diff -u -r1921 -r1924 --- vhUnitTest/APPS/MAG/Inventaris/TestInventarisService.cls.xml (.../TestInventarisService.cls.xml) (revision 1921) +++ vhUnitTest/APPS/MAG/Inventaris/TestInventarisService.cls.xml (.../TestInventarisService.cls.xml) (revision 1924) @@ -23,6 +23,7 @@ Do $$$AssertEquals(ProductOpPallet.ProductID,1000,"Voor product 1000") Do $$$AssertEquals(ProductOpPallet.AantalSecties,1,"Er is 1 sectie op de pallet") Do $$$AssertEquals(ProductOpPallet.MagazijnOmschrijving,"LANG","Langgoed magazijn") + Do $$$AssertFalse(ProductOpPallet.PalletIsBezet,"De pallet is niet bezet") Set AanwezigInMagazijn = ProductOpPallet.AanwezigInMagazijnen.GetAt(1) @@ -49,6 +50,7 @@ Do $$$AssertEquals(ProductOpPallet.ProductID,1000,"Voor product 1000") Do $$$AssertEquals(ProductOpPallet.AantalSecties,1,"Er is 1 sectie op de pallet") Do $$$AssertEquals(ProductOpPallet.MagazijnOmschrijving,"LANG","Langgoed magazijn") + Do $$$AssertFalse(ProductOpPallet.PalletIsBezet,"De pallet is niet bezet") ]]> Index: WS/MAG/Inventaris/InventarisService.cls.xml =================================================================== diff -u -r1921 -r1924 --- WS/MAG/Inventaris/InventarisService.cls.xml (.../InventarisService.cls.xml) (revision 1921) +++ WS/MAG/Inventaris/InventarisService.cls.xml (.../InventarisService.cls.xml) (revision 1924) @@ -36,5 +36,12 @@ + + +PalletID:%String,Uitgang:APPS.MAG.Inventaris.enu.AutoMagazijnUitgang +1 + + Index: vhDeploy/CSC/Deploy20110830x0900.cls.xml =================================================================== diff -u --- vhDeploy/CSC/Deploy20110830x0900.cls.xml (revision 0) +++ vhDeploy/CSC/Deploy20110830x0900.cls.xml (revision 1924) @@ -0,0 +1,14 @@ + + + +1 +svn.Deploy +0 + + +1 + + + + Index: APPS/MAG/InventarisService.cls.xml =================================================================== diff -u -r1921 -r1924 --- APPS/MAG/InventarisService.cls.xml (.../InventarisService.cls.xml) (revision 1921) +++ APPS/MAG/InventarisService.cls.xml (.../InventarisService.cls.xml) (revision 1924) @@ -14,7 +14,8 @@ Set ProductAPI = ##class(DOM.DomeinContext).Instance().GeefProductAPI() Set ResultSet = ##class(%ResultSet).%New() - Do ResultSet.Prepare("SELECT rtrim(product) as ProductID, CAST(qty_pcs AS INT) as Aantal, I.loc_m, L.loc_g, L.loc_x, L.loc_y, (SELECT count(1) FROM EWMS.Inventory WHERE loc_id = I.loc_id) as AantalSecties FROM EWMS.Inventory I JOIN EWMS.Locations L ON I.loc_m = L.loc_m and I.loc_id = L.loc_id WHERE I.loc_id = ? AND I.loc_m < 5") + Do ResultSet.Prepare("SELECT rtrim(product) as ProductID, CAST(qty_pcs AS INT) as Aantal, I.loc_m, L.loc_g, L.loc_x, L.loc_y, (SELECT count(1) FROM EWMS.Inventory WHERE loc_id = I.loc_id) as AantalSecties" + _" FROM EWMS.Inventory I JOIN EWMS.Locations L ON I.loc_m = L.loc_m and I.loc_id = L.loc_id WHERE I.loc_id = ? AND I.loc_m < 5") Do ResultSet.Execute(PalletID) While (ResultSet.Next()) { @@ -38,6 +39,7 @@ { Set ProductOpPallet = ProductOpPalletIterator.Next() Set ProductOpPallet.AanwezigInMagazijnen = ..GeefAanwezigInMagazijnen(ProductOpPallet.ProductID) + Set ProductOpPallet.PalletIsBezet = ##class(BL.MB.UGLYPicking.Opslag).PalletIsBusy(PalletID) } Quit ProductenOpPallet @@ -72,6 +74,14 @@ } Do ResultSet.Close() + /// Busy status achteraf ophalen omdat een resultset in een resultset niet werkt. + Set ProductOpPalletIterator = ##class(TECH.ListIterator).%New(ProductenOpPallet) + While (ProductOpPalletIterator.HasNext()) + { + Set ProductOpPallet = ProductOpPalletIterator.Next() + Set ProductOpPallet.PalletIsBezet = ##class(BL.MB.UGLYPicking.Opslag).PalletIsBusy(ProductOpPallet.LocatieID) + } + Quit ProductenOpPallet ]]> @@ -114,6 +124,36 @@ ]]> + +PalletID:%String,Uitgang:APPS.MAG.Inventaris.enu.AutoMagazijnUitgang + + + ProductID:%Integer 1 Index: APPS/MAG/Inventaris/enu/AutoMagazijnUitgang.cls.xml =================================================================== diff -u --- APPS/MAG/Inventaris/enu/AutoMagazijnUitgang.cls.xml (revision 0) +++ APPS/MAG/Inventaris/enu/AutoMagazijnUitgang.cls.xml (revision 1924) @@ -0,0 +1,27 @@ + + + +datatype +1 +%String +0 + + +;UGLY;TRANSIT + + + +1 +APPS.MAG.Inventaris.enu.AutoMagazijnUitgang + + + + +1 +APPS.MAG.Inventaris.enu.AutoMagazijnUitgang + + + + Index: APPS/MAG/Inventaris/dto/ProductOpPallet.cls.xml =================================================================== diff -u -r1909 -r1924 --- APPS/MAG/Inventaris/dto/ProductOpPallet.cls.xml (.../ProductOpPallet.cls.xml) (revision 1909) +++ APPS/MAG/Inventaris/dto/ProductOpPallet.cls.xml (.../ProductOpPallet.cls.xml) (revision 1924) @@ -33,6 +33,10 @@ %String + +%Boolean + + APPS.MAG.Inventaris.dto.AanwezigInMagazijn list Index: CSC Ugly Picking.prj.xml =================================================================== diff -u -r1921 -r1924 --- CSC Ugly Picking.prj.xml (.../CSC Ugly Picking.prj.xml) (revision 1921) +++ CSC Ugly Picking.prj.xml (.../CSC Ugly Picking.prj.xml) (revision 1924) @@ -1,12 +1,13 @@ - + + @@ -63,6 +64,7 @@ + @@ -111,6 +113,7 @@ +