Index: OBJTimpl/WMSOrder/OphalenVoorraadOpLocatie.cls.xml =================================================================== diff -u -r67861 -r68334 --- OBJTimpl/WMSOrder/OphalenVoorraadOpLocatie.cls.xml (.../OphalenVoorraadOpLocatie.cls.xml) (revision 67861) +++ OBJTimpl/WMSOrder/OphalenVoorraadOpLocatie.cls.xml (.../OphalenVoorraadOpLocatie.cls.xml) (revision 68334) @@ -82,23 +82,33 @@ Set OBJTConnect=..GeefSQLConnectie() Set Status="" Set SqlStatement="SELECT " - _" loc.FULLNAME LOCATIONID" - _" , loc.TYPE LOC_TYPE" - _" , wh.NAME WH_NAME" - _" , isnull(wh.DESCRIPTION,wh.NAME) as WH_DESCRIPTION" - _" , inv.ITEM_NAME as ITEMID" - _" , case when lpn like '000000%' then 'sublpn' else LPN end LPN" - _" , inv.DEPARTMENT_NAME" - _" , sum(VALUE) QTYONHAND" - _" , max(inv.DTSUPDATE) DTSMODIFICATION" - _" from dcereport_inventory inv " - _" left join dcereport_locations loc" - _" on inv.location_oid=loc.OID" - _" left join dcereport_warehouses wh " - _" on wh.oid=loc.WAREHOUSE_OID" - _" where type='BIN' and inv.Item_name=?" - _" group by loc.FULLNAME , loc.TYPE , wh.NAME , isnull(wh.DESCRIPTION,wh.NAME),inv.ITEM_NAME, case when lpn like '000000%' then 'sublpn' else LPN end,inv.DEPARTMENT_NAME " - + _" location.FULLNAME LOCATIONID" + _" , 'BIN' as LOC_TYPE" + _" , warehouse.NAME WH_NAME" + _" , isnull(warehouse.DESCRIPTION,warehouse.NAME) as WH_DESCRIPTION" + _" , ITEM.NAME as ITEMID" + _" , case when csitq.NAME like '000000%' then 'sublpn' else csitq.NAME end LPN" + _" , Department.Name as DEPARTMENT_NAME" + _" , sum(storageitemqty.VALUE) QTYONHAND" + _" , max(storageitemqty.DTSUPDATE) DTSMODIFICATION" + _" FROM OBJT_STORAGEITEMQTY storageitemqty WITH (NOLOCK)" + _" LEFT OUTER JOIN OBJT_CONTAINERSTORAGEITEMQTY csitq WITH (NOLOCK) ON storageitemqty.CONTAINERSTORAGEITEMQTYOID = csitq.oid," + _" OBJT_WAREHOUSELOCATION location WITH (NOLOCK)," + _" OBJT_WAREHOUSE warehouse WITH (NOLOCK)" + _" LEFT OUTER JOIN OBJT_RESOURCELINK departmentwarehouselink WITH (NOLOCK) on warehouse.OID = departmentwarehouselink.CHILDOID and departmentwarehouselink.PARENTCLASSNAME = 'dce.bo.resourcemgt.Department'" + _" LEFT OUTER JOIN OBJT_DEPARTMENT department WITH (NOLOCK) on departmentwarehouselink.PARENTOID = department.oid," + _" OBJT_ITEM item WITH (NOLOCK)," + _" OBJT_UOM uom WITH (NOLOCK)" + _" WHERE storageitemqty.DTSVALIDUNTIL is null" + _" AND storageitemqty.UOMOID = uom.OID" + _" AND storageitemqty.WAREHOUSELOCATIONOID = location.OID" + _" AND location.WAREHOUSEOID = warehouse.OID" + _" AND storageitemqty.ITEMOID = item.OID" + _" AND (csitq.CLASSOID IS NULL OR csitq.CLASSOID = 9000000000000095836)" + _" and Item.name=?" + _" and location.BOType=40" + _" and location.FULLNAME <>'SYSTEMLOSTANDFOUND'" + _" group by location.FULLNAME , warehouse.NAME , isnull(warehouse.DESCRIPTION,warehouse.NAME),ITEM.NAME, case when csitq.NAME like '000000%' then 'sublpn' else csitq.NAME end,DEPARTMENT.NAME " try { Do rs.Prepare(SqlStatement,,OBJTConnect) Index: OBJTimpl/WMSOrder/ImporteerVoorraadWijziging.cls.xml =================================================================== diff -u -r67493 -r68334 --- OBJTimpl/WMSOrder/ImporteerVoorraadWijziging.cls.xml (.../ImporteerVoorraadWijziging.cls.xml) (revision 67493) +++ OBJTimpl/WMSOrder/ImporteerVoorraadWijziging.cls.xml (.../ImporteerVoorraadWijziging.cls.xml) (revision 68334) @@ -160,10 +160,10 @@ { Set AantalComp=$P(R,D,2) Set DimUitV=$P($G(^PRBS("BS",PRNr,HFCode,"D")),D,3) - Set AantalWV=$$CV2WV^MRP(HFPRNr,0,VoorraadWijziging*AantalComp,DimUitV) + Set AantalWV=-$$CV2WV^MRP(HFPRNr,0,VoorraadWijziging*AantalComp,DimUitV) Set CifPPL=$$CifPPL^KPRIJS(HFPRNr) - Set R=$$EXTDATE^vhLib.DataTypes(,"DSN")_3_D_AantalWV_D_(CifPPL*AantalWV)_D_1_D_D_D_D_Referentie_D_D_D ; Record voor WV^KPR10 + Set R=$$EXTDATE^vhLib.DataTypes(,"DSN")_4_D_-AantalWV_D_(CifPPL*AantalWV)_D_1_D_D_D_D_Referentie_D_D_D ; Record voor WV^KPR10 Set PR=HFPRNr ;w !,HFPRNr," ",AantalWV Do WV^KPR10 @@ -193,7 +193,27 @@ Quit:..pxVoorraad.ItemId="" "" Set:..pxVoorraad.ItemIdAX?1E1"."3N1"."3N1"."1.3N ..pxVoorraad.ItemId=..pxVoorraad.ItemIdAX ; Indien ItemId is het OBJTItemId, maar in Admin en AX kunnen dit meerdere producten zijn door SOPR. + Set ..pxVoorraad.PRNr=$P($G(^KPR2($TR(..pxVoorraad.ItemId,".")_" ")),"\") + + If ..pxVoorraad.PRNr="" + { + /// Indien het identnummer niet rechtstreeks gekend is dan vertalen via de OBJT mapping + #dim ResultSet as %ResultSet + Set ResultSet=##class(%ResultSet).%New("%DynamicQuery:SQL") + + Set sc=ResultSet.Prepare("select Product from OBJTimpl_PM.OBJTIdentNrMapping where Geldig=1 and OBJTItemID=? ") + + If $$$ISERR(sc) Do DisplayError^%apiOBJ(sc) Quit + Set sc=ResultSet.Execute(..pxVoorraad.ItemId) If $$$ISERR(sc) Do DisplayError^%apiOBJ(sc) Quit + Set it=##class(TECH.ResultSetIterator).%New(ResultSet) + + If it.HasNext() + { + Set ResultSet=it.Next() + Set ..pxVoorraad.PRNr=ResultSet.Data("Product") + } + } ]]> Index: Flow/OrderWMS/Hoofding.cls.xml =================================================================== diff -u -r60142 -r68334 --- Flow/OrderWMS/Hoofding.cls.xml (.../Hoofding.cls.xml) (revision 60142) +++ Flow/OrderWMS/Hoofding.cls.xml (.../Hoofding.cls.xml) (revision 68334) @@ -192,6 +192,14 @@ + +%String +1 + Set {*}=##class(Flow.OrderWMS.Hoofding).OBJTOutboundorderCalc({ConsolidatieNr}) +1 + + + %Library.String @@ -246,6 +254,21 @@ ]]> + +1 +CONSNr:%String + + + + + + + 1 CONSNr:%String Index: EWSTAT.mac.rou =================================================================== diff -u -r67493 -r68334 --- EWSTAT.mac.rou (.../EWSTAT.mac.rou) (revision 67493) +++ EWSTAT.mac.rou (.../EWSTAT.mac.rou) (revision 68334) @@ -70,13 +70,15 @@ .Write $$HEX^vhRtn1("0,0,0,0,0,01,5A,30,30,02,45,3B"),$P(Date,".",2),$P(Date,"."),$P(Date,".",3),$$HEX^vhRtn1("04") ;Datum Write $$HEX^vhRtn1("0,0,0,0,0,01,5A,30,30,02") ; Broadcast naar alle displays Write $$HEX^vhRtn1("41,41") ; Write tot file "A" + ;Write $$HEX^vhRtn1("1B,20") Write $$HEX^vhRtn1("1B,20") ;If SuperSpoed Do ; Superspoed . Write "T"_"[SUPERSPOED] " ; De eerste karakter 'T' wordt niet getoond op het display If $D(^EWREC("P","DISPTXT")) Do ; Vaste tekst - . Write "T"_$G(^EWREC("P","DISPTXT")) ; De eerste karakter 'T' wordt niet getoond op het display + . Write $$HEX^vhRtn1(62),Kleur(3),$G(^EWREC("P","DISPTXT")) + Else If $P($G(Cnt),D,2) Do ;Te verwerken lijnen . Write $$HEX^vhRtn1("15") ; slow speed als er meer tekst is dan op het scherm kan . Set Mag="" @@ -212,7 +214,7 @@ TRANSORD New DatRec,I,Key,Label,Dev Do FETCH(DatVan,DatTot) Quit:'$D(^HULP(%J,"F")) - Set Dev=$$OPEN^vhDEV($$DIRUSER^vhDEV,$$ASKFILE^vhDEV("PICKSTAT.TXT"),"W") + Set Dev=$$OPEN^vhDEV(,"PICKSTAT.TXT","W") Use Dev Set Date="",Count=0 Write "Jaar",$C(9),"Maand",$C(9),"Datum",$C(9),"Dag",$C(9) @@ -374,14 +376,17 @@ .Set R=^ORDW("D",CONSNr) .Quit:$P(R,D,20)'="B" .Set KLNr=$P(R,D),DatBon=+$P(R,D,23) ; Einde consolidatie + .Set Vzw=$$COMPACTVZW($P(R,D,2)) .Set:'DatBon DatBon=+$P(R,D,19) ; Op bon gezet .Set:'DatBon DatBon=+$P(R,D,22) ; Begin picking .Quit:DatBonDatTot Quit .Set ^HULP(%J,"F",DatBon,"K",KLNr)="" .Set LevAdr=$G(^ORDW("D",CONSNr,"A")) - .Set LevAdr=$E(LevAdr,1,50)_KLNr + .Set LevAdr=$E(LevAdr,1,100)_KLNr .Set ^HULP(%J,"F",DatBon,"A",LevAdr)="" + .Set ^HULP(%J,"F",DatBon,"VZWADR",Vzw,LevAdr)="" + .Set ^HULP(%J,"F",DatBon,"VZWBON",Vzw,CONSNr)="" .Kill DatRec .Merge DatRec=^HULP(%J,"F",DatBon,"D") .Set MemMol=$G(DatRec("MOL")) @@ -422,7 +427,7 @@ ..... If $P(R,D,5)<15000000 Set DatRec("SOLED")=$G(DatRec("SOLED"))+1 ; SOL Directe uitvoer ..... Else Do ...... Set DatRec("SOLEP")=$G(DatRec("SOLEP"))+1 ; EWMS pickpost - ...... If $P(R,D,5)<(15800000) Set DatRec("SOLEP1")=$G(DatRec("SOLEP1"))+1 ; Pickpost 1 + ...... If $P(R,D,5)<(16600000) Set DatRec("SOLEP1")=$G(DatRec("SOLEP1"))+1 ; Pickpost 1 ...... Else If $P(R,D,5)<(16990000) Set DatRec("SOLEP2")=$G(DatRec("SOLEP2"))+1 ; Pickpost2 ...... Else Set DatRec("SOLEU")=$G(DatRec("SOLEU"))+1 ; EWMS uglypick ..... Set:IsOrgal DatRec("SOLEO")=$G(DatRec("SOLEO"))+1 ; Dubbeltelling orgalux @@ -445,6 +450,12 @@ .For Set KLNr=$O(^HULP(%J,"F",DatBon,"K",KLNr)) Quit:KLNr="" Set DatRec("KL")=$G(DatRec("KL"))+1 ; Aantal klanten .Set LevAdr="" .For Set LevAdr=$O(^HULP(%J,"F",DatBon,"A",LevAdr)) Quit:LevAdr="" Set DatRec("KLA")=$G(DatRec("KLA"))+1 ; Aantal leveringsadressen + .Set (Vzw,LevAdr)="" + .For Set Vzw=$O(^HULP(%J,"F",DatBon,"VZWADR",Vzw)) Quit:Vzw="" Do + . . For Set LevAdr=$O(^HULP(%J,"F",DatBon,"VZWADR",Vzw,LevAdr)) Quit:LevAdr="" Set DatRec("KLA"_Vzw)=$G(DatRec("KLA"_Vzw))+1 ; Aantal leveringsadressen per verzend wijze + .Set (CONSNr,LevAdr)="" + .For Set Vzw=$O(^HULP(%J,"F",DatBon,"VZWBON",Vzw)) Quit:Vzw="" Do + . . For Set CONSNr=$O(^HULP(%J,"F",DatBon,"VZWBON",Vzw,CONSNr)) Quit:CONSNr="" Set DatRec("BON"_Vzw)=$G(DatRec("BON"_Vzw))+1 ; Aantal leveringsadressen per verzend wijze .Set CONSNr="" .For Set CONSNr=$O(^HULP(%J,"F",DatBon,"P",CONSNr)) Quit:CONSNr="" Do ..Set PRNr="" @@ -454,6 +465,22 @@ .Merge ^HULP(%J,"F",DatBon,"D")=DatRec Quit ; +COMPACTVZW(Vzw) + New CompactVzw + If Vzw?1"OD".E + { + Set CompactVzw="OD" + } + ElseIf Vzw?1"DI1" + { + Set CompactVzw="GLS" + } + Else + { + Set CompactVzw="ANDERE" + } + Quit CompactVzw + PICKLOG(PalId,Datum) Quit @@ -494,29 +521,33 @@ LORDdef ;ProgrLabel;DisplayLabel;TransferLabel LORD1 ;KL ;Klanten;#KL LORD2 ;KLA ;Leveringsadressen;LevAdr -LORD3 ;WBON ;WMS Leveringsbons;Bons WMS -LORD4 ;WOL ; Orderlijnen;OL WMS -LORD5 ;WOLQ ; Status Q,K of E; -LORD6 ;WOLe ; Status e of m; -LORD7 ;WOLK ; Orderlijnen (incl. kind);OLKind -LORD8 ;WOLP ; Zelfde produkt;OLIdemProd -LORD9 ;SOL ; Suborderlijnen;SubOL -LORD10 ;SOLE ; EWMS; -LORD11 ;SOLEP ; Pickpost;SubOLEPick -LORD12 ;SOLEP1; PP1 ;SubOLEPick1 -LORD13 ;SOLEP2; PP2 ;SubOLEPick2 -LORD14 ;SOLED ; Directe uitvoer;SubOLDirUitv -LORD15 ;SOLEU ; Ugly pick;SubOLEUglyPick -LORD16 ;SOLEO ; Orgalux dubbeltelling;SubOLEOrgalux dubtel -LORD17 ;SOLU ; UGLY; -LORD18 ;SOLUH ; Halux ;SubOLHalux -LORD19 ;SOLUL ; Langgoed;SubOLLanggoed -LORD20 ;SOLUO ; Orgalux ;SubOLOrgalux -LORD21 ;SOLUU ; Ugly ;SubOLUgly -LORD22 ;SOLUA ; Tandem ;SubOLTandem -LORD23 ;SOLUK ; Aventos ;SubOLAventos -LORD24 ;MBON ;Manueel leveringsbons;Bons Manueel -LORD25 ;MOL ; Orderlijnen;OL Manueel +LORD3 ;KLAOD ; Leveringsadr OD;Lev OD +LORD4 ;KLAGLS ; Leveringsadr DI1;Lev GLS +LORD5 ;WBON ;WMS Leveringsbons;Bons WMS +LORD6 ;BONOD ; Leveringsbons OD;Bons OD +LORD7 ;BONGLS ; Leveringsbons DI1;Bons GLS +LORD8 ;WOL ; Orderlijnen;OL WMS +LORD9 ;WOLQ ; Status Q,K of E; +LORD10 ;WOLe ; Status e of m; +LORD11 ;WOLK ; Orderlijnen (incl. kind);OLKind +LORD12 ;WOLP ; Zelfde produkt;OLIdemProd +LORD13 ;SOL ; Suborderlijnen;SubOL +LORD14 ;SOLE ; EWMS; +LORD15 ;SOLEP ; Pickpost;SubOLEPick +LORD16 ;SOLEP1; PP1 ;SubOLEPick1 +LORD17 ;SOLEP2; PP2 ;SubOLEPick2 +LORD18 ;SOLED ; Directe uitvoer;SubOLDirUitv +LORD19 ;SOLEU ; Ugly pick;SubOLEUglyPick +LORD20 ;SOLEO ; Orgalux dubbeltelling;SubOLEOrgalux dubtel +LORD21 ;SOLU ; UGLY; +LORD22 ;SOLUH ; Halux ;SubOLHalux +LORD23 ;SOLUL ; Langgoed;SubOLLanggoed +LORD24 ;SOLUO ; Orgalux ;SubOLOrgalux +LORD25 ;SOLUU ; Ugly ;SubOLUgly +LORD26 ;SOLUA ; Tandem ;SubOLTandem +LORD27 ;SOLUK ; Aventos ;SubOLAventos +LORD28 ;MBON ;Manueel leveringsbons;Bons Manueel +LORD29 ;MOL ; Orderlijnen;OL Manueel Lijst New R,CONSNr,DatBon,PRNr,DatRec,KLNr,PRNr Index: OBJTimpl/WMSOrder/dtoPicklijn.cls.xml =================================================================== diff -u -r67716 -r68334 --- OBJTimpl/WMSOrder/dtoPicklijn.cls.xml (.../dtoPicklijn.cls.xml) (revision 67716) +++ OBJTimpl/WMSOrder/dtoPicklijn.cls.xml (.../dtoPicklijn.cls.xml) (revision 68334) @@ -139,7 +139,7 @@ ; Set ..KLNr=..#KardexKlant Set ..KLNaam=..#KardexKlantnaam - Set ..DueOutTime=ProductVoorraad.DueoutTijdstip + Set ..DueOutTime=$zdt(ProductVoorraad.DueoutTijdstip,3) Set ..Verzendwijze=..#KardexVerzendwijze Set ..LevAdresNaam="Kardex" Set ..LevAdresToenaam="NV" Index: EWORDSW.mac.rou =================================================================== diff -u -r67712 -r68334 --- EWORDSW.mac.rou (.../EWORDSW.mac.rou) (revision 67712) +++ EWORDSW.mac.rou (.../EWORDSW.mac.rou) (revision 68334) @@ -411,10 +411,11 @@ Set C("LEVADRTOENM")=$P(AdrRec,D,3) Set C("LEVADRSTR")=$P(AdrRec,D,5) Set C("LEVADRGEM")=$E($P(AdrRec,D,6)_" "_$P(AdrRec,D,7),1,30) - If ";9365;2671;3814;"[(";"_KLNr_";") Do ; klant Haefele en 'New SobelWood' -> 1 order / 1 bon - . Set C("LEVADRTOENM")=C("LEVADRSTR") - . Set C("LEVADRSTR")=C("LEVADRGEM") - . Set C("LEVADRGEM")=$$CommRef(KLNr,CONSNr) + ; PV 04/07/2022 : deze code is niet meer van toepassing omdat de stickers door het EWMS werden afgedrukt in het verre verleden. + ;If ";9365;2671;3814;"[(";"_KLNr_";") Do ; klant Haefele en 'New SobelWood' -> 1 order / 1 bon + ;. Set C("LEVADRTOENM")=C("LEVADRSTR") + ;. Set C("LEVADRSTR")=C("LEVADRGEM") + ;. Set C("LEVADRGEM")=$$CommRef(KLNr,CONSNr) Set Txt="" If $P(ORDRec,D,16)'="" Set Txt=Txt_";Beloofd op "_$P(ORDRec,D,16) Set:Txt'="" C("ORDTEKST")=$E(Txt,2,999) Index: BL/MB/UGLYPicking/VerzendDirectControleur.cls.xml =================================================================== diff -u -r66219 -r68334 --- BL/MB/UGLYPicking/VerzendDirectControleur.cls.xml (.../VerzendDirectControleur.cls.xml) (revision 66219) +++ BL/MB/UGLYPicking/VerzendDirectControleur.cls.xml (.../VerzendDirectControleur.cls.xml) (revision 68334) @@ -234,9 +234,15 @@ ]]> + + + + KLNr:%String,ORDNr:%String -1 Index: OBJTimpl/WMSOrder/ZendPicklijst.cls.xml =================================================================== diff -u -r67716 -r68334 --- OBJTimpl/WMSOrder/ZendPicklijst.cls.xml (.../ZendPicklijst.cls.xml) (revision 67716) +++ OBJTimpl/WMSOrder/ZendPicklijst.cls.xml (.../ZendPicklijst.cls.xml) (revision 68334) @@ -16,7 +16,7 @@ -%Decimal +%String @@ -25,7 +25,7 @@ Set ..Picklijnen=##class(dtoPicklijnen).%New() Set ..HerbevoorradingsNr="HK"_$TR($J($I(^OBJTHerbevoorrading),8,0)," ","0") - Set ..DueoutTijdstip=$zdt($H) + Set ..DueoutTijdstip=$H Quit $$$OK ]]> Index: OBJTimpl/WMSOrder/ImporteerPicking.cls.xml =================================================================== diff -u -r67799 -r68334 --- OBJTimpl/WMSOrder/ImporteerPicking.cls.xml (.../ImporteerPicking.cls.xml) (revision 67799) +++ OBJTimpl/WMSOrder/ImporteerPicking.cls.xml (.../ImporteerPicking.cls.xml) (revision 68334) @@ -186,7 +186,7 @@ #dim FromLoc as %String = ..rsPicking.GetDataByName("FROMLOC") Set:(FromLoc="KardexOPSLAG") FromLoc="Kardex" Set C("SOURCEPALID")=FromLoc - If $Piece(..rsPicking.GetDataByName("TOLOC"),"-",1) = "KLZ.DI1" { + If ##class(TECH.StringUtils).Equals($Piece(..rsPicking.GetDataByName("TOLOC"),"-",1),"KLZ.DI1","KLZ.AFH") { #Dim CodeKegeltje as %String = $Piece(..rsPicking.GetDataByName("TOLOC"),"-",2) Set:($Length(CodeKegeltje)) C("SOURCEPALID")=FromLoc _"-"_ CodeKegeltje } Index: Flow/OrderWMS/Sub.cls.xml =================================================================== diff -u -r29059 -r68334 --- Flow/OrderWMS/Sub.cls.xml (.../Sub.cls.xml) (revision 29059) +++ Flow/OrderWMS/Sub.cls.xml (.../Sub.cls.xml) (revision 68334) @@ -83,7 +83,7 @@ @@ -95,7 +95,7 @@ @@ -121,12 +121,34 @@ SUBOLNr + +%String +1 + Set {*}=##class(Flow.OrderWMS.Sub).OBJTOutboundorderLijnCalc({ID}) +1 + + + + +1 +ID:%String + + + + + + + %Library.CacheSQLStorage ^Flow.Ord.SubS data -0 ^ORDW delimited