Index: APPS/MAG/Inventaris/impl/CycleCountBevestiger.cls.xml
===================================================================
diff -u -r29059 -r33919
--- APPS/MAG/Inventaris/impl/CycleCountBevestiger.cls.xml (.../CycleCountBevestiger.cls.xml) (revision 29059)
+++ APPS/MAG/Inventaris/impl/CycleCountBevestiger.cls.xml (.../CycleCountBevestiger.cls.xml) (revision 33919)
@@ -34,7 +34,7 @@
-PalletID:%String,Product:DOM.PM.Product,Reden:%String,AantalGrootVerpakkingen:%Integer,AantalKleinVerpakkingen:%Integer,AantalStukVerpakkingen:%Integer,PalletInfo:APPS.MAG.UGLYPicking.dto.PalletInfo
+PalletID:%String,Product:DOM.PM.Product,Reden:%String,AantalGrootVerpakkingen:%Integer,AantalKleinVerpakkingen:%Integer,AantalStukVerpakkingen:%Integer,PalletInfo:APPS.MAG.UGLYPicking.dto.PalletInfo,AutoCC:%Boolean=0
-PalletID:%String,Product:DOM.PM.Product,Aantal:%Integer,Reden:%String,Historiek:%String
+PalletID:%String,Product:DOM.PM.Product,Aantal:%Integer,Reden:%String,Historiek:%String,AutoCC:%Boolean=0
Index: WS/MAG/Inventaris/InventarisService.cls.xml
===================================================================
diff -u -r29059 -r33919
--- WS/MAG/Inventaris/InventarisService.cls.xml (.../InventarisService.cls.xml) (revision 29059)
+++ WS/MAG/Inventaris/InventarisService.cls.xml (.../InventarisService.cls.xml) (revision 33919)
@@ -90,9 +90,9 @@
-PalletID:%String,ProductID:%String,Reden:%String,AantalGrootVerpakkingen:%Integer,AantalKleinVerpakkingen:%Integer,AantalStukVerpakkingen:%Integer
+PalletID:%String,ProductID:%String,Reden:%String,AantalGrootVerpakkingen:%Integer,AantalKleinVerpakkingen:%Integer,AantalStukVerpakkingen:%Integer,AutoCC:%Boolean
1
-
Index: APPS/MAG/UGLYPicking/dto/PickingResultaat.cls.xml
===================================================================
diff -u -r29059 -r33919
--- APPS/MAG/UGLYPicking/dto/PickingResultaat.cls.xml (.../PickingResultaat.cls.xml) (revision 29059)
+++ APPS/MAG/UGLYPicking/dto/PickingResultaat.cls.xml (.../PickingResultaat.cls.xml) (revision 33919)
@@ -19,6 +19,10 @@
APPS.MAG.UGLYPicking.dto.PalletInfo
+
+
+%Boolean
+
Index: vhUnitTest/APPS/MAG/Inventaris/InventarisService/BevestigCycleCount/Test.cls.xml
===================================================================
diff -u -r29059 -r33919
--- vhUnitTest/APPS/MAG/Inventaris/InventarisService/BevestigCycleCount/Test.cls.xml (.../Test.cls.xml) (revision 29059)
+++ vhUnitTest/APPS/MAG/Inventaris/InventarisService/BevestigCycleCount/Test.cls.xml (.../Test.cls.xml) (revision 33919)
@@ -19,10 +19,10 @@
Set PalletLocatieMakerDummy = ##class(vhTest.Dummy.APPS.MAG.Inventaris.PalletLocatieMaker).%New()
Set StockWijzigerMock = ##class(vhTest.Mock.DOM.MAG.Inventaris.StockWijziger).%New()
- Do StockWijzigerMock.VerwachtMethodCall("Wijzig", ..PalletIDs.PalletID1, ProductDummy, 801, "Reden", "C/C: Reden").ExactAantalKeer(1)
+ Do StockWijzigerMock.VerwachtMethodCall("Wijzig", ..PalletIDs.PalletID1, ProductDummy, 801, "Reden", "C/C: Reden", 0).ExactAantalKeer(1)
Set CycleCountBevestiger = ##class(APPS.MAG.Inventaris.impl.CycleCountBevestiger).%New(InventarisRepositoryDummy, PalletLocatieMakerDummy, StockWijzigerMock)
- Do CycleCountBevestiger.BevestigCycleCount(..PalletIDs.PalletID1, ProductDummy, "Reden", 0, 80, 1, PalletInfo)
+ Do CycleCountBevestiger.BevestigCycleCount(..PalletIDs.PalletID1, ProductDummy, "Reden", 0, 80, 1, PalletInfo, 0)
Do StockWijzigerMock.Verifieer()
]]>
Index: vhTest/Mock/DOM/MAG/Inventaris/StockWijziger.cls.xml
===================================================================
diff -u -r29059 -r33919
--- vhTest/Mock/DOM/MAG/Inventaris/StockWijziger.cls.xml (.../StockWijziger.cls.xml) (revision 29059)
+++ vhTest/Mock/DOM/MAG/Inventaris/StockWijziger.cls.xml (.../StockWijziger.cls.xml) (revision 33919)
@@ -10,8 +10,8 @@
right
-PalletID:%String,Product:DOM.PM.Product,Aantal:%Integer,Reden:%String,Historiek:%String
-PalletID:%String,Product:DOM.PM.Product,Aantal:%Integer,Reden:%String,Historiek:%String,AutoCC:%Boolean
+
Index: APPS/MAG/UGLYPicking/impl/UglyPickingService.cls.xml
===================================================================
diff -u -r33820 -r33919
--- APPS/MAG/UGLYPicking/impl/UglyPickingService.cls.xml (.../UglyPickingService.cls.xml) (revision 33820)
+++ APPS/MAG/UGLYPicking/impl/UglyPickingService.cls.xml (.../UglyPickingService.cls.xml) (revision 33919)
@@ -829,6 +829,7 @@
;frequent cycle counts
If (PalletReservatie.Inventory.ExtraInt7 > 0) {
Set PickingResultaat.CycleCountUitvoeren = 1 ;Heeft de nightly ZetAutoCC() ExtraInt7 gezet? zo ja: C/C triggeren
+ Set PickingResultaat.AutoCC = 1
}
Set PalletReservatie = ""
Index: APPS/MAG/Inventaris/impl/InventarisService.cls.xml
===================================================================
diff -u -r29059 -r33919
--- APPS/MAG/Inventaris/impl/InventarisService.cls.xml (.../InventarisService.cls.xml) (revision 29059)
+++ APPS/MAG/Inventaris/impl/InventarisService.cls.xml (.../InventarisService.cls.xml) (revision 33919)
@@ -688,11 +688,11 @@
-PalletID:%String,ProductID:%String,Reden:%String,AantalGrootVerpakkingen:%Integer,AantalKleinVerpakkingen:%Integer,AantalStukVerpakkingen:%Integer,PalletInfo:APPS.MAG.UGLYPicking.dto.PalletInfo=##class(APPS.MAG.UGLYPicking.dto.PalletInfo).%New()
+PalletID:%String,ProductID:%String,Reden:%String,AantalGrootVerpakkingen:%Integer,AantalKleinVerpakkingen:%Integer,AantalStukVerpakkingen:%Integer,PalletInfo:APPS.MAG.UGLYPicking.dto.PalletInfo=##class(APPS.MAG.UGLYPicking.dto.PalletInfo).%New(),AutoCC:%Boolean=0
Index: BL/MB/UGLYPicking/Opslag.cls.xml
===================================================================
diff -u -r29059 -r33919
--- BL/MB/UGLYPicking/Opslag.cls.xml (.../Opslag.cls.xml) (revision 29059)
+++ BL/MB/UGLYPicking/Opslag.cls.xml (.../Opslag.cls.xml) (revision 33919)
@@ -525,7 +525,7 @@
1
-LocID:%String,Locatie:%List,Sectie:%String,Product:%String,CCQty:%Integer,Reden:%String="",UserID:%String="",HistoryRemark:%String=""
+LocID:%String,Locatie:%List,Sectie:%String,Product:%String,CCQty:%Integer,Reden:%String="",UserID:%String="",HistoryRemark:%String="",AutoCC:%Library.Boolean=0
cache
0
%String
@@ -552,7 +552,7 @@
//----------------------------------------------------------------------------------------------
//COMMIT PICKING
//----------------------------------------------------------------------------------------------
- Set tmpStatus = ..FChangeStock(LocID, Locatie, Sectie, Product, CCQty, 0, HistoryRemark, SQLGCWrapper, Reden, UserID)
+ Set tmpStatus = ..FChangeStock(LocID, Locatie, Sectie, Product, CCQty, 0, HistoryRemark, SQLGCWrapper, Reden, UserID, AutoCC)
$$$WriteToLog("ChangeStock: "_$$LCVT^vhLib(tmpStatus))
//----------------------------------------------------------------------------------------------
@@ -656,6 +656,7 @@
$$$WriteToLog("- Sectie: "_Sectie_", Product: "_Product)
$$$WriteToLog("- ChangeToQty: "_CCQty_", Reden: "_Reden)
$$$WriteToLog("- UserID: "_UserID_", Remark: "_HistoryRemark_", with reservation: "_WithReservation)
+ $$$WriteToLog("- AutoCC: "_AutoCC)
//RETURN VALUES:
//ERRORS
@@ -682,6 +683,7 @@
Set C("REDEN") = Reden
Set C("USER") = UserID
Set C("VOLGNR") = $random(10000) ;Doesn't matter, wo enkel gebruikt bij error
+ Set C("AUTOCC")=AutoCC
New InventoryID
Set InventoryID = $list(tmpStatus, 2)
Index: DOM/MAG/Inventaris/StockWijziger.cls.xml
===================================================================
diff -u -r29059 -r33919
--- DOM/MAG/Inventaris/StockWijziger.cls.xml (.../StockWijziger.cls.xml) (revision 29059)
+++ DOM/MAG/Inventaris/StockWijziger.cls.xml (.../StockWijziger.cls.xml) (revision 33919)
@@ -6,7 +6,7 @@
1
-PalletID:%String,Product:DOM.PM.Product,Aantal:%Integer,Reden:%String,Historiek:%String
+PalletID:%String,Product:DOM.PM.Product,Aantal:%Integer,Reden:%String,Historiek:%String,AutoCC:%Boolean