This commit is contained in:
2021-08-14 00:41:08 +00:00
parent 8ae51cda29
commit 346da39b55

View File

@@ -1799,6 +1799,7 @@ namespace AyaNova.PlugIn.V8
StringBuilder sbText1 = new StringBuilder(); StringBuilder sbText1 = new StringBuilder();
StringBuilder sbText2 = new StringBuilder(); StringBuilder sbText2 = new StringBuilder();
//get receipts for this PO //get receipts for this PO
PurchaseOrderReceiptListDetailed prl = PurchaseOrderReceiptListDetailed.GetList( PurchaseOrderReceiptListDetailed prl = PurchaseOrderReceiptListDetailed.GetList(
"<?xml version=\"1.0\" encoding=\"utf-16\" standalone=\"yes\"?><GRIDCRITERIA><COLUMNITEM CM=\"aPurchaseOrderReceipt.aReceivedDate\" UI=\"LT_PurchaseOrderReceipt_Label_ReceivedDate\" PIN=\"0\" WIDTH=\"121\" SORT=\"ASC\" /><COLUMNITEM CM=\"aPurchaseOrder.aPONumber\" UI=\"LT_PurchaseOrder_Label_PONumber\" PIN=\"0\" WIDTH=\"105\" /><COLUMNITEM CM=\"grid\" UI=\"LT_O_PurchaseOrderReceipt\" PIN=\"0\" WIDTH=\"155\" /><WHEREITEMGROUP GROUPLOGICALOPERATOR=\"And\" UI=\"LT_PurchaseOrder_Label_PONumber\"><WHEREITEM COMPAREOPERATOR=\"Equals\" CM=\"aPurchaseOrder.aID\" UICOMPAREVALUE=\"\" TYPE=\"System.Guid\" COMPAREVALUE=\"{" + "<?xml version=\"1.0\" encoding=\"utf-16\" standalone=\"yes\"?><GRIDCRITERIA><COLUMNITEM CM=\"aPurchaseOrderReceipt.aReceivedDate\" UI=\"LT_PurchaseOrderReceipt_Label_ReceivedDate\" PIN=\"0\" WIDTH=\"121\" SORT=\"ASC\" /><COLUMNITEM CM=\"aPurchaseOrder.aPONumber\" UI=\"LT_PurchaseOrder_Label_PONumber\" PIN=\"0\" WIDTH=\"105\" /><COLUMNITEM CM=\"grid\" UI=\"LT_O_PurchaseOrderReceipt\" PIN=\"0\" WIDTH=\"155\" /><WHEREITEMGROUP GROUPLOGICALOPERATOR=\"And\" UI=\"LT_PurchaseOrder_Label_PONumber\"><WHEREITEM COMPAREOPERATOR=\"Equals\" CM=\"aPurchaseOrder.aID\" UICOMPAREVALUE=\"\" TYPE=\"System.Guid\" COMPAREVALUE=\"{" +
@@ -1815,6 +1816,7 @@ namespace AyaNova.PlugIn.V8
} }
dynamic dItems = new JArray(); dynamic dItems = new JArray();
foreach (PurchaseOrderItem pi in c.OrderItems) foreach (PurchaseOrderItem pi in c.OrderItems)
{ {
//here combine potiem and poreceipts into singular items for v8 //here combine potiem and poreceipts into singular items for v8
@@ -1829,7 +1831,8 @@ namespace AyaNova.PlugIn.V8
dItem.partWarehouseId = Getv7v8IdMap(pi.PartWarehouseID, "warehouse for poitem"); dItem.partWarehouseId = Getv7v8IdMap(pi.PartWarehouseID, "warehouse for poitem");
dItem.quantityOrdered = pi.QuantityOrdered; dItem.quantityOrdered = pi.QuantityOrdered;
dItem.quantityReceived = 0; dItem.quantityReceived = 0;
dItem.serials = string.Empty; //dItem.serials = string.Empty;
StringBuilder sbSerials = new StringBuilder();
dItem.purchaseOrderCost = pi.PurchaseOrderCost; dItem.purchaseOrderCost = pi.PurchaseOrderCost;
dItem.partRequestedById = Getv7v8IdMapNullOk(pi.PartRequestedByID); dItem.partRequestedById = Getv7v8IdMapNullOk(pi.PartRequestedByID);
dItem.purchaseTaxCodeId = Getv7v8IdMapNullOk(pi.PurchaseTaxCodeID); dItem.purchaseTaxCodeId = Getv7v8IdMapNullOk(pi.PurchaseTaxCodeID);
@@ -1855,13 +1858,14 @@ namespace AyaNova.PlugIn.V8
dItem.quantityReceived += ri.QuantityReceived; dItem.quantityReceived += ri.QuantityReceived;
dItem.receivedCost = ri.ReceiptCost;//yes, last receipt wins for cost dItem.receivedCost = ri.ReceiptCost;//yes, last receipt wins for cost
foreach (PartSerial sn in ri.SerialNumbers) foreach (PartSerial sn in ri.SerialNumbers)
dItem.serials += sn.SerialNumber + ", "; sbSerials.Append(sn.SerialNumber + ", ");
dItem.receivedDate = util.DateToV8(ri.Created);//yes, last receipt wins for the official received date, no options otherwise dItem.receivedDate = util.DateToV8(ri.Created);//yes, last receipt wins for the official received date, no options otherwise
} }
}//end of poreceiptitem loop }//end of poreceiptitem loop
}//end of poreceipt loop }//end of poreceipt loop
dItem.serials=dItem.serials.trim().trimEnd(','); if (sbSerials.Length > 0)
dItem.serials = sbSerials.ToString().Trim().TrimEnd(',');
dItems.add(dItem); dItems.add(dItem);
}//end of poitem loop }//end of poitem loop