Index: AXimpl/Controle/OrdDiff/MaakDiff.cls.xml
===================================================================
diff -u -r49434 -r69259
--- AXimpl/Controle/OrdDiff/MaakDiff.cls.xml (.../MaakDiff.cls.xml) (revision 49434)
+++ AXimpl/Controle/OrdDiff/MaakDiff.cls.xml (.../MaakDiff.cls.xml) (revision 69259)
@@ -3,23 +3,50 @@
TECH.RegisteredObject
+
+%Boolean
+
+
+
+Naam,KlantNr,OrderId,AX_AXSalesId,AX_AantalBesteld,AX_AantalGeleverd,AX_AantalOpenstaand,AX_ConfigId,AX_ItemId,
+AX_Leverdatum,ax_product->KortTekst,AX_ProductNr,AX_SoprContractId,Admin_AXSalesId,Admin_Aantal,Admin_ItemId, Admin_Leverdatum,admin_product->KortTekst,Admin_ProductNr,Admin_AantalLijnen
+from AXimpl_Controle_OrdDiff.ProductOrderLijn where diff_Orderverschillend=1
+order by orderid, axinventtransid
+*/
+]]>
+
+
D ##class(AXimpl.Controle.OrdDiff.MaakDiff).%New().Maak()
+Debug:%Boolean=1
1
1
%Status
1
-
Index: AXimpl/Controle/OrdDiff/Admin/OrderData.cls.xml
===================================================================
diff -u -r49378 -r69259
--- AXimpl/Controle/OrdDiff/Admin/OrderData.cls.xml (.../OrderData.cls.xml) (revision 49378)
+++ AXimpl/Controle/OrdDiff/Admin/OrderData.cls.xml (.../OrderData.cls.xml) (revision 69259)
@@ -28,6 +28,14 @@
%String
+
+%Boolean
+
+
+
+%Boolean
+
+
%Date
@@ -45,8 +53,6 @@
OrderDataState
^AXimpl.ControleC566.OrderDataS
-listnode
-
%%CLASSNAME
@@ -64,8 +70,6 @@
-listnode
-
Aantal
@@ -93,6 +97,12 @@
Product
+
+InWMS
+
+
+HeeftGeenToelevering
+
Index: AXimpl/Controle/OrdDiff/VergelijkOrder.cls.xml
===================================================================
diff -u -r49434 -r69259
--- AXimpl/Controle/OrdDiff/VergelijkOrder.cls.xml (.../VergelijkOrder.cls.xml) (revision 49434)
+++ AXimpl/Controle/OrdDiff/VergelijkOrder.cls.xml (.../VergelijkOrder.cls.xml) (revision 69259)
@@ -35,7 +35,7 @@
1
sum(Diff_GekendInAX)"
+ Set SqlStatement="select Orderid from AXimpl_Controle_OrdDiff.ProductOrderLijn group by orderid having max(Diff_Product)=1 or max(Diff_Aantal)=1 or max(Admin_HeeftGeenToelevering)=1 or sum(Diff_GekendInAdmin)<>sum(Diff_GekendInAX)"
Set ..ResultSet = ..QueryAPI.GetResultSet(##class(TECH.DynamicQuery).%New(SqlStatement))
Set ..OrderLijnIterator=##class(TECH.ResultSetIterator).%New(..ResultSet)
Quit $$$OK
@@ -44,12 +44,15 @@
Index: AXimpl/Controle/OrdDiff/DiffData.cls.xml
===================================================================
diff -u -r49378 -r69259
--- AXimpl/Controle/OrdDiff/DiffData.cls.xml (.../DiffData.cls.xml) (revision 49378)
+++ AXimpl/Controle/OrdDiff/DiffData.cls.xml (.../DiffData.cls.xml) (revision 69259)
@@ -8,6 +8,10 @@
%Boolean
+
+%Boolean
+
+
%Boolean
@@ -33,8 +37,6 @@
DiffDataState
^AXimpl.Controle.OF100.DiffDataS
-listnode
-
AanwezigInAdmin
@@ -59,6 +61,9 @@
OrderVerschillend
+
+WasGekendInAdmin
+
Index: AXimpl/Controle/OrdDiff/AX/AxOrderLijnIterator.cls.xml
===================================================================
diff -u -r49438 -r69259
--- AXimpl/Controle/OrdDiff/AX/AxOrderLijnIterator.cls.xml (.../AxOrderLijnIterator.cls.xml) (revision 49438)
+++ AXimpl/Controle/OrdDiff/AX/AxOrderLijnIterator.cls.xml (.../AxOrderLijnIterator.cls.xml) (revision 69259)
@@ -41,27 +41,35 @@
Set SqlStatement = "Select salesLine.SALESID,salesLine.CUSTACCOUNT,salesline.INVENTTRANSID,salesline.ITEMID,salesline.CONFIRMEDDLV,salesline.RECEIPTDATECONFIRMED,salesline.QTYORDERED"
_" ,isnull(( select -sum(qty) from inventtrans where INVENTTRANSORIGIN.RECID = inventtrans.INVENTTRANSORIGIN and INVENTTRANS.STATUSISSUE = 3 and "
_" inventtrans.STATUSRECEIPT = 0 and inventtrans.DATAAREAID = INVENTTRANSORIGIN.DATAAREAID and inventtrans.PARTITION = INVENTTRANSORIGIN.PARTITION),0) as GEPICKTEHOEVEELHEID"
- _" ,salesline.REMAINSALESPHYSICAL as OPENSTAANDEHOEVEELHEID,ADMINPRODUCTNUMMER "
- _" ,inventtransorigin.ADUSOPRCONTRACTID "
+ _" ,salesline.REMAINSALESPHYSICAL as OPENSTAANDEHOEVEELHEID, QtyOpBon,ADMINPRODUCTNUMMER "
+ _" ,INVENTTRANSORIGIN.ADUSOPRCONTRACTID "
_" ,InventDim.CONFIGID "
_" ,isnull(LogisticsPostalAddress.CountryRegionId,'') as COUNTRYREGIONID "
_" ,isnull(LogisticsPostalAddress.City,'') as CITY "
_" ,isnull(LogisticsPostalAddress.Street,'') as STREET "
_" ,isnull(LogisticsPostalAddress.Zipcode,'') as ZIPCODE "
- _"from SALESLINE "
- _"join inventdim on inventdim.INVENTDIMID = salesline.INVENTDIMID and inventdim.DATAAREAID = SALESLINE.DATAAREAID and inventdim.PARTITION = salesline.PARTITION "
- _"join SALESTABLE on SALESTABLE.SALESID = salesline.SALESID and SALESTABLE.DATAAREAID = salesline.DATAAREAID and salestable.PARTITION = salesline.PARTITION "
- _"left outer join ADUEcoResAttributeCombination as Kenmerk on InventDim.ConfigId=Kenmerk.ConfigId "
+ _" ,(select top 1 r.LOG from VHVALENTITYRUN r where r.PARTITION = SALESTABLE.PARTITION and r.DATAAREAID = SALESTABLE.DATAAREAID and r.ENTITY = 2 and r.REFRECID = SALESTABLE.recid and r.STATUS in (2,3) and SALESTABLE.DOCUMENTSTATUS=0 ) as VALIDATIECODE "
+ _" from SALESLINE "
+ _" join inventdim on inventdim.INVENTDIMID = salesline.INVENTDIMID and inventdim.DATAAREAID = SALESLINE.DATAAREAID and inventdim.PARTITION = salesline.PARTITION "
+ _" join SALESTABLE on SALESTABLE.SALESID = salesline.SALESID and SALESTABLE.DATAAREAID = salesline.DATAAREAID and salestable.PARTITION = salesline.PARTITION "
+ _" left outer join ADUEcoResAttributeCombination as Kenmerk on InventDim.ConfigId=Kenmerk.ConfigId "
_" and SalesLine.ITEMID=Kenmerk.ITEMID "
_" and InventDim.ConfigId<>'' "
- _"left outer join LOGISTICSPOSTALADDRESS on LOGISTICSPOSTALADDRESS.RECID = salesline.DELIVERYPOSTALADDRESS and LOGISTICSPOSTALADDRESS.PARTITION = salesline.PARTITION "
- _"join INVENTTRANSORIGIN on INVENTTRANSORIGIN.INVENTTRANSID = salesline.INVENTTRANSID and INVENTTRANSORIGIN.DATAAREAID = salesline.DATAAREAID and "
+ _" left outer join LOGISTICSPOSTALADDRESS on LOGISTICSPOSTALADDRESS.RECID = salesline.DELIVERYPOSTALADDRESS and LOGISTICSPOSTALADDRESS.PARTITION = salesline.PARTITION "
+ _" join INVENTTRANSORIGIN on INVENTTRANSORIGIN.INVENTTRANSID = salesline.INVENTTRANSID and INVENTTRANSORIGIN.DATAAREAID = salesline.DATAAREAID and "
_" INVENTTRANSORIGIN.PARTITION = salesline.PARTITION "
- _"where salestable.SALESSTATUS = 1 and salestable.SALESTYPE = 3 and salesline.SALESQTY >= 0 "
+ _" Left outer join (select ito.INVENTTRANSID, -sum(qty) as QtyOpBon "
+ _" from inventtrans it "
+ _" join INVENTTRANSORIGIN ito "
+ _" on it.INVENTTRANSORIGIN = ito.recid and ito.DATAAREAID='vhbe' and ito.PARTITION=5637144576 "
+ _" where it.PARTITION = 5637144576 and it.DATAAREAID = 'vhbe' and it.StatusIssue=3 "
+ _" group by ito.INVENTTRANSID) it2 "
+ _" on salesline.inventtransid = it2.INVENTTRANSID "
+ _" where salestable.SALESSTATUS = 1 and salestable.SALESTYPE = 3 and salesline.SALESQTY >= 0 "
_" and salesLine.DATAAREAID = 'VHBE' and salesline.PARTITION = '5637144576' "
- _" and salesline.REMAINSALESPHYSICAL - isnull(( select -sum(qty) from inventtrans where INVENTTRANSORIGIN.RECID = inventtrans.INVENTTRANSORIGIN and INVENTTRANS.STATUSISSUE = 3 and "
- _" inventtrans.STATUSRECEIPT = 0 and inventtrans.DATAAREAID = INVENTTRANSORIGIN.DATAAREAID and inventtrans.PARTITION = INVENTTRANSORIGIN.PARTITION),0) > 0 "
- _"order by salesline.inventtransid"
+ _" and salesline.REMAINSALESPHYSICAL > 0 "
+ _" and not exists (select 'x' from adushoppingcart sc where sc.dataareaid = 'vhbe' and sc.partition = 5637144576 and sc.salesid = salestable.salesid and sc.shoppingcartstatus <> 4 and sc.SOURCESERVICE in (0,1)) "
+ _" order by salesline.inventtransid"
Set ..ResultSet = ..SqlQueryConnection.GetResultSet(SqlStatement)
]]>
Index: AXimpl/Controle/OrdDiff/VergelijkLijn.cls.xml
===================================================================
diff -u -r65693 -r69259
--- AXimpl/Controle/OrdDiff/VergelijkLijn.cls.xml (.../VergelijkLijn.cls.xml) (revision 65693)
+++ AXimpl/Controle/OrdDiff/VergelijkLijn.cls.xml (.../VergelijkLijn.cls.xml) (revision 69259)
@@ -65,8 +65,13 @@
{
Do ..ControleerAantal()
Do ..ControleerProduct()
+
Do ..ControleerLeverDatum()
}
+ elseif (..Diff.GekendInAX) && ('..Diff.GekendInAdmin) && ((..OrderLijn.AX.AantalOpenstaand=0) && (..OrderLijn.AX.ValidatieBlokkering=""))
+ {
+ Set ..Diff.GekendInAX=0 ; Niet meer gekend omdat er niets meer te leveren is
+ }
]]>
@@ -76,6 +81,14 @@
Set:('..Diff.GekendInAX)&&(..OrderLijn.Admin.ProductNr=1793108) ..Diff.GekendInAX=1 ; SERV.TRANSPORT is nooit gekend in AX
Set ..Diff.GekendInAdmin=''..OrderLijn.Admin.ProductNr
+ If ..Diff.GekendInAX && ('..Diff.GekendInAdmin) && (..OrderLijn.AX.AXSalesId'="")
+ {
+ Set Rec=$G(^KO1($reverse($E($reverse(..OrderLijn.AX.AXSalesId),1,6)),"F"))
+ If ($P(Rec,"\")=..OrderLijn.KlantNr) && $P(Rec,"\",2) ; Bonnummer is ingevuld
+ {
+ Set ..Diff.WasGekendInAdmin=1
+ }
+ }
]]>
Index: AXimpl/Controle/OrdDiff/Admin/DataBouwer.cls.xml
===================================================================
diff -u -r49434 -r69259
--- AXimpl/Controle/OrdDiff/Admin/DataBouwer.cls.xml (.../DataBouwer.cls.xml) (revision 49434)
+++ AXimpl/Controle/OrdDiff/Admin/DataBouwer.cls.xml (.../DataBouwer.cls.xml) (revision 69259)
@@ -1,7 +1,7 @@
-BL.Derde.KlantSpecifiek
+BL.Derde.KlantSpecifiek,BL.Derde.LevSpecifiek
TECH.RegisteredObject
@@ -13,6 +13,15 @@
AX.Uitgaand.EC.DataAX.impl.Translator
+
+AX.Uitgaand.PM.impl.Convertor.Sopr.ProductConvertor
+
+
+
+%String
+1
+
+
1
1
@@ -21,13 +30,15 @@
+
+AdminData:AXimpl.Controle.OrdDiff.Admin.OrderData,AdminOrderLijn:DOM.VKP.ProductOrderlijn
+
+
+
KlantNr:%String,OrderId:%String,ProductNr:%String,AxInventTransId:%String
AXimpl.Controle.OrdDiff.ProductOrderLijn
Index: AXimpl/Controle/OrdDiff/AX/DataBouwer.cls.xml
===================================================================
diff -u -r65693 -r69259
--- AXimpl/Controle/OrdDiff/AX/DataBouwer.cls.xml (.../DataBouwer.cls.xml) (revision 65693)
+++ AXimpl/Controle/OrdDiff/AX/DataBouwer.cls.xml (.../DataBouwer.cls.xml) (revision 69259)
@@ -28,7 +28,7 @@
Index: AXimpl/Controle/OrdDiff/AX/OrderData.cls.xml
===================================================================
diff -u -r50300 -r69259
--- AXimpl/Controle/OrdDiff/AX/OrderData.cls.xml (.../OrderData.cls.xml) (revision 50300)
+++ AXimpl/Controle/OrdDiff/AX/OrderData.cls.xml (.../OrderData.cls.xml) (revision 69259)
@@ -16,10 +16,18 @@
%Decimal
+
+%Decimal
+
+
%String
+
+%String
+
+
%String
@@ -49,8 +57,6 @@
OrderDataState
^AXimpl.Controle3314.OrderDataS
-listnode
-
Aantal
@@ -96,6 +102,12 @@
Product
+
+AantalOpBon
+
+
+ValidatieBlokkering
+