From 293a679f141a397c82b7305d71358d13072f68bb Mon Sep 17 00:00:00 2001
From: John Cardinal <support@ayanova.com>
Date: Wed, 26 May 2021 19:55:41 +0000
Subject: [PATCH]

---
 server/AyaNova/biz/WorkOrderBiz.cs            | 30 +++++++++++++++----
 .../models/WorkOrderItemPartRequest.cs        |  2 +-
 server/AyaNova/util/AySchema.cs               |  2 +-
 3 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/server/AyaNova/biz/WorkOrderBiz.cs b/server/AyaNova/biz/WorkOrderBiz.cs
index 2ecdb24f..8092df2d 100644
--- a/server/AyaNova/biz/WorkOrderBiz.cs
+++ b/server/AyaNova/biz/WorkOrderBiz.cs
@@ -3068,8 +3068,8 @@ namespace AyaNova.Biz
             if (o.PartId != 0)
                 part = await ct.Part.AsNoTracking().FirstOrDefaultAsync(x => x.Id == o.PartId);
             o.PartViz = part.PartNumber;
-            
-            o.UpcViz=part.UPC;
+
+            o.UpcViz = part.UPC;
 
             TaxCode Tax = null;
             if (o.TaxPartSaleId != null)
@@ -3459,9 +3459,29 @@ namespace AyaNova.Biz
         // 
         private async Task PartRequestPopulateVizFields(WorkOrderItemPartRequest o)
         {
-            await Task.CompletedTask;
-            // if (o.WorkOrderOverseerId != null)
-            //     o.WorkOrderOverseerViz = await ct.User.AsNoTracking().Where(x => x.Id == o.WorkOrderOverseerId).Select(x => x.Name).FirstOrDefaultAsync();
+            if (o.PartWarehouseId != 0)
+                o.PartWarehouseViz = await ct.PartWarehouse.AsNoTracking().Where(x => x.Id == o.PartWarehouseId).Select(x => x.Name).FirstOrDefaultAsync();
+            Part part = null;
+            if (o.PartId != 0)
+                part = await ct.Part.AsNoTracking().FirstOrDefaultAsync(x => x.Id == o.PartId);
+            o.PartViz = part.PartNumber;
+            o.UpcViz = part.UPC;
+
+            PurchaseOrder po = null;
+            if (o.PurchaseOrderItemId != null)
+            {
+                var poid = await ct.PurchaseOrderItem.AsNoTracking().Where(x => x.Id == o.PurchaseOrderItemId).Select(x => x.PurchaseOrderId).FirstOrDefaultAsync();
+                if (poid != 0)
+                    po = await ct.PurchaseOrder.AsNoTracking().Where(x => x.Id == poid).FirstOrDefaultAsync();
+            }
+            if(po!=null){
+                o.PurchaseOrderViz=po.Serial.ToString();
+                o.PurchaseOrderIdViz=po.Id;
+                o.PurchaseOrderDateViz=po.OrderedDate;
+                o.PurchaseOrderExpectedDateViz=po.ExpectedReceiveDate;
+            }
+
+
         }
 
 
diff --git a/server/AyaNova/models/WorkOrderItemPartRequest.cs b/server/AyaNova/models/WorkOrderItemPartRequest.cs
index 40230dc8..65e0daa8 100644
--- a/server/AyaNova/models/WorkOrderItemPartRequest.cs
+++ b/server/AyaNova/models/WorkOrderItemPartRequest.cs
@@ -26,7 +26,7 @@ namespace AyaNova.Models
         public decimal Quantity { get; set; }
 
         [Required]
-        public long PurchaseOrderItemId { get; set; }
+        public long? PurchaseOrderItemId { get; set; }
         [NotMapped]
         public string PurchaseOrderViz { get; set; }
         [NotMapped]
diff --git a/server/AyaNova/util/AySchema.cs b/server/AyaNova/util/AySchema.cs
index 6bef8ad1..788a2751 100644
--- a/server/AyaNova/util/AySchema.cs
+++ b/server/AyaNova/util/AySchema.cs
@@ -805,7 +805,7 @@ $BODY$ LANGUAGE PLPGSQL STABLE");
                 //WORKORDERITEM PART REQUEST
                 await ExecQueryAsync("CREATE TABLE aworkorderitempartrequest (id BIGINT GENERATED ALWAYS AS IDENTITY PRIMARY KEY, workorderitemid BIGINT NOT NULL REFERENCES aworkorderitem (id), "
                     + "partid BIGINT NOT NULL REFERENCES apart, partwarehouseid BIGINT NOT NULL REFERENCES apartwarehouse, quantity DECIMAL(19,5) NOT NULL default 0, received DECIMAL(19,5) NOT NULL default 0, "
-                    + "purchaseorderitemid BIGINT REFERENCES apurchaseorderitem"
+                    + "purchaseorderitemid BIGINT NULL REFERENCES apurchaseorderitem"
                     + ")");
 
                 //WORKORDERITEM SCHEDULED USER