Forráskód Böngészése

Removed Consignment from Factory Floor Treatment PO

Kenric Nugteren 1 éve
szülő
commit
d16e12facd

+ 1 - 2
prs.classes/DataModels/ManufacturingTreatmentDataModel.cs

@@ -8,7 +8,7 @@ namespace Comal.Classes
     {
         private PurchaseOrder _order;
 
-        public ManufacturingTreatmentDataModel(PurchaseOrder order, Delivery delivery, Consignment consignment)
+        public ManufacturingTreatmentDataModel(PurchaseOrder order, Delivery delivery)
         {
             _order = order;
 
@@ -16,7 +16,6 @@ namespace Comal.Classes
             AddChildTable<PurchaseOrder, PurchaseOrderItem>(x => x.ID, x => x.PurchaseOrderLink.ID, isdefault:true);
 
             AddTable(new Filter<Delivery>(x => x.ID).IsEqualTo(delivery.ID), null, true);
-            AddTable(new Filter<Consignment>(x => x.ID).IsEqualTo(consignment.ID), null, true);
         }
 
         public override string Name => "Manufacturing Treatment";

+ 6 - 17
prs.desktop/Panels/Factory/FactoryPanel.xaml.cs

@@ -649,16 +649,6 @@ namespace PRSDesktop
             order.DueDate = DateTime.Today.AddDays(7);
             new Client<PurchaseOrder>().Save(order, "Created Treatment Purchase Order");
 
-            Progress.SetMessage("Creating Consignment");
-            var consignment = new Consignment();
-            consignment.Number = string.Format("MFG PO {0}", order.PONumber);
-            consignment.Supplier.ID = order.SupplierLink.ID;
-            consignment.EstimatedDispatchDate = order.IssuedDate;
-            consignment.EstimatedWarehouseArrival = order.DueDate;
-            consignment.Description = string.Format("{0} #{1} - {2}", CurrentSection.Name, CurrentStation,
-                Employees.ContainsKey(myID) ? Employees[myID] : "(unknown)");
-            new Client<Consignment>().Save(consignment, "Created by Factory Floor Purchase");
-
             Progress.SetMessage("Processing Order");
             var orderitems = new List<PurchaseOrderItem>();
             var packetupdates = new List<ManufacturingPacket>();
@@ -698,7 +688,6 @@ namespace PRSDesktop
                 item.PurchaseOrderLink.ID = order.ID;
                 item.Job.ID = treatment.Packet.SetoutLink.JobLink.ID;
                 item.Packet.ID = packet.ID;
-                item.Consignment.ID = consignment.ID;
                 item.Product.ID = window.ProductID;
 
                 item.Qty = packet.BarcodeQty;
@@ -762,9 +751,9 @@ namespace PRSDesktop
             new Client<Delivery>().Save(delivery, "Created by Factory Floor Purchase");
             Progress.Close();
 
-            PrintDeliveryBarcode(delivery, order, consignment);
+            PrintDeliveryBarcode(delivery, order);
 
-            PrintOrderItemBarcodes(delivery, order, consignment);
+            PrintOrderItemBarcodes(delivery, order);
 
             SendPurchaseNotification(order.PONumber);
 
@@ -792,9 +781,9 @@ namespace PRSDesktop
             new Client<Notification>().Save(updates, "Sent Notification");
         }
 
-        private void PrintDeliveryBarcode(Delivery delivery, PurchaseOrder order, Consignment consignment)
+        private void PrintDeliveryBarcode(Delivery delivery, PurchaseOrder order)
         {
-            var model = new ManufacturingTreatmentDataModel(order, delivery, consignment);
+            var model = new ManufacturingTreatmentDataModel(order, delivery);
 
             var templatename = "Print Treatment Delivery Bar Code";
             var sectionName = "Treatment Delivery Bar Code";
@@ -820,9 +809,9 @@ namespace PRSDesktop
         }
 
 
-        private void PrintOrderItemBarcodes(Delivery delivery, PurchaseOrder order, Consignment consignment)
+        private void PrintOrderItemBarcodes(Delivery delivery, PurchaseOrder order)
         {
-            var model = new ManufacturingTreatmentDataModel(order, delivery, consignment);
+            var model = new ManufacturingTreatmentDataModel(order, delivery);
 
             var templatename = "Print Treatment Item Bar Codes";
             var sectionName = "Treatment Item Bar Code";