Index: CSC Ugly Picking.prj.xml =================================================================== diff -u -r1893 -r1909 --- CSC Ugly Picking.prj.xml (.../CSC Ugly Picking.prj.xml) (revision 1893) +++ CSC Ugly Picking.prj.xml (.../CSC Ugly Picking.prj.xml) (revision 1909) @@ -1,6 +1,6 @@ - + @@ -59,6 +59,8 @@ + + @@ -100,6 +102,8 @@ + + Index: vhUnitTest/APPS/MAG/UGLYPicking/TestUglyPickingService.cls.xml =================================================================== diff -u -r1793 -r1909 --- vhUnitTest/APPS/MAG/UGLYPicking/TestUglyPickingService.cls.xml (.../TestUglyPickingService.cls.xml) (revision 1793) +++ vhUnitTest/APPS/MAG/UGLYPicking/TestUglyPickingService.cls.xml (.../TestUglyPickingService.cls.xml) (revision 1909) @@ -105,7 +105,7 @@ @@ -279,54 +279,6 @@ ]]> - -1 - - - - -1 - - - + + +1 +svn.Deploy +0 + + +1 + + + + Index: APPS/MAG/Inventaris/dto/ProductOpPallet.cls.xml =================================================================== diff -u -r1893 -r1909 --- APPS/MAG/Inventaris/dto/ProductOpPallet.cls.xml (.../ProductOpPallet.cls.xml) (revision 1893) +++ APPS/MAG/Inventaris/dto/ProductOpPallet.cls.xml (.../ProductOpPallet.cls.xml) (revision 1909) @@ -17,6 +17,10 @@ %String + +%String + + %String Index: vhUnitTest/APPS/MAG/MAGProducten.cls.xml =================================================================== diff -u --- vhUnitTest/APPS/MAG/MAGProducten.cls.xml (revision 0) +++ vhUnitTest/APPS/MAG/MAGProducten.cls.xml (revision 1909) @@ -0,0 +1,62 @@ + + + +1 +%RegisteredObject +0 + + +1000 + + + +1001 + + + +1 + + + + +1 + + + + Index: vhUnitTest/APPS/MAG/Inventaris/TestInventarisService.cls.xml =================================================================== diff -u --- vhUnitTest/APPS/MAG/Inventaris/TestInventarisService.cls.xml (revision 0) +++ vhUnitTest/APPS/MAG/Inventaris/TestInventarisService.cls.xml (revision 1909) @@ -0,0 +1,137 @@ + + + + +Do ##class(vhUnitTest.Manager).RunTest("/debug/display=all","APPS.MAG.Inventaris.TestInventarisService") +1 +vhUnitTest.TestCase +0 + + + + + + + + + + +%Status + + + + +%Status + + + + +SQL:%String +%Status + + + + Index: APPS/MAG/InventarisService.cls.xml =================================================================== diff -u -r1893 -r1909 --- APPS/MAG/InventarisService.cls.xml (.../InventarisService.cls.xml) (revision 1893) +++ APPS/MAG/InventarisService.cls.xml (.../InventarisService.cls.xml) (revision 1909) @@ -14,7 +14,7 @@ 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, loc_m, (SELECT count(1) FROM EWMS.Inventory WHERE loc_id = I.loc_id) as AantalSecties FROM EWMS.Inventory I WHERE loc_id = ? AND 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()) { @@ -23,6 +23,7 @@ Set ProductOpPallet.ProductID = ProductID Set ProductOpPallet.Aantal = ResultSet.Data("Aantal") Set ProductOpPallet.PalletID = PalletID + Set ProductOpPallet.LocatieID = ##class(BL.MB.UGLYPicking.General).GetTransLocStr(ResultSet.Data("loc_m"),ResultSet.Get("loc_g"),ResultSet.Get("loc_x"),ResultSet.Get("loc_y")) Set ProductOpPallet.Korttekst = ProductAPI.GeefProduct(ProductID).GeefKorttekst() Set ProductOpPallet.MagazijnOmschrijving = ##class(Prod.Product).GetMagViaOpslagzone(ResultSet.Data("loc_m")) Set ProductOpPallet.AantalSecties = ResultSet.Data("AantalSecties") @@ -52,15 +53,18 @@ Set ProductAPI = ##class(DOM.DomeinContext).Instance().GeefProductAPI() Set ResultSet = ##class(%ResultSet).%New() - Do ResultSet.Prepare("SELECT CAST(qty_pcs AS INT) as Aantal, loc_id As PalletID, loc_m, (SELECT count(1) FROM EWMS.Inventory WHERE loc_id = I.loc_id GROUP BY loc_id) as AantalSecties" - _" FROM EWMS.Inventory I WHERE product = ? AND loc_m < 5") + Do ResultSet.Prepare("SELECT CAST(qty_pcs AS INT) as Aantal, I.loc_id As PalletID, I.loc_m, L.loc_g, L.loc_x, L.loc_y, (SELECT count(1) FROM EWMS.Inventory WHERE loc_id = I.loc_id GROUP BY 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 product = ? AND I.loc_m < 5") Do ResultSet.Execute(ProductID) While (ResultSet.Next()) { Set ProductOpPallet = ##class(APPS.MAG.Inventaris.dto.ProductOpPallet).%New() Set ProductOpPallet.ProductID = ProductID Set ProductOpPallet.Aantal = ResultSet.Data("Aantal") Set ProductOpPallet.PalletID = ResultSet.Data("PalletID") + Set ProductOpPallet.LocatieID = ##class(BL.MB.UGLYPicking.General).GetTransLocStr(ResultSet.Data("loc_m"),ResultSet.Get("loc_g"),ResultSet.Get("loc_x"),ResultSet.Get("loc_y")) Set ProductOpPallet.Korttekst = ProductAPI.GeefProduct(ProductID).GeefKorttekst() Set ProductOpPallet.MagazijnOmschrijving = ##class(Prod.Product).GetMagViaOpslagzone(ResultSet.Data("loc_m")) Set ProductOpPallet.AantalSecties = ResultSet.Data("AantalSecties")