From a2915c42e5eced1fae96b4f9946d3e1dd404f40e Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Mon, 14 Jun 2021 17:06:17 +0000 Subject: [PATCH] --- ayanova/devdocs/todo.txt | 1 + .../src/components/work-order-item-labors.vue | 6 +--- .../src/components/work-order-item-loans.vue | 18 +++++----- .../work-order-item-part-requests.vue | 34 +------------------ .../work-order-item-scheduled-users.vue | 21 ------------ .../components/work-order-item-travels.vue | 1 - 6 files changed, 11 insertions(+), 70 deletions(-) diff --git a/ayanova/devdocs/todo.txt b/ayanova/devdocs/todo.txt index d61d60aa..729070b2 100644 --- a/ayanova/devdocs/todo.txt +++ b/ayanova/devdocs/todo.txt @@ -445,6 +445,7 @@ todo 2: open object handler for workorder descendants **VERY IMPORTANT** todo: how to directly open a workorder quickly when you know the wo number?? should be supported, otherwise you need to scroll around a list to find it which is fucked +todo: picking from part assembly to populate a bunch of parts?? todo 2-3: test and confirm can duplicate workorder and it works properly inventory affecting items are handled how? Because duplicate happens AT the server so it can't just do the same exact items and serials and quantities etc diff --git a/ayanova/src/components/work-order-item-labors.vue b/ayanova/src/components/work-order-item-labors.vue index 70136eb6..3af5586d 100644 --- a/ayanova/src/components/work-order-item-labors.vue +++ b/ayanova/src/components/work-order-item-labors.vue @@ -488,16 +488,12 @@ export default { id: 0, concurrency: 0, userId: null, - //userViz: null, serviceStartDate: null, - serviceStopDate: null, //Actually I think it's best to be null, user can select NOW from start or stop and have it automatically do it's thing - // serviceStartDate: window.$gz.locale.nowUTC8601String(), - // serviceStopDate: window.$gz.locale.nowUTC8601String(), //TODO:sb now plus one hour to match v7 + serviceStopDate: null, serviceRateId: null, serviceDetails: null, serviceRateQuantity: 0, noChargeQuantity: 0, - //serviceBankId: null, taxCodeSaleId: null, price: 0, priceOverride: null, diff --git a/ayanova/src/components/work-order-item-loans.vue b/ayanova/src/components/work-order-item-loans.vue index feaf6304..384913f2 100644 --- a/ayanova/src/components/work-order-item-loans.vue +++ b/ayanova/src/components/work-order-item-loans.vue @@ -508,18 +508,16 @@ export default { this.value.items[this.activeWoItemIndex].loans.push({ id: 0, concurrency: 0, - userId: null, - description: null, - serials: null, - loanUnitId: 0, //zero to break rule on new - loanWarehouseId: null, - quantity: 1, - rate: 0, + notes: null, + outDate: null, + dueDate: null, + returnDate: null, taxCodeId: null, - price: 0, - priceOverride: null, + loanUnitId: 0, //zero to break rule on new + quantity: 1, + rate: 1, cost: 0, - listPrice: 0, + priceOverride: null, isDirty: true, workOrderItemId: this.value.items[this.activeWoItemIndex].id, uid: Date.now() //used for error tracking / display diff --git a/ayanova/src/components/work-order-item-part-requests.vue b/ayanova/src/components/work-order-item-part-requests.vue index 7724564a..d52acfaf 100644 --- a/ayanova/src/components/work-order-item-part-requests.vue +++ b/ayanova/src/components/work-order-item-part-requests.vue @@ -84,39 +84,7 @@ ///////////////////////////////////////////////////////////////////////////////////////////////////////////// /* XXXeslint-disable */ //////////////////////////////////////////////////////////////////////////////////////////////////////////// -/* -WORKORDER ITEM PART REQUEST -l.Add(new FormField { TKey = "WorkOrderItemPartRequestPartID", FieldKey = "WorkOrderItemPartRequestPartID", TKeySection = "WorkOrderItemPartRequests" }); -l.Add(new FormField { TKey = "WorkOrderItemPartRequestPartWarehouseID", FieldKey = "WorkOrderItemPartRequestPartWarehouseID", TKeySection = "WorkOrderItemPartRequests" }); -l.Add(new FormField { TKey = "WorkOrderItemPartRequestQuantity", FieldKey = "WorkOrderItemPartRequestQuantity", TKeySection = "WorkOrderItemPartRequests" }); -l.Add(new FormField { TKey = "PartUPC", FieldKey = "PartRequestPartUPC", TKeySection = "WorkOrderItemPartRequests" }); -l.Add(new FormField { TKey = "PurchaseOrder", FieldKey = "WorkOrderItemPartRequestPurchaseOrder", TKeySection = "WorkOrderItemPartRequests" }); -l.Add(new FormField { TKey = "PurchaseOrderExpectedReceiveDate", FieldKey = "WorkOrderItemPartRequestExpectedReceiveDate", TKeySection = "WorkOrderItemPartRequests" }); -l.Add(new FormField { TKey = "PurchaseOrderOrderedDate", FieldKey = "WorkOrderItemPartRequestOrderedDate", TKeySection = "WorkOrderItemPartRequests" }); -l.Add(new FormField { TKey = "WorkOrderItemPartRequestOnOrder", FieldKey = "WorkOrderItemPartRequestOnOrder", TKeySection = "WorkOrderItemPartRequests" }); -l.Add(new FormField { TKey = "WorkOrderItemPartRequestReceived", FieldKey = "WorkOrderItemPartRequestReceived", TKeySection = "WorkOrderItemPartRequests" }); -{ -"0": { -"id": 39, -"concurrency": 8121176, -"partId": 3, -"partViz": "565221", -"upcViz": "2202707210364", -"partWarehouseId": 1, -"partWarehouseViz": "Default", -"quantity": 1, -"purchaseOrderItemId": null, -"purchaseOrderViz": null, -"purchaseOrderIdViz": null, -"purchaseOrderDateViz": null, -"purchaseOrderExpectedDateViz": null, -"purchaseOrderOnOrderViz": false, -"received": 0, -"isDirty": false, -"workOrderItemId": 20 - } -} -*/ + export default { created() { this.setDefaultView(); diff --git a/ayanova/src/components/work-order-item-scheduled-users.vue b/ayanova/src/components/work-order-item-scheduled-users.vue index 5060539e..8695d3cb 100644 --- a/ayanova/src/components/work-order-item-scheduled-users.vue +++ b/ayanova/src/components/work-order-item-scheduled-users.vue @@ -270,28 +270,7 @@ ///////////////////////////////////////////////////////////////////////////////////////////////////////////// /* XXXeslint-disable */ //////////////////////////////////////////////////////////////////////////////////////////////////////////// -/* - l.Add(new FormField { TKey = "WorkOrderItemScheduledUserEstimatedQuantity", FieldKey = "WorkOrderItemScheduledUserEstimatedQuantity", TKeySection = "WorkOrderItemScheduledUser" }); - l.Add(new FormField { TKey = "WorkOrderItemScheduledUserServiceRateID", FieldKey = "WorkOrderItemScheduledUserServiceRateID", TKeySection = "WorkOrderItemScheduledUser" }); - l.Add(new FormField { TKey = "WorkOrderItemScheduledUserStartDate", FieldKey = "WorkOrderItemScheduledUserStartDate", TKeySection = "WorkOrderItemScheduledUser" }); - l.Add(new FormField { TKey = "WorkOrderItemScheduledUserStopDate", FieldKey = "WorkOrderItemScheduledUserStopDate", TKeySection = "WorkOrderItemScheduledUser" }); - l.Add(new FormField { TKey = "WorkOrderItemScheduledUserUserID", FieldKey = "WorkOrderItemScheduledUserUserID", TKeySection = "WorkOrderItemScheduledUser" }); - - - public long? UserId { get; set; } - public decimal EstimatedQuantity { get; set; } - public DateTime? StartDate { get; set; } - public DateTime? StopDate { get; set; } - public long? ServiceRateId { get; set; } - - - - "WorkOrderItemScheduledUserServiceRateID": "Suggested rate", - "WorkOrderItemScheduledUserStartDate": "Start Date Time", - "WorkOrderItemScheduledUserStopDate": "Stop Date Time", - "WorkOrderItemScheduledUserUserID": "User", -*/ export default { created() { this.setDefaultView(); diff --git a/ayanova/src/components/work-order-item-travels.vue b/ayanova/src/components/work-order-item-travels.vue index 14a079ea..e02845d2 100644 --- a/ayanova/src/components/work-order-item-travels.vue +++ b/ayanova/src/components/work-order-item-travels.vue @@ -494,7 +494,6 @@ export default { travelDetails: null, travelRateQuantity: 0, noChargeQuantity: 0, - // serviceBankId: null, taxCodeSaleId: null, price: 0, priceOverride: null,