diff --git a/Jenkinsfile b/Jenkinsfile index 5ef4500d7..e273dad19 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -24,7 +24,8 @@ node { checkout scm } stage ('Install Node dependencies') { - sh "npm install" + sh "npm install --only=prod" + sh "npm install --only=dev" sh "gulp install" } stage ('Build project') { diff --git a/client/claim/routes.json b/client/claim/routes.json index 7b493f237..efd4ecec3 100644 --- a/client/claim/routes.json +++ b/client/claim/routes.json @@ -15,7 +15,8 @@ "url": "/index?q", "state": "claim.index", "component": "vn-claim-index", - "description": "Listado" + "description": "Listado", + "acl": ["salesAssistant"] }, { "url": "/:id", @@ -53,7 +54,19 @@ "claim": "$ctrl.claim" }, "menu": { - "icon": "settings" + "icon": "icon-details" + } + }, + { + "url": "/development", + "state": "claim.card.development", + "component": "vn-claim-development", + "description": "Development", + "params": { + "claim": "$ctrl.claim" + }, + "menu": { + "icon": "icon-traceability" } }, { @@ -65,7 +78,7 @@ "claim": "$ctrl.claim" }, "menu": { - "icon": "settings" + "icon": "icon-actions" } } ] diff --git a/client/claim/src/action/index.html b/client/claim/src/action/index.html new file mode 100644 index 000000000..7a1a1515f --- /dev/null +++ b/client/claim/src/action/index.html @@ -0,0 +1,116 @@ + + + + + + + Action +
+ + +
+ + + + + Id + Destination + Landed + Quantity + Description + Price + Disc. + Total + + + + + {{saleClaimed.sale.id}} + + + + + {{saleClaimed.sale.ticket.landed | dateTime: 'dd/MM/yyyy'}} + {{saleClaimed.sale.quantity}} + {{saleClaimed.sale.concept}} + {{saleClaimed.sale.price | currency:'€':2}} + {{saleClaimed.sale.discount}} % + + {{(saleClaimed.sale.quantity * saleClaimed.sale.price) - + ((saleClaimed.sale.discount * + (saleClaimed.sale.quantity * saleClaimed.sale.price))/100) | currency:'€':2 + }} + + + + + + + + + No results + + + + + + + + + +

Claimable sales from ticket

{{$ctrl.claim.ticketFk}}

+ + + + Id + Landed + Quantity + Description + Price + Disc. + Total + + + + + {{sale.saleFk}} + {{sale.landed | dateTime: 'dd/MM/yyyy'}} + {{sale.quantity}} + {{sale.concept}} + {{sale.price | currency:'€':2}} + {{sale.discount}} % + + {{(sale.quantity * sale.price) - ((sale.discount * (sale.quantity * sale.price))/100) | currency:'€':2}} + + + + + No results + + + + \ No newline at end of file diff --git a/client/claim/src/action/index.js b/client/claim/src/action/index.js new file mode 100644 index 000000000..295b9a955 --- /dev/null +++ b/client/claim/src/action/index.js @@ -0,0 +1,93 @@ +import ngModule from '../module'; +import './style.scss'; + +class Controller { + constructor($state, $scope, $http, $translate, vnApp) { + this.$state = $state; + this.$ = $scope; + this.$http = $http; + this.$translate = $translate; + this.vnApp = vnApp; + this.filter = { + where: {claimFk: $state.params.id}, + include: [ + {relation: 'sale', + scope: { + fields: ['concept', 'ticketFk', 'price', 'quantity', 'discount'], + include: { + relation: 'ticket' + } + } + }, + {relation: 'claimBeggining'} + ] + }; + } + + openAddSalesDialog() { + this.getClaimedSales(); + this.$.addSales.show(); + } + + getClaimedSales() { + let json = encodeURIComponent(JSON.stringify(this.claim.id)); + + let query = `/claim/api/ClaimBeginnings/${json}`; + this.$http.get(query).then(res => { + if (res.data) { + this.claimedSales = res.data; + } + }); + } + + addClaimedSale(saleFk) { + let saleToAdd = {saleFk: saleFk, claimFk: this.claim.id, workerFk: this.claim.workerFk, claimDestinationFk: 1}; + let query = `claim/api/ClaimEnds/`; + this.$http.post(query, saleToAdd).then(() => { + this.$.model.refresh(); + this.$.addSales.hide(); + this.vnApp.showSuccess(this.$translate.instant('Data saved!')); + }); + } + + deleteClaimedSale(id) { + let json = encodeURIComponent(JSON.stringify(id)); + let query = `claim/api/ClaimEnds/${json}`; + this.$http.delete(query).then(() => { + this.$.model.refresh(); + this.vnApp.showSuccess(this.$translate.instant('Data saved!')); + }); + } + + focusLastInput() { + let inputs = document.querySelectorAll("#claimDestinationFk"); + inputs[inputs.length - 1].querySelector("input").focus(); + this.calculateTotals(); + } + + setClaimDestination(id, claimDestinationFk) { + let params = {id: id, claimDestinationFk: claimDestinationFk}; + let query = `claim/api/ClaimEnds/`; + this.$http.patch(query, params).then(() => { + this.$.model.refresh(); + this.vnApp.showSuccess(this.$translate.instant('Data saved!')); + }); + } + + calculateTotals() { + this.claimedTotal = 0; + this.salesClaimed.forEach(sale => { + this.claimedTotal += (sale.sale.quantity * sale.sale.price) - ((sale.sale.discount * (sale.sale.quantity * sale.sale.price)) / 100); + }); + } +} + +Controller.$inject = ['$state', '$scope', '$http', '$translate', 'vnApp']; + +ngModule.component('vnClaimAction', { + template: require('./index.html'), + controller: Controller, + bindings: { + claim: '<' + } +}); diff --git a/client/claim/src/action/index.spec.js b/client/claim/src/action/index.spec.js new file mode 100644 index 000000000..d6769a022 --- /dev/null +++ b/client/claim/src/action/index.spec.js @@ -0,0 +1,94 @@ +import './index.js'; + +describe('claim', () => { + describe('Component vnClaimDetail', () => { + let $componentController; + let controller; + let $httpBackend; + let $state; + + beforeEach(() => { + angular.mock.module('claim'); + }); + + beforeEach(angular.mock.inject((_$componentController_, _$state_, _$httpBackend_, $rootScope) => { + $componentController = _$componentController_; + $httpBackend = _$httpBackend_; + $httpBackend.when('GET', /\/locale\/\w+\/[a-z]{2}\.json/).respond({}); + $httpBackend.when('GET', 'claim/api/Claims/ClaimBeginnings').respond({}); + $state = _$state_; + $state.params.id = 1; + + controller = $componentController('vnClaimDetail', {$state: $state}); + controller.claim = {ticketFk: 1}; + controller.$.model = {refresh: () => {}}; + controller.$.addSales = { + hide: () => {}, + show: () => {} + }; + })); + + describe('openAddSalesDialog()', () => { + it('should call getClaimableFromTicket and $.addSales.show', () => { + controller.$ = {addSales: {show: () => {}}}; + spyOn(controller, 'getClaimableFromTicket'); + spyOn(controller.$.addSales, 'show'); + controller.openAddSalesDialog(); + + expect(controller.getClaimableFromTicket).toHaveBeenCalledWith(); + expect(controller.$.addSales.show).toHaveBeenCalledWith(); + }); + }); + + describe('getClaimableFromTicket()', () => { + it('should make a query and set salesToClaim', () => { + $httpBackend.expectGET(`/api/Sales/getClaimableFromTicket?ticketFk=1`).respond(200, 1); + controller.getClaimableFromTicket(); + $httpBackend.flush(); + + expect(controller.salesToClaim).toEqual(1); + }); + }); + + describe('addClaimedSale(saleFk)', () => { + it('should make a post and call refresh, hide and showSuccess', () => { + spyOn(controller.$.model, 'refresh'); + spyOn(controller.$.addSales, 'hide'); + spyOn(controller.vnApp, 'showSuccess'); + $httpBackend.expectPOST(`claim/api/ClaimBeginnings/`).respond({}); + controller.addClaimedSale(1); + $httpBackend.flush(); + + expect(controller.$.model.refresh).toHaveBeenCalledWith(); + expect(controller.$.addSales.hide).toHaveBeenCalledWith(); + expect(controller.vnApp.showSuccess).toHaveBeenCalledWith('Data saved!'); + }); + }); + + describe('deleteClaimedSale(id)', () => { + it('should make a delete and call refresh and showSuccess', () => { + spyOn(controller.$.model, 'refresh'); + spyOn(controller.vnApp, 'showSuccess'); + $httpBackend.expectDELETE(`claim/api/ClaimBeginnings/1`).respond({}); + controller.deleteClaimedSale(1); + $httpBackend.flush(); + + expect(controller.$.model.refresh).toHaveBeenCalledWith(); + expect(controller.vnApp.showSuccess).toHaveBeenCalledWith('Data saved!'); + }); + }); + + describe('setClaimedQuantity(id, claimedQuantity)', () => { + it('should make a patch and call refresh and showSuccess', () => { + spyOn(controller.$.model, 'refresh'); + spyOn(controller.vnApp, 'showSuccess'); + $httpBackend.expectPATCH(`claim/api/ClaimBeginnings/`).respond({}); + controller.setClaimedQuantity(1, 1); + $httpBackend.flush(); + + expect(controller.$.model.refresh).toHaveBeenCalledWith(); + expect(controller.vnApp.showSuccess).toHaveBeenCalledWith('Data saved!'); + }); + }); + }); +}); diff --git a/client/claim/src/action/locale/es.yml b/client/claim/src/action/locale/es.yml new file mode 100644 index 000000000..7620ef965 --- /dev/null +++ b/client/claim/src/action/locale/es.yml @@ -0,0 +1,3 @@ +Destination: Destino +Action: Actuaciones +Total claimed: Total Reclamado \ No newline at end of file diff --git a/client/claim/src/action/style.scss b/client/claim/src/action/style.scss new file mode 100644 index 000000000..a3947e63c --- /dev/null +++ b/client/claim/src/action/style.scss @@ -0,0 +1,16 @@ +vn-claim-action { + vn-dialog[vn-id=addSales] { + tpl-body { + width: 950px; + div { + div.buttons { + display: none; + } + vn-table{ + min-width: 950px; + } + } + } + } +} + diff --git a/client/claim/src/card/index.js b/client/claim/src/card/index.js index 59692f6f6..24401b9a8 100644 --- a/client/claim/src/card/index.js +++ b/client/claim/src/card/index.js @@ -4,7 +4,6 @@ class Controller { constructor($http, $state) { this.$http = $http; this.$state = $state; - this.order = {}; this.filter = { include: [ {relation: 'worker', scope: {fields: ['name', 'firstName']}}, diff --git a/client/claim/src/detail/index.html b/client/claim/src/detail/index.html index 068765e2a..6137d76a9 100644 --- a/client/claim/src/detail/index.html +++ b/client/claim/src/detail/index.html @@ -2,12 +2,22 @@ vn-id="model" url="claim/api/ClaimBeginnings" filter="$ctrl.filter" - data="$ctrl.salesClaimed" on-data-change="$ctrl.onDataChange()"> + data="$ctrl.salesClaimed"> - Detail + + Detail +
+ + + + +
+ @@ -22,12 +32,13 @@ - + {{saleClaimed.sale.id}} {{saleClaimed.sale.ticket.landed | dateTime: 'dd/MM/yyyy'}} {{saleClaimed.sale.quantity}} - - - - + + + { + this.paidTotal += (sale.sale.quantity * sale.sale.price) - ((sale.sale.discount * (sale.sale.quantity * sale.sale.price)) / 100); + }); + this.claimedTotal = 0; + this.salesClaimed.forEach(sale => { + this.claimedTotal += (sale.quantity * sale.sale.price) - ((sale.sale.discount * (sale.quantity * sale.sale.price)) / 100); + }); + } } Controller.$inject = ['$state', '$scope', '$http', '$translate', 'vnApp']; diff --git a/client/claim/src/detail/index.spec.js b/client/claim/src/detail/index.spec.js index d6769a022..b75063d2c 100644 --- a/client/claim/src/detail/index.spec.js +++ b/client/claim/src/detail/index.spec.js @@ -90,5 +90,15 @@ describe('claim', () => { expect(controller.vnApp.showSuccess).toHaveBeenCalledWith('Data saved!'); }); }); + + describe('calculateTotals()', () => { + it('should set paidTotal and claimedTotal to 0 if salesClaimed has no data', () => { + controller.salesClaimed = []; + controller.calculateTotals(); + + expect(controller.paidTotal).toEqual(0); + expect(controller.claimedTotal).toEqual(0); + }); + }); }); }); diff --git a/client/claim/src/development/index.html b/client/claim/src/development/index.html new file mode 100644 index 000000000..0d462256f --- /dev/null +++ b/client/claim/src/development/index.html @@ -0,0 +1,124 @@ + + + + + + + + + + + + + + + + + +
+ Development + + + + + + + + + {{firstName}} {{name}} + + + + + + +
+ + + + + + + + + + + \ No newline at end of file diff --git a/client/claim/src/development/index.js b/client/claim/src/development/index.js new file mode 100644 index 000000000..6253e6b5a --- /dev/null +++ b/client/claim/src/development/index.js @@ -0,0 +1,30 @@ +import ngModule from '../module'; +import './style.scss'; + +class Controller { + constructor($state, $scope, $http, $translate, vnApp) { + this.$state = $state; + this.$ = $scope; + this.$http = $http; + this.$translate = $translate; + this.vnApp = vnApp; + } + + onSubmit() { + this.$.watcher.check(); + this.$.model.save().then(() => { + this.$.watcher.notifySaved(); + this.$.model.refresh(); + }); + } +} + +Controller.$inject = ['$state', '$scope', '$http', '$translate', 'vnApp']; + +ngModule.component('vnClaimDevelopment', { + template: require('./index.html'), + controller: Controller, + bindings: { + claim: '<' + } +}); diff --git a/client/claim/src/development/locale/es.yml b/client/claim/src/development/locale/es.yml new file mode 100644 index 000000000..dc5cd3554 --- /dev/null +++ b/client/claim/src/development/locale/es.yml @@ -0,0 +1,7 @@ +Destination: Destino +Development: Trazabilidad +Reason: Motivo +Result: Consecuencia +Responsible: Responsable +Worker: Trabajador +Redelivery: Devolución \ No newline at end of file diff --git a/client/claim/src/development/style.scss b/client/claim/src/development/style.scss new file mode 100644 index 000000000..e69de29bb diff --git a/client/claim/src/index.js b/client/claim/src/index.js index e779cd595..f3cb8d052 100644 --- a/client/claim/src/index.js +++ b/client/claim/src/index.js @@ -1,8 +1,11 @@ export * from './module'; -import './index/'; +import './action'; +import './basic-data'; import './card'; import './detail'; import './descriptor'; -import './basic-data'; -// import './summary'; +import './development'; +import './index/'; +import './search-panel'; +import './summary'; diff --git a/client/claim/src/index/index.html b/client/claim/src/index/index.html index 907bab746..af7a9b263 100644 --- a/client/claim/src/index/index.html +++ b/client/claim/src/index/index.html @@ -10,7 +10,7 @@
@@ -25,23 +25,21 @@ Client Created Worker - Observation State - + {{::claim.id}} {{::claim.client.id}} {{::claim.client.name}} {{::claim.created | date:'dd/MM/yyyy'}} {{::claim.worker.firstName}} {{::claim.worker.name}} - {{::claim.observation}} {{::claim.claimState.description}} @@ -55,4 +53,10 @@ scroll-selector="ui-view">
- \ No newline at end of file + + + + + + \ No newline at end of file diff --git a/client/claim/src/index/index.js b/client/claim/src/index/index.js index 391008c6c..fc371b60c 100644 --- a/client/claim/src/index/index.js +++ b/client/claim/src/index/index.js @@ -30,6 +30,24 @@ export default class Controller { }; } + exprBuilder(param, value) { + switch (param) { + case 'search': + return /^\d+$/.test(value) + ? {id: value} + : {client: {regexp: value}}; + case 'client': + return {[param]: {regexp: value}}; + case 'created': + return {created: {between: [value, value]}}; + case 'id': + case 'clientFk': + case 'workerFk': + case 'claimStateFk': + return {[param]: value}; + } + } + showDescriptor(event, clientFk) { this.$.descriptor.clientFk = clientFk; this.$.descriptor.parent = event.target; @@ -38,6 +56,13 @@ export default class Controller { event.stopImmediatePropagation(); } + preview(event, claim) { + this.claimSelected = claim; + this.$.dialogSummaryClaim.show(); + event.preventDefault(); + event.stopImmediatePropagation(); + } + onDescriptorLoad() { this.$.popover.relocate(); } diff --git a/client/claim/src/locale/es.yml b/client/claim/src/locale/es.yml index fc6b2c490..49df860e8 100644 --- a/client/claim/src/locale/es.yml +++ b/client/claim/src/locale/es.yml @@ -2,6 +2,7 @@ Client Id: Id cliente Observation: Observación Responsible: Responsable +Claim Id: Id reclamación #sections Claims: Reclamaciones diff --git a/client/claim/src/search-panel/index.html b/client/claim/src/search-panel/index.html new file mode 100644 index 000000000..700f213de --- /dev/null +++ b/client/claim/src/search-panel/index.html @@ -0,0 +1,54 @@ +
+
+ + + + + + + + + + + + + {{description}} + + + {{firstName}} {{name}} + + + + + + + + + +
+
\ No newline at end of file diff --git a/client/claim/src/search-panel/index.js b/client/claim/src/search-panel/index.js new file mode 100644 index 000000000..c15bf4be9 --- /dev/null +++ b/client/claim/src/search-panel/index.js @@ -0,0 +1,7 @@ +import ngModule from '../module'; +import SearchPanel from 'core/src/components/searchbar/search-panel'; + +ngModule.component('vnClaimSearchPanel', { + template: require('./index.html'), + controller: SearchPanel +}); diff --git a/client/claim/src/search-panel/locale/es.yml b/client/claim/src/search-panel/locale/es.yml new file mode 100644 index 000000000..1f892a742 --- /dev/null +++ b/client/claim/src/search-panel/locale/es.yml @@ -0,0 +1,7 @@ +Ticket id: Id ticket +Client id: Id cliente +Nickname: Alias +From: Desde +To: Hasta +Agency: Agencia +Warehouse: Almacén \ No newline at end of file diff --git a/client/claim/src/summary/index.html b/client/claim/src/summary/index.html new file mode 100644 index 000000000..05ded4c62 --- /dev/null +++ b/client/claim/src/summary/index.html @@ -0,0 +1,152 @@ + + + + +
{{$ctrl.summary.claim.id}} - {{$ctrl.summary.claim.client.name}}
+ + + + + + + + + + + + + + + + + + + + + + + + + +
Detail
+ + + + Id + Landed + Quantity + Claimed + Description + Price + Disc. + Total + + + + + {{saleClaimed.sale.id}} + {{saleClaimed.sale.ticket.landed | dateTime: 'dd/MM/yyyy'}} + {{saleClaimed.sale.quantity}} + {{saleClaimed.quantity}} + {{saleClaimed.sale.concept}} + {{saleClaimed.sale.price | currency:'€':2}} + {{saleClaimed.sale.discount}} % + + {{(saleClaimed.sale.quantity * saleClaimed.sale.price) - + ((saleClaimed.sale.discount * + (saleClaimed.sale.quantity * saleClaimed.sale.price))/100) | currency:'€':2 + }} + + + + + No results + + + + + + +
Development
+ + + + Reason + Result + Responsible + Worker + Redelivery + + + + + {{development.claimReason.description}} + {{development.claimResult.description}} + {{development.claimResponsible.description}} + {{development.worker.firstName}} + {{development.claimRedelivery.description}} + + + + No results + + + + + + +
Action
+ + + + Id + Destination + Landed + Quantity + Description + Price + Disc. + Total + + + + + {{action.sale.id}} + {{action.claimBeggining.description}} + {{action.sale.ticket.landed | dateTime: 'dd/MM/yyyy'}} + {{action.sale.quantity}} + {{action.sale.concept}} + {{action.sale.price}} + {{action.sale.discount}} % + + {{(action.sale.quantity * action.sale.price) - + ((action.sale.discount * + (action.sale.quantity * action.sale.price))/100) | currency:'€':2 + }} + + + + + No results + + + + + + + \ No newline at end of file diff --git a/client/claim/src/summary/index.js b/client/claim/src/summary/index.js new file mode 100644 index 000000000..f20133abc --- /dev/null +++ b/client/claim/src/summary/index.js @@ -0,0 +1,28 @@ +import ngModule from '../module'; + +class Controller { + constructor($http) { + this.$http = $http; + } + + getSummary() { + this.$http.get(`/claim/api/Claims/${this.claim.id}/getSummary`).then(response => { + this.summary = response.data; + }); + } + + $onChanges() { + if (this.claim && this.claim.id) + this.getSummary(); + } +} + +Controller.$inject = ['$http']; + +ngModule.component('vnClaimSummary', { + template: require('./index.html'), + controller: Controller, + bindings: { + claim: '<' + } +}); diff --git a/client/claim/src/summary/index.spec.js b/client/claim/src/summary/index.spec.js new file mode 100644 index 000000000..89ee4e930 --- /dev/null +++ b/client/claim/src/summary/index.spec.js @@ -0,0 +1,41 @@ +import './index.js'; + +describe('Claim', () => { + describe('Component summary', () => { + let $componentController; + let controller; + let $httpBackend; + + beforeEach(() => { + angular.mock.module('claim'); + }); + + beforeEach(angular.mock.inject((_$componentController_, _$httpBackend_) => { + $componentController = _$componentController_; + $httpBackend = _$httpBackend_; + $httpBackend.when('GET', /\/locale\/\w+\/[a-z]{2}\.json/).respond({}); + controller = $componentController('vnClaimSummary'); + controller.claim = {id: 1}; + })); + + describe('getSummary()', () => { + it("should perform a query to set summary", () => { + $httpBackend.when('GET', `/claim/api/Claims/1/getSummary`).respond(200, 24); + $httpBackend.expect('GET', `/claim/api/Claims/1/getSummary`); + controller.getSummary(); + $httpBackend.flush(); + + expect(controller.summary).toEqual(24); + }); + }); + + describe('$onChanges()', () => { + it("should call getSummary when item.id is defined", () => { + spyOn(controller, 'getSummary'); + controller.$onChanges(); + + expect(controller.getSummary).toHaveBeenCalledWith(); + }); + }); + }); +}); diff --git a/client/core/src/components/input-range/index.js b/client/core/src/components/input-range/index.js index c3c0c37da..4b102a7e2 100644 --- a/client/core/src/components/input-range/index.js +++ b/client/core/src/components/input-range/index.js @@ -53,6 +53,10 @@ export default class inputRange extends Input { set model(value) { this._model = value; } + + set disabled(value) { + this.input.disabled = value; + } } inputRange.$inject = ['$element', '$scope']; diff --git a/client/core/src/components/pagination/pagination.js b/client/core/src/components/pagination/pagination.js index 68c1b3d71..03d3f52c7 100644 --- a/client/core/src/components/pagination/pagination.js +++ b/client/core/src/components/pagination/pagination.js @@ -14,7 +14,7 @@ import './style.scss'; class Pagination extends Component { constructor($element, $scope) { super($element, $scope); - this.scrollOffset = 150; + this.scrollOffset = 300; this.scrollHandler = e => this.onScroll(e); } diff --git a/client/core/src/components/rest-model/crud-model.js b/client/core/src/components/rest-model/crud-model.js index 55db63c89..d4ae1c0cd 100644 --- a/client/core/src/components/rest-model/crud-model.js +++ b/client/core/src/components/rest-model/crud-model.js @@ -10,6 +10,9 @@ export default class CrudModel extends ModelProxy { this.autoLoad = true; } + /** + * Whether the model is loading. + */ get isLoading() { return this.canceler != null; } @@ -19,23 +22,76 @@ export default class CrudModel extends ModelProxy { this.refresh(); } - refresh(usFilter) { - if (!this.url) return; + buildFilter() { + let order = this.order; + + if (typeof order === 'string') + order = this.order.split(/\s*,\s*/); let myFilter = { fields: this.fields, where: mergeWhere(this.link, this.where), include: this.include, - order: this.order, + order: order, limit: this.limit }; let filter = this.filter; filter = mergeFilters(myFilter, filter); - filter = mergeFilters(usFilter, filter); - return this.sendRequest(filter); + filter = mergeFilters(this.userFilter, filter); + return filter; } + /** + * Refresh the model data. + * + * @return {Promise} The request promise + */ + refresh() { + if (!this.url) return; + return this.sendRequest(this.buildFilter()); + } + + /** + * Applies a new filter to the model. + * + * @param {Object} userFilter The Loopback filter + * @param {Object} userParams Custom parameters + * @return {Promise} The request promise + */ + applyFilter(userFilter, userParams) { + this.userFilter = userFilter; + this.userParams = userParams; + return this.refresh(); + } + + /** + * Adds a filter to the model. + * + * @param {Object} userFilter The Loopback filter + * @param {Object} userParams Custom parameters + * @return {Promise} The request promise + */ + addFilter(userFilter, userParams) { + this.userFilter = mergeFilters(userFilter, this.userFilter); + Object.assign(this.userParams, userParams); + return this.refresh(); + } + + /** + * Removes the currently applied user filters. + * + * @return {Promise} The request promise + */ + removeFilter() { + this.userFilter = null; + this.userParams = null; + return this.refresh(); + } + + /** + * Cancels the current request, if any. + */ cancelRequest() { if (this.canceler) { this.canceler.resolve(); @@ -43,55 +99,21 @@ export default class CrudModel extends ModelProxy { } } - sendRequest(filter, append) { - this.cancelRequest(); - this.canceler = this.$q.defer(); - - let options = { - timeout: this.canceler.promise, - params: {filter: filter} - }; - - if (this.userParams instanceof Object) - Object.assign(options.params, this.userParams); - - return this.$http.get(this.url, options).then( - json => this.onRemoteDone(json, filter, append), - json => this.onRemoteError(json) - ); - } - - onRemoteDone(json, filter, append) { - let data = json.data; - - if (append) - this.orgData = this.orgData.concat(data); - else - this.orgData = data; - - this.currentFilter = filter; - this.moreRows = filter.limit && data.length == filter.limit; - this.onRequestEnd(); - this.dataChanged(); - } - - onRemoteError(err) { - this.onRequestEnd(); - throw err; - } - - onRequestEnd() { - this.canceler = null; - } - + /** + * When limit is enabled, loads the next set of rows. + */ loadMore() { - if (this.moreRows) { - let filter = Object.assign({}, this.currentFilter); - filter.skip = (filter.skip || 0) + filter.limit; - this.sendRequest(filter, true); - } + if (!this.moreRows) return; + let filter = Object.assign({}, this.currentFilter); + filter.skip = this.orgData ? this.orgData.length : 0; + this.sendRequest(filter, true); } + /** + * Returns an object with the unsaved changes made to the model. + * + * @return {Object} The current changes + */ getChanges() { let create = []; let update = []; @@ -124,6 +146,11 @@ export default class CrudModel extends ModelProxy { return changes; } + /** + * Saves current changes on the server. + * + * @return {Promise} The save request promise + */ save() { let changes = this.getChanges(); @@ -134,6 +161,60 @@ export default class CrudModel extends ModelProxy { return this.$http.post(url, changes) .then(() => this.resetChanges()); } + + buildParams() { + let params = {}; + + if (this.params instanceof Object) + Object.assign(params, this.params); + if (this.userParams instanceof Object) + Object.assign(params, this.userParams); + + return params; + } + + sendRequest(filter, append) { + this.cancelRequest(); + this.canceler = this.$q.defer(); + + let params = Object.assign( + {filter: filter}, + this.buildParams() + ); + let options = { + timeout: this.canceler.promise, + params: params + }; + + return this.$http.get(this.url, options).then( + json => this.onRemoteDone(json, filter, append), + json => this.onRemoteError(json) + ); + } + + onRemoteDone(json, filter, append) { + let data = json.data; + + if (append) { + this.orgData = this.orgData.concat(data); + } else { + this.orgData = data; + this.currentFilter = filter; + } + + this.moreRows = filter.limit && data.length == filter.limit; + this.onRequestEnd(); + this.dataChanged(); + } + + onRemoteError(err) { + this.onRequestEnd(); + throw err; + } + + onRequestEnd() { + this.canceler = null; + } } CrudModel.$inject = ['$http', '$q']; @@ -152,6 +233,8 @@ ngModule.component('vnCrudModel', { order: '@?', limit: ' 0 ? {where: {and}} : null; - this.model.refresh(lbFilter); + let where; + + if (and.length == 1) + where = and[0]; + else if (and.length > 1) + where = {and}; + else + where = null; + + this.model.applyFilter( + and.length > 0 ? {where: where} : null, + hasParams ? userParams : null + ); } } + exprBuilder(param, value) { + return {[param]: value}; + } + pushFilterToState(filter) { let state = window.location.hash.split('?')[0]; let keys = Object.keys(filter); @@ -214,7 +238,8 @@ ngModule.component('vnSearchbar', { onSearch: '&', panel: '@', model: ' { }); describe('clear()', () => { - it(`should set value property to null and call focus`, () => { + it(`should set value property to null, call focus and saveOldValue`, () => { spyOn(controller.input, 'focus'); + spyOn(controller, 'saveOldValue'); controller.clear(); expect(controller.value).toEqual(null); + expect(controller.saveOldValue).toHaveBeenCalledWith(); expect(controller.input.focus).toHaveBeenCalledWith(); }); }); diff --git a/client/item/src/diary/index.html b/client/item/src/diary/index.html index b07771097..366902678 100644 --- a/client/item/src/diary/index.html +++ b/client/item/src/diary/index.html @@ -37,17 +37,27 @@ {{::sale.date | date:'dd/MM/yyyy HH:mm' }} - - {{::sale.origin | dashIfEmpty}} + + + {{::sale.origin | dashIfEmpty}} + + {{::sale.stateName | dashIfEmpty}} {{::sale.reference | dashIfEmpty}} - - {{sale.name | dashIfEmpty}} + + + {{sale.name | dashIfEmpty}} + + {{::sale.in | dashIfEmpty}} {{::sale.out | dashIfEmpty}} - {{::sale.balance | dashIfEmpty}} + + + {{::sale.balance | dashIfEmpty}} + + diff --git a/client/item/src/index/index.html b/client/item/src/index/index.html index 30ee7eb42..19a8f08db 100644 --- a/client/item/src/index/index.html +++ b/client/item/src/index/index.html @@ -2,7 +2,7 @@ vn-id="model" url="/item/api/Items/filter" limit="8" - order="isActive ASC, name" + order="isActive DESC, name" data="items" auto-load="false"> @@ -12,7 +12,8 @@ + expr-builder="$ctrl.exprBuilder(param, value)" + param-builder="$ctrl.paramBuilder(param, value)"> diff --git a/client/item/src/index/index.js b/client/item/src/index/index.js index 6e17a8521..7926c33c6 100644 --- a/client/item/src/index/index.js +++ b/client/item/src/index/index.js @@ -22,9 +22,13 @@ class Controller { case 'id': case 'typeFk': return {[param]: value}; + } + } + + paramBuilder(param, value) { + switch (param) { case 'tags': - this.$.model.userParams = {tags: value}; - break; + return {[param]: value}; } } diff --git a/client/order/src/line/index.html b/client/order/src/line/index.html index d195cca78..3657b9c3c 100644 --- a/client/order/src/line/index.html +++ b/client/order/src/line/index.html @@ -41,9 +41,11 @@ zoom-image="//verdnatura.es/vn-image-data/catalog/1600x900/{{::row.item.image}}" on-error-src/> - - {{("000000"+row.itemFk).slice(-6)}} + + + {{("000000"+row.itemFk).slice(-6)}} + {{row.warehouse.name}} diff --git a/client/order/src/volume/index.html b/client/order/src/volume/index.html index 26738e17e..73be7062c 100644 --- a/client/order/src/volume/index.html +++ b/client/order/src/volume/index.html @@ -32,9 +32,12 @@ - - {{::row.itemFk}} + + + {{::row.itemFk}} + {{::row.quantity}} diff --git a/client/ticket/src/component/index.html b/client/ticket/src/component/index.html index 57c7ccee2..13aef9362 100644 --- a/client/ticket/src/component/index.html +++ b/client/ticket/src/component/index.html @@ -42,9 +42,13 @@ {{("000000"+sale.itemFk).slice(-6)}} + }}" number> + + {{("000000"+sale.itemFk).slice(-6)}} + + diff --git a/client/ticket/src/expedition/index.html b/client/ticket/src/expedition/index.html index ba39cc0b3..10253d615 100644 --- a/client/ticket/src/expedition/index.html +++ b/client/ticket/src/expedition/index.html @@ -25,17 +25,19 @@ - + delete - - {{expedition.itemFk}} + + + {{expedition.itemFk}} + {{::expedition.namePackage}} {{::expedition.nameBox}} diff --git a/client/ticket/src/sale-checked/index.html b/client/ticket/src/sale-checked/index.html index ef070d6e1..1dde0152c 100644 --- a/client/ticket/src/sale-checked/index.html +++ b/client/ticket/src/sale-checked/index.html @@ -27,10 +27,12 @@ disabled="true"> - - {{("000000"+sale.itemFk).slice(-6)}} + + + {{("000000"+sale.itemFk).slice(-6)}} + {{::sale.quantity}} diff --git a/client/ticket/src/sale-tracking/index.html b/client/ticket/src/sale-tracking/index.html index 9a2e26b73..13ecc543c 100644 --- a/client/ticket/src/sale-tracking/index.html +++ b/client/ticket/src/sale-tracking/index.html @@ -33,10 +33,12 @@ ng-if="sale.quantity != sale.originalQuantity" vn-tooltip="The quantity do not match"> - - {{("000000"+sale.itemFk).slice(-6)}} + + + {{("000000"+sale.itemFk).slice(-6)}} + {{::sale.quantity}} diff --git a/client/ticket/src/sale/index.html b/client/ticket/src/sale/index.html index 65b533e5e..b3c756766 100644 --- a/client/ticket/src/sale/index.html +++ b/client/ticket/src/sale/index.html @@ -84,9 +84,12 @@ zoom-image="//verdnatura.es/vn-image-data/catalog/1600x900/{{::sale.image}}" on-error-src/> - - {{("000000"+sale.itemFk).slice(-6)}} + + + {{("000000"+sale.itemFk).slice(-6)}} + {{sale.quantity}} diff --git a/client/ticket/src/sale/index.js b/client/ticket/src/sale/index.js index 77ed7c2e4..e5f602a96 100644 --- a/client/ticket/src/sale/index.js +++ b/client/ticket/src/sale/index.js @@ -141,6 +141,7 @@ class Controller { let query = `/ticket/api/Sales/removes`; this.$http.post(query, params).then(() => { this.removeInstances(sales); + this.vnApp.showSuccess(this.$translate.instant('Data saved!')); }); } } diff --git a/client/ticket/src/summary/index.html b/client/ticket/src/summary/index.html index 871ad30d0..8d1bbc1cc 100644 --- a/client/ticket/src/summary/index.html +++ b/client/ticket/src/summary/index.html @@ -67,16 +67,20 @@ - - + + + - - {{("000000"+sale.itemFk).slice(-6)}} + + + {{("000000"+sale.itemFk).slice(-6)}} + {{::sale.quantity}} diff --git a/client/ticket/src/volume/index.html b/client/ticket/src/volume/index.html index 1869ef0e1..83da50ce7 100644 --- a/client/ticket/src/volume/index.html +++ b/client/ticket/src/volume/index.html @@ -32,10 +32,12 @@ - - {{("000000"+sale.itemFk).slice(-6)}} + + + {{("000000"+sale.itemFk).slice(-6)}} + {{::sale.quantity}} diff --git a/e2e/helpers/selectors.js b/e2e/helpers/selectors.js index a133c0103..2a8e62233 100644 --- a/e2e/helpers/selectors.js +++ b/e2e/helpers/selectors.js @@ -357,6 +357,6 @@ export default { }, claimDetails: { detailsButton: `vn-menu-item a[ui-sref="claim.card.detail"]`, - addItemButton: `vn-claim-detail > vn-vertical > vn-card > div > vn-vertical > vn-one > vn-icon-button > vn-icon > i` + addItemButton: `vn-claim-detail a vn-float-button` } }; diff --git a/e2e/paths/claim-module/01_edit_basic_data.spec.js b/e2e/paths/claim-module/01_edit_basic_data.spec.js index 44ed03231..574b20c32 100644 --- a/e2e/paths/claim-module/01_edit_basic_data.spec.js +++ b/e2e/paths/claim-module/01_edit_basic_data.spec.js @@ -22,18 +22,17 @@ describe('Claim', () => { }); }); - // descomentar este test despues de completar la tarea #629 claim index buscador avanzado - // it('should search for the claim with id 1', () => { - // return nightmare - // .wait(selectors.claimsIndex.searchResult) - // .type(selectors.claimsIndex.searchClaimInput, '1') - // .click(selectors.claimsIndex.searchButton) - // .waitForNumberOfElements(selectors.claimsIndex.searchResult, 1) - // .countElement(selectors.claimsIndex.searchResult) - // .then(result => { - // expect(result).toEqual(1); - // }); - // }); + it('should search for the claim with id 1', () => { + return nightmare + .wait(selectors.claimsIndex.searchResult) + .type(selectors.claimsIndex.searchClaimInput, '1') + .click(selectors.claimsIndex.searchButton) + .waitForNumberOfElements(selectors.claimsIndex.searchResult, 1) + .countElement(selectors.claimsIndex.searchResult) + .then(result => { + expect(result).toEqual(1); + }); + }); it(`should click on the search result to access to the ticket Basic Data`, () => { return nightmare diff --git a/e2e/paths/client-module/03_edit_fiscal_data.spec.js b/e2e/paths/client-module/03_edit_fiscal_data.spec.js index 59fd99883..a46ab294a 100644 --- a/e2e/paths/client-module/03_edit_fiscal_data.spec.js +++ b/e2e/paths/client-module/03_edit_fiscal_data.spec.js @@ -1,338 +1,336 @@ import selectors from '../../helpers/selectors.js'; import createNightmare from '../../helpers/helpers'; -describe('Client', () => { - describe('Edit fiscalData path', () => { - const nightmare = createNightmare(); +describe('Client Edit fiscalData path', () => { + const nightmare = createNightmare(); - beforeAll(() => { - return nightmare - .waitForLogin('developer'); + beforeAll(() => { + return nightmare + .waitForLogin('developer'); + }); + + it('should click on the Clients button of the top bar menu', () => { + return nightmare + .waitToClick(selectors.globalItems.applicationsMenuButton) + .wait(selectors.globalItems.applicationsMenuVisible) + .waitToClick(selectors.globalItems.clientsButton) + .wait(selectors.clientsIndex.createClientButton) + .parsedUrl() + .then(url => { + expect(url.hash).toEqual('#!/client/index'); }); + }); - it('should click on the Clients button of the top bar menu', () => { - return nightmare - .waitToClick(selectors.globalItems.applicationsMenuButton) - .wait(selectors.globalItems.applicationsMenuVisible) - .waitToClick(selectors.globalItems.clientsButton) - .wait(selectors.clientsIndex.createClientButton) - .parsedUrl() - .then(url => { - expect(url.hash).toEqual('#!/client/index'); - }); + it('should search for the user Bruce Banner', () => { + return nightmare + .wait(selectors.clientsIndex.searchResult) + .type(selectors.clientsIndex.searchClientInput, 'Bruce Banner') + .click(selectors.clientsIndex.searchButton) + .waitForNumberOfElements(selectors.clientsIndex.searchResult, 1) + .countElement(selectors.clientsIndex.searchResult) + .then(result => { + expect(result).toEqual(1); }); + }); - it('should search for the user Bruce Banner', () => { + describe('Confirms all addresses have EQtax false for future propagation test', () => { + it(`should click on the search result to access to the client's addresses`, () => { return nightmare - .wait(selectors.clientsIndex.searchResult) - .type(selectors.clientsIndex.searchClientInput, 'Bruce Banner') - .click(selectors.clientsIndex.searchButton) - .waitForNumberOfElements(selectors.clientsIndex.searchResult, 1) - .countElement(selectors.clientsIndex.searchResult) - .then(result => { - expect(result).toEqual(1); - }); - }); - - describe('Confirms all addresses have EQtax false for future propagation test', () => { - it(`should click on the search result to access to the client's addresses`, () => { - return nightmare - .waitForTextInElement(selectors.clientsIndex.searchResult, 'Bruce Banner') - .waitToClick(selectors.clientsIndex.searchResult) - .waitToClick(selectors.clientAddresses.addressesButton) - .waitForURL('/address/index') - .url() - .then(url => { - expect(url).toContain('/address/index'); - }); - }); - - it(`should click on the 1st edit icon to check EQtax isnt checked`, () => { - return nightmare - .waitToClick(selectors.clientAddresses.firstEditButton) - .wait(selectors.clientAddresses.equalizationTaxCheckboxLabel) - .evaluate(selector => { - return document.querySelector(selector).checked; - }, selectors.clientAddresses.equalizationTaxCheckboxLabel) - .then(value => { - expect(value).toBeFalsy(); - }); - }); - - it(`should go back to addresses then select the second one and confirm the EQtax isnt checked`, () => { - return nightmare - .waitToClick(selectors.clientAddresses.addressesButton) - .waitToClick(selectors.clientAddresses.secondEditButton) - .wait(selectors.clientAddresses.equalizationTaxCheckboxLabel) - .evaluate(selector => { - return document.querySelector(selector).checked; - }, selectors.clientAddresses.equalizationTaxCheckboxLabel) - .then(value => { - expect(value).toBeFalsy(); - }); - }); - }); - - it(`should click on the fiscal data button to start editing`, () => { - return nightmare - .waitToClick(selectors.clientFiscalData.fiscalDataButton) - .waitForURL('fiscal-data') + .waitForTextInElement(selectors.clientsIndex.searchResult, 'Bruce Banner') + .waitToClick(selectors.clientsIndex.searchResult) + .waitToClick(selectors.clientAddresses.addressesButton) + .waitForURL('/address/index') .url() .then(url => { - expect(url).toContain('fiscal-data'); + expect(url).toContain('/address/index'); }); }); - it('should edit the clients fiscal data', () => { + it(`should click on the 1st edit icon to check EQtax isnt checked`, () => { return nightmare - .wait(selectors.clientFiscalData.socialNameInput) - .clearInput(selectors.clientFiscalData.socialNameInput) - .type(selectors.clientFiscalData.socialNameInput, 'SMASH!') - .waitForTextInInput(selectors.clientFiscalData.socialNameInput, 'SMASH!') - .clearInput(selectors.clientFiscalData.fiscalIdInput) - .type(selectors.clientFiscalData.fiscalIdInput, '94980061C') - .clearInput(selectors.clientFiscalData.addressInput) - .type(selectors.clientFiscalData.addressInput, 'Somewhere edited') - .clearInput(selectors.clientFiscalData.postcodeInput) - .type(selectors.clientFiscalData.postcodeInput, '12345') - .clearInput(selectors.clientFiscalData.cityInput) - .type(selectors.clientFiscalData.cityInput, 'N/A') - .waitToClick(selectors.clientFiscalData.countryInput) - .waitToClick(selectors.clientFiscalData.countryThirdOption) - .waitToClick(selectors.clientFiscalData.provinceInput) - .waitToClick(selectors.clientFiscalData.provinceFifthOption) - .waitToClick(selectors.clientFiscalData.activeCheckboxLabel) - .waitToClick(selectors.clientFiscalData.frozenCheckboxLabel) - .waitToClick(selectors.clientFiscalData.hasToInvoiceCheckboxLabel) - .waitToClick(selectors.clientFiscalData.viesCheckboxInput) - .waitToClick(selectors.clientFiscalData.invoiceByMailCheckboxLabel) - .waitToClick(selectors.clientFiscalData.invoiceByAddressCheckboxInput) - .waitToClick(selectors.clientFiscalData.equalizationTaxCheckboxLabel) - .waitToClick(selectors.clientFiscalData.verifiedDataCheckboxInput) - .click(selectors.clientFiscalData.saveButton) + .waitToClick(selectors.clientAddresses.firstEditButton) + .wait(selectors.clientAddresses.equalizationTaxCheckboxLabel) + .evaluate(selector => { + return document.querySelector(selector).checked; + }, selectors.clientAddresses.equalizationTaxCheckboxLabel) + .then(value => { + expect(value).toBeFalsy(); + }); + }); + + it(`should go back to addresses then select the second one and confirm the EQtax isnt checked`, () => { + return nightmare + .waitToClick(selectors.clientAddresses.addressesButton) + .waitToClick(selectors.clientAddresses.secondEditButton) + .wait(selectors.clientAddresses.equalizationTaxCheckboxLabel) + .evaluate(selector => { + return document.querySelector(selector).checked; + }, selectors.clientAddresses.equalizationTaxCheckboxLabel) + .then(value => { + expect(value).toBeFalsy(); + }); + }); + }); + + it(`should click on the fiscal data button to start editing`, () => { + return nightmare + .waitToClick(selectors.clientFiscalData.fiscalDataButton) + .waitForURL('fiscal-data') + .url() + .then(url => { + expect(url).toContain('fiscal-data'); + }); + }); + + it('should edit the clients fiscal data', () => { + return nightmare + .wait(selectors.clientFiscalData.socialNameInput) + .clearInput(selectors.clientFiscalData.socialNameInput) + .type(selectors.clientFiscalData.socialNameInput, 'SMASH!') + .waitForTextInInput(selectors.clientFiscalData.socialNameInput, 'SMASH!') + .clearInput(selectors.clientFiscalData.fiscalIdInput) + .type(selectors.clientFiscalData.fiscalIdInput, '94980061C') + .clearInput(selectors.clientFiscalData.addressInput) + .type(selectors.clientFiscalData.addressInput, 'Somewhere edited') + .clearInput(selectors.clientFiscalData.postcodeInput) + .type(selectors.clientFiscalData.postcodeInput, '12345') + .clearInput(selectors.clientFiscalData.cityInput) + .type(selectors.clientFiscalData.cityInput, 'N/A') + .waitToClick(selectors.clientFiscalData.countryInput) + .waitToClick(selectors.clientFiscalData.countryThirdOption) + .waitToClick(selectors.clientFiscalData.provinceInput) + .waitToClick(selectors.clientFiscalData.provinceFifthOption) + .waitToClick(selectors.clientFiscalData.activeCheckboxLabel) + .waitToClick(selectors.clientFiscalData.frozenCheckboxLabel) + .waitToClick(selectors.clientFiscalData.hasToInvoiceCheckboxLabel) + .waitToClick(selectors.clientFiscalData.viesCheckboxInput) + .waitToClick(selectors.clientFiscalData.invoiceByMailCheckboxLabel) + .waitToClick(selectors.clientFiscalData.invoiceByAddressCheckboxInput) + .waitToClick(selectors.clientFiscalData.equalizationTaxCheckboxLabel) + .waitToClick(selectors.clientFiscalData.verifiedDataCheckboxInput) + .click(selectors.clientFiscalData.saveButton) + .waitForSnackbar() + .then(result => { + expect(result).toEqual(jasmine.arrayContaining(['Data saved!'])); + }); + }); + + it('should propagate the Equalization tax', () => { + return nightmare + .waitToClick(selectors.clientFiscalData.acceptPropagationButton) + .waitForSnackbar() + .then(result => { + expect(result).toEqual(jasmine.arrayContaining(['Equivalent tax spreaded'])); + }); + }); + + describe('confirm all addresses have now EQtax checked', () => { + it(`should click on the addresses button to access to the client's addresses`, () => { + return nightmare + .waitToClick(selectors.clientAddresses.addressesButton) + .waitForURL('/address/index') + .url() + .then(url => { + expect(url).toContain('/address/index'); + }); + }); + + it(`should click on the 1st edit icon to confirm EQtax is checked`, () => { + return nightmare + .waitToClick(selectors.clientAddresses.firstEditButton) + .wait(selectors.clientAddresses.equalizationTaxCheckboxLabel) + .evaluate(selector => { + return document.querySelector(selector).checked; + }, selectors.clientAddresses.equalizationTaxCheckboxLabel) + .then(value => { + expect(value).toBeTruthy(); + }); + }); + + it(`should go back to addresses then select the second one and confirm the EQtax is checked`, () => { + return nightmare + .waitToClick(selectors.clientAddresses.addressesButton) + .waitToClick(selectors.clientAddresses.secondEditButton) + .wait(selectors.clientAddresses.equalizationTaxCheckboxLabel) + .evaluate(selector => { + return document.querySelector(selector).checked; + }, selectors.clientAddresses.equalizationTaxCheckboxLabel) + .then(value => { + expect(value).toBeTruthy(); + }); + }); + }); + + it('should navigate back to fiscal data to confirm its name have been edited', () => { + return nightmare + .waitToClick(selectors.clientFiscalData.fiscalDataButton) + .wait(selectors.clientFiscalData.socialNameInput) + .getInputValue(selectors.clientFiscalData.socialNameInput) + .then(result => { + expect(result).toEqual('SMASH!'); + }); + }); + + it('should confirm the fiscal id have been edited', () => { + return nightmare + .getInputValue(selectors.clientFiscalData.fiscalIdInput) + .then(result => { + expect(result).toEqual('94980061C'); + }); + }); + + it('should confirm the address have been edited', () => { + return nightmare + .getInputValue(selectors.clientFiscalData.addressInput) + .then(result => { + expect(result).toEqual('Somewhere edited'); + }); + }); + + it('should confirm the postcode have been edited', () => { + return nightmare + .getInputValue(selectors.clientFiscalData.postcodeInput) + .then(result => { + expect(result).toEqual('12345'); + }); + }); + + it('should confirm the city have been edited', () => { + return nightmare + .getInputValue(selectors.clientFiscalData.cityInput) + .then(result => { + expect(result).toEqual('N/A'); + }); + }); + + it(`should confirm the country have been selected`, () => { + return nightmare + .getInputValue(selectors.clientFiscalData.countryInput) + .then(result => { + expect(result).toEqual('Francia'); + }); + }); + + it(`should confirm the province have been selected`, () => { + return nightmare + .getInputValue(selectors.clientFiscalData.provinceInput) + .then(result => { + expect(result).toEqual('Province two'); + }); + }); + + it('should confirm active checkbox is unchecked', () => { + return nightmare + .evaluate(selector => { + return document.querySelector(selector).checked; + }, selectors.clientFiscalData.activeCheckboxLabel) + .then(value => { + expect(value).toBeFalsy(); + }); + }); + + it('should confirm frozen checkbox is unchecked', () => { + return nightmare + .evaluate(selector => { + return document.querySelector(selector).checked; + }, selectors.clientFiscalData.frozenCheckboxLabel) + .then(value => { + expect(value).toBeFalsy(); + }); + }); + + it('should confirm Has to invoice checkbox is unchecked', () => { + return nightmare + .evaluate(selector => { + return document.querySelector(selector).checked; + }, selectors.clientFiscalData.hasToInvoiceCheckboxLabel) + .then(value => { + expect(value).toBeFalsy(); + }); + }); + + it('should confirm Vies checkbox is checked', () => { + return nightmare + .evaluate(selector => { + return document.querySelector(selector).checked; + }, selectors.clientFiscalData.viesCheckboxInput) + .then(value => { + expect(value).toBeTruthy(); + }); + }); + + it('should confirm Invoice by mail checkbox is unchecked', () => { + return nightmare + .evaluate(selector => { + return document.querySelector(selector).checked; + }, selectors.clientFiscalData.invoiceByMailCheckboxLabel) + .then(value => { + expect(value).toBeFalsy(); + }); + }); + + it('should confirm invoice by address checkbox is unchecked', () => { + return nightmare + .evaluate(selector => { + return document.querySelector(selector).checked; + }, selectors.clientFiscalData.invoiceByAddressCheckboxInput) + .then(value => { + expect(value).toBeFalsy(); + }); + }); + + it('should confirm Equalization tax checkbox is checked', () => { + return nightmare + .evaluate(selector => { + return document.querySelector(selector).checked; + }, selectors.clientFiscalData.equalizationTaxCheckboxLabel) + .then(value => { + expect(value).toBeTruthy(); + }); + }); + + it('should confirm Verified data checkbox is checked', () => { + return nightmare + .evaluate(selector => { + return document.querySelector(selector).checked; + }, selectors.clientFiscalData.verifiedDataCheckboxInput) + .then(value => { + expect(value).toBeTruthy(); + }); + }); + + describe('confirm invoice by address checkbox gets checked if the EQtax differs between addresses', () => { + it(`should click on the addresses button to access to the client's addresses`, () => { + return nightmare + .waitToClick(selectors.clientAddresses.addressesButton) + .waitForURL('/address/index') + .url() + .then(url => { + expect(url).toContain('/address/index'); + }); + }); + + it(`should click on the 1st edit icon to access the address details and uncheck EQtax checkbox`, () => { + return nightmare + .waitToClick(selectors.clientAddresses.firstEditButton) + .waitToClick(selectors.clientAddresses.equalizationTaxCheckboxLabel) + .click(selectors.clientAddresses.saveButton) .waitForSnackbar() .then(result => { expect(result).toEqual(jasmine.arrayContaining(['Data saved!'])); }); }); - it('should propagate the Equalization tax', () => { - return nightmare - .waitToClick(selectors.clientFiscalData.acceptPropagationButton) - .waitForSnackbar() - .then(result => { - expect(result).toEqual(jasmine.arrayContaining(['Equivalent tax spreaded'])); - }); - }); - - describe('confirm all addresses have now EQtax checked', () => { - it(`should click on the addresses button to access to the client's addresses`, () => { - return nightmare - .waitToClick(selectors.clientAddresses.addressesButton) - .waitForURL('/address/index') - .url() - .then(url => { - expect(url).toContain('/address/index'); - }); - }); - - it(`should click on the 1st edit icon to confirm EQtax is checked`, () => { - return nightmare - .waitToClick(selectors.clientAddresses.firstEditButton) - .wait(selectors.clientAddresses.equalizationTaxCheckboxLabel) - .evaluate(selector => { - return document.querySelector(selector).checked; - }, selectors.clientAddresses.equalizationTaxCheckboxLabel) - .then(value => { - expect(value).toBeTruthy(); - }); - }); - - it(`should go back to addresses then select the second one and confirm the EQtax is checked`, () => { - return nightmare - .waitToClick(selectors.clientAddresses.addressesButton) - .waitToClick(selectors.clientAddresses.secondEditButton) - .wait(selectors.clientAddresses.equalizationTaxCheckboxLabel) - .evaluate(selector => { - return document.querySelector(selector).checked; - }, selectors.clientAddresses.equalizationTaxCheckboxLabel) - .then(value => { - expect(value).toBeTruthy(); - }); - }); - }); - - it('should navigate back to fiscal data to confirm its name have been edited', () => { + it('should navigate back to fiscal data to confirm invoice by address is now checked', () => { return nightmare .waitToClick(selectors.clientFiscalData.fiscalDataButton) - .wait(selectors.clientFiscalData.socialNameInput) - .getInputValue(selectors.clientFiscalData.socialNameInput) - .then(result => { - expect(result).toEqual('SMASH!'); - }); - }); - - it('should confirm the fiscal id have been edited', () => { - return nightmare - .getInputValue(selectors.clientFiscalData.fiscalIdInput) - .then(result => { - expect(result).toEqual('94980061C'); - }); - }); - - it('should confirm the address have been edited', () => { - return nightmare - .getInputValue(selectors.clientFiscalData.addressInput) - .then(result => { - expect(result).toEqual('Somewhere edited'); - }); - }); - - it('should confirm the postcode have been edited', () => { - return nightmare - .getInputValue(selectors.clientFiscalData.postcodeInput) - .then(result => { - expect(result).toEqual('12345'); - }); - }); - - it('should confirm the city have been edited', () => { - return nightmare - .getInputValue(selectors.clientFiscalData.cityInput) - .then(result => { - expect(result).toEqual('N/A'); - }); - }); - - it(`should confirm the country have been selected`, () => { - return nightmare - .getInputValue(selectors.clientFiscalData.countryInput) - .then(result => { - expect(result).toEqual('Francia'); - }); - }); - - it(`should confirm the province have been selected`, () => { - return nightmare - .getInputValue(selectors.clientFiscalData.provinceInput) - .then(result => { - expect(result).toEqual('Province two'); - }); - }); - - it('should confirm active checkbox is unchecked', () => { - return nightmare - .evaluate(selector => { - return document.querySelector(selector).checked; - }, selectors.clientFiscalData.activeCheckboxLabel) - .then(value => { - expect(value).toBeFalsy(); - }); - }); - - it('should confirm frozen checkbox is unchecked', () => { - return nightmare - .evaluate(selector => { - return document.querySelector(selector).checked; - }, selectors.clientFiscalData.frozenCheckboxLabel) - .then(value => { - expect(value).toBeFalsy(); - }); - }); - - it('should confirm Has to invoice checkbox is unchecked', () => { - return nightmare - .evaluate(selector => { - return document.querySelector(selector).checked; - }, selectors.clientFiscalData.hasToInvoiceCheckboxLabel) - .then(value => { - expect(value).toBeFalsy(); - }); - }); - - it('should confirm Vies checkbox is checked', () => { - return nightmare - .evaluate(selector => { - return document.querySelector(selector).checked; - }, selectors.clientFiscalData.viesCheckboxInput) - .then(value => { - expect(value).toBeTruthy(); - }); - }); - - it('should confirm Invoice by mail checkbox is unchecked', () => { - return nightmare - .evaluate(selector => { - return document.querySelector(selector).checked; - }, selectors.clientFiscalData.invoiceByMailCheckboxLabel) - .then(value => { - expect(value).toBeFalsy(); - }); - }); - - it('should confirm invoice by address checkbox is unchecked', () => { - return nightmare + .wait(selectors.clientFiscalData.invoiceByAddressCheckboxInput) .evaluate(selector => { return document.querySelector(selector).checked; }, selectors.clientFiscalData.invoiceByAddressCheckboxInput) - .then(value => { - expect(value).toBeFalsy(); - }); - }); - - it('should confirm Equalization tax checkbox is checked', () => { - return nightmare - .evaluate(selector => { - return document.querySelector(selector).checked; - }, selectors.clientFiscalData.equalizationTaxCheckboxLabel) .then(value => { expect(value).toBeTruthy(); }); }); - - it('should confirm Verified data checkbox is checked', () => { - return nightmare - .evaluate(selector => { - return document.querySelector(selector).checked; - }, selectors.clientFiscalData.verifiedDataCheckboxInput) - .then(value => { - expect(value).toBeTruthy(); - }); - }); - - describe('confirm invoice by address checkbox gets checked if the EQtax differs between addresses', () => { - it(`should click on the addresses button to access to the client's addresses`, () => { - return nightmare - .waitToClick(selectors.clientAddresses.addressesButton) - .waitForURL('/address/index') - .url() - .then(url => { - expect(url).toContain('/address/index'); - }); - }); - - it(`should click on the 1st edit icon to access the address details and uncheck EQtax checkbox`, () => { - return nightmare - .waitToClick(selectors.clientAddresses.firstEditButton) - .waitToClick(selectors.clientAddresses.equalizationTaxCheckboxLabel) - .click(selectors.clientAddresses.saveButton) - .waitForSnackbar() - .then(result => { - expect(result).toEqual(jasmine.arrayContaining(['Data saved!'])); - }); - }); - - it('should navigate back to fiscal data to confirm invoice by address is now checked', () => { - return nightmare - .waitToClick(selectors.clientFiscalData.fiscalDataButton) - .wait(selectors.clientFiscalData.invoiceByAddressCheckboxInput) - .evaluate(selector => { - return document.querySelector(selector).checked; - }, selectors.clientFiscalData.invoiceByAddressCheckboxInput) - .then(value => { - expect(value).toBeTruthy(); - }); - }); - }); }); }); diff --git a/e2e/paths/client-module/06_add_address_notes.spec.js b/e2e/paths/client-module/06_add_address_notes.spec.js index 7f224089d..1899f61ea 100644 --- a/e2e/paths/client-module/06_add_address_notes.spec.js +++ b/e2e/paths/client-module/06_add_address_notes.spec.js @@ -1,99 +1,96 @@ import selectors from '../../helpers/selectors.js'; import createNightmare from '../../helpers/helpers'; -describe('Client', () => { - describe('Add address notes path', () => { - const nightmare = createNightmare(); +describe('Client add address notes path', () => { + const nightmare = createNightmare(); - beforeAll(() => { - return nightmare - .waitForLogin('developer'); + beforeAll(() => { + return nightmare + .waitForLogin('developer'); + }); + + it('should click on the Clients button of the top bar menu', () => { + return nightmare + .waitToClick(selectors.globalItems.applicationsMenuButton) + .wait(selectors.globalItems.applicationsMenuVisible) + .waitToClick(selectors.globalItems.clientsButton) + .wait(selectors.clientsIndex.createClientButton) + .parsedUrl() + .then(url => { + expect(url.hash).toEqual('#!/client/index'); }); + }); - it('should click on the Clients button of the top bar menu', () => { - return nightmare - .waitToClick(selectors.globalItems.applicationsMenuButton) - .wait(selectors.globalItems.applicationsMenuVisible) - .waitToClick(selectors.globalItems.clientsButton) - .wait(selectors.clientsIndex.createClientButton) - .parsedUrl() - .then(url => { - expect(url.hash).toEqual('#!/client/index'); - }); + it('should search for the user Petter Parker', () => { + return nightmare + .wait(selectors.clientsIndex.searchResult) + .type(selectors.clientsIndex.searchClientInput, 'Petter Parker') + .click(selectors.clientsIndex.searchButton) + .waitForNumberOfElements(selectors.clientsIndex.searchResult, 1) + .countElement(selectors.clientsIndex.searchResult) + .then(result => { + expect(result).toEqual(1); }); + }); - it('should search for the user Petter Parker', () => { - return nightmare - .wait(selectors.clientsIndex.searchResult) - .type(selectors.clientsIndex.searchClientInput, 'Petter Parker') - .click(selectors.clientsIndex.searchButton) - .waitForNumberOfElements(selectors.clientsIndex.searchResult, 1) - .countElement(selectors.clientsIndex.searchResult) - .then(result => { - expect(result).toEqual(1); - }); + it(`should click on the search result to access to the client addresses`, () => { + return nightmare + .waitForTextInElement(selectors.clientsIndex.searchResult, 'Petter Parker') + .waitToClick(selectors.clientsIndex.searchResult) + .waitToClick(selectors.clientAddresses.addressesButton) + .waitForURL('address/index') + .url() + .then(url => { + expect(url).toContain('address/index'); }); + }); - it(`should click on the search result to access to the client addresses`, () => { - return nightmare - .waitForTextInElement(selectors.clientsIndex.searchResult, 'Petter Parker') - .waitToClick(selectors.clientsIndex.searchResult) - .waitToClick(selectors.clientAddresses.addressesButton) - .waitForURL('address/index') - .url() - .then(url => { - expect(url).toContain('address/index'); - }); + it(`should click on the edit icon of the default address`, () => { + return nightmare + .waitForTextInElement(selectors.clientAddresses.defaultAddress, '20 Ingram Street') + .waitToClick(selectors.clientAddresses.firstEditButton) + .waitForURL('/edit') + .url() + .then(result => { + expect(result).toContain('/edit'); }); + }); - it(`should click on the edit icon of the default address`, () => { - return nightmare - .waitForTextInElement(selectors.clientAddresses.defaultAddress, '20 Ingram Street') - .waitToClick(selectors.clientAddresses.firstEditButton) - .waitForURL('/edit') - .url() - .then(result => { - expect(result).toContain('/edit'); - }); + it('should not save a description without observation type', () => { + return nightmare + .waitToClick(selectors.clientAddresses.addObservationButton) + .wait(selectors.clientAddresses.firstObservationDescriptionInput) + .type(selectors.clientAddresses.firstObservationDescriptionInput, 'first description') + .waitToClick(selectors.clientAddresses.saveButton) + .waitForSnackbar() + .then(result => { + expect(result).toEqual(jasmine.arrayContaining(['Observation type cannot be blank'])); }); + }); - it('should not save a description without observation type', () => { - return nightmare - .waitToClick(selectors.clientAddresses.addObservationButton) - .wait(selectors.clientAddresses.firstObservationDescriptionInput) - .type(selectors.clientAddresses.firstObservationDescriptionInput, 'first description') - .waitToClick(selectors.clientAddresses.saveButton) - .waitForSnackbar() - .then(result => { - expect(result).toEqual(jasmine.arrayContaining(['Observation type cannot be blank'])); - }); + it('should not save an observation type without description', () => { + return nightmare + .clearInput(selectors.clientAddresses.firstObservationDescriptionInput) + .waitToClick(selectors.clientAddresses.firstObservationTypeSelect) + .waitToClick(selectors.clientAddresses.firstObservationTypeSelectOptionOne) + .waitToClick(selectors.clientAddresses.saveButton) + .waitForSnackbar() + .then(result => { + expect(result).toEqual(jasmine.arrayContaining(['Some fields are invalid'])); }); + }); - it('should not save an observation type without description', () => { - return nightmare - .clearInput(selectors.clientAddresses.firstObservationDescriptionInput) - .waitToClick(selectors.clientAddresses.firstObservationTypeSelect) - .waitToClick(selectors.clientAddresses.firstObservationTypeSelectOptionOne) - .waitToClick(selectors.clientAddresses.saveButton) - .waitForSnackbar() - .then(result => { - expect(result).toEqual(jasmine.arrayContaining(['Some fields are invalid'])); - }); - }); - - it('should create two new observations', () => { - return nightmare - .type(selectors.clientAddresses.firstObservationDescriptionInput, 'first description') - .waitToClick(selectors.clientAddresses.addObservationButton) - .waitToClick(selectors.clientAddresses.secondObservationTypeSelect) - .waitToClick(selectors.clientAddresses.secondObservationTypeSelectOptionTwo) - .type(selectors.clientAddresses.secondObservationDescriptionInput, 'second description') - .waitToClick(selectors.clientAddresses.saveButton) - .waitForSnackbar() - .then(result => { - expect(result).toEqual(jasmine.arrayContaining(['Data saved!'])); - }); + it('should create two new observations', () => { + return nightmare + .type(selectors.clientAddresses.firstObservationDescriptionInput, 'first description') + .waitToClick(selectors.clientAddresses.addObservationButton) + .waitToClick(selectors.clientAddresses.secondObservationTypeSelect) + .waitToClick(selectors.clientAddresses.secondObservationTypeSelectOptionTwo) + .type(selectors.clientAddresses.secondObservationDescriptionInput, 'second description') + .waitToClick(selectors.clientAddresses.saveButton) + .waitForSnackbar() + .then(result => { + expect(result).toEqual(jasmine.arrayContaining(['Data saved!'])); }); }); }); - diff --git a/e2e/paths/client-module/12_lock_of_verified_data.spec.js b/e2e/paths/client-module/12_lock_of_verified_data.spec.js index d2816829e..4c25f0620 100644 --- a/e2e/paths/client-module/12_lock_of_verified_data.spec.js +++ b/e2e/paths/client-module/12_lock_of_verified_data.spec.js @@ -1,474 +1,472 @@ import selectors from '../../helpers/selectors.js'; import createNightmare from '../../helpers/helpers'; -describe('Client', () => { - describe('lock verified data path', () => { - const nightmare = createNightmare(); +describe('Client lock verified data path', () => { + const nightmare = createNightmare(); - describe('as salesPerson', () => { - beforeAll(() => { - return nightmare - .waitForLogin('salesPerson'); - }); + describe('as salesPerson', () => { + beforeAll(() => { + return nightmare + .waitForLogin('salesPerson'); + }); - it('should click on the Clients button of the top bar menu', () => { - return nightmare - .waitToClick(selectors.globalItems.applicationsMenuButton) - .wait(selectors.globalItems.applicationsMenuVisible) - .waitToClick(selectors.globalItems.clientsButton) - .wait(selectors.clientsIndex.createClientButton) - .parsedUrl() - .then(url => { - expect(url.hash).toEqual('#!/client/index'); - }); - }); - - it('should search for the user Petter Parker', () => { - return nightmare - .wait(selectors.clientsIndex.searchResult) - .type(selectors.clientsIndex.searchClientInput, 'Petter Parker') - .click(selectors.clientsIndex.searchButton) - .waitForNumberOfElements(selectors.clientsIndex.searchResult, 1) - .countElement(selectors.clientsIndex.searchResult) - .then(result => { - expect(result).toEqual(1); - }); - }); - - it(`should click on the search result to access to the client's fiscal data`, () => { - return nightmare - .waitForTextInElement(selectors.clientsIndex.searchResult, 'Petter Parker') - .waitToClick(selectors.clientsIndex.searchResult) - .waitToClick(selectors.clientFiscalData.fiscalDataButton) - .waitForURL('fiscal-data') - .parsedUrl() - .then(url => { - expect(url.hash).toContain('fiscal-data'); - }); - }); - - it(`should click on the fiscal data button to start editing`, () => { - return nightmare - .waitToClick(selectors.clientFiscalData.fiscalDataButton) - .waitForURL('fiscal-data') - .parsedUrl() - .then(url => { - expect(url.hash).toContain('fiscal-data'); - }); - }); - - it('should confirm verified data button is disabled for salesPerson', () => { - return nightmare - .wait(selectors.clientFiscalData.verifiedDataCheckboxInput) - .evaluate(selector => { - console.log(document.querySelector(selector)); - return document.querySelector(selector).disabled; - }, selectors.clientFiscalData.verifiedDataCheckbox) - .then(result => { - expect(result).toBe(true); - }); - }); - - it('should edit the social name', () => { - return nightmare - .wait(selectors.clientFiscalData.socialNameInput) - .clearInput(selectors.clientFiscalData.socialNameInput) - .type(selectors.clientFiscalData.socialNameInput, 'salesPerson was here') - .click(selectors.clientFiscalData.saveButton) - .waitForSnackbar() - .then(result => { - expect(result).toEqual(jasmine.arrayContaining(['Data saved!'])); - }); - }); - - it('should confirm the social name have been edited', () => { - return nightmare - .waitToClick(selectors.clientBasicData.basicDataButton) - .wait(selectors.clientBasicData.nameInput) - .waitToClick(selectors.clientFiscalData.fiscalDataButton) - .wait(selectors.clientFiscalData.socialNameInput) - .getInputValue(selectors.clientFiscalData.socialNameInput) - .then(result => { - expect(result).toEqual('salesPerson was here'); - }); + it('should click on the Clients button of the top bar menu', () => { + return nightmare + .waitToClick(selectors.globalItems.applicationsMenuButton) + .wait(selectors.globalItems.applicationsMenuVisible) + .waitToClick(selectors.globalItems.clientsButton) + .wait(selectors.clientsIndex.createClientButton) + .parsedUrl() + .then(url => { + expect(url.hash).toEqual('#!/client/index'); }); }); - describe('as administrative', () => { - beforeAll(() => { - return nightmare - .waitToClick(selectors.globalItems.logOutButton) - .waitForLogin('administrative'); - }); - - it('should navigate to clients index', () => { - return nightmare - .waitToClick(selectors.globalItems.applicationsMenuButton) - .wait(selectors.globalItems.applicationsMenuVisible) - .waitToClick(selectors.globalItems.clientsButton) - .wait(selectors.clientsIndex.createClientButton) - .parsedUrl() - .then(url => { - expect(url.hash).toEqual('#!/client/index'); - }); - }); - - it('should search again for the user Petter Parker', () => { - return nightmare - .wait(selectors.clientsIndex.searchResult) - .type(selectors.clientsIndex.searchClientInput, 'Petter Parker') - .click(selectors.clientsIndex.searchButton) - .waitForNumberOfElements(selectors.clientsIndex.searchResult, 1) - .countElement(selectors.clientsIndex.searchResult) - .then(result => { - expect(result).toEqual(1); - }); - }); - - it(`should click on the search result to access to the Petter Parkers fiscal data`, () => { - return nightmare - .waitForTextInElement(selectors.clientsIndex.searchResult, 'Petter Parker') - .waitToClick(selectors.clientsIndex.searchResult) - .waitToClick(selectors.clientFiscalData.fiscalDataButton) - .waitForURL('fiscal-data') - .parsedUrl() - .then(url => { - expect(url.hash).toContain('fiscal-data'); - }); - }); - - it(`should click on the fiscal data button`, () => { - return nightmare - .waitToClick(selectors.clientFiscalData.fiscalDataButton) - .waitForURL('fiscal-data') - .parsedUrl() - .then(url => { - expect(url.hash).toContain('fiscal-data'); - }); - }); - - it('should confirm verified data button is enabled for administrative', () => { - return nightmare - .wait(selectors.clientFiscalData.verifiedDataCheckboxInput) - .evaluate(selector => { - return document.querySelector(selector).disabled; - }, selectors.clientFiscalData.verifiedDataCheckbox) - .then(result => { - expect(result).not.toBe(true); - }); - }); - - it('should check the Verified data checkbox', () => { - return nightmare - .waitToClick(selectors.clientFiscalData.verifiedDataCheckboxInput) - .waitToClick(selectors.clientFiscalData.saveButton) - .waitForSnackbar() - .then(result => { - expect(result).toEqual(jasmine.arrayContaining(['Data saved!'])); - }); - }); - - it('should confirm Verified data checkbox is checked', () => { - return nightmare - .waitToClick(selectors.clientBasicData.basicDataButton) - .wait(selectors.clientBasicData.nameInput) - .waitToClick(selectors.clientFiscalData.fiscalDataButton) - .wait(selectors.clientFiscalData.verifiedDataCheckboxInput) - .evaluate(selector => { - return document.querySelector(selector).checked; - }, selectors.clientFiscalData.verifiedDataCheckboxInput) - .then(value => { - expect(value).toBeTruthy(); - }); - }); - - it('should again edit the social name', () => { - return nightmare - .wait(selectors.clientFiscalData.socialNameInput) - .clearInput(selectors.clientFiscalData.socialNameInput) - .type(selectors.clientFiscalData.socialNameInput, 'administrative was here') - .click(selectors.clientFiscalData.saveButton) - .waitForSnackbar() - .then(result => { - expect(result).toEqual(jasmine.arrayContaining(['Data saved!'])); - }); - }); - - it('should confirm the social name have been edited once and for all', () => { - return nightmare - .waitToClick(selectors.clientBasicData.basicDataButton) - .wait(selectors.clientBasicData.nameInput) - .waitToClick(selectors.clientFiscalData.fiscalDataButton) - .wait(selectors.clientFiscalData.socialNameInput) - .getInputValue(selectors.clientFiscalData.socialNameInput) - .then(result => { - expect(result).toEqual('administrative was here'); - }); + it('should search for the user Petter Parker', () => { + return nightmare + .wait(selectors.clientsIndex.searchResult) + .type(selectors.clientsIndex.searchClientInput, 'Petter Parker') + .click(selectors.clientsIndex.searchButton) + .waitForNumberOfElements(selectors.clientsIndex.searchResult, 1) + .countElement(selectors.clientsIndex.searchResult) + .then(result => { + expect(result).toEqual(1); }); }); - describe('as salesPerson second run', () => { - beforeAll(() => { - return nightmare - .waitToClick(selectors.globalItems.logOutButton) - .waitForLogin('salesPerson'); - }); - - it('should again click on the Clients button of the top bar menu', () => { - return nightmare - .waitToClick(selectors.globalItems.applicationsMenuButton) - .wait(selectors.globalItems.applicationsMenuVisible) - .waitToClick(selectors.globalItems.clientsButton) - .wait(selectors.clientsIndex.createClientButton) - .parsedUrl() - .then(url => { - expect(url.hash).toEqual('#!/client/index'); - }); - }); - - it('should again search for the user Petter Parker', () => { - return nightmare - .wait(selectors.clientsIndex.searchResult) - .type(selectors.clientsIndex.searchClientInput, 'Petter Parker') - .click(selectors.clientsIndex.searchButton) - .waitForNumberOfElements(selectors.clientsIndex.searchResult, 1) - .countElement(selectors.clientsIndex.searchResult) - .then(result => { - expect(result).toEqual(1); - }); - }); - - it(`should click on the search result to access to the client's fiscal data`, () => { - return nightmare - .waitForTextInElement(selectors.clientsIndex.searchResult, 'Petter Parker') - .waitToClick(selectors.clientsIndex.searchResult) - .waitToClick(selectors.clientFiscalData.fiscalDataButton) - .waitForURL('fiscal-data') - .parsedUrl() - .then(url => { - expect(url.hash).toContain('fiscal-data'); - }); - }); - - it(`should click on the fiscal data button to start editing`, () => { - return nightmare - .waitToClick(selectors.clientFiscalData.fiscalDataButton) - .waitForURL('fiscal-data') - .parsedUrl() - .then(url => { - expect(url.hash).toContain('fiscal-data'); - }); - }); - - it('should confirm verified data button is disabled once again for salesPerson', () => { - return nightmare - .wait(selectors.clientFiscalData.verifiedDataCheckboxInput) - .evaluate(selector => { - return document.querySelector(selector).disabled; - }, selectors.clientFiscalData.verifiedDataCheckbox) - .then(result => { - expect(result).toBe(true); - }); - }); - - it('should confirm the form have been disabled for salesPerson', () => { - return nightmare - .wait(selectors.clientFiscalData.socialNameInput) - .evaluate(selector => { - return document.querySelector(selector).disabled; - }, 'vn-textfield[field="$ctrl.client.socialName"] input') - .then(result => { - expect(result).toEqual(true); - }); + it(`should click on the search result to access to the client's fiscal data`, () => { + return nightmare + .waitForTextInElement(selectors.clientsIndex.searchResult, 'Petter Parker') + .waitToClick(selectors.clientsIndex.searchResult) + .waitToClick(selectors.clientFiscalData.fiscalDataButton) + .waitForURL('fiscal-data') + .parsedUrl() + .then(url => { + expect(url.hash).toContain('fiscal-data'); }); }); - describe('as salesAssistant', () => { - beforeAll(() => { - return nightmare - .waitToClick(selectors.globalItems.logOutButton) - .waitForLogin('salesAssistant'); - }); - - it('should navigate to clients index', () => { - return nightmare - .waitToClick(selectors.globalItems.applicationsMenuButton) - .wait(selectors.globalItems.applicationsMenuVisible) - .waitToClick(selectors.globalItems.clientsButton) - .wait(selectors.clientsIndex.createClientButton) - .parsedUrl() - .then(url => { - expect(url.hash).toEqual('#!/client/index'); - }); - }); - - it('should search again for the user Petter Parker', () => { - return nightmare - .wait(selectors.clientsIndex.searchResult) - .type(selectors.clientsIndex.searchClientInput, 'Petter Parker') - .click(selectors.clientsIndex.searchButton) - .waitForNumberOfElements(selectors.clientsIndex.searchResult, 1) - .countElement(selectors.clientsIndex.searchResult) - .then(result => { - expect(result).toEqual(1); - }); - }); - - it(`should click on the search result to access to the Petter Parkers fiscal data`, () => { - return nightmare - .waitForTextInElement(selectors.clientsIndex.searchResult, 'Petter Parker') - .waitToClick(selectors.clientsIndex.searchResult) - .waitToClick(selectors.clientFiscalData.fiscalDataButton) - .waitForURL('fiscal-data') - .parsedUrl() - .then(url => { - expect(url.hash).toContain('fiscal-data'); - }); - }); - - it(`should click on the fiscal data button`, () => { - return nightmare - .waitToClick(selectors.clientFiscalData.fiscalDataButton) - .waitForURL('fiscal-data') - .parsedUrl() - .then(url => { - expect(url.hash).toContain('fiscal-data'); - }); - }); - - it('should confirm verified data button is enabled for salesAssistant', () => { - return nightmare - .wait(selectors.clientFiscalData.verifiedDataCheckboxInput) - .evaluate(selector => { - return document.querySelector(selector).disabled; - }, selectors.clientFiscalData.verifiedDataCheckbox) - .then(result => { - expect(result).not.toBe(true); - }); - }); - - it('should uncheck the Verified data checkbox', () => { - return nightmare - .waitToClick(selectors.clientFiscalData.verifiedDataCheckboxInput) - .waitToClick(selectors.clientFiscalData.saveButton) - .waitForSnackbar() - .then(result => { - expect(result).toEqual(jasmine.arrayContaining(['Data saved!'])); - }); - }); - - it('should confirm Verified data checkbox is unchecked', () => { - return nightmare - .waitToClick(selectors.clientBasicData.basicDataButton) - .wait(selectors.clientBasicData.nameInput) - .waitToClick(selectors.clientFiscalData.fiscalDataButton) - .wait(selectors.clientFiscalData.verifiedDataCheckboxInput) - .evaluate(selector => { - return document.querySelector(selector).checked; - }, selectors.clientFiscalData.verifiedDataCheckboxInput) - .then(value => { - expect(value).toBeFalsy(); - }); - }); - - it('should again edit the social name', () => { - return nightmare - .wait(selectors.clientFiscalData.socialNameInput) - .clearInput(selectors.clientFiscalData.socialNameInput) - .type(selectors.clientFiscalData.socialNameInput, 'salesAssistant was here') - .click(selectors.clientFiscalData.saveButton) - .waitForSnackbar() - .then(result => { - expect(result).toEqual(jasmine.arrayContaining(['Data saved!'])); - }); - }); - - it('should confirm the social name have been edited once and for all', () => { - return nightmare - .waitToClick(selectors.clientBasicData.basicDataButton) - .wait(selectors.clientBasicData.nameInput) - .waitToClick(selectors.clientFiscalData.fiscalDataButton) - .wait(selectors.clientFiscalData.socialNameInput) - .getInputValue(selectors.clientFiscalData.socialNameInput) - .then(result => { - expect(result).toEqual('salesAssistant was here'); - }); + it(`should click on the fiscal data button to start editing`, () => { + return nightmare + .waitToClick(selectors.clientFiscalData.fiscalDataButton) + .waitForURL('fiscal-data') + .parsedUrl() + .then(url => { + expect(url.hash).toContain('fiscal-data'); }); }); - describe('as salesPerson third run', () => { - beforeAll(() => { - return nightmare - .waitToClick(selectors.globalItems.logOutButton) - .waitForLogin('salesPerson'); + it('should confirm verified data button is disabled for salesPerson', () => { + return nightmare + .wait(selectors.clientFiscalData.verifiedDataCheckboxInput) + .evaluate(selector => { + console.log(document.querySelector(selector)); + return document.querySelector(selector).disabled; + }, selectors.clientFiscalData.verifiedDataCheckbox) + .then(result => { + expect(result).toBe(true); }); + }); - it('should again click on the Clients button of the top bar menu', () => { - return nightmare - .waitToClick(selectors.globalItems.applicationsMenuButton) - .wait(selectors.globalItems.applicationsMenuVisible) - .waitToClick(selectors.globalItems.clientsButton) - .wait(selectors.clientsIndex.createClientButton) - .parsedUrl() - .then(url => { - expect(url.hash).toEqual('#!/client/index'); - }); + it('should edit the social name', () => { + return nightmare + .wait(selectors.clientFiscalData.socialNameInput) + .clearInput(selectors.clientFiscalData.socialNameInput) + .type(selectors.clientFiscalData.socialNameInput, 'salesPerson was here') + .click(selectors.clientFiscalData.saveButton) + .waitForSnackbar() + .then(result => { + expect(result).toEqual(jasmine.arrayContaining(['Data saved!'])); }); + }); - it('should once again search for the user Petter Parker', () => { - return nightmare - .wait(selectors.clientsIndex.searchResult) - .type(selectors.clientsIndex.searchClientInput, 'Petter Parker') - .click(selectors.clientsIndex.searchButton) - .waitForNumberOfElements(selectors.clientsIndex.searchResult, 1) - .countElement(selectors.clientsIndex.searchResult) - .then(result => { - expect(result).toEqual(1); - }); + it('should confirm the social name have been edited', () => { + return nightmare + .waitToClick(selectors.clientBasicData.basicDataButton) + .wait(selectors.clientBasicData.nameInput) + .waitToClick(selectors.clientFiscalData.fiscalDataButton) + .wait(selectors.clientFiscalData.socialNameInput) + .getInputValue(selectors.clientFiscalData.socialNameInput) + .then(result => { + expect(result).toEqual('salesPerson was here'); }); + }); + }); - it(`should click on the search result to access to the client's fiscal data`, () => { - return nightmare - .waitForTextInElement(selectors.clientsIndex.searchResult, 'Petter Parker') - .waitToClick(selectors.clientsIndex.searchResult) - .waitToClick(selectors.clientFiscalData.fiscalDataButton) - .waitForURL('fiscal-data') - .parsedUrl() - .then(url => { - expect(url.hash).toContain('fiscal-data'); - }); + describe('as administrative', () => { + beforeAll(() => { + return nightmare + .waitToClick(selectors.globalItems.logOutButton) + .waitForLogin('administrative'); + }); + + it('should navigate to clients index', () => { + return nightmare + .waitToClick(selectors.globalItems.applicationsMenuButton) + .wait(selectors.globalItems.applicationsMenuVisible) + .waitToClick(selectors.globalItems.clientsButton) + .wait(selectors.clientsIndex.createClientButton) + .parsedUrl() + .then(url => { + expect(url.hash).toEqual('#!/client/index'); }); + }); - it(`should click on the fiscal data button to start editing`, () => { - return nightmare - .waitToClick(selectors.clientFiscalData.fiscalDataButton) - .waitForURL('fiscal-data') - .parsedUrl() - .then(url => { - expect(url.hash).toContain('fiscal-data'); - }); + it('should search again for the user Petter Parker', () => { + return nightmare + .wait(selectors.clientsIndex.searchResult) + .type(selectors.clientsIndex.searchClientInput, 'Petter Parker') + .click(selectors.clientsIndex.searchButton) + .waitForNumberOfElements(selectors.clientsIndex.searchResult, 1) + .countElement(selectors.clientsIndex.searchResult) + .then(result => { + expect(result).toEqual(1); }); + }); - it('should confirm verified data button is enabled once again', () => { - return nightmare - .wait(selectors.clientFiscalData.verifiedDataCheckboxInput) - .evaluate(selector => { - return document.querySelector(selector).disabled; - }, selectors.clientFiscalData.verifiedDataCheckbox) - .then(result => { - expect(result).toBe(true); - }); + it(`should click on the search result to access to the Petter Parkers fiscal data`, () => { + return nightmare + .waitForTextInElement(selectors.clientsIndex.searchResult, 'Petter Parker') + .waitToClick(selectors.clientsIndex.searchResult) + .waitToClick(selectors.clientFiscalData.fiscalDataButton) + .waitForURL('fiscal-data') + .parsedUrl() + .then(url => { + expect(url.hash).toContain('fiscal-data'); }); + }); - it('should confirm the form is enabled for salesPerson', () => { - return nightmare - .wait(selectors.clientFiscalData.socialNameInput) - .evaluate(selector => { - return document.querySelector(selector).disabled; - }, 'vn-textfield[field="$ctrl.client.socialName"] > div') - .then(result => { - expect(result).not.toBe(true); - }); + it(`should click on the fiscal data button`, () => { + return nightmare + .waitToClick(selectors.clientFiscalData.fiscalDataButton) + .waitForURL('fiscal-data') + .parsedUrl() + .then(url => { + expect(url.hash).toContain('fiscal-data'); + }); + }); + + it('should confirm verified data button is enabled for administrative', () => { + return nightmare + .wait(selectors.clientFiscalData.verifiedDataCheckboxInput) + .evaluate(selector => { + return document.querySelector(selector).disabled; + }, selectors.clientFiscalData.verifiedDataCheckbox) + .then(result => { + expect(result).not.toBe(true); + }); + }); + + it('should check the Verified data checkbox', () => { + return nightmare + .waitToClick(selectors.clientFiscalData.verifiedDataCheckboxInput) + .waitToClick(selectors.clientFiscalData.saveButton) + .waitForSnackbar() + .then(result => { + expect(result).toEqual(jasmine.arrayContaining(['Data saved!'])); + }); + }); + + it('should confirm Verified data checkbox is checked', () => { + return nightmare + .waitToClick(selectors.clientBasicData.basicDataButton) + .wait(selectors.clientBasicData.nameInput) + .waitToClick(selectors.clientFiscalData.fiscalDataButton) + .wait(selectors.clientFiscalData.verifiedDataCheckboxInput) + .evaluate(selector => { + return document.querySelector(selector).checked; + }, selectors.clientFiscalData.verifiedDataCheckboxInput) + .then(value => { + expect(value).toBeTruthy(); + }); + }); + + it('should again edit the social name', () => { + return nightmare + .wait(selectors.clientFiscalData.socialNameInput) + .clearInput(selectors.clientFiscalData.socialNameInput) + .type(selectors.clientFiscalData.socialNameInput, 'administrative was here') + .click(selectors.clientFiscalData.saveButton) + .waitForSnackbar() + .then(result => { + expect(result).toEqual(jasmine.arrayContaining(['Data saved!'])); + }); + }); + + it('should confirm the social name have been edited once and for all', () => { + return nightmare + .waitToClick(selectors.clientBasicData.basicDataButton) + .wait(selectors.clientBasicData.nameInput) + .waitToClick(selectors.clientFiscalData.fiscalDataButton) + .wait(selectors.clientFiscalData.socialNameInput) + .getInputValue(selectors.clientFiscalData.socialNameInput) + .then(result => { + expect(result).toEqual('administrative was here'); + }); + }); + }); + + describe('as salesPerson second run', () => { + beforeAll(() => { + return nightmare + .waitToClick(selectors.globalItems.logOutButton) + .waitForLogin('salesPerson'); + }); + + it('should again click on the Clients button of the top bar menu', () => { + return nightmare + .waitToClick(selectors.globalItems.applicationsMenuButton) + .wait(selectors.globalItems.applicationsMenuVisible) + .waitToClick(selectors.globalItems.clientsButton) + .wait(selectors.clientsIndex.createClientButton) + .parsedUrl() + .then(url => { + expect(url.hash).toEqual('#!/client/index'); + }); + }); + + it('should again search for the user Petter Parker', () => { + return nightmare + .wait(selectors.clientsIndex.searchResult) + .type(selectors.clientsIndex.searchClientInput, 'Petter Parker') + .click(selectors.clientsIndex.searchButton) + .waitForNumberOfElements(selectors.clientsIndex.searchResult, 1) + .countElement(selectors.clientsIndex.searchResult) + .then(result => { + expect(result).toEqual(1); + }); + }); + + it(`should click on the search result to access to the client's fiscal data`, () => { + return nightmare + .waitForTextInElement(selectors.clientsIndex.searchResult, 'Petter Parker') + .waitToClick(selectors.clientsIndex.searchResult) + .waitToClick(selectors.clientFiscalData.fiscalDataButton) + .waitForURL('fiscal-data') + .parsedUrl() + .then(url => { + expect(url.hash).toContain('fiscal-data'); + }); + }); + + it(`should click on the fiscal data button to start editing`, () => { + return nightmare + .waitToClick(selectors.clientFiscalData.fiscalDataButton) + .waitForURL('fiscal-data') + .parsedUrl() + .then(url => { + expect(url.hash).toContain('fiscal-data'); + }); + }); + + it('should confirm verified data button is disabled once again for salesPerson', () => { + return nightmare + .wait(selectors.clientFiscalData.verifiedDataCheckboxInput) + .evaluate(selector => { + return document.querySelector(selector).disabled; + }, selectors.clientFiscalData.verifiedDataCheckbox) + .then(result => { + expect(result).toBe(true); + }); + }); + + it('should confirm the form have been disabled for salesPerson', () => { + return nightmare + .wait(selectors.clientFiscalData.socialNameInput) + .evaluate(selector => { + return document.querySelector(selector).disabled; + }, 'vn-textfield[field="$ctrl.client.socialName"] input') + .then(result => { + expect(result).toEqual(true); + }); + }); + }); + + describe('as salesAssistant', () => { + beforeAll(() => { + return nightmare + .waitToClick(selectors.globalItems.logOutButton) + .waitForLogin('salesAssistant'); + }); + + it('should navigate to clients index', () => { + return nightmare + .waitToClick(selectors.globalItems.applicationsMenuButton) + .wait(selectors.globalItems.applicationsMenuVisible) + .waitToClick(selectors.globalItems.clientsButton) + .wait(selectors.clientsIndex.createClientButton) + .parsedUrl() + .then(url => { + expect(url.hash).toEqual('#!/client/index'); + }); + }); + + it('should search again for the user Petter Parker', () => { + return nightmare + .wait(selectors.clientsIndex.searchResult) + .type(selectors.clientsIndex.searchClientInput, 'Petter Parker') + .click(selectors.clientsIndex.searchButton) + .waitForNumberOfElements(selectors.clientsIndex.searchResult, 1) + .countElement(selectors.clientsIndex.searchResult) + .then(result => { + expect(result).toEqual(1); + }); + }); + + it(`should click on the search result to access to the Petter Parkers fiscal data`, () => { + return nightmare + .waitForTextInElement(selectors.clientsIndex.searchResult, 'Petter Parker') + .waitToClick(selectors.clientsIndex.searchResult) + .waitToClick(selectors.clientFiscalData.fiscalDataButton) + .waitForURL('fiscal-data') + .parsedUrl() + .then(url => { + expect(url.hash).toContain('fiscal-data'); + }); + }); + + it(`should click on the fiscal data button`, () => { + return nightmare + .waitToClick(selectors.clientFiscalData.fiscalDataButton) + .waitForURL('fiscal-data') + .parsedUrl() + .then(url => { + expect(url.hash).toContain('fiscal-data'); + }); + }); + + it('should confirm verified data button is enabled for salesAssistant', () => { + return nightmare + .wait(selectors.clientFiscalData.verifiedDataCheckboxInput) + .evaluate(selector => { + return document.querySelector(selector).disabled; + }, selectors.clientFiscalData.verifiedDataCheckbox) + .then(result => { + expect(result).not.toBe(true); + }); + }); + + it('should uncheck the Verified data checkbox', () => { + return nightmare + .waitToClick(selectors.clientFiscalData.verifiedDataCheckboxInput) + .waitToClick(selectors.clientFiscalData.saveButton) + .waitForSnackbar() + .then(result => { + expect(result).toEqual(jasmine.arrayContaining(['Data saved!'])); + }); + }); + + it('should confirm Verified data checkbox is unchecked', () => { + return nightmare + .waitToClick(selectors.clientBasicData.basicDataButton) + .wait(selectors.clientBasicData.nameInput) + .waitToClick(selectors.clientFiscalData.fiscalDataButton) + .wait(selectors.clientFiscalData.verifiedDataCheckboxInput) + .evaluate(selector => { + return document.querySelector(selector).checked; + }, selectors.clientFiscalData.verifiedDataCheckboxInput) + .then(value => { + expect(value).toBeFalsy(); + }); + }); + + it('should again edit the social name', () => { + return nightmare + .wait(selectors.clientFiscalData.socialNameInput) + .clearInput(selectors.clientFiscalData.socialNameInput) + .type(selectors.clientFiscalData.socialNameInput, 'salesAssistant was here') + .click(selectors.clientFiscalData.saveButton) + .waitForSnackbar() + .then(result => { + expect(result).toEqual(jasmine.arrayContaining(['Data saved!'])); + }); + }); + + it('should confirm the social name have been edited once and for all', () => { + return nightmare + .waitToClick(selectors.clientBasicData.basicDataButton) + .wait(selectors.clientBasicData.nameInput) + .waitToClick(selectors.clientFiscalData.fiscalDataButton) + .wait(selectors.clientFiscalData.socialNameInput) + .getInputValue(selectors.clientFiscalData.socialNameInput) + .then(result => { + expect(result).toEqual('salesAssistant was here'); + }); + }); + }); + + describe('as salesPerson third run', () => { + beforeAll(() => { + return nightmare + .waitToClick(selectors.globalItems.logOutButton) + .waitForLogin('salesPerson'); + }); + + it('should again click on the Clients button of the top bar menu', () => { + return nightmare + .waitToClick(selectors.globalItems.applicationsMenuButton) + .wait(selectors.globalItems.applicationsMenuVisible) + .waitToClick(selectors.globalItems.clientsButton) + .wait(selectors.clientsIndex.createClientButton) + .parsedUrl() + .then(url => { + expect(url.hash).toEqual('#!/client/index'); + }); + }); + + it('should once again search for the user Petter Parker', () => { + return nightmare + .wait(selectors.clientsIndex.searchResult) + .type(selectors.clientsIndex.searchClientInput, 'Petter Parker') + .click(selectors.clientsIndex.searchButton) + .waitForNumberOfElements(selectors.clientsIndex.searchResult, 1) + .countElement(selectors.clientsIndex.searchResult) + .then(result => { + expect(result).toEqual(1); + }); + }); + + it(`should click on the search result to access to the client's fiscal data`, () => { + return nightmare + .waitForTextInElement(selectors.clientsIndex.searchResult, 'Petter Parker') + .waitToClick(selectors.clientsIndex.searchResult) + .waitToClick(selectors.clientFiscalData.fiscalDataButton) + .waitForURL('fiscal-data') + .parsedUrl() + .then(url => { + expect(url.hash).toContain('fiscal-data'); + }); + }); + + it(`should click on the fiscal data button to start editing`, () => { + return nightmare + .waitToClick(selectors.clientFiscalData.fiscalDataButton) + .waitForURL('fiscal-data') + .parsedUrl() + .then(url => { + expect(url.hash).toContain('fiscal-data'); + }); + }); + + it('should confirm verified data button is enabled once again', () => { + return nightmare + .wait(selectors.clientFiscalData.verifiedDataCheckboxInput) + .evaluate(selector => { + return document.querySelector(selector).disabled; + }, selectors.clientFiscalData.verifiedDataCheckbox) + .then(result => { + expect(result).toBe(true); + }); + }); + + it('should confirm the form is enabled for salesPerson', () => { + return nightmare + .wait(selectors.clientFiscalData.socialNameInput) + .evaluate(selector => { + return document.querySelector(selector).disabled; + }, 'vn-textfield[field="$ctrl.client.socialName"] > div') + .then(result => { + expect(result).not.toBe(true); }); }); }); diff --git a/e2e/paths/ticket-module/03_list_sale.spec.js b/e2e/paths/ticket-module/03_list_sale.spec.js index 884faaaf8..b76e9cc5a 100644 --- a/e2e/paths/ticket-module/03_list_sale.spec.js +++ b/e2e/paths/ticket-module/03_list_sale.spec.js @@ -53,9 +53,9 @@ describe('Ticket', () => { .then(value => { expect(value).toContain('Yellow'); expect(value).toContain('5'); - expect(value).toContain('€23.50'); + expect(value).toContain('€9.60'); expect(value).toContain('0 %'); - expect(value).toContain('€117.50'); + expect(value).toContain('€48.00'); }); }); @@ -65,9 +65,9 @@ describe('Ticket', () => { .getInnerText(selectors.ticketSales.secondSaleText) .then(value => { expect(value).toContain('Red'); - expect(value).toContain('€4.50'); + expect(value).toContain('€4.21'); expect(value).toContain('0 %'); - expect(value).toContain('€45.00'); + expect(value).toContain('€42.10'); }); }); }); diff --git a/e2e/paths/ticket-module/06_edit_basic_data_steps.spec.js b/e2e/paths/ticket-module/06_edit_basic_data_steps.spec.js index 35527aebe..beeb1d749 100644 --- a/e2e/paths/ticket-module/06_edit_basic_data_steps.spec.js +++ b/e2e/paths/ticket-module/06_edit_basic_data_steps.spec.js @@ -53,7 +53,7 @@ describe('Ticket', () => { .wait(500) .waitToClick(selectors.ticketBasicData.addressSelect) .waitToClick(selectors.ticketBasicData.addressSelectSecondOption) - .waitForTextInInput(selectors.ticketBasicData.addressSelect, 'Charles') + .waitForTextInInput(selectors.ticketBasicData.addressSelect, 'address 28') .click(selectors.ticketBasicData.nextStepButton) .waitForURL('data/step-two') .url() diff --git a/gulpfile.js b/gulpfile.js index 0c85a8935..f381b1fbc 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -71,9 +71,6 @@ gulp.task('services-only', async () => { * Runs the e2e tests, restoring the fixtures first. */ gulp.task('e2e', ['docker'], async () => { - if (argv.show || argv.s) - process.env.E2E_SHOW = true; - await runSequenceP('e2e-only'); }); @@ -86,6 +83,10 @@ gulp.task('smokes', ['docker'], async () => { */ gulp.task('e2e-only', () => { const jasmine = require('gulp-jasmine'); + + if (argv.show || argv.s) + process.env.E2E_SHOW = true; + return gulp.src('./e2e_tests.js') .pipe(jasmine({reporter: 'none'})); }); diff --git a/package-lock.json b/package-lock.json index dee1edd82..ba954971a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1383,7 +1383,7 @@ "bluebird": { "version": "3.5.1", "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.1.tgz", - "integrity": "sha1-2VUfnemPH82h5oPRfukaBgLuLrk=", + "integrity": "sha512-MKiLiV+I1AA596t9w1sQJ8jkiSr5+ZKi0WKrYGUn6d1Fx+Ij4tIj+m2WMQSGczs5jZVxV339chE8iwk6F64wjA==", "dev": true }, "bn.js": { @@ -10852,7 +10852,7 @@ "jasmine-spec-reporter": { "version": "4.2.1", "resolved": "https://registry.npmjs.org/jasmine-spec-reporter/-/jasmine-spec-reporter-4.2.1.tgz", - "integrity": "sha1-HWMq7ANBZwrTJPkrqEtLMrNeniI=", + "integrity": "sha512-FZBoZu7VE5nR7Nilzy+Np8KuVIOxF4oXDPDknehCYBDE080EnlPu0afdZNmpGDBRCUBv3mj5qgqCRmk6W/K8vg==", "dev": true, "requires": { "colors": "1.1.2" @@ -10998,7 +10998,7 @@ "karma": { "version": "1.7.1", "resolved": "https://registry.npmjs.org/karma/-/karma-1.7.1.tgz", - "integrity": "sha1-hcwI6eCiLXzpzKN8ShvoJPaisa4=", + "integrity": "sha512-k5pBjHDhmkdaUccnC7gE3mBzZjcxyxYsYVaqiL2G5AqlfLyBO5nw2VdNK+O16cveEPd/gIOWULH7gkiYYwVNHg==", "dev": true, "requires": { "bluebird": "3.5.1", @@ -11050,7 +11050,7 @@ "karma-chrome-launcher": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/karma-chrome-launcher/-/karma-chrome-launcher-2.2.0.tgz", - "integrity": "sha1-zxudBxNswY/iOTJ9JGVMPbw2is8=", + "integrity": "sha512-uf/ZVpAabDBPvdPdveyk1EPgbnloPvFFGgmRhYLTDH7gEB4nZdSBk8yTU47w1g/drLSx5uMOkjKk7IWKfWg/+w==", "dev": true, "requires": { "fs-access": "1.0.1", @@ -21351,7 +21351,7 @@ "useragent": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/useragent/-/useragent-2.3.0.tgz", - "integrity": "sha1-IX+UOtVAyyEoZYqyP8lg9qiMmXI=", + "integrity": "sha512-4AoH4pxuSvHCjqLO04sU6U/uE65BYza8l/KKBS0b0hnUPWi+cQ2BpeTEwejCSx9SPV5/U03nniDTrWx5NrmKdw==", "dev": true, "requires": { "lru-cache": "4.1.1", diff --git a/services/claim/common/methods/claim/getSummary.js b/services/claim/common/methods/claim/getSummary.js new file mode 100644 index 000000000..11ed52522 --- /dev/null +++ b/services/claim/common/methods/claim/getSummary.js @@ -0,0 +1,104 @@ +module.exports = Self => { + Self.remoteMethod('getSummary', { + description: 'Updates the item taxes', + accessType: 'READ', + accepts: [{ + arg: 'id', + type: 'number', + required: true, + description: 'The item id', + http: {source: 'path'} + }], + returns: { + type: 'object', + root: true + }, + http: { + path: `/:id/getSummary`, + verb: 'GET' + } + }); + + Self.getSummary = async id => { + let promises = []; + let summary = {}; + + // Claim + + let filter = { + where: {id: id}, + include: [ + {relation: 'worker', scope: {fields: ['name', 'firstName']}}, + {relation: 'claimState', scope: {fields: ['id', 'description']}}, + { + relation: 'client', + scope: { + fields: ['salesPersonFk', 'name'], + include: { + relation: 'salesPerson', + fields: ['firstName', 'name'] + } + } + } + ] + }; + + promises.push(Self.app.models.Claim.find(filter)); + + // Claim detail + filter = { + where: {claimFk: id}, + include: [ + {relation: 'sale', + scope: { + fields: ['concept', 'ticketFk', 'price', 'quantity', 'discount'], + include: { + relation: 'ticket' + } + } + } + ] + }; + promises.push(Self.app.models.ClaimBeginning.find(filter)); + + // Claim developments + filter = { + where: {claimFk: id}, + include: [ + {relation: 'claimResponsible'}, + {relation: 'worker'}, + {relation: 'claimDestination'}, + {relation: 'claimReason'}, + {relation: 'claimResult'}, + {relation: 'claimRedelivery'} + ] + }; + promises.push(Self.app.models.ClaimDevelopment.find(filter)); + + // Claim action + filter = { + where: {claimFk: id}, + include: [ + {relation: 'sale', + scope: { + fields: ['concept', 'price', 'quantity', 'discount', 'ticketFk', 'itemFk'], + include: [ + {relation: 'ticket'} + ] + } + }, + {relation: 'claimBeggining'} + ] + }; + promises.push(Self.app.models.ClaimEnd.find(filter)); + + let res = await Promise.all(promises); + + [summary.claim] = res[0]; + summary.salesClaimed = res[1]; + summary.developments = res[2]; + summary.actions = res[3]; + + return summary; + }; +}; diff --git a/services/claim/common/methods/claim/specs/getSummary.spec.js b/services/claim/common/methods/claim/specs/getSummary.spec.js new file mode 100644 index 000000000..8f816bb96 --- /dev/null +++ b/services/claim/common/methods/claim/specs/getSummary.spec.js @@ -0,0 +1,13 @@ +const app = require(`${servicesDir}/claim/server/server`); + +describe('claim getSummary()', () => { + it('should return summary with claim, salesClaimed, developments and actions defined ', async() => { + let result = await app.models.Claim.getSummary(1); + let keys = Object.keys(result); + + expect(keys).toContain('claim'); + expect(keys).toContain('salesClaimed'); + expect(keys).toContain('developments'); + expect(keys).toContain('actions'); + }); +}); diff --git a/services/claim/common/models/claim-end.json b/services/claim/common/models/claim-end.json index fd81d41bc..01c6c494a 100644 --- a/services/claim/common/models/claim-end.json +++ b/services/claim/common/models/claim-end.json @@ -34,6 +34,11 @@ "type": "belongsTo", "model": "ClaimDestination", "foreignKey": "claimDestinationFk" + }, + "claimBeggining": { + "type": "belongsTo", + "model": "ClaimDestination", + "foreignKey": "claimDestinationFk" } } } diff --git a/services/claim/common/models/claim.js b/services/claim/common/models/claim.js new file mode 100644 index 000000000..dd01547ea --- /dev/null +++ b/services/claim/common/models/claim.js @@ -0,0 +1,3 @@ +module.exports = Self => { + require('../methods/claim/getSummary')(Self); +}; diff --git a/services/db/install/changes/1.0.12/01-itemType.sql b/services/db/install/changes/1.0.12/01-itemType.sql new file mode 100644 index 000000000..58bde4d2d --- /dev/null +++ b/services/db/install/changes/1.0.12/01-itemType.sql @@ -0,0 +1,17 @@ +USE `vn`; +CREATE + OR REPLACE ALGORITHM = UNDEFINED + DEFINER = `root`@`%` + SQL SECURITY DEFINER +VIEW `itemType` AS + SELECT + `t`.`tipo_id` AS `id`, + `t`.`Id_Tipo` AS `code`, + `t`.`Tipo` AS `name`, + `t`.`reino_id` AS `categoryFk`, + `t`.`life` AS `life`, + `t`.`Id_Trabajador` AS `workerFk`, + `t`.`warehouseFk` AS `warehouseFk`, + `t`.`isPackaging` AS `isPackaging` + FROM + `vn2008`.`Tipos` `t`; diff --git a/services/db/install/changes/1.0.9/04-sample.sql b/services/db/install/changes/1.0.9/04-sample.sql deleted file mode 100644 index 7a9c4faf4..000000000 --- a/services/db/install/changes/1.0.9/04-sample.sql +++ /dev/null @@ -1,19 +0,0 @@ -USE `vn`; - -ALTER TABLE `vn2008`.`escritos` - ADD COLUMN `hasCompany` VARCHAR(45) NOT NULL DEFAULT 0 AFTER `visible`; - - -CREATE - OR REPLACE ALGORITHM = UNDEFINED - DEFINER = `root`@`%` - SQL SECURITY DEFINER -VIEW `sample` AS - SELECT - `e`.`id` AS `id`, - `e`.`abrev` AS `code`, - `e`.`descripcion` AS `description`, - `e`.`visible` AS `isVisible`, - `e`.`hasCompany` AS `hasCompany` - FROM - `vn2008`.`escritos` `e`; \ No newline at end of file diff --git a/services/db/install/changes/1.1.0/08-reinos.sql b/services/db/install/changes/1.1.0/08-reinos.sql deleted file mode 100644 index 8470be879..000000000 --- a/services/db/install/changes/1.1.0/08-reinos.sql +++ /dev/null @@ -1,13 +0,0 @@ -USE `vn2008`; - -ALTER TABLE `vn2008`.`reinos` -ADD COLUMN `icon` VARCHAR(45) NULL AFTER `mercancia`; - -INSERT INTO `vn2008`.`reinos` (`reino`, `display`, `icon`) VALUES -('Handmade', '1', 'icon-handmade'), -('Artificial', '1', 'icon-artificial'), -('Green', '1', 'icon-greenery'), -('Accessories', '1', 'icon-accessory'); - -UPDATE `vn2008`.`reinos` SET `icon`='icon-plant' WHERE `id`=1; -UPDATE `vn2008`.`reinos` SET `icon`='icon-flower' WHERE `id`=2; \ No newline at end of file diff --git a/services/db/install/dump/01-structure.sql b/services/db/install/dump/01-structure.sql index afeb36663..18db82e45 100644 --- a/services/db/install/dump/01-structure.sql +++ b/services/db/install/dump/01-structure.sql @@ -174,7 +174,7 @@ CREATE TABLE `mailAlias` ( `isPublic` tinyint(4) NOT NULL DEFAULT '1', PRIMARY KEY (`id`), UNIQUE KEY `alias` (`alias`) -) ENGINE=InnoDB AUTO_INCREMENT=71 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Mail aliases'; +) ENGINE=InnoDB AUTO_INCREMENT=72 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Mail aliases'; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -363,7 +363,7 @@ CREATE TABLE `user` ( KEY `nickname` (`nickname`), KEY `lang` (`lang`), CONSTRAINT `user_ibfk_2` FOREIGN KEY (`role`) REFERENCES `role` (`id`) ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=14462 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Global users'; +) ENGINE=InnoDB AUTO_INCREMENT=14565 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Global users'; /*!40101 SET character_set_client = @saved_cs_client */; /*!50003 SET @saved_cs_client = @@character_set_client */ ; /*!50003 SET @saved_cs_results = @@character_set_results */ ; @@ -2414,7 +2414,7 @@ CREATE TABLE `Agencias` ( PRIMARY KEY (`Id_Agencia`), KEY `Agencias` (`Agencia`), KEY `Vista` (`Vista`) -) ENGINE=InnoDB AUTO_INCREMENT=1209 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=1212 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -2433,7 +2433,7 @@ CREATE TABLE `Agencias_dits` ( `value_old` varchar(100) COLLATE utf8_unicode_ci DEFAULT NULL, `value_new` varchar(100) COLLATE utf8_unicode_ci DEFAULT NULL, PRIMARY KEY (`idAgencia_dits`) -) ENGINE=InnoDB AUTO_INCREMENT=21569 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=22589 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -2534,6 +2534,8 @@ CREATE TABLE `Articles` ( `tag10` varchar(20) COLLATE utf8_unicode_ci DEFAULT NULL, `value10` varchar(20) COLLATE utf8_unicode_ci DEFAULT NULL, `compression` decimal(5,2) NOT NULL DEFAULT '1.00' COMMENT 'Relacion de compresividad entre el volumen de las entradas en Silla y el empaquetado en los envios a clientes.\n\nMenor que 1 significa que se puede comprimir más que el volumen original.', + `minimum` decimal(10,0) unsigned NOT NULL DEFAULT '3', + `upToDown` decimal(10,0) unsigned NOT NULL DEFAULT '0', PRIMARY KEY (`Id_Article`), KEY `Article` (`Article`), KEY `Color` (`Color`), @@ -2549,7 +2551,7 @@ CREATE TABLE `Articles` ( CONSTRAINT `Articles_ibfk_5` FOREIGN KEY (`tipo_id`) REFERENCES `Tipos` (`tipo_id`) ON UPDATE CASCADE, CONSTRAINT `expenceFk` FOREIGN KEY (`expenceFk`) REFERENCES `Gastos` (`Id_Gasto`) ON UPDATE CASCADE, CONSTRAINT `producer_id` FOREIGN KEY (`producer_id`) REFERENCES `producer` (`producer_id`) ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=317656 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=320677 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; /*!50003 SET @saved_cs_client = @@character_set_client */ ; /*!50003 SET @saved_cs_results = @@character_set_results */ ; @@ -2634,7 +2636,7 @@ DELIMITER ;; /*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `vn2008`.`Articles_AFTER_INSERT` AFTER INSERT ON `Articles` FOR EACH ROW BEGIN - CALL itemTagArrangedUpdate(NEW.Id_Article); + -- CALL itemTagArrangedUpdate(NEW.Id_Article); INSERT INTO vn.itemTaxCountry(itemFk, countryFk, taxClassFk) SELECT NEW.Id_Article, 1, NEW.iva_group_id; @@ -2708,45 +2710,6 @@ DELIMITER ; /*!50003 SET character_set_client = @saved_cs_client */ ; /*!50003 SET character_set_results = @saved_cs_results */ ; /*!50003 SET collation_connection = @saved_col_connection */ ; -/*!50003 SET @saved_cs_client = @@character_set_client */ ; -/*!50003 SET @saved_cs_results = @@character_set_results */ ; -/*!50003 SET @saved_col_connection = @@collation_connection */ ; -/*!50003 SET character_set_client = utf8 */ ; -/*!50003 SET character_set_results = utf8 */ ; -/*!50003 SET collation_connection = utf8_general_ci */ ; -/*!50003 SET @saved_sql_mode = @@sql_mode */ ; -/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; -DELIMITER ;; -/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `vn2008`.`Articles_AFTER_UPDATE` AFTER UPDATE ON `Articles` FOR EACH ROW -BEGIN - - CALL itemTagArrangedUpdate(NEW.Id_Article); - -END */;; -DELIMITER ; -/*!50003 SET sql_mode = @saved_sql_mode */ ; -/*!50003 SET character_set_client = @saved_cs_client */ ; -/*!50003 SET character_set_results = @saved_cs_results */ ; -/*!50003 SET collation_connection = @saved_col_connection */ ; - --- --- Table structure for table `Articles_PVP` --- - -DROP TABLE IF EXISTS `Articles_PVP`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; -CREATE TABLE `Articles_PVP` ( - `Id_Article` int(11) NOT NULL, - `PVP` double DEFAULT NULL, - `Id_Cliente` int(11) NOT NULL, - `Fecha` date NOT NULL, - KEY `id_article_pvp_idx` (`Id_Article`), - KEY `id_cliente_pvp_idx` (`Id_Cliente`), - CONSTRAINT `id_article_pvp` FOREIGN KEY (`Id_Article`) REFERENCES `Articles` (`Id_Article`) ON DELETE CASCADE ON UPDATE CASCADE, - CONSTRAINT `id_cliente_pvp` FOREIGN KEY (`Id_Cliente`) REFERENCES `Clientes` (`id_cliente`) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Almacena los precios para etiquetar los articulos a los clientes'; -/*!40101 SET character_set_client = @saved_cs_client */; -- -- Table structure for table `Articles_botanical` @@ -2823,7 +2786,7 @@ CREATE TABLE `Articles_dits` ( KEY `fgkey1_idx` (`idaccion_dits`), KEY `fgkey2_idx` (`Id_Ticket`), KEY `fgkey3_idx` (`Id_Trabajador`) -) ENGINE=InnoDB AUTO_INCREMENT=20473 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=20566 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -2845,45 +2808,7 @@ CREATE TABLE `Articles_nicho` ( KEY `Articles_nicho_wh_fk` (`warehouse_id`), CONSTRAINT `Articles_nicho_wh_fk` FOREIGN KEY (`warehouse_id`) REFERENCES `warehouse` (`id`) ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT `Articles_nichos_fk` FOREIGN KEY (`Id_Article`) REFERENCES `Articles` (`Id_Article`) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=511916 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; -/*!40101 SET character_set_client = @saved_cs_client */; - --- --- Table structure for table `Articles_old` --- - -DROP TABLE IF EXISTS `Articles_old`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; -CREATE TABLE `Articles_old` ( - `Id_Article` int(11) NOT NULL DEFAULT '0', - `Equivalente` int(11) unsigned DEFAULT NULL, - `Article` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL, - `Medida` int(10) unsigned DEFAULT NULL, - `Tallos` int(11) DEFAULT '1', - `PVP` double DEFAULT '0', - `Imprimir` tinyint(1) NOT NULL DEFAULT '0', - `Albaranero` tinyint(1) NOT NULL DEFAULT '0', - `iva_group_id` tinyint(4) unsigned NOT NULL DEFAULT '1', - `Familia` varchar(3) COLLATE utf8_unicode_ci DEFAULT 'VT', - `caja` tinyint(1) NOT NULL DEFAULT '0', - `Categoria` varchar(3) COLLATE utf8_unicode_ci DEFAULT NULL, - `id_origen` tinyint(2) unsigned NOT NULL, - `do_photo` tinyint(4) NOT NULL DEFAULT '0', - `Foto` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL, - `Color` varchar(3) COLLATE utf8_unicode_ci DEFAULT NULL, - `Nicho` varchar(10) COLLATE utf8_unicode_ci DEFAULT NULL, - `Codintrastat` int(8) unsigned zerofill DEFAULT NULL, - `Min` tinyint(1) NOT NULL DEFAULT '0', - `odbc_date` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, - `offer` tinyint(4) NOT NULL DEFAULT '0', - `bargain` tinyint(4) NOT NULL DEFAULT '0', - `comments` varchar(150) COLLATE utf8_unicode_ci DEFAULT NULL COMMENT 'renombrar: reference', - `tipo_id` smallint(5) unsigned NOT NULL, - `generic` tinyint(1) unsigned zerofill NOT NULL DEFAULT '0', - `producer_id` mediumint(3) unsigned DEFAULT NULL, - `description` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=545516 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -3009,7 +2934,7 @@ CREATE TABLE `Cajas` ( KEY `warehouse_id` (`warehouse_id`), KEY `fk_Cajas_Proveedores_account1_idx` (`Proveedores_account_Id`), CONSTRAINT `Cajas_ibfk_2` FOREIGN KEY (`Id_Banco`) REFERENCES `Bancos` (`Id_Banco`) ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=602874 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=613567 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; /*!50003 SET @saved_cs_client = @@character_set_client */ ; /*!50003 SET @saved_cs_results = @@character_set_results */ ; @@ -3157,7 +3082,7 @@ CREATE TABLE `Clientes` ( CONSTRAINT `Clientes_ibfk_5` FOREIGN KEY (`province_id`) REFERENCES `province` (`province_id`) ON UPDATE CASCADE, CONSTRAINT `canal_nuevo_cliente` FOREIGN KEY (`chanel_id`) REFERENCES `chanel` (`chanel_id`) ON UPDATE CASCADE, CONSTRAINT `tipos_de_cliente` FOREIGN KEY (`clientes_tipo_id`) REFERENCES `clientes_tipo` (`clientes_tipo_id`) ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=14462 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=14565 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; /*!50003 SET @saved_cs_client = @@character_set_client */ ; /*!50003 SET @saved_cs_results = @@character_set_results */ ; @@ -3440,7 +3365,7 @@ CREATE TABLE `Colas` ( CONSTRAINT `Colas_ibfk_3` FOREIGN KEY (`Id_Prioridad`) REFERENCES `Prioridades` (`Id_Prioridad`) ON UPDATE CASCADE, CONSTRAINT `Colas_ibfk_4` FOREIGN KEY (`Id_Impresora`) REFERENCES `Impresoras` (`Id_Impresora`) ON UPDATE CASCADE, CONSTRAINT `Colas_ibfk_5` FOREIGN KEY (`Id_Trabajador`) REFERENCES `Trabajadores` (`Id_Trabajador`) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=320742 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=33943 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -3522,7 +3447,7 @@ CREATE TABLE `Compres` ( CONSTRAINT `Compres_ibfk_2` FOREIGN KEY (`Id_Cubo`) REFERENCES `Cubos` (`Id_Cubo`) ON UPDATE CASCADE, CONSTRAINT `Compres_ibfk_3` FOREIGN KEY (`container_id`) REFERENCES `container` (`container_id`) ON UPDATE CASCADE, CONSTRAINT `buy_id` FOREIGN KEY (`Id_Entrada`) REFERENCES `Entradas` (`Id_Entrada`) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=264445628 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci ROW_FORMAT=DYNAMIC; +) ENGINE=InnoDB AUTO_INCREMENT=272113009 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci ROW_FORMAT=DYNAMIC; /*!40101 SET character_set_client = @saved_cs_client */; /*!50003 SET @saved_cs_client = @@character_set_client */ ; /*!50003 SET @saved_cs_results = @@character_set_results */ ; @@ -3698,46 +3623,6 @@ DELIMITER ; /*!50003 SET character_set_results = @saved_cs_results */ ; /*!50003 SET collation_connection = @saved_col_connection */ ; --- --- Table structure for table `Compres_2014_kk` --- - -DROP TABLE IF EXISTS `Compres_2014_kk`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; -CREATE TABLE `Compres_2014_kk` ( - `Id_Compra` int(11) NOT NULL AUTO_INCREMENT, - `Id_Entrada` int(11) NOT NULL DEFAULT '0', - `Id_Article` int(11) NOT NULL DEFAULT '90', - `Cantidad` int(11) DEFAULT '0', - `Costefijo` decimal(10,3) DEFAULT '0.000', - `Portefijo` decimal(10,3) DEFAULT '0.000', - `Novincular` tinyint(1) NOT NULL DEFAULT '0', - `Etiquetas` int(11) DEFAULT '0', - `Packing` int(11) DEFAULT '0', - `grouping` smallint(5) unsigned NOT NULL DEFAULT '1', - `caja` tinyint(4) NOT NULL COMMENT '0=sin obligar 1=groping 2=packing', - `container_id` smallint(5) unsigned NOT NULL DEFAULT '36', - `Comisionfija` decimal(10,3) DEFAULT '0.000', - `Embalajefijo` decimal(10,3) DEFAULT '0.000', - `Nicho` varchar(5) COLLATE utf8_unicode_ci DEFAULT NULL, - `Id_Cubo` varchar(10) COLLATE utf8_unicode_ci DEFAULT '--', - `Tarifa1` decimal(10,2) DEFAULT '0.00', - `Tarifa2` decimal(10,2) DEFAULT '0.00', - `Tarifa3` decimal(10,2) DEFAULT '0.00', - `PVP` decimal(10,2) DEFAULT '0.00', - `Productor` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL, - `Vida` int(11) DEFAULT '0', - `Id_Trabajador` int(11) DEFAULT '0', - `punteo` tinyint(1) NOT NULL DEFAULT '0', - `Volumenkk` int(11) DEFAULT NULL, - `odbc_date` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, - `cm2kk` int(10) unsigned NOT NULL DEFAULT '0', - `buy_edi_id` int(11) DEFAULT NULL, - PRIMARY KEY (`Id_Compra`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci ROW_FORMAT=DYNAMIC; -/*!40101 SET character_set_client = @saved_cs_client */; - -- -- Table structure for table `Compres_mark` -- @@ -3774,7 +3659,7 @@ CREATE TABLE `Compres_ok` ( KEY `Id_Movimiento` (`Id_Compra`), KEY `Id_Accion` (`Id_Accion`), CONSTRAINT `Compres_ok_ibfk_1` FOREIGN KEY (`Id_Compra`) REFERENCES `Compres` (`Id_Compra`) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=21030 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=22169 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -3818,7 +3703,7 @@ CREATE TABLE `Consignatarios` ( CONSTRAINT `Consignatarios_ibfk_3` FOREIGN KEY (`province_id`) REFERENCES `province` (`province_id`) ON UPDATE CASCADE, CONSTRAINT `Consignatarios_ibfk_4` FOREIGN KEY (`Id_Agencia`) REFERENCES `Agencias` (`Id_Agencia`) ON UPDATE CASCADE, CONSTRAINT `address_customer_id` FOREIGN KEY (`Id_cliente`) REFERENCES `Clientes` (`id_cliente`) ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=25516 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=25727 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; /*!50003 SET @saved_cs_client = @@character_set_client */ ; /*!50003 SET @saved_cs_results = @@character_set_results */ ; @@ -4002,7 +3887,7 @@ CREATE TABLE `Contactos` ( PRIMARY KEY (`Id_Contacto`), KEY `Telefono` (`Telefono`), KEY `Movil` (`Movil`) -) ENGINE=InnoDB AUTO_INCREMENT=2644 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=2648 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; /*!50003 SET @saved_cs_client = @@character_set_client */ ; /*!50003 SET @saved_cs_results = @@character_set_results */ ; @@ -4199,7 +4084,7 @@ CREATE TABLE `Entradas` ( CONSTRAINT `Entradas_ibfk_1` FOREIGN KEY (`Id_Proveedor`) REFERENCES `Proveedores` (`Id_Proveedor`) ON UPDATE CASCADE, CONSTRAINT `Entradas_ibfk_6` FOREIGN KEY (`travel_id`) REFERENCES `travel` (`id`) ON UPDATE CASCADE, CONSTRAINT `Entradas_ibfk_7` FOREIGN KEY (`empresa_id`) REFERENCES `empresa` (`id`) ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=146850 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='InnoDB free: 88064 kB; (`Id_Proveedor`) REFER `vn2008/Provee'; +) ENGINE=InnoDB AUTO_INCREMENT=149602 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='InnoDB free: 88064 kB; (`Id_Proveedor`) REFER `vn2008/Provee'; /*!40101 SET character_set_client = @saved_cs_client */; /*!50003 SET @saved_cs_client = @@character_set_client */ ; /*!50003 SET @saved_cs_results = @@character_set_results */ ; @@ -4363,7 +4248,7 @@ CREATE TABLE `Entradas_dits` ( CONSTRAINT `Entradas_dits_ibfk_1` FOREIGN KEY (`Id_Ticket`) REFERENCES `Entradas` (`Id_Entrada`) ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT `fgkey_entradas_1` FOREIGN KEY (`idaccion_dits`) REFERENCES `accion_dits` (`idaccion_dits`) ON DELETE NO ACTION ON UPDATE CASCADE, CONSTRAINT `fgkey_entradas_3` FOREIGN KEY (`Id_Trabajador`) REFERENCES `Trabajadores` (`Id_Trabajador`) ON DELETE NO ACTION ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=2922478 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=2997439 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -4381,7 +4266,7 @@ CREATE TABLE `Entradas_kop` ( PRIMARY KEY (`Id_Entradas_kop`), KEY `entradas_entradas_kop_idx` (`Id_Entrada`), CONSTRAINT `entradas_entradas_kop` FOREIGN KEY (`Id_Entrada`) REFERENCES `Entradas` (`Id_Entrada`) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=797 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Relaciona las entradas con los origenes de compra'; +) ENGINE=InnoDB AUTO_INCREMENT=1072 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Relaciona las entradas con los origenes de compra'; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -4469,7 +4354,7 @@ CREATE TABLE `Equipos` ( PRIMARY KEY (`id`), KEY `trabajador_id` (`trabajador_id`), CONSTRAINT `Equipos_ibfk_1` FOREIGN KEY (`trabajador_id`) REFERENCES `Trabajadores` (`Id_Trabajador`) ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=159 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=165 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -4624,7 +4509,7 @@ CREATE TABLE `Facturas` ( CONSTRAINT `Facturas_ibfk_4` FOREIGN KEY (`cplusTaxBreakFk`) REFERENCES `vn`.`cplusTaxBreak` (`id`) ON UPDATE CASCADE, CONSTRAINT `invoice_bank_id` FOREIGN KEY (`Id_Banco`) REFERENCES `Bancos` (`Id_Banco`) ON UPDATE CASCADE, CONSTRAINT `invoice_customer_id` FOREIGN KEY (`Id_Cliente`) REFERENCES `Clientes` (`id_cliente`) ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=461181 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=467442 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; /*!50003 SET @saved_cs_client = @@character_set_client */ ; /*!50003 SET @saved_cs_results = @@character_set_results */ ; @@ -4842,7 +4727,7 @@ CREATE TABLE `Greuges` ( KEY `Id_Ticket_Greuge_Ticket_idx` (`Id_Ticket`), CONSTRAINT `Id_Ticket_Greuge_Ticket` FOREIGN KEY (`Id_Ticket`) REFERENCES `Tickets` (`Id_Ticket`) ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT `greuges_type_fk` FOREIGN KEY (`Greuges_type_id`) REFERENCES `Greuges_type` (`Greuges_type_id`) ON DELETE SET NULL ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=2337845 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci ROW_FORMAT=FIXED; +) ENGINE=InnoDB AUTO_INCREMENT=2391288 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci ROW_FORMAT=FIXED; /*!40101 SET character_set_client = @saved_cs_client */; /*!50003 SET @saved_cs_client = @@character_set_client */ ; /*!50003 SET @saved_cs_results = @@character_set_results */ ; @@ -5043,7 +4928,7 @@ CREATE TABLE `Movimientos` ( KEY `itemFk_ticketFk` (`Id_Article`,`Id_Ticket`), CONSTRAINT `Movimientos_ibfk_1` FOREIGN KEY (`Id_Article`) REFERENCES `Articles` (`Id_Article`) ON UPDATE CASCADE, CONSTRAINT `movement_ticket_id` FOREIGN KEY (`Id_Ticket`) REFERENCES `Tickets` (`Id_Ticket`) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=21527515 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=21954135 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; /*!50003 SET @saved_cs_client = @@character_set_client */ ; /*!50003 SET @saved_cs_results = @@character_set_results */ ; @@ -5073,12 +4958,20 @@ DELIMITER ; /*!50003 SET @saved_sql_mode = @@sql_mode */ ; /*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; DELIMITER ;; -/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `MovimientosBeforeUpdate` - BEFORE UPDATE ON `Movimientos` FOR EACH ROW +/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `vn2008`.`Movimientos_BEFORE_UPDATE` BEFORE UPDATE ON `Movimientos` FOR EACH ROW BEGIN + IF NEW.Descuento > 100 THEN SET NEW.Descuento = 0; END IF; + + IF NEW.OK = FALSE AND OLD.OK != FALSE THEN + + CALL vn.saleItemShelvingDelete(new.Id_Movimiento); + + END IF; + + END */;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -5094,10 +4987,12 @@ DELIMITER ; /*!50003 SET @saved_sql_mode = @@sql_mode */ ; /*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; DELIMITER ;; -/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `vn2008`.`MovimientosAfterUpdate` - AFTER UPDATE ON `Movimientos` FOR EACH ROW +/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `vn2008`.`Movimientos_AFTER_UPDATE` AFTER UPDATE ON `Movimientos` FOR EACH ROW BEGIN + CALL stock.queueAdd ('sale', NEW.Id_Movimiento, OLD.Id_Movimiento); + + END */;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -5192,10 +5087,11 @@ CREATE TABLE `Movimientos_mark` ( `Id_Movimiento_mark` int(11) NOT NULL AUTO_INCREMENT, `stateFk` tinyint(3) unsigned NOT NULL, PRIMARY KEY (`Id_Movimiento_mark`), + UNIQUE KEY `stateFk_UNIQUE` (`stateFk`,`Id_Movimiento`), KEY `Id_Movimiento` (`Id_Movimiento`), KEY `fgnStateFk_idx` (`stateFk`), CONSTRAINT `fgnStateFk` FOREIGN KEY (`stateFk`) REFERENCES `state` (`id`) ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=11411136 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=11885066 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; /*!50003 SET @saved_cs_client = @@character_set_client */ ; /*!50003 SET @saved_cs_results = @@character_set_results */ ; @@ -5289,7 +5185,7 @@ CREATE TABLE `Ordenes` ( KEY `Id_Comprador` (`CodCOMPRADOR`), KEY `Id_Movimiento` (`Id_Movimiento`), KEY `Id_Vendedor` (`CodVENDEDOR`) -) ENGINE=InnoDB AUTO_INCREMENT=32932 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=34219 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -5335,7 +5231,7 @@ CREATE TABLE `Pagares` ( KEY `empresa_id` (`kk_empresa_id`), KEY `pago_id` (`pago_id`), CONSTRAINT `Pagares_ibfk_2` FOREIGN KEY (`pago_id`) REFERENCES `pago` (`id`) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=2843 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=2844 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -5399,7 +5295,7 @@ CREATE TABLE `PreciosEspeciales` ( CONSTRAINT `sp_customer_id` FOREIGN KEY (`Id_Cliente`) REFERENCES `Clientes` (`id_cliente`) ON UPDATE CASCADE, CONSTRAINT `{01A99AF1-3D3F-4B15-AC0C-C7A834F319A3}` FOREIGN KEY (`Id_Cliente`) REFERENCES `Clientes` (`id_cliente`) ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT `{EE4ADEF6-0AC6-401F-B7C4-D797972FC065}` FOREIGN KEY (`Id_Article`) REFERENCES `Articles` (`Id_Article`) ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=691 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=693 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -5461,7 +5357,7 @@ CREATE TABLE `Proveedores` ( CONSTRAINT `pay_dem_id` FOREIGN KEY (`pay_dem_id`) REFERENCES `pay_dem` (`id`) ON UPDATE CASCADE, CONSTRAINT `pay_met_id` FOREIGN KEY (`pay_met_id`) REFERENCES `pay_met` (`id`) ON UPDATE CASCADE, CONSTRAINT `province_id` FOREIGN KEY (`province_id`) REFERENCES `province` (`province_id`) ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=2543 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=2575 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -5487,7 +5383,7 @@ CREATE TABLE `Proveedores_account` ( KEY `fk_Proveedores_account_entity1_idx` (`entity_id`), KEY `fk_banco_prov_account_idx` (`Id_Banco`), CONSTRAINT `fk_banco_prov_account` FOREIGN KEY (`Id_Banco`) REFERENCES `Bancos` (`Id_Banco`) ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=662 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=671 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -5578,7 +5474,7 @@ CREATE TABLE `Recibos` ( CONSTRAINT `Recibos_ibfk_1` FOREIGN KEY (`empresa_id`) REFERENCES `empresa` (`id`) ON UPDATE CASCADE, CONSTRAINT `Recibos_ibfk_2` FOREIGN KEY (`Id_Banco`) REFERENCES `Bancos` (`Id_Banco`) ON UPDATE CASCADE, CONSTRAINT `recibo_customer_id` FOREIGN KEY (`Id_Cliente`) REFERENCES `Clientes` (`id_cliente`) ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=476555 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=485315 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; /*!50003 SET @saved_cs_client = @@character_set_client */ ; /*!50003 SET @saved_cs_results = @@character_set_results */ ; @@ -5669,7 +5565,7 @@ CREATE TABLE `Relaciones` ( KEY `Id_Contacto` (`Id_Contacto`), KEY `Id_Proveedor` (`Id_Proveedor`), KEY `Id_Cliente` (`Id_Cliente`) -) ENGINE=InnoDB AUTO_INCREMENT=2644 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=2648 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -5689,7 +5585,7 @@ CREATE TABLE `Remesas` ( KEY `empresa_id` (`empresa_id`), CONSTRAINT `Remesas_ibfk_1` FOREIGN KEY (`empresa_id`) REFERENCES `empresa` (`id`) ON UPDATE CASCADE, CONSTRAINT `Remesas_ibfk_2` FOREIGN KEY (`Banco`) REFERENCES `Bancos` (`Id_Banco`) ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=1113 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=1134 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -5714,7 +5610,7 @@ CREATE TABLE `Reservas` ( PRIMARY KEY (`Id_Reserva`), KEY `Id_1` (`Id_Ticket`), KEY `Id_Article` (`Id_Article`) -) ENGINE=InnoDB AUTO_INCREMENT=2805 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=433 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -5745,7 +5641,7 @@ CREATE TABLE `Rutas` ( KEY `Fecha` (`Fecha`), KEY `gestdoc_id` (`gestdoc_id`), CONSTRAINT `Rutas_ibfk_1` FOREIGN KEY (`gestdoc_id`) REFERENCES `gestdoc` (`id`) ON DELETE SET NULL ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=40799 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=42066 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; /*!50003 SET @saved_cs_client = @@character_set_client */ ; /*!50003 SET @saved_cs_results = @@character_set_results */ ; @@ -5807,7 +5703,7 @@ CREATE TABLE `Rutas_Master` ( PRIMARY KEY (`id`), KEY `fk_rutas_warehouse_id_idx` (`warehouse_id`), CONSTRAINT `fk_rutas_warehouse_id` FOREIGN KEY (`warehouse_id`) REFERENCES `warehouse` (`id`) ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=69 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=72 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -5898,7 +5794,7 @@ CREATE TABLE `Saldos_Prevision` ( KEY `empresa_prevision_idx` (`empresa_id`), CONSTRAINT `banco_prevision` FOREIGN KEY (`Id_Banco`) REFERENCES `Bancos` (`Id_Banco`) ON UPDATE CASCADE, CONSTRAINT `empresa_prevision` FOREIGN KEY (`empresa_id`) REFERENCES `empresa` (`id`) ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=102 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Aqui ponemos los gastos e ingresos pendientes de introducir '; +) ENGINE=InnoDB AUTO_INCREMENT=109 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Aqui ponemos los gastos e ingresos pendientes de introducir '; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -5933,7 +5829,7 @@ CREATE TABLE `Split_lines` ( KEY `Id_Compra` (`Id_Compra`), CONSTRAINT `Id_Compra` FOREIGN KEY (`Id_Compra`) REFERENCES `Compres` (`Id_Compra`) ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT `Split_lines_ibfk_1` FOREIGN KEY (`Id_Split`) REFERENCES `Splits` (`Id_Split`) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=329261 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=332554 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -5951,7 +5847,7 @@ CREATE TABLE `Splits` ( `Notas` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL, PRIMARY KEY (`Id_Split`), KEY `Id_Entrada` (`Id_Entrada`) -) ENGINE=InnoDB AUTO_INCREMENT=36315 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=36356 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -5979,7 +5875,7 @@ CREATE TABLE `Stockcontrol` ( CONSTRAINT `Stockcontrol_ibfk_1` FOREIGN KEY (`Id_Article`) REFERENCES `Articles` (`Id_Article`) ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT `Stockcontrol_ibfk_2` FOREIGN KEY (`Id_Remitente`) REFERENCES `Trabajadores` (`Id_Trabajador`) ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT `Stockcontrol_ibfk_3` FOREIGN KEY (`Id_Solver`) REFERENCES `Trabajadores` (`Id_Trabajador`) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=23614 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=23716 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -6037,7 +5933,7 @@ CREATE TABLE `Tickets` ( CONSTRAINT `Tickets_ibfk_9` FOREIGN KEY (`Id_Ruta`) REFERENCES `Rutas` (`Id_Ruta`) ON UPDATE CASCADE, CONSTRAINT `ticket_customer_id` FOREIGN KEY (`Id_Cliente`) REFERENCES `Clientes` (`id_cliente`) ON UPDATE CASCADE, CONSTRAINT `tickets_fk10` FOREIGN KEY (`Factura`) REFERENCES `Facturas` (`Id_Factura`) ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=1935610 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=1972428 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; /*!50003 SET @saved_cs_client = @@character_set_client */ ; /*!50003 SET @saved_cs_results = @@character_set_results */ ; @@ -6251,7 +6147,7 @@ CREATE TABLE `Tickets_dits` ( CONSTRAINT `Tickets_dits_ibfk_1` FOREIGN KEY (`Id_Ticket`) REFERENCES `Tickets` (`Id_Ticket`) ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT `fgkey1` FOREIGN KEY (`idaccion_dits`) REFERENCES `accion_dits` (`idaccion_dits`) ON DELETE NO ACTION ON UPDATE CASCADE, CONSTRAINT `fgkey3` FOREIGN KEY (`Id_Trabajador`) REFERENCES `Trabajadores` (`Id_Trabajador`) ON DELETE NO ACTION ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=59918951 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=60986271 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -6300,7 +6196,7 @@ CREATE TABLE `Tickets_turno` ( `weekDay` tinyint(1) DEFAULT NULL COMMENT 'funcion de mysql Lunes = 0, Domingo = 6', PRIMARY KEY (`Id_Ticket`), CONSTRAINT `Id_Ticket_fk` FOREIGN KEY (`Id_Ticket`) REFERENCES `Tickets` (`Id_Ticket`) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=1922539 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=1966194 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -6457,7 +6353,7 @@ CREATE TABLE `Trabajadores` ( KEY `sub` (`sub`), CONSTRAINT `Clientes` FOREIGN KEY (`Id_Cliente_Interno`) REFERENCES `Clientes` (`id_cliente`) ON UPDATE CASCADE, CONSTRAINT `Trabajadores_ibfk_1` FOREIGN KEY (`user_id`) REFERENCES `account`.`user` (`id`) ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=1162 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=1181 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; /*!50003 SET @saved_cs_client = @@character_set_client */ ; /*!50003 SET @saved_cs_results = @@character_set_results */ ; @@ -6584,7 +6480,7 @@ CREATE TABLE `Vehiculos` ( KEY `provinceFk_idx` (`warehouseFk`), CONSTRAINT `Vehiculos_ibfk_1` FOREIGN KEY (`empresa_id`) REFERENCES `empresa` (`id`) ON UPDATE CASCADE, CONSTRAINT `provinceFk` FOREIGN KEY (`warehouseFk`) REFERENCES `province` (`province_id`) ON DELETE NO ACTION ON UPDATE NO ACTION -) ENGINE=InnoDB AUTO_INCREMENT=381 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=384 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -6610,7 +6506,7 @@ CREATE TABLE `Vehiculos_consumo` ( PRIMARY KEY (`Vehiculos_consumo_id`,`Id_Vehiculo`), KEY `fk_Vehiculos_consumo_Vehiculos_idx` (`Id_Vehiculo`), CONSTRAINT `fk_Vehiculos_consumo_Vehiculos` FOREIGN KEY (`Id_Vehiculo`) REFERENCES `Vehiculos` (`Id_Vehiculo`) ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=8732 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='En esta tabla apuntan el importe de los tickets de la gasolinera solred, con quien tenemos un contrato y nos facturan mensualmente'; +) ENGINE=InnoDB AUTO_INCREMENT=9024 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='En esta tabla apuntan el importe de los tickets de la gasolinera solred, con quien tenemos un contrato y nos facturan mensualmente'; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -6724,7 +6620,7 @@ CREATE TABLE `XDiario` ( PRIMARY KEY (`id`), KEY `empresa_id` (`empresa_id`), CONSTRAINT `XDiario_ibfk_1` FOREIGN KEY (`empresa_id`) REFERENCES `empresa` (`id`) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=3400357 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=3459758 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; /*!50003 SET @saved_cs_client = @@character_set_client */ ; /*!50003 SET @saved_cs_results = @@character_set_results */ ; @@ -6832,7 +6728,7 @@ CREATE TABLE `account_conciliacion` ( KEY `fg_accconciliacion_key1_idx` (`Id_Proveedores_account`), KEY `index_id_calculated` (`id_calculated`), CONSTRAINT `fg_key1_accountconc` FOREIGN KEY (`Id_Proveedores_account`) REFERENCES `Proveedores_account` (`Id_Proveedores_account`) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=5671 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=8474 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; /*!50003 SET @saved_cs_client = @@character_set_client */ ; /*!50003 SET @saved_cs_results = @@character_set_results */ ; @@ -6953,7 +6849,7 @@ CREATE TABLE `agency` ( KEY `agencias_alias_idx` (`warehouse_alias_id`), CONSTRAINT `agency_ibfk_1` FOREIGN KEY (`warehouse_id`) REFERENCES `warehouse` (`id`) ON UPDATE CASCADE, CONSTRAINT `agency_ibfk_2` FOREIGN KEY (`Id_Banco`) REFERENCES `Bancos` (`Id_Banco`) ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=231 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=281 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; /*!50003 SET @saved_cs_client = @@character_set_client */ ; /*!50003 SET @saved_cs_results = @@character_set_results */ ; @@ -6999,7 +6895,7 @@ CREATE TABLE `agency_hour` ( CONSTRAINT `agency_hour_ibfk_1` FOREIGN KEY (`agency_id`) REFERENCES `agency` (`agency_id`) ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT `agency_hour_ibfk_2` FOREIGN KEY (`warehouse_id`) REFERENCES `warehouse` (`id`) ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT `agency_hour_ibfk_3` FOREIGN KEY (`province_id`) REFERENCES `province` (`province_id`) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=4671 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=4682 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; /*!50003 SET @saved_cs_client = @@character_set_client */ ; /*!50003 SET @saved_cs_results = @@character_set_results */ ; @@ -7095,7 +6991,7 @@ CREATE TABLE `agency_weekday_bonus` ( `bonus` decimal(10,2) NOT NULL DEFAULT '0.00', PRIMARY KEY (`id`), UNIQUE KEY `warehouse_id` (`warehouse_id`,`agency_id`,`weekDay`,`zona`) -) ENGINE=InnoDB AUTO_INCREMENT=134 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=138 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -7165,7 +7061,7 @@ CREATE TABLE `albaran` ( CONSTRAINT `fk_albaran_empresa1` FOREIGN KEY (`empresa_id`) REFERENCES `empresa` (`id`) ON UPDATE CASCADE, CONSTRAINT `fk_albaran_recibida` FOREIGN KEY (`recibida_id`) REFERENCES `recibida` (`id`) ON DELETE SET NULL ON UPDATE CASCADE, CONSTRAINT `fk_albaran_warehouse1` FOREIGN KEY (`warehouse_id`) REFERENCES `warehouse` (`id`) ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=2547 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=2603 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -7242,7 +7138,7 @@ CREATE TABLE `awb` ( CONSTRAINT `awbInvoiceIn` FOREIGN KEY (`invoiceInFk`) REFERENCES `recibida` (`id`) ON DELETE SET NULL ON UPDATE CASCADE, CONSTRAINT `awbTransitoryFk` FOREIGN KEY (`transitario_id`) REFERENCES `Proveedores` (`Id_Proveedor`) ON UPDATE CASCADE, CONSTRAINT `awb_ibfk_1` FOREIGN KEY (`iva_id`) REFERENCES `iva_codigo` (`id`) ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=2636 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=2698 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; /*!50003 SET @saved_cs_client = @@character_set_client */ ; /*!50003 SET @saved_cs_results = @@character_set_results */ ; @@ -7419,7 +7315,7 @@ CREATE TABLE `awb_component_template` ( CONSTRAINT `Id_Moneda` FOREIGN KEY (`Id_Moneda`) REFERENCES `Monedas` (`Id_Moneda`) ON UPDATE CASCADE, CONSTRAINT `awb_unit_fk1` FOREIGN KEY (`awb_unit_id`) REFERENCES `awb_unit` (`awb_unit_id`) ON UPDATE CASCADE, CONSTRAINT `role_fk` FOREIGN KEY (`awb_role_id`) REFERENCES `awb_role` (`awb_role_id`) ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=591 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=594 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -7500,7 +7396,7 @@ CREATE TABLE `awb_gestdoc` ( KEY `awb_gestdoc_gestdoc_fk` (`gestdoc_id`), CONSTRAINT `awb_gestdoc_awb_fk` FOREIGN KEY (`awb_id`) REFERENCES `awb` (`id`) ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT `awb_gestdoc_gestdoc_fk` FOREIGN KEY (`gestdoc_id`) REFERENCES `gestdoc` (`id`) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=2298 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=2357 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -7618,7 +7514,7 @@ CREATE TABLE `barcodes` ( UNIQUE KEY `Id_Article_2` (`Id_Article`,`code`), KEY `Id_Article` (`Id_Article`), CONSTRAINT `barcodes_ibfk_1` FOREIGN KEY (`Id_Article`) REFERENCES `Articles` (`Id_Article`) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=36336 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=36494 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -7686,7 +7582,7 @@ CREATE TABLE `businessReasonEnd` ( `id` tinyint(3) NOT NULL AUTO_INCREMENT, `reason` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL, PRIMARY KEY (`id`) -) ENGINE=InnoDB AUTO_INCREMENT=13 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=14 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -7759,7 +7655,7 @@ CREATE TABLE `buy_edi` ( KEY `kop` (`kop`), KEY `barcode` (`barcode`), KEY `fec` (`fec`) -) ENGINE=InnoDB AUTO_INCREMENT=731393 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=751612 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -7852,27 +7748,6 @@ CREATE TABLE `callings` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; --- --- Table structure for table `callingtasksKK` --- - -DROP TABLE IF EXISTS `callingtasksKK`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; -CREATE TABLE `callingtasksKK` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `instruccion` varchar(99) COLLATE utf8_unicode_ci DEFAULT NULL, - `tel1` varchar(15) COLLATE utf8_unicode_ci DEFAULT NULL, - `tel2` varchar(15) COLLATE utf8_unicode_ci DEFAULT NULL, - `situacion` varchar(99) COLLATE utf8_unicode_ci DEFAULT NULL, - `closed` tinyint(1) DEFAULT '0', - `Id_Trabajador` tinyint(4) DEFAULT NULL, - `Id_Prioridad` tinyint(4) DEFAULT '2', - `selected` tinyint(4) DEFAULT '0', - PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; -/*!40101 SET character_set_client = @saved_cs_client */; - -- -- Temporary table structure for view `cdr` -- @@ -8013,7 +7888,7 @@ CREATE TABLE `cl_act` ( CONSTRAINT `cl_act_ibfk_1` FOREIGN KEY (`Id_Movimiento`) REFERENCES `Movimientos` (`Id_Movimiento`) ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT `cl_act_ibfk_3` FOREIGN KEY (`Id_Trabajador`) REFERENCES `Trabajadores` (`Id_Trabajador`) ON UPDATE CASCADE, CONSTRAINT `cl_act_ibfk_4` FOREIGN KEY (`cl_main_id`) REFERENCES `cl_main` (`id`) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=87927 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Acciones en respuesta a las reclamaciones'; +) ENGINE=InnoDB AUTO_INCREMENT=90091 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Acciones en respuesta a las reclamaciones'; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -8047,7 +7922,7 @@ CREATE TABLE `cl_cau` ( CONSTRAINT `cl_cau_ibfk_7` FOREIGN KEY (`cl_mot_id`) REFERENCES `cl_mot` (`id`) ON UPDATE CASCADE, CONSTRAINT `cl_cau_ibfk_8` FOREIGN KEY (`cl_con_id`) REFERENCES `cl_con` (`id`) ON UPDATE CASCADE, CONSTRAINT `cl_cau_ibfk_9` FOREIGN KEY (`Id_Trabajador`) REFERENCES `Trabajadores` (`Id_Trabajador`) ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=46887 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Causas de las reclamaciones'; +) ENGINE=InnoDB AUTO_INCREMENT=47768 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Causas de las reclamaciones'; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -8101,8 +7976,36 @@ CREATE TABLE `cl_det` ( CONSTRAINT `cl_det_ibfk_6` FOREIGN KEY (`cl_pet_id`) REFERENCES `cl_pet` (`id`) ON UPDATE CASCADE, CONSTRAINT `cl_det_ibfk_7` FOREIGN KEY (`Id_Movimiento`) REFERENCES `Movimientos` (`Id_Movimiento`) ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT `cl_det_ibfk_8` FOREIGN KEY (`cl_main_id`) REFERENCES `cl_main` (`id`) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=120464 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Detalle de las reclamaciones'; +) ENGINE=InnoDB AUTO_INCREMENT=123155 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Detalle de las reclamaciones'; /*!40101 SET character_set_client = @saved_cs_client */; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8 */ ; +/*!50003 SET character_set_results = utf8 */ ; +/*!50003 SET collation_connection = utf8_general_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `vn2008`.`cl_det_AFTER_INSERT` AFTER INSERT ON `cl_det` FOR EACH ROW +BEGIN + + DECLARE vTicket INT; + + SELECT s.ticketFk INTO vTicket + FROM vn.sale s + WHERE s.id = NEW.Id_Movimiento; + + UPDATE vn.claim + SET ticketFk = vTicket + WHERE id = NEW.cl_main_id; + +END */;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; -- -- Table structure for table `cl_dev` @@ -8129,7 +8032,7 @@ CREATE TABLE `cl_est` ( `id` int(10) unsigned NOT NULL AUTO_INCREMENT, `estado` varchar(15) COLLATE utf8_unicode_ci NOT NULL, PRIMARY KEY (`id`) -) ENGINE=InnoDB AUTO_INCREMENT=8 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Estados posibles de las reclamaciones'; +) ENGINE=InnoDB AUTO_INCREMENT=6 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Estados posibles de las reclamaciones'; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -8150,15 +8053,18 @@ CREATE TABLE `cl_main` ( `sensib` int(1) unsigned NOT NULL DEFAULT '3', `mana` tinyint(1) NOT NULL DEFAULT '0', `odbc_date` timestamp NULL DEFAULT CURRENT_TIMESTAMP, + `ticketFk` int(11) DEFAULT NULL, PRIMARY KEY (`id`), KEY `cl_dep_id` (`cl_dep_id`), KEY `cl_est_id` (`cl_est_id`), KEY `Id_Cliente` (`Id_Cliente`), KEY `Id_Trabajador` (`Id_Trabajador`), + KEY `cl_main_ticketFk_idx` (`ticketFk`), CONSTRAINT `cl_main_ibfk_3` FOREIGN KEY (`cl_est_id`) REFERENCES `cl_est` (`id`) ON UPDATE CASCADE, CONSTRAINT `cl_main_ibfk_4` FOREIGN KEY (`cl_dep_id`) REFERENCES `cl_dep` (`id`) ON UPDATE CASCADE, - CONSTRAINT `cl_main_ibfk_5` FOREIGN KEY (`Id_Cliente`) REFERENCES `Clientes` (`id_cliente`) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=52169 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Reclamaciones, tabla principal'; + CONSTRAINT `cl_main_ibfk_5` FOREIGN KEY (`Id_Cliente`) REFERENCES `Clientes` (`id_cliente`) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT `cl_main_ticketFk` FOREIGN KEY (`ticketFk`) REFERENCES `Tickets` (`Id_Ticket`) ON UPDATE CASCADE +) ENGINE=InnoDB AUTO_INCREMENT=53369 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Reclamaciones, tabla principal'; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -8271,7 +8177,7 @@ CREATE TABLE `client_observation` ( KEY `Id_Cliente` (`Id_Cliente`), CONSTRAINT `client_observation_ibfk_1` FOREIGN KEY (`Id_Cliente`) REFERENCES `Clientes` (`id_cliente`) ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT `client_observation_ibfk_2` FOREIGN KEY (`Id_Trabajador`) REFERENCES `Trabajadores` (`Id_Trabajador`) ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=65864 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Todas las observaciones referentes a un ticket'; +) ENGINE=InnoDB AUTO_INCREMENT=67001 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Todas las observaciones referentes a un ticket'; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -8322,8 +8228,9 @@ CREATE TABLE `clientes_regalos_lista_enc` ( `datend` date DEFAULT NULL, `warehouse_id` smallint(6) unsigned DEFAULT '1', `province_id` smallint(5) unsigned DEFAULT NULL, + `countryFk` smallint(5) unsigned DEFAULT NULL, PRIMARY KEY (`Id_Regalo`) -) ENGINE=MyISAM AUTO_INCREMENT=177 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=MyISAM AUTO_INCREMENT=179 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -8437,7 +8344,7 @@ CREATE TABLE `consignatarios_observation` ( `text` text COLLATE utf8_unicode_ci NOT NULL, PRIMARY KEY (`consignatarios_observation_id`), UNIQUE KEY `Id_Consigna` (`Id_Consigna`,`observation_type_id`) -) ENGINE=InnoDB AUTO_INCREMENT=3306 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Observaciones de los consignatarios'; +) ENGINE=InnoDB AUTO_INCREMENT=3371 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Observaciones de los consignatarios'; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -8481,7 +8388,7 @@ CREATE TABLE `cooler_path_detail` ( `pasillo` varchar(3) COLLATE utf8_unicode_ci NOT NULL, PRIMARY KEY (`cooler_path_id`,`pasillo`), UNIQUE KEY `cooler_path_detail_id_UNIQUE` (`cooler_path_detail_id`) -) ENGINE=InnoDB AUTO_INCREMENT=718 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=719 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -8519,7 +8426,7 @@ CREATE TABLE `credit` ( KEY `credit_ClienteFk` (`Id_Cliente`), CONSTRAINT `credit_ClienteFk` FOREIGN KEY (`Id_Cliente`) REFERENCES `Clientes` (`id_cliente`) ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT `workers_fk` FOREIGN KEY (`Id_Trabajador`) REFERENCES `Trabajadores` (`Id_Trabajador`) ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=65001 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=66244 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -8644,7 +8551,7 @@ CREATE TABLE `device` ( PRIMARY KEY (`device_id`), UNIQUE KEY `device_id_UNIQUE` (`device_id`), UNIQUE KEY `sn_UNIQUE` (`sn`) -) ENGINE=InnoDB AUTO_INCREMENT=229 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=260 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -9009,6 +8916,7 @@ CREATE TABLE `escritos` ( `abrev` varchar(20) COLLATE utf8_unicode_ci NOT NULL, `descripcion` varchar(105) COLLATE utf8_unicode_ci NOT NULL, `visible` tinyint(4) NOT NULL DEFAULT '1', + `hasCompany` varchar(45) COLLATE utf8_unicode_ci NOT NULL DEFAULT '0', PRIMARY KEY (`id`) ) ENGINE=InnoDB AUTO_INCREMENT=17 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; @@ -9024,7 +8932,7 @@ CREATE TABLE `escritos_det` ( `id` int(10) unsigned NOT NULL AUTO_INCREMENT, `Id_Cliente` int(10) unsigned NOT NULL, `escritos_id` int(10) unsigned NOT NULL, - `fecha` datetime NOT NULL, + `fecha` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, `Id_Trabajador` int(10) unsigned NOT NULL, `Saldo` float NOT NULL, `empresa_id` smallint(5) unsigned DEFAULT NULL, @@ -9033,7 +8941,7 @@ CREATE TABLE `escritos_det` ( PRIMARY KEY (`id`), KEY `empresa_id` (`empresa_id`), CONSTRAINT `escritos_det_ibfk_1` FOREIGN KEY (`empresa_id`) REFERENCES `empresa` (`id`) ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=15784 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=15953 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -9062,7 +8970,7 @@ CREATE TABLE `expeditions` ( KEY `index4` (`ticket_id`), CONSTRAINT `Id_Agencia` FOREIGN KEY (`agency_id`) REFERENCES `Agencias` (`Id_Agencia`) ON UPDATE CASCADE, CONSTRAINT `ticket_id` FOREIGN KEY (`ticket_id`) REFERENCES `Tickets` (`Id_Ticket`) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=2514238 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=2572859 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; /*!50003 SET @saved_cs_client = @@character_set_client */ ; /*!50003 SET @saved_cs_results = @@character_set_results */ ; @@ -9322,7 +9230,7 @@ CREATE TABLE `gestdoc` ( UNIQUE KEY `emp_id` (`emp_id`,`orden`,`warehouse_id`), KEY `trabajador_id` (`trabajador_id`), KEY `warehouse_id` (`warehouse_id`) -) ENGINE=InnoDB AUTO_INCREMENT=1040841 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='document managment system'; +) ENGINE=InnoDB AUTO_INCREMENT=1061182 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='document managment system'; /*!40101 SET character_set_client = @saved_cs_client */; /*!50003 SET @saved_cs_client = @@character_set_client */ ; /*!50003 SET @saved_cs_results = @@character_set_results */ ; @@ -9521,7 +9429,7 @@ CREATE TABLE `intrastat_data` ( KEY `recibida` (`recibida_id`), CONSTRAINT `intrastat_data_ibfk_1` FOREIGN KEY (`intrastat_id`) REFERENCES `Intrastat` (`Codintrastat`) ON UPDATE CASCADE, CONSTRAINT `intrastat_data_ibfk_2` FOREIGN KEY (`recibida_id`) REFERENCES `recibida` (`id`) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=67334 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=68478 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -9859,7 +9767,7 @@ CREATE TABLE `mail` ( `recipientFk` int(11) DEFAULT NULL, `plainTextBody` text COLLATE utf8_unicode_ci, PRIMARY KEY (`id`) -) ENGINE=MyISAM AUTO_INCREMENT=1401931 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=MyISAM AUTO_INCREMENT=1437979 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -9917,7 +9825,7 @@ CREATE TABLE `mandato` ( CONSTRAINT `mandato_fgkey1` FOREIGN KEY (`Id_Cliente`) REFERENCES `Clientes` (`id_cliente`) ON DELETE NO ACTION ON UPDATE CASCADE, CONSTRAINT `mandato_fgkey2` FOREIGN KEY (`empresa_id`) REFERENCES `empresa` (`id`) ON DELETE NO ACTION ON UPDATE CASCADE, CONSTRAINT `mandato_fgkey3` FOREIGN KEY (`idmandato_tipo`) REFERENCES `mandato_tipo` (`idmandato_tipo`) ON DELETE NO ACTION ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=15399 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=15504 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; /*!50003 SET @saved_cs_client = @@character_set_client */ ; /*!50003 SET @saved_cs_results = @@character_set_results */ ; @@ -10126,7 +10034,7 @@ CREATE TABLE `pago` ( CONSTRAINT `pago_moneda` FOREIGN KEY (`id_moneda`) REFERENCES `Monedas` (`Id_Moneda`) ON UPDATE CASCADE, CONSTRAINT `pago_pay_met` FOREIGN KEY (`pay_met_id`) REFERENCES `pay_met` (`id`) ON UPDATE CASCADE, CONSTRAINT `proveedor_pago` FOREIGN KEY (`id_proveedor`) REFERENCES `Proveedores` (`Id_Proveedor`) ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=42921 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=43510 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; /*!50003 SET @saved_cs_client = @@character_set_client */ ; /*!50003 SET @saved_cs_results = @@character_set_results */ ; @@ -10207,7 +10115,7 @@ CREATE TABLE `pago_sdc` ( CONSTRAINT `empresa_sdc` FOREIGN KEY (`empresa_id`) REFERENCES `empresa` (`id`) ON UPDATE CASCADE, CONSTRAINT `financial_type_fk` FOREIGN KEY (`financialProductTypefk`) REFERENCES `financialProductType` (`id`) ON UPDATE CASCADE, CONSTRAINT `pago_sdc_entity_fk` FOREIGN KEY (`entity_id`) REFERENCES `entity` (`entity_id`) ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=50 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Seguros de cambio'; +) ENGINE=InnoDB AUTO_INCREMENT=49 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Seguros de cambio'; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -10621,7 +10529,7 @@ CREATE TABLE `price_fixed` ( KEY `date_end` (`date_end`), KEY `warehouse_id` (`warehouse_id`), CONSTRAINT `price_fixed_ibfk_1` FOREIGN KEY (`item_id`) REFERENCES `Articles` (`Id_Article`) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=54928 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=55927 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; /*!50003 SET @saved_cs_client = @@character_set_client */ ; /*!50003 SET @saved_cs_results = @@character_set_results */ ; @@ -10683,7 +10591,7 @@ CREATE TABLE `producer` ( `visible` tinyint(1) NOT NULL DEFAULT '1', PRIMARY KEY (`producer_id`), UNIQUE KEY `name_UNIQUE` (`name`) -) ENGINE=InnoDB AUTO_INCREMENT=4928 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=5166 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -10852,7 +10760,7 @@ CREATE TABLE `recibida` ( CONSTRAINT `recibida_ibfk_5` FOREIGN KEY (`cplusInvoiceType472Fk`) REFERENCES `vn`.`cplusInvoiceType472` (`id`) ON UPDATE CASCADE, CONSTRAINT `recibida_ibfk_6` FOREIGN KEY (`cplusRectificationTypeFk`) REFERENCES `vn`.`cplusRectificationType` (`id`) ON UPDATE CASCADE, CONSTRAINT `recibida_ibfk_7` FOREIGN KEY (`cplusTrascendency472Fk`) REFERENCES `vn`.`cplusTrascendency472` (`id`) ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=70155 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=71550 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; /*!50003 SET @saved_cs_client = @@character_set_client */ ; /*!50003 SET @saved_cs_results = @@character_set_results */ ; @@ -11441,7 +11349,7 @@ CREATE TABLE `recibida_iva` ( CONSTRAINT `recibida_iva_ibfk_2` FOREIGN KEY (`iva_id`) REFERENCES `iva_codigo` (`id`) ON DELETE NO ACTION ON UPDATE CASCADE, CONSTRAINT `recibida_iva_ibfk_5` FOREIGN KEY (`recibida_id`) REFERENCES `recibida` (`id`) ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT `recibida_iva_ibfk_6` FOREIGN KEY (`gastos_id`) REFERENCES `Gastos` (`Id_Gasto`) ON DELETE NO ACTION ON UPDATE NO ACTION -) ENGINE=InnoDB AUTO_INCREMENT=95758 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=100400 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -11464,7 +11372,7 @@ CREATE TABLE `recibida_vencimiento` ( KEY `banco_id` (`banco_id`), CONSTRAINT `recibida_vencimiento_ibfk_6` FOREIGN KEY (`banco_id`) REFERENCES `Bancos` (`Id_Banco`) ON UPDATE CASCADE, CONSTRAINT `recibida_vencimiento_ibfk_7` FOREIGN KEY (`recibida_id`) REFERENCES `recibida` (`id`) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=93163 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=97793 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; /*!50003 SET @saved_cs_client = @@character_set_client */ ; /*!50003 SET @saved_cs_results = @@character_set_results */ ; @@ -11507,7 +11415,7 @@ CREATE TABLE `recovery` ( KEY `cliente_idx` (`Id_Cliente`), CONSTRAINT `cliente333` FOREIGN KEY (`Id_Cliente`) REFERENCES `Clientes` (`id_cliente`) ON UPDATE CASCADE, CONSTRAINT `cliente_cliente` FOREIGN KEY (`Id_Cliente`) REFERENCES `Clientes` (`id_cliente`) ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=269 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='En esta tabla apuntaremos los acuerdos de recobro semanal a '; +) ENGINE=InnoDB AUTO_INCREMENT=271 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='En esta tabla apuntaremos los acuerdos de recobro semanal a '; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -11574,8 +11482,9 @@ CREATE TABLE `reinos` ( `color` char(6) COLLATE utf8_unicode_ci DEFAULT NULL, `efimero` int(11) NOT NULL DEFAULT '0' COMMENT 'Sirve para filtrar aquellos reinos que tienen precios estables', `mercancia` tinyint(1) NOT NULL DEFAULT '1', + `icon` varchar(45) COLLATE utf8_unicode_ci DEFAULT NULL, PRIMARY KEY (`id`) -) ENGINE=InnoDB AUTO_INCREMENT=9 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=13 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -11607,20 +11516,6 @@ CREATE TABLE `reparacion` ( ) ENGINE=InnoDB AUTO_INCREMENT=11 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; --- --- Table structure for table `rolekk` --- - -DROP TABLE IF EXISTS `rolekk`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; -CREATE TABLE `rolekk` ( - `role_id` smallint(5) unsigned NOT NULL AUTO_INCREMENT, - `description` varchar(20) COLLATE utf8_unicode_ci NOT NULL, - PRIMARY KEY (`role_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; -/*!40101 SET character_set_client = @saved_cs_client */; - -- -- Table structure for table `rounding` -- @@ -11701,7 +11596,7 @@ CREATE TABLE `scan` ( `name` varchar(45) CHARACTER SET utf8 DEFAULT NULL, `odbc_date` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, PRIMARY KEY (`id`) -) ENGINE=InnoDB AUTO_INCREMENT=62927 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Se borra automaticamente 8 dias en el pasado desde vn2008.clean'; +) ENGINE=InnoDB AUTO_INCREMENT=66450 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Se borra automaticamente 8 dias en el pasado desde vn2008.clean'; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -11741,7 +11636,7 @@ CREATE TABLE `scan_line` ( PRIMARY KEY (`scan_line_id`), KEY `id_scan_id_idx` (`scan_id`), CONSTRAINT `id_scan_id` FOREIGN KEY (`scan_id`) REFERENCES `scan` (`id`) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=790585 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=829357 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -11763,7 +11658,7 @@ CREATE TABLE `sharingcart` ( KEY `Suplent` (`Id_Suplente`), CONSTRAINT `Suplent_key` FOREIGN KEY (`Id_Suplente`) REFERENCES `Trabajadores` (`Id_Trabajador`) ON UPDATE CASCADE, CONSTRAINT `Trabajador_key` FOREIGN KEY (`Id_Trabajador`) REFERENCES `Trabajadores` (`Id_Trabajador`) ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=1857 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=1891 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; /*!50003 SET @saved_cs_client = @@character_set_client */ ; /*!50003 SET @saved_cs_results = @@character_set_results */ ; @@ -11841,7 +11736,7 @@ CREATE TABLE `sharingclient` ( KEY `Client` (`Id_Cliente`), CONSTRAINT `Clients_key` FOREIGN KEY (`Id_Cliente`) REFERENCES `Clientes` (`id_cliente`) ON UPDATE CASCADE, CONSTRAINT `Trabajadores_key` FOREIGN KEY (`Id_Trabajador`) REFERENCES `Trabajadores` (`Id_Trabajador`) ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=34 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=33 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; /*!50003 SET @saved_cs_client = @@character_set_client */ ; /*!50003 SET @saved_cs_results = @@character_set_results */ ; @@ -11934,9 +11829,25 @@ CREATE TABLE `state` ( `order` tinyint(3) unsigned DEFAULT NULL, `alert_level` int(11) NOT NULL DEFAULT '0', `code` varchar(45) CHARACTER SET utf8 NOT NULL, + `sectorProdPriority` tinyint(3) DEFAULT NULL, PRIMARY KEY (`id`), UNIQUE KEY `code_UNIQUE` (`code`) -) ENGINE=InnoDB AUTO_INCREMENT=26 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=27 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Table structure for table `subordinate` +-- + +DROP TABLE IF EXISTS `subordinate`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `subordinate` ( + `Id_Trabajador` bigint(11) DEFAULT NULL, + `visited` int(1) NOT NULL DEFAULT '0', + `boss` int(1) NOT NULL DEFAULT '0', + KEY `Id_Trabajador` (`Id_Trabajador`) +) ENGINE=MEMORY DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -12005,7 +11916,7 @@ CREATE TABLE `tarifas` ( PRIMARY KEY (`tarifa_id`), KEY `tarifa_warehouse` (`warehouse_id`), CONSTRAINT `tarifa_warehouse` FOREIGN KEY (`warehouse_id`) REFERENCES `warehouse` (`id`) ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=152 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=158 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -12218,7 +12129,7 @@ CREATE TABLE `ticket_observation` ( KEY `observation_type_id` (`observation_type_id`), CONSTRAINT `ticket_observation_ibfk_1` FOREIGN KEY (`Id_Ticket`) REFERENCES `Tickets` (`Id_Ticket`) ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT `ticket_observation_ibfk_2` FOREIGN KEY (`observation_type_id`) REFERENCES `observation_type` (`observation_type_id`) ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=1116660 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Todas las observaciones referentes a un ticket'; +) ENGINE=InnoDB AUTO_INCREMENT=1144144 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Todas las observaciones referentes a un ticket'; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -12341,7 +12252,7 @@ CREATE TABLE `travel` ( CONSTRAINT `travel_ibfk_2` FOREIGN KEY (`warehouse_id_out`) REFERENCES `warehouse` (`id`) ON UPDATE CASCADE, CONSTRAINT `travel_ibfk_3` FOREIGN KEY (`agency_id`) REFERENCES `Agencias` (`Id_Agencia`) ON UPDATE CASCADE, CONSTRAINT `travel_ibfk_4` FOREIGN KEY (`cargoSupplierFk`) REFERENCES `Proveedores` (`Id_Proveedor`) ON DELETE SET NULL ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=110544 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci ROW_FORMAT=DYNAMIC; +) ENGINE=InnoDB AUTO_INCREMENT=112878 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci ROW_FORMAT=DYNAMIC; /*!40101 SET character_set_client = @saved_cs_client */; /*!50003 SET @saved_cs_client = @@character_set_client */ ; /*!50003 SET @saved_cs_results = @@character_set_results */ ; @@ -12478,7 +12389,7 @@ CREATE TABLE `travel_dits` ( KEY `fgkey2_idx` (`Id_Ticket`), KEY `fgkey3_idx` (`Id_Trabajador`), CONSTRAINT `travel_dits_ibfk_1` FOREIGN KEY (`Id_Trabajador`) REFERENCES `Trabajadores` (`Id_Trabajador`) ON DELETE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=176169 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=181305 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -12505,7 +12416,7 @@ CREATE TABLE `travel_pattern` ( CONSTRAINT `travel_pattern_ibfk_3` FOREIGN KEY (`warehouse_out`) REFERENCES `warehouse` (`id`) ON UPDATE CASCADE, CONSTRAINT `travel_pattern_ibfk_4` FOREIGN KEY (`agency_id`) REFERENCES `Agencias` (`Id_Agencia`) ON UPDATE CASCADE, CONSTRAINT `travel_pattern_ibfk_5` FOREIGN KEY (`warehouse_in`) REFERENCES `warehouse` (`id`) ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=327 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=329 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -12602,7 +12513,7 @@ CREATE TABLE `unary` ( UNIQUE KEY `idunary_UNIQUE` (`id`), KEY `unary_parent_idx` (`parent`), CONSTRAINT `unary_parent` FOREIGN KEY (`parent`) REFERENCES `unary` (`id`) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=883 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=884 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -13852,7 +13763,7 @@ CREATE TABLE `workerTeam` ( PRIMARY KEY (`id`), KEY `user_team_idx` (`user`), CONSTRAINT `user_team` FOREIGN KEY (`user`) REFERENCES `account`.`user` (`id`) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=165 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=169 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -15398,36 +15309,6 @@ BEGIN RETURN n; -END ;; -DELIMITER ; -/*!50003 SET sql_mode = @saved_sql_mode */ ; -/*!50003 SET character_set_client = @saved_cs_client */ ; -/*!50003 SET character_set_results = @saved_cs_results */ ; -/*!50003 SET collation_connection = @saved_col_connection */ ; -/*!50003 DROP FUNCTION IF EXISTS `riskKk` */; -/*!50003 SET @saved_cs_client = @@character_set_client */ ; -/*!50003 SET @saved_cs_results = @@character_set_results */ ; -/*!50003 SET @saved_col_connection = @@collation_connection */ ; -/*!50003 SET character_set_client = utf8 */ ; -/*!50003 SET character_set_results = utf8 */ ; -/*!50003 SET collation_connection = utf8_general_ci */ ; -/*!50003 SET @saved_sql_mode = @@sql_mode */ ; -/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; -DELIMITER ;; -CREATE DEFINER=`root`@`%` FUNCTION `riskKk`(datMax DATE, intCustomer INT) RETURNS decimal(10,2) -BEGIN -/** - * Deprecated - * - * Utilizar vn.clientGetDebt - **/ - - DECLARE decRisk DECIMAL(10,2) DEFAULT 0; - - SELECT vn.clientGetDebt(intCustomer,datMax) INTO decRisk; - - RETURN decRisk; - END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -15702,53 +15583,6 @@ RETURN strVAR; -END ;; -DELIMITER ; -/*!50003 SET sql_mode = @saved_sql_mode */ ; -/*!50003 SET character_set_client = @saved_cs_client */ ; -/*!50003 SET character_set_results = @saved_cs_results */ ; -/*!50003 SET collation_connection = @saved_col_connection */ ; -/*!50003 DROP FUNCTION IF EXISTS `ticket_totalkk` */; -/*!50003 SET @saved_cs_client = @@character_set_client */ ; -/*!50003 SET @saved_cs_results = @@character_set_results */ ; -/*!50003 SET @saved_col_connection = @@collation_connection */ ; -/*!50003 SET character_set_client = utf8 */ ; -/*!50003 SET character_set_results = utf8 */ ; -/*!50003 SET collation_connection = utf8_general_ci */ ; -/*!50003 SET @saved_sql_mode = @@sql_mode */ ; -/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; -DELIMITER ;; -CREATE DEFINER=`root`@`%` FUNCTION `ticket_totalkk`(ticket_id INT) RETURNS double -BEGIN -/** - * Calcula el total con IVA de un ticket. - * - * @deprecated Use function vn.ticketGetTotal() instead - * - * @param ticket_id Identificador del ticket - * @return Total del ticket - */ - -- TODO: Una vez provado el nuevo método con esta instrucción es suficiente - -- RETURN vn.ticketGetTotal (vTicketId); - - DECLARE v_total DOUBLE; - - DROP TEMPORARY TABLE IF EXISTS ticket_tmp; - - CREATE TEMPORARY TABLE ticket_tmp - (INDEX (ticket_id)) - ENGINE = MEMORY - SELECT ticket_id; - - CALL ticket_total; - - SELECT total INTO v_total FROM ticket_total; - - DROP TEMPORARY TABLE - ticket_total, - ticket_tmp; - - RETURN v_total; END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -15820,43 +15654,6 @@ BEGIN RETURN vTicketVolumenEnCajas; -RETURN 1; -END ;; -DELIMITER ; -/*!50003 SET sql_mode = @saved_sql_mode */ ; -/*!50003 SET character_set_client = @saved_cs_client */ ; -/*!50003 SET character_set_results = @saved_cs_results */ ; -/*!50003 SET collation_connection = @saved_col_connection */ ; -/*!50003 DROP FUNCTION IF EXISTS `ticket_volumen_en_cajasKK` */; -/*!50003 SET @saved_cs_client = @@character_set_client */ ; -/*!50003 SET @saved_cs_results = @@character_set_results */ ; -/*!50003 SET @saved_col_connection = @@collation_connection */ ; -/*!50003 SET character_set_client = utf8 */ ; -/*!50003 SET character_set_results = utf8 */ ; -/*!50003 SET collation_connection = utf8_general_ci */ ; -/*!50003 SET @saved_sql_mode = @@sql_mode */ ; -/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; -DELIMITER ;; -CREATE DEFINER=`root`@`%` FUNCTION `ticket_volumen_en_cajasKK`(idT INT) RETURNS decimal(10,1) -BEGIN - -/* Devuelve el volumen estimado de un pedido, en cajas -* -* idT Numero de ticket -* -* - - - DECLARE vVolumenCajaM3 DOUBLE; - DECLARE vTicketVolumenEnCajas DECIMAL(10,1); - DECLARE CAJA VARCHAR(10) DEFAULT '94'; - - SELECT Volumen/1000000 INTO vVolumenCajaM3 FROM Cubos WHERE Id_Cubo = CAJA; - - SET vTicketVolumenEnCajas = ticket_volumen(idT) / vVolumenCajaM3; - - RETURN vTicketVolumenEnCajas; -*/ RETURN 1; END ;; DELIMITER ; @@ -16439,56 +16236,6 @@ BEGIN AND IFNULL(act.airline_id, f.airline_id) = f.airline_id AND INSTR(IFNULL(act.days, WEEKDAY(vShipment) + 1),WEEKDAY(vShipment) + 1) WHERE a.id = v_awb AND Fecha <= vShipment ORDER BY Fecha DESC, act.days DESC) t; -END ;; -DELIMITER ; -/*!50003 SET sql_mode = @saved_sql_mode */ ; -/*!50003 SET character_set_client = @saved_cs_client */ ; -/*!50003 SET character_set_results = @saved_cs_results */ ; -/*!50003 SET collation_connection = @saved_col_connection */ ; -/*!50003 DROP PROCEDURE IF EXISTS `add_awb_componentkk` */; -/*!50003 SET @saved_cs_client = @@character_set_client */ ; -/*!50003 SET @saved_cs_results = @@character_set_results */ ; -/*!50003 SET @saved_col_connection = @@collation_connection */ ; -/*!50003 SET character_set_client = utf8 */ ; -/*!50003 SET character_set_results = utf8 */ ; -/*!50003 SET collation_connection = utf8_general_ci */ ; -/*!50003 SET @saved_sql_mode = @@sql_mode */ ; -/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; -DELIMITER ;; -CREATE DEFINER=`root`@`%` PROCEDURE `add_awb_componentkk`(IN v_awb SMALLINT) -BEGIN - - DECLARE vShipment DATE; - SELECT t.shipment INTO vShipment - FROM awb_recibida aw - JOIN recibida_entrada re ON re.awb_recibida = aw.recibida_id - JOIN Entradas e ON e.Id_Entrada = re.Id_Entrada - JOIN travel t ON t.id = e.travel_id - WHERE awb_id = v_awb limit 1; - - INSERT IGNORE INTO awb_component (awb_id,Id_Proveedor,awb_component_type_id,awb_role_id,awb_unit_id,value,Id_Moneda) - SELECT id,Id_Proveedor,awb_component_type_id,awb_role_id,awb_unit_id,LEAST(GREATEST(value1,IFNULL(min_value,value1)),IFNULL(max_value,value1)),Id_Moneda - FROM ( - SELECT a.id,IFNULL(act.carguera_id,CASE awb_role_id WHEN 1 THEN a.carguera_id WHEN 2 THEN a.transitario_id WHEN 3 THEN f.airline_id END) Id_Proveedor, - act.awb_component_type_id,act.awb_role_id,act.awb_unit_id, value * - CASE awb_unit_id - WHEN '1000Tj-20' THEN ((CAST(stems AS SIGNED) - 20000)/1000) + (min_value / value) - WHEN '1000Tj-10' THEN ((CAST(stems AS SIGNED) - 10000)/1000) + (min_value / value) - WHEN '100GW' THEN peso/100 - WHEN 'AWB' THEN 1 -- No action - WHEN 'FB' THEN hb/2 - WHEN 'GW' THEN peso - WHEN 'TW' THEN GREATEST(peso,volume_weight) - END value1 - , value, - act.Id_Moneda, act.min_value, act.max_value - FROM awb a JOIN flight f ON f.flight_id = a.flight_id - LEFT JOIN awb_component_template act ON ((IFNULL(act.carguera_id, a.carguera_id) = a.carguera_id AND awb_role_id = 1) - OR (IFNULL(act.carguera_id, a.transitario_id) = a.transitario_id AND awb_role_id = 2)) - AND IFNULL(act.airport_out, f.airport_out) = f.airport_out AND IFNULL(act.airport_in, f.airport_in) = f.airport_in - AND IFNULL(act.airline_id, f.airline_id) = f.airline_id - WHERE a.id = v_awb AND Fecha <= vShipment ORDER BY Fecha DESC) t ; - END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -16866,30 +16613,6 @@ BEGIN `future` DATETIME ) ENGINE = MEMORY; -END ;; -DELIMITER ; -/*!50003 SET sql_mode = @saved_sql_mode */ ; -/*!50003 SET character_set_client = @saved_cs_client */ ; -/*!50003 SET character_set_results = @saved_cs_results */ ; -/*!50003 SET collation_connection = @saved_col_connection */ ; -/*!50003 DROP PROCEDURE IF EXISTS `articleTagUpdatePriority_kk` */; -/*!50003 SET @saved_cs_client = @@character_set_client */ ; -/*!50003 SET @saved_cs_results = @@character_set_results */ ; -/*!50003 SET @saved_col_connection = @@collation_connection */ ; -/*!50003 SET character_set_client = utf8 */ ; -/*!50003 SET character_set_results = utf8 */ ; -/*!50003 SET collation_connection = utf8_general_ci */ ; -/*!50003 SET @saved_sql_mode = @@sql_mode */ ; -/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; -DELIMITER ;; -CREATE DEFINER=`root`@`%` PROCEDURE `articleTagUpdatePriority_kk`(IN vItem INT) -BEGIN -/* -* DEPRECATED -*/ - -CALL vn.itemTagUpdatePriority(vItem); - END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -17197,7 +16920,7 @@ BEGIN DECLARE datINV DATE; SELECT FechaInventario INTO datINV FROM tblContadores; - ALTER TABLE `article_inventory` + ALTER TABLE `article_inventory` ADD `buy_date` datetime NOT NULL; UPDATE article_inventory INNER JOIN @@ -17224,7 +16947,7 @@ BEGIN GROUP BY article_id ) AS buy ON article_inventory.article_id = buy.article_id - SET article_inventory.buy_date = buy.bdate; + SET article_inventory.buy_date = buy.bdate; END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -18486,6 +18209,7 @@ CREATE DEFINER=`root`@`%` PROCEDURE `bionic_calc`( vAddress INT, vAgency INT) proc: BEGIN +-- @DEPRECATED use vn.ticketCalculate DECLARE vAvailableCalc INT; DECLARE vShipment DATE; DECLARE vAgencyId INT; @@ -18670,6 +18394,7 @@ DELIMITER ; /*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; DELIMITER ;; CREATE DEFINER=`root`@`%` PROCEDURE `bionic_calc_component`( + -- DEPRECATED use vn.ticketComponentCalculate -- v_date DATE, -- fecha de recepcion de mercancia v_consigna INT, v_agencia INT) @@ -18952,593 +18677,6 @@ DELIMITER ; /*!50003 SET character_set_client = @saved_cs_client */ ; /*!50003 SET character_set_results = @saved_cs_results */ ; /*!50003 SET collation_connection = @saved_col_connection */ ; -/*!50003 DROP PROCEDURE IF EXISTS `bionic_calc_component_beta` */; -/*!50003 SET @saved_cs_client = @@character_set_client */ ; -/*!50003 SET @saved_cs_results = @@character_set_results */ ; -/*!50003 SET @saved_col_connection = @@collation_connection */ ; -/*!50003 SET character_set_client = utf8 */ ; -/*!50003 SET character_set_results = utf8 */ ; -/*!50003 SET collation_connection = utf8_general_ci */ ; -/*!50003 SET @saved_sql_mode = @@sql_mode */ ; -/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; -DELIMITER ;; -CREATE DEFINER=`root`@`%` PROCEDURE `bionic_calc_component_beta`( - -- v_date DATE, -- fecha de recepcion de mercancia - v_consigna INT, - v_agencia INT) -proc: BEGIN - - DECLARE v_customer INT; - DECLARE COEFICIENTE_DE_INFLACION_GENERAL INT DEFAULT 1.3; - DECLARE DENSIDAD_MINIMA_PESO_VOLUMETRICO INT DEFAULT 167; - DECLARE VOLUMEN_CAJA_VERDNATURA BIGINT DEFAULT 138000; - -- DECLARE vValorEmbolsado DOUBLE DEFAULT 0.04; - - SELECT Id_Cliente INTO v_customer FROM Consignatarios WHERE Id_Consigna = v_consigna; - SET @rate2 := 0; - SET @rate3 := 0; - - DROP TEMPORARY TABLE IF EXISTS t_bionic_temp; - CREATE TEMPORARY TABLE t_bionic_temp - (PRIMARY KEY (item_id,warehouse_id)) - ENGINE = MEMORY - SELECT - b.item_id, b.warehouse_id,available, - IF((@rate2 := IFNULL(pf.rate_2,c.Tarifa2)) < a.PVP AND a.`Min`, a.PVP, @rate2) * 1.0 rate_2, - IF((@rate3 := IFNULL(pf.rate_3,c.Tarifa3)) < a.PVP AND a.`Min`, a.PVP, @rate3) * 1.0 rate_3, - ifnull(pf.rate_3,0) AS min_price, - IFNULL(pf.Packing,c.Packing) packing, - IFNULL(pf.grouping,c.grouping) grouping, - ABS(IFNULL(pf.caja,c.caja)) box, - b.buy_id, a.tipo_id - FROM tmp.bionic_lot b - JOIN vn2008.Compres c ON b.buy_id = c.Id_Compra - JOIN vn2008.Articles a ON b.item_id = a.Id_Article - JOIN vn2008.Tipos t ON t.tipo_id = a.tipo_id - LEFT JOIN vn2008.reinos r ON r.id = t.reino_id - LEFT JOIN vn2008.PreciosEspeciales p ON a.Id_Article = p.Id_Article AND p.Id_Cliente = v_customer - LEFT JOIN ( - SELECT * FROM ( - SELECT p.item_id, p.grouping, p.Packing,p.caja, p.rate_2, p.rate_3, t.warehouse_id - FROM vn2008.price_fixed p - JOIN vn2008.travel_tree t ON t.warehouse_id = p.warehouse_id OR p.warehouse_id = 0 - WHERE t.Fecha_envio BETWEEN p.date_start AND p.date_end ORDER BY p.item_id, p.warehouse_id DESC - ) t - GROUP BY item_id, warehouse_id - ) pf ON pf.item_id = b.item_id AND pf.warehouse_id = b.warehouse_id - -- descartamos articulos con coste menor de 0.01 - WHERE Costefijo + Portefijo + Embalajefijo + Comisionfija > 0.01 AND r.display <> 0; - - -- Creamos la tabla tmp.bionic_component - DROP TEMPORARY TABLE IF EXISTS tmp.bionic_component; - CREATE TEMPORARY TABLE tmp.bionic_component LIKE - template_bionic_component; - - -- Componentes del precio, valores absolutos - INSERT INTO tmp.bionic_component ( warehouse_id, item_id, component_id, cost) - SELECT b.warehouse_id, b.item_id, 29, rate_3 - Costefijo - Portefijo - Embalajefijo - Comisionfija - FROM t_bionic_temp b - JOIN vn2008.Compres c ON b.buy_id = c.Id_Compra; - - INSERT INTO tmp.bionic_component ( warehouse_id, item_id, component_id, cost) - SELECT b.warehouse_id, b.item_id, 28, Costefijo + Portefijo + Embalajefijo + Comisionfija - FROM t_bionic_temp b - JOIN vn2008.Compres c ON b.buy_id = c.Id_Compra; - - -- Ahora los valores en funcion de la base - - DROP TEMPORARY TABLE IF EXISTS t_components_base; - - CREATE TEMPORARY TABLE t_components_base - SELECT bc.item_id, ROUND(SUM(cost), 4) AS base, bc.warehouse_id - FROM tmp.bionic_component bc - GROUP BY bc.item_id,warehouse_id; - - -- La ratio se calcula teniendo en cuenta el valor de las reclamaciones y el saldo de greuge - - INSERT INTO tmp.bionic_component - SELECT cb.warehouse_id, item_id, 17, ROUND(base * LEAST(recobro,0.25), 3) - FROM t_components_base cb - JOIN bi.claims_ratio ON Id_Cliente = v_customer - WHERE recobro > 0.009; - - -- PAK 2016-08-31 Componente de maná automático, en función del maná acumulado por el comercial. - - INSERT INTO tmp.bionic_component - SELECT cb.warehouse_id, item_id, 39, ROUND(base * prices_modifier_rate, 3) as manaAuto - FROM t_components_base cb - JOIN Clientes c on c.Id_Cliente = v_customer - JOIN bs.mana_spellers ms ON c.Id_Trabajador = ms.Id_Trabajador - WHERE ms.prices_modifier_activated - HAVING manaAuto <> 0 ; - - -/* - -- Vendedor variable - INSERT INTO tmp.bionic_component - SELECT cb.warehouse_id, item_id, Id_Componente, IFNULL(ROUND(base * tax,4), 0) - FROM t_components_base cb - JOIN bi.tarifa_componentes - WHERE tarifa_componentes_series_id = 2 and IFNULL(tax, 0) > 0; - */ - - --- ******* Inicio Bloque para componentes con tarifa_class diferente de NULL - -- Descuento por ultimas unidades - INSERT INTO tmp.bionic_component - SELECT cb.warehouse_id, b.item_id, Id_Componente, GREATEST(IFNULL(ROUND(base * tax,4), 0), b.min_price - b.rate_3) - FROM t_components_base cb - JOIN bi.tarifa_componentes - JOIN t_bionic_temp b ON b.item_id = cb.item_id - LEFT JOIN PreciosEspeciales pe ON pe.Id_Cliente = v_customer AND pe.Id_Article = b.item_id - WHERE Id_Componente = 32 AND tax <> 0 AND b.min_price < b.rate_3 AND PrecioEspecial IS NULL; - - -- Incremento por paquete suelto - INSERT INTO tmp.bionic_component - SELECT b.warehouse_id, b.item_id, 22, rate_2 - rate_3 - FROM t_bionic_temp b - JOIN vn2008.Compres c ON b.buy_id = c.Id_Compra - LEFT JOIN PreciosEspeciales pe ON pe.Id_Cliente = v_customer AND pe.Id_Article = b.item_id - WHERE PrecioEspecial IS NULL; - --- ******* Fin Bloque para componentes con tarifa_class diferente de NULL - - -- Reparto - INSERT INTO tmp.bionic_component - SELECT b.warehouse_id - , b.item_id - , 15 - , COEFICIENTE_DE_INFLACION_GENERAL - * ROUND( - r.cm3 - * art.compression - * IF(a.Vista = 1, (GREATEST(art.density,DENSIDAD_MINIMA_PESO_VOLUMETRICO) / DENSIDAD_MINIMA_PESO_VOLUMETRICO ) , 1) - * az.price - * az.inflacion - / VOLUMEN_CAJA_VERDNATURA, 4 - ) cost - FROM t_bionic_temp b - JOIN vn2008.Articles art ON art.Id_Article = b.item_id - JOIN vn2008.Agencias a ON a.Id_Agencia = v_agencia - JOIN vn2008.Consignatarios c ON c.Id_Consigna = v_consigna - JOIN vn2008.Agencias_province ap ON ap.agency_id = a.agency_id AND ap.warehouse_id = b.warehouse_id AND ap.province_id = c.province_id - JOIN vn2008.Agencias_zonas az ON az.Id_Agencia = v_agencia AND az.zona = ap.zona AND az.Id_Article = 71 AND az.warehouse_id = b.warehouse_id - LEFT JOIN bi.rotacion r ON r.warehouse_id = b.warehouse_id AND r.Id_Article = b.item_id - HAVING cost <> 0; - --- Reparto bonificado - INSERT INTO tmp.bionic_component - SELECT b.warehouse_id - , b.item_id - , 41 - , COEFICIENTE_DE_INFLACION_GENERAL - * ROUND( - r.cm3 - * IF(a.Vista = 1, (GREATEST(art.density,DENSIDAD_MINIMA_PESO_VOLUMETRICO) / DENSIDAD_MINIMA_PESO_VOLUMETRICO ) , 1) - * awb.bonus - * az.inflacion - / VOLUMEN_CAJA_VERDNATURA, 4 - ) cost - FROM t_bionic_temp b - JOIN vn2008.Articles art ON art.Id_Article = b.item_id - JOIN vn2008.Agencias a ON a.Id_Agencia = v_agencia - JOIN vn2008.Consignatarios c ON c.Id_Consigna = v_consigna - JOIN vn2008.Agencias_province ap ON ap.agency_id = a.agency_id AND ap.warehouse_id = b.warehouse_id AND ap.province_id = c.province_id - JOIN vn2008.Agencias_zonas az ON az.Id_Agencia = v_agencia AND az.zona = ap.zona AND az.Id_Article = 71 AND az.warehouse_id = b.warehouse_id - JOIN vn2008.agency_weekday_bonus awb ON awb.warehouse_id = az.warehouse_id AND awb.zona = az.zona AND a.agency_id = awb.agency_id - LEFT JOIN bi.rotacion r ON r.warehouse_id = b.warehouse_id AND r.Id_Article = b.item_id - JOIN vn2008.travel_tree t ON t.warehouse_id = awb.warehouse_id AND weekday(t.Fecha_recepcion) = awb.weekDay - HAVING cost <> 0; - --- PAK 12-05-2015 - -- EMBOLSADO - IF (SELECT COUNT(*) FROM vn.addressForPackaging WHERE addressFk = v_consigna) THEN - - -- IF v_consigna IN (13690, 3402, 5661, 4233) THEN - - INSERT INTO tmp.bionic_component - SELECT b.warehouse_id, b.item_id, 38, ap.packagingValue cost - FROM t_bionic_temp b - JOIN vn.addressForPackaging ap - WHERE ap.addressFk = v_consigna; - - END IF; - - -- JGF 14-08-2015 - -- Modificacion de precio por dia de preparacion del pedido - INSERT INTO tmp.bionic_component - SELECT cb.warehouse_id, cb.item_id, 14, cb.base * (IFNULL(pe.percentage,pp.percentage)/100) - FROM t_components_base cb - JOIN vn2008.travel_tree tt ON tt.warehouse_id = cb.warehouse_id - LEFT JOIN vn2008.preparation_percentage pp ON pp.week_day = weekday(tt.Fecha_envio) AND cb.warehouse_id = IFNULL(pp.warehouse_id,cb.warehouse_id) - LEFT JOIN vn2008.preparation_exception pe ON pe.exception_day = tt.Fecha_envio AND cb.warehouse_id = IFNULL(pe.warehouse_id,cb.warehouse_id) - WHERE IFNULL(pe.percentage,pp.percentage); - - -- Creamos la tabla tmp.bionic_component_copy por que mysql no puede reabrir una tabla temporal - DROP TEMPORARY TABLE IF EXISTS tmp.bionic_component_copy; - CREATE TEMPORARY TABLE tmp.bionic_component_copy - SELECT * FROM tmp.bionic_component; - - -- JGF 19-01-2016 - -- Precios especiales - INSERT INTO tmp.bionic_component - SELECT b.warehouse_id, b.item_id, 10, pe.PrecioEspecial - SUM(cost) sum_cost - FROM tmp.bionic_component_copy b - JOIN bi.tarifa_componentes t ON b.component_id = t.Id_Componente - JOIN PreciosEspeciales pe ON pe.Id_Cliente = v_customer AND pe.Id_Article = b.item_id - WHERE t.tarifa_class IS NULL - GROUP BY b.item_id, b.warehouse_id - HAVING ABS(sum_cost) > 0.001; - - - - - -- Lotes - DROP TEMPORARY TABLE IF EXISTS t_component_sum; - CREATE TEMPORARY TABLE t_component_sum - (INDEX (item_id, warehouse_id)) - ENGINE = MEMORY - SELECT SUM(cost) sum_cost, b.item_id, b.warehouse_id, t.tarifa_class - FROM tmp.bionic_component b - JOIN bi.tarifa_componentes t ON b.component_id = t.Id_Componente - GROUP BY b.item_id, b.warehouse_id, t.tarifa_class; - - -- ***** Inicia Modifica t_bionic_rate las diferentes tarifas - -- Tarifa por unidad minima - DROP TEMPORARY TABLE IF EXISTS t_bionic_rate; - CREATE TEMPORARY TABLE t_bionic_rate - ENGINE = MEMORY - SELECT b.warehouse_id, item_id, 1 rate, - IF(box = 1, grouping, 1) grouping, SUM(sum_cost) price - FROM t_bionic_temp b - JOIN t_component_sum cs USING(item_id, warehouse_id) - WHERE IFNULL(cs.tarifa_class,1) = 1 AND box < 2 AND (packing > grouping or box = 0) - GROUP BY warehouse_id, item_id; - - -- Tarifa por caja - INSERT INTO t_bionic_rate (warehouse_id, item_id, rate, grouping, price) - SELECT b.warehouse_id, item_id, 2 rate, packing grouping, - SUM(sum_cost) price - FROM t_bionic_temp b - JOIN t_component_sum cs USING(item_id, warehouse_id) - WHERE available IS NULL OR (IFNULL(cs.tarifa_class,2) = 2 AND packing > 0 AND available >= packing) - GROUP BY warehouse_id, item_id; - - -- Tarifa para toda la cantidad disponible - INSERT INTO t_bionic_rate (warehouse_id, item_id, rate, grouping, price) - SELECT b.warehouse_id, item_id, 3 rate, available grouping, - SUM(sum_cost) price - FROM t_bionic_temp b - JOIN t_component_sum cs USING(item_id, warehouse_id) - WHERE IFNULL(cs.tarifa_class,3) = 3 - GROUP BY warehouse_id, item_id; - - -- ***** Fin Modifica t_bionic_rate las diferentes tarifas - - DROP TEMPORARY TABLE IF EXISTS tmp.bionic_price; - CREATE TEMPORARY TABLE tmp.bionic_price - LIKE template_bionic_price; - - INSERT INTO tmp.bionic_price (warehouse_id, item_id, rate, grouping, price) - SELECT * FROM ( - SELECT * FROM t_bionic_rate ORDER BY price - ) t - GROUP BY item_id, warehouse_id, grouping; - - - DROP TEMPORARY TABLE IF EXISTS tmp.travel_tree; - CREATE TEMPORARY TABLE tmp.travel_tree - ENGINE = MEMORY - SELECT * FROM travel_tree; - - -- Limpieza - - DROP TEMPORARY TABLE travel_tree; - DROP TEMPORARY TABLE t_bionic_temp; - DROP TEMPORARY TABLE t_component_sum; - DROP TEMPORARY TABLE t_components_base; - - DROP TEMPORARY TABLE t_bionic_rate; - DROP TEMPORARY TABLE tmp.bionic_component_copy; -END ;; -DELIMITER ; -/*!50003 SET sql_mode = @saved_sql_mode */ ; -/*!50003 SET character_set_client = @saved_cs_client */ ; -/*!50003 SET character_set_results = @saved_cs_results */ ; -/*!50003 SET collation_connection = @saved_col_connection */ ; -/*!50003 DROP PROCEDURE IF EXISTS `bionic_calc_component_betakk` */; -/*!50003 SET @saved_cs_client = @@character_set_client */ ; -/*!50003 SET @saved_cs_results = @@character_set_results */ ; -/*!50003 SET @saved_col_connection = @@collation_connection */ ; -/*!50003 SET character_set_client = utf8 */ ; -/*!50003 SET character_set_results = utf8 */ ; -/*!50003 SET collation_connection = utf8_general_ci */ ; -/*!50003 SET @saved_sql_mode = @@sql_mode */ ; -/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; -DELIMITER ;; -CREATE DEFINER=`root`@`%` PROCEDURE `bionic_calc_component_betakk`( - -- v_date DATE, -- fecha de recepcion de mercancia - v_consigna INT, - v_agencia INT) -proc: BEGIN - - DECLARE v_customer INT; - DECLARE COEFICIENTE_DE_INFLACION_GENERAL INT DEFAULT 1.3; - DECLARE DENSIDAD_MINIMA_PESO_VOLUMETRICO INT DEFAULT 167; - DECLARE VOLUMEN_CAJA_VERDNATURA BIGINT DEFAULT 138000; - -- DECLARE vValorEmbolsado DOUBLE DEFAULT 0.04; - - SELECT Id_Cliente INTO v_customer FROM Consignatarios WHERE Id_Consigna = v_consigna; - SET @rate2 := 0; - SET @rate3 := 0; - - DROP TEMPORARY TABLE IF EXISTS t_bionic_temp; - CREATE TEMPORARY TABLE t_bionic_temp - (PRIMARY KEY (item_id,warehouse_id)) - ENGINE = MEMORY - SELECT - b.item_id, b.warehouse_id,available, - IF((@rate2 := IFNULL(pf.rate_2,c.Tarifa2)) < a.PVP AND a.`Min`, a.PVP, @rate2) * 1.0 rate_2, - IF((@rate3 := IFNULL(pf.rate_3,c.Tarifa3)) < a.PVP AND a.`Min`, a.PVP, @rate3) * 1.0 rate_3, - ifnull(pf.rate_3,0) AS min_price, - IFNULL(pf.Packing,c.Packing) packing, - IFNULL(pf.grouping,c.grouping) grouping, - ABS(IFNULL(pf.caja,c.caja)) box, - b.buy_id, a.tipo_id - FROM tmp.bionic_lot b - JOIN vn2008.Compres c ON b.buy_id = c.Id_Compra - JOIN vn2008.Articles a ON b.item_id = a.Id_Article - JOIN vn2008.Tipos t ON t.tipo_id = a.tipo_id - LEFT JOIN vn2008.reinos r ON r.id = t.reino_id - LEFT JOIN vn2008.PreciosEspeciales p ON a.Id_Article = p.Id_Article AND p.Id_Cliente = v_customer - LEFT JOIN ( - SELECT * FROM ( - SELECT p.item_id, p.grouping, p.Packing,p.caja, p.rate_2, p.rate_3, t.warehouse_id - FROM vn2008.price_fixed p - JOIN vn2008.travel_tree t ON t.warehouse_id = p.warehouse_id OR p.warehouse_id = 0 - WHERE t.Fecha_envio BETWEEN p.date_start AND p.date_end ORDER BY p.item_id, p.warehouse_id DESC - ) t - GROUP BY item_id, warehouse_id - ) pf ON pf.item_id = b.item_id AND pf.warehouse_id = b.warehouse_id - -- descartamos articulos con coste menor de 0.01 - WHERE Costefijo + Portefijo + Embalajefijo + Comisionfija > 0.01 AND r.display <> 0; - - -- Creamos la tabla tmp.bionic_component - DROP TEMPORARY TABLE IF EXISTS tmp.bionic_component; - CREATE TEMPORARY TABLE tmp.bionic_component LIKE - template_bionic_component; - - -- Componentes del precio, valores absolutos - INSERT INTO tmp.bionic_component ( warehouse_id, item_id, component_id, cost) - SELECT b.warehouse_id, b.item_id, 29, rate_3 - Costefijo - Portefijo - Embalajefijo - Comisionfija - FROM t_bionic_temp b - JOIN vn2008.Compres c ON b.buy_id = c.Id_Compra; - - INSERT INTO tmp.bionic_component ( warehouse_id, item_id, component_id, cost) - SELECT b.warehouse_id, b.item_id, 28, Costefijo + Portefijo + Embalajefijo + Comisionfija - FROM t_bionic_temp b - JOIN vn2008.Compres c ON b.buy_id = c.Id_Compra; - - -- Ahora los valores en funcion de la base - - DROP TEMPORARY TABLE IF EXISTS t_components_base; - - CREATE TEMPORARY TABLE t_components_base - SELECT bc.item_id, ROUND(SUM(cost), 4) AS base, bc.warehouse_id - FROM tmp.bionic_component bc - GROUP BY bc.item_id,warehouse_id; - - -- La ratio se calcula teniendo en cuenta el valor de las reclamaciones y el saldo de greuge - - INSERT INTO tmp.bionic_component - SELECT cb.warehouse_id, item_id, 17, ROUND(base * LEAST(recobro,0.25), 3) - FROM t_components_base cb - JOIN bi.claims_ratio ON Id_Cliente = v_customer - WHERE recobro > 0.009; - - -- PAK 2016-08-31 Componente de maná automático, en función del maná acumulado por el comercial. - - INSERT INTO tmp.bionic_component - SELECT cb.warehouse_id, item_id, 39, ROUND(base * prices_modifier_rate, 3) as manaAuto - FROM t_components_base cb - JOIN Clientes c on c.Id_Cliente = v_customer - JOIN bs.mana_spellers ms ON c.Id_Trabajador = ms.Id_Trabajador - WHERE ms.prices_modifier_activated - HAVING manaAuto <> 0 ; - - -/* - -- Vendedor variable - INSERT INTO tmp.bionic_component - SELECT cb.warehouse_id, item_id, Id_Componente, IFNULL(ROUND(base * tax,4), 0) - FROM t_components_base cb - JOIN bi.tarifa_componentes - WHERE tarifa_componentes_series_id = 2 and IFNULL(tax, 0) > 0; - */ - - --- ******* Inicio Bloque para componentes con tarifa_class diferente de NULL - -- Descuento por ultimas unidades - INSERT INTO tmp.bionic_component - SELECT cb.warehouse_id, b.item_id, Id_Componente, GREATEST(IFNULL(ROUND(base * tax,4), 0), b.min_price - b.rate_3) - FROM t_components_base cb - JOIN bi.tarifa_componentes - JOIN t_bionic_temp b ON b.item_id = cb.item_id - LEFT JOIN PreciosEspeciales pe ON pe.Id_Cliente = v_customer AND pe.Id_Article = b.item_id - WHERE Id_Componente = 32 AND tax <> 0 AND b.min_price < b.rate_3 AND PrecioEspecial IS NULL; - - -- Incremento por paquete suelto - INSERT INTO tmp.bionic_component - SELECT b.warehouse_id, b.item_id, 22, rate_2 - rate_3 - FROM t_bionic_temp b - JOIN vn2008.Compres c ON b.buy_id = c.Id_Compra - LEFT JOIN PreciosEspeciales pe ON pe.Id_Cliente = v_customer AND pe.Id_Article = b.item_id - WHERE PrecioEspecial IS NULL; - --- ******* Fin Bloque para componentes con tarifa_class diferente de NULL - - -- Reparto - INSERT INTO tmp.bionic_component - SELECT b.warehouse_id - , b.item_id - , 15 - , COEFICIENTE_DE_INFLACION_GENERAL - * ROUND( - r.cm3 - * IF(a.Vista = 1, (GREATEST(art.density,DENSIDAD_MINIMA_PESO_VOLUMETRICO) / DENSIDAD_MINIMA_PESO_VOLUMETRICO ) , 1) - * az.price - * az.inflacion - / VOLUMEN_CAJA_VERDNATURA, 4 - ) cost - FROM t_bionic_temp b - JOIN vn2008.Articles art ON art.Id_Article = b.item_id - JOIN vn2008.Agencias a ON a.Id_Agencia = v_agencia - JOIN vn2008.Consignatarios c ON c.Id_Consigna = v_consigna - JOIN vn2008.Agencias_province ap ON ap.agency_id = a.agency_id AND ap.warehouse_id = b.warehouse_id AND ap.province_id = c.province_id - JOIN vn2008.Agencias_zonas az ON az.Id_Agencia = v_agencia AND az.zona = ap.zona AND az.Id_Article = 71 AND az.warehouse_id = b.warehouse_id - LEFT JOIN bi.rotacion r ON r.warehouse_id = b.warehouse_id AND r.Id_Article = b.item_id - HAVING cost <> 0; - --- Reparto bonificado - INSERT INTO tmp.bionic_component - SELECT b.warehouse_id - , b.item_id - , 41 - , COEFICIENTE_DE_INFLACION_GENERAL - * ROUND( - r.cm3 - * IF(a.Vista = 1, (GREATEST(art.density,DENSIDAD_MINIMA_PESO_VOLUMETRICO) / DENSIDAD_MINIMA_PESO_VOLUMETRICO ) , 1) - * awb.bonus - * az.inflacion - / VOLUMEN_CAJA_VERDNATURA, 4 - ) cost - FROM t_bionic_temp b - JOIN vn2008.Articles art ON art.Id_Article = b.item_id - JOIN vn2008.Agencias a ON a.Id_Agencia = v_agencia - JOIN vn2008.Consignatarios c ON c.Id_Consigna = v_consigna - JOIN vn2008.Agencias_province ap ON ap.agency_id = a.agency_id AND ap.warehouse_id = b.warehouse_id AND ap.province_id = c.province_id - JOIN vn2008.Agencias_zonas az ON az.Id_Agencia = v_agencia AND az.zona = ap.zona AND az.Id_Article = 71 AND az.warehouse_id = b.warehouse_id - JOIN vn2008.agency_weekday_bonus awb ON awb.warehouse_id = az.warehouse_id AND awb.zona = az.zona AND a.agency_id = awb.agency_id - LEFT JOIN bi.rotacion r ON r.warehouse_id = b.warehouse_id AND r.Id_Article = b.item_id - JOIN vn2008.travel_tree t ON t.warehouse_id = awb.warehouse_id AND weekday(t.Fecha_recepcion) = awb.weekDay - HAVING cost <> 0; - --- PAK 12-05-2015 - -- EMBOLSADO - IF (SELECT COUNT(*) FROM vn.addressForPackaging WHERE addressFk = v_consigna) THEN - - -- IF v_consigna IN (13690, 3402, 5661, 4233) THEN - - INSERT INTO tmp.bionic_component - SELECT b.warehouse_id, b.item_id, 38, ap.packagingValue cost - FROM t_bionic_temp b - JOIN vn.addressForPackaging ap - WHERE ap.addressFk = v_consigna; - - END IF; - - -- JGF 14-08-2015 - -- Modificacion de precio por dia de preparacion del pedido - INSERT INTO tmp.bionic_component - SELECT cb.warehouse_id, cb.item_id, 14, cb.base * (IFNULL(pe.percentage,pp.percentage)/100) - FROM t_components_base cb - JOIN vn2008.travel_tree tt ON tt.warehouse_id = cb.warehouse_id - LEFT JOIN vn2008.preparation_percentage pp ON pp.week_day = weekday(tt.Fecha_envio) AND cb.warehouse_id = IFNULL(pp.warehouse_id,cb.warehouse_id) - LEFT JOIN vn2008.preparation_exception pe ON pe.exception_day = tt.Fecha_envio AND cb.warehouse_id = IFNULL(pe.warehouse_id,cb.warehouse_id) - WHERE IFNULL(pe.percentage,pp.percentage); - - -- Creamos la tabla tmp.bionic_component_copy por que mysql no puede reabrir una tabla temporal - DROP TEMPORARY TABLE IF EXISTS tmp.bionic_component_copy; - CREATE TEMPORARY TABLE tmp.bionic_component_copy - SELECT * FROM tmp.bionic_component; - - -- JGF 19-01-2016 - -- Precios especiales - INSERT INTO tmp.bionic_component - SELECT b.warehouse_id, b.item_id, 10, pe.PrecioEspecial - SUM(cost) sum_cost - FROM tmp.bionic_component_copy b - JOIN bi.tarifa_componentes t ON b.component_id = t.Id_Componente - JOIN PreciosEspeciales pe ON pe.Id_Cliente = v_customer AND pe.Id_Article = b.item_id - WHERE t.tarifa_class IS NULL - GROUP BY b.item_id, b.warehouse_id - HAVING ABS(sum_cost) > 0.001; - - - - - -- Lotes - DROP TEMPORARY TABLE IF EXISTS t_component_sum; - CREATE TEMPORARY TABLE t_component_sum - (INDEX (item_id, warehouse_id)) - ENGINE = MEMORY - SELECT SUM(cost) sum_cost, b.item_id, b.warehouse_id, t.tarifa_class - FROM tmp.bionic_component b - JOIN bi.tarifa_componentes t ON b.component_id = t.Id_Componente - GROUP BY b.item_id, b.warehouse_id, t.tarifa_class; - - -- ***** Inicia Modifica t_bionic_rate las diferentes tarifas - -- Tarifa por unidad minima - DROP TEMPORARY TABLE IF EXISTS t_bionic_rate; - CREATE TEMPORARY TABLE t_bionic_rate - ENGINE = MEMORY - SELECT b.warehouse_id, item_id, 1 rate, - IF(box = 1, grouping, 1) grouping, SUM(sum_cost) price - FROM t_bionic_temp b - JOIN t_component_sum cs USING(item_id, warehouse_id) - WHERE IFNULL(cs.tarifa_class,1) = 1 AND box < 2 AND (packing > grouping or box = 0) - GROUP BY warehouse_id, item_id; - - -- Tarifa por caja - INSERT INTO t_bionic_rate (warehouse_id, item_id, rate, grouping, price) - SELECT b.warehouse_id, item_id, 2 rate, packing grouping, - SUM(sum_cost) price - FROM t_bionic_temp b - JOIN t_component_sum cs USING(item_id, warehouse_id) - WHERE available IS NULL OR (IFNULL(cs.tarifa_class,2) = 2 AND packing > 0 AND available >= packing) - GROUP BY warehouse_id, item_id; - - -- Tarifa para toda la cantidad disponible - INSERT INTO t_bionic_rate (warehouse_id, item_id, rate, grouping, price) - SELECT b.warehouse_id, item_id, 3 rate, available grouping, - SUM(sum_cost) price - FROM t_bionic_temp b - JOIN t_component_sum cs USING(item_id, warehouse_id) - WHERE IFNULL(cs.tarifa_class,3) = 3 - GROUP BY warehouse_id, item_id; - - -- ***** Fin Modifica t_bionic_rate las diferentes tarifas - - DROP TEMPORARY TABLE IF EXISTS tmp.bionic_price; - CREATE TEMPORARY TABLE tmp.bionic_price - LIKE template_bionic_price; - - INSERT INTO tmp.bionic_price (warehouse_id, item_id, rate, grouping, price) - SELECT * FROM ( - SELECT * FROM t_bionic_rate ORDER BY price - ) t - GROUP BY item_id, warehouse_id, grouping; - - - DROP TEMPORARY TABLE IF EXISTS tmp.travel_tree; - CREATE TEMPORARY TABLE tmp.travel_tree - ENGINE = MEMORY - SELECT * FROM travel_tree; - - -- Limpieza - - DROP TEMPORARY TABLE travel_tree; - DROP TEMPORARY TABLE t_bionic_temp; - DROP TEMPORARY TABLE t_component_sum; - DROP TEMPORARY TABLE t_components_base; - - DROP TEMPORARY TABLE t_bionic_rate; - DROP TEMPORARY TABLE tmp.bionic_component_copy; -END ;; -DELIMITER ; -/*!50003 SET sql_mode = @saved_sql_mode */ ; -/*!50003 SET character_set_client = @saved_cs_client */ ; -/*!50003 SET character_set_results = @saved_cs_results */ ; -/*!50003 SET collation_connection = @saved_col_connection */ ; /*!50003 DROP PROCEDURE IF EXISTS `bionic_calc_date` */; /*!50003 SET @saved_cs_client = @@character_set_client */ ; /*!50003 SET @saved_cs_results = @@character_set_results */ ; @@ -20010,6 +19148,7 @@ DELIMITER ; /*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; DELIMITER ;; CREATE DEFINER=`root`@`%` PROCEDURE `bionic_from_ticket`( + -- DEPRECATED use vn.ticketComponentPreview v_date DATE, -- fecha de recepcion de mercancia v_consigna INT, v_agencia INT, @@ -20079,6 +19218,7 @@ DELIMITER ; /*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; DELIMITER ;; CREATE DEFINER=`root`@`%` PROCEDURE `bionic_from_type`( + -- DEPRECATED use vn.ticketCalculate v_date DATE, -- fecha de recepcion de mercancia v_consigna INT, v_agencia INT, @@ -20119,6 +19259,8 @@ CREATE DEFINER=`root`@`%` PROCEDURE `bionic_make_update`( ,i_option INT) BEGIN /** +* DEPRECATED use vn.ticketComponentUpdate +* * Ejecuta los cambios en el ticket, en los movimientos y en los componentes. */ DECLARE EXIT HANDLER FOR SQLEXCEPTION @@ -20240,6 +19382,8 @@ DELIMITER ;; CREATE DEFINER=`root`@`%` PROCEDURE `bionic_movement_update`(i_option INT) BEGIN /** +* DEPRECATED use vn.ticketComponentUpdateSale +* * A partir de la tabla tmp.movement, crea los Movimientos_componentes * y modifica el campo Preu de la tabla Movimientos * @@ -21066,119 +20210,6 @@ BEGIN DROP TEMPORARY TABLE `entry_label`; DROP TEMPORARY TABLE `buy_label_source`; -END ;; -DELIMITER ; -/*!50003 SET sql_mode = @saved_sql_mode */ ; -/*!50003 SET character_set_client = @saved_cs_client */ ; -/*!50003 SET character_set_results = @saved_cs_results */ ; -/*!50003 SET collation_connection = @saved_col_connection */ ; -/*!50003 DROP PROCEDURE IF EXISTS `buy_label_bunchkk` */; -/*!50003 SET @saved_cs_client = @@character_set_client */ ; -/*!50003 SET @saved_cs_results = @@character_set_results */ ; -/*!50003 SET @saved_col_connection = @@collation_connection */ ; -/*!50003 SET character_set_client = utf8 */ ; -/*!50003 SET character_set_results = utf8 */ ; -/*!50003 SET collation_connection = utf8_general_ci */ ; -/*!50003 SET @saved_sql_mode = @@sql_mode */ ; -/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; -DELIMITER ;; -CREATE DEFINER=`root`@`%` PROCEDURE `buy_label_bunchkk`(IN entry_id_ INT, IN groupby TINYINT(1),IN single TINYINT(1), IN idCOM BIGINT) -BEGIN - DECLARE done INT DEFAULT 0; - DECLARE date_ DATE; - DECLARE provider_id INT; - DECLARE agency_id INT; - DECLARE i_wh INT; - DECLARE label INT; - DECLARE id INT; - DECLARE recordset CURSOR FOR - SELECT ROUND(C.Cantidad / IF(C.caja = FALSE, 1,C.Grouping) + 0.49), C.Id_Compra - FROM Compres C - INNER JOIN entry_label ON C.Id_Entrada = entry_label.entry_id - INNER JOIN Articles A ON C.Id_Article = A.Id_Article - WHERE (A.Imprimir <> FALSE AND idCOM = 0 AND C.Novincular = FALSE) - OR idCOM = C.Id_Compra; - - DECLARE CONTINUE HANDLER FOR NOT FOUND SET done = 1; - SET idCOM = IFNULL(idCOM, 0); - - DROP TEMPORARY TABLE IF EXISTS `entry_label`; - CREATE TEMPORARY TABLE `entry_label` - ( - `entry_id` INT(11) NOT NULL - ) - ENGINE=MEMORY DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; - - IF groupby <> FALSE THEN - - SELECT Id_Proveedor, DATE(landing), travel.agency_id, warehouse_id INTO provider_id, date_, agency_id, i_wh - FROM Entradas - INNER JOIN travel ON travel.id = Entradas.travel_id - - WHERE Id_Entrada = entry_id_; - - INSERT INTO entry_label (entry_id) SELECT Entradas.Id_Entrada FROM Entradas - - INNER JOIN travel ON travel.id = Entradas.travel_id - - WHERE Entradas.Inventario = FALSE AND Entradas.Id_Proveedor = provider_id - - AND warehouse_id = i_wh AND DATE(landing) = date_ AND travel.agency_id= agency_id; - - ELSE - - INSERT INTO entry_label (entry_id) VALUES (entry_id_); - SELECT landing INTO date_ FROM Entradas e - JOIN travel t ON t.id = e.travel_id - JOIN Compres c ON c.Id_Entrada = e.Id_Entrada - WHERE (entry_id_ = e.Id_Entrada OR c.Id_Compra = idCOM) LIMIT 1; - - END IF; - - - DROP TEMPORARY TABLE IF EXISTS `buy_label_source`; - - CREATE TEMPORARY TABLE `buy_label_source` - ( - `buy_id` INT(11) NOT NULL - ) - ENGINE=MEMORY DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; - - OPEN recordset; - FETCH recordset INTO label, id; - REPEAT - REPEAT - - SET label = label - 1; - INSERT INTO buy_label_source (buy_id) VALUES (id); - UNTIL label <= 0 OR single END REPEAT; - - INSERT INTO buy_label_source (buy_id) VALUES (0); - FETCH recordset INTO label, id; - UNTIL done END REPEAT; - - SELECT C.Id_Article,@a := IF(A.min AND IFNULL(rate_3,C.Tarifa3) < A.PVP, A.PVP, IFNULL(rate_3,C.Tarifa3)) Tarifa2, - ROUND(IF(C.caja = FALSE, @a,@a * C.Grouping),2) AS Bunch, - ROUND(@a / A.Tallos,2) AS PPT, - A.Article, A.Medida, A.Color, A.Categoria, Abreviatura as Origen, C.Productor, - A.Tallos, C.grouping, E.Notas_Eva,P.Proveedor,C.Packing - FROM buy_label_source bls - LEFT JOIN Compres C ON C.Id_Compra = bls.buy_id - LEFT JOIN Entradas E ON E.Id_Entrada = C.Id_Entrada - LEFT JOIN Articles A ON A.Id_Article = C.Id_Article - LEFT JOIN Proveedores P ON P.Id_Proveedor = E.Id_Proveedor - LEFT JOIN Origen o ON A.id_origen = o.id - LEFT JOIN ( - SELECT item_id, rate_3 FROM price_fixed - WHERE IFNULL(date_,CURDATE()) BETWEEN date_start AND date_end AND rate_3 - AND warehouse_id IN (0,i_wh) - GROUP BY item_id - ) pf ON pf.item_id = A.Id_Article; - -- JGF 02/02/15 canvie CURDATE() per IFNULL(date_,CURDATE()) - - DROP TEMPORARY TABLE `entry_label`; - DROP TEMPORARY TABLE `buy_label_source`; - END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -22255,121 +21286,6 @@ DELIMITER ; /*!50003 SET character_set_client = @saved_cs_client */ ; /*!50003 SET character_set_results = @saved_cs_results */ ; /*!50003 SET collation_connection = @saved_col_connection */ ; -/*!50003 DROP PROCEDURE IF EXISTS `buy_transferkk` */; -/*!50003 SET @saved_cs_client = @@character_set_client */ ; -/*!50003 SET @saved_cs_results = @@character_set_results */ ; -/*!50003 SET @saved_col_connection = @@collation_connection */ ; -/*!50003 SET character_set_client = utf8 */ ; -/*!50003 SET character_set_results = utf8 */ ; -/*!50003 SET collation_connection = utf8_general_ci */ ; -/*!50003 SET @saved_sql_mode = @@sql_mode */ ; -/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; -DELIMITER ;; -CREATE DEFINER=`root`@`%` PROCEDURE `buy_transferkk`(v_buy INT, v_fv_entry INT, v_pca_entry INT) -proc: BEGIN -/** - * Traslada la cantidad restante de una compra de Holanda - * al almacén de Silla. - **/ - DECLARE v_wh INT; - DECLARE v_entry INT; - DECLARE v_fv INT; - DECLARE v_amount INT; - DECLARE v_item INT; - DECLARE v_holland_wh INT DEFAULT 7; - --- Comprueba que es mercancía que llega al almacén de Holanda - SELECT t.warehouse_id, tp.FV INTO v_wh, v_fv - FROM Compres c - JOIN Entradas e ON c.Id_Entrada = e.Id_Entrada - JOIN travel t ON t.id = e.travel_id - JOIN Articles a ON a.Id_Article = c.Id_Article - JOIN Tipos tp ON tp.tipo_id = a.tipo_id - WHERE c.Id_Compra = v_buy; - - IF v_wh != v_holland_wh THEN - LEAVE proc; - END IF; - - -- Calcula a que almacén de Silla debe transladar la mercancía - - SET v_entry = IF(v_fv, v_fv_entry, v_pca_entry); - SET v_entry = IFNULL(v_entry, IFNULL(v_pca_entry, v_fv_entry)); - - IF v_entry IS NULL THEN - LEAVE proc; - END IF; - - -- Calcula la cantidad a trasladar - - SELECT Id_Article INTO v_item - FROM Compres WHERE Id_Compra = v_buy; - - SELECT IFNULL(SUM(amount), 0) INTO v_amount - FROM ( - SELECT SUM(c.Cantidad) amount - FROM Compres c - JOIN Entradas e ON e.Id_Entrada = c.Id_Entrada - JOIN travel t ON t.id = e.travel_id - WHERE c.Id_Article = v_item - AND t.landing = CURDATE() - AND t.warehouse_id = v_holland_wh - UNION ALL - SELECT -SUM(c.Cantidad) - FROM Compres c - JOIN Entradas e ON e.Id_Entrada = c.Id_Entrada - JOIN travel t ON t.id = e.travel_id - WHERE c.Id_Article = v_item - AND t.shipment = CURDATE() - AND t.warehouse_id_out = v_holland_wh - UNION ALL - SELECT -SUM(Cantidad) - FROM Movimientos m - JOIN Tickets t ON t.Id_Ticket = m.Id_Ticket - WHERE m.Id_Article = v_item - AND t.Fecha = CURDATE() - AND t.warehouse_id = v_holland_wh - ) t; - - IF v_amount <= 0 THEN - LEAVE proc; - END IF; - - -- Crea la nueva línea de compra con el translado - - INSERT INTO Compres ( - Id_Article, Etiquetas, Cantidad, Id_Entrada, - Id_Cubo, Packing, grouping, caja, Costefijo, Portefijo, - Embalajefijo, Comisionfija, novincular, buy_edi_id) - SELECT - c.Id_Article, - v_amount DIV c.Packing, - v_amount, - v_entry, - c.Id_Cubo, - c.Packing, - c.grouping, - c.caja, - @cost := IFNULL(c.Costefijo, 0) + IFNULL(c.Comisionfija, 0) + IFNULL(c.Portefijo, 0), - @porte := ROUND((@cm3:= cm3_2(c.Id_Cubo, c.Id_Article)) * a.m3 / 1000000 / c.Packing, 3), - c.EmbalajeFijo, - @comision := ROUND(c.Costefijo * e.comision / 100, 3), - c.novincular, - c.buy_edi_id - FROM Compres c - JOIN Cubos cu ON cu.Id_Cubo = c.Id_Cubo - JOIN Entradas e ON e.Id_Entrada = v_entry - JOIN travel t ON t.id = e.travel_id - JOIN Agencias a ON t.agency_id = a.Id_Agencia - WHERE c.Id_Compra = v_buy; - - CALL buy_tarifas (LAST_INSERT_ID()); -END ;; -DELIMITER ; -/*!50003 SET sql_mode = @saved_sql_mode */ ; -/*!50003 SET character_set_client = @saved_cs_client */ ; -/*!50003 SET character_set_results = @saved_cs_results */ ; -/*!50003 SET collation_connection = @saved_col_connection */ ; /*!50003 DROP PROCEDURE IF EXISTS `cacheReset` */; /*!50003 SET @saved_cs_client = @@character_set_client */ ; /*!50003 SET @saved_cs_results = @@character_set_results */ ; @@ -22528,86 +21444,6 @@ BEGIN ) c on c.Id_Cliente = cli.Id_Cliente JOIN Proveedores p on p.Id_Proveedor = c.company_id JOIN empresa e on e.id = c.company_id; -END ;; -DELIMITER ; -/*!50003 SET sql_mode = @saved_sql_mode */ ; -/*!50003 SET character_set_client = @saved_cs_client */ ; -/*!50003 SET character_set_results = @saved_cs_results */ ; -/*!50003 SET collation_connection = @saved_col_connection */ ; -/*!50003 DROP PROCEDURE IF EXISTS `CalculoRemesaskk` */; -/*!50003 SET @saved_cs_client = @@character_set_client */ ; -/*!50003 SET @saved_cs_results = @@character_set_results */ ; -/*!50003 SET @saved_col_connection = @@collation_connection */ ; -/*!50003 SET character_set_client = utf8 */ ; -/*!50003 SET character_set_results = utf8 */ ; -/*!50003 SET collation_connection = utf8_general_ci */ ; -/*!50003 SET @saved_sql_mode = @@sql_mode */ ; -/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; -DELIMITER ;; -CREATE DEFINER=`root`@`%` PROCEDURE `CalculoRemesaskk`(IN vFechaRemesa DATE) -BEGIN - - -DROP TEMPORARY TABLE IF EXISTS TMP_REMESAS; -CREATE TEMPORARY TABLE TMP_REMESAS SELECT - CONCAT(p.NIF,REPEAT('0', 12-LENGTH(p.NIF))) as CIF1, - cli.Id_Cliente, - cli.Cliente, - cli.`IF` as NIF , - cli.CC, - c.PaymentDate as Vencimiento, - 0 ImporteFac, - cast(c.Recibo as decimal(10,2)) as ImporteRec, - 0 as ImporteActual, - c.empresa_id, - cli.RazonSocial, - cast(c.Recibo as decimal(10,2)) as ImporteTotal, - cast(c.Recibo as decimal(10,2)) as Saldo, - p.Proveedor as Empresa, - e.abbreviation as EMP, - cli.cuenta, - CONCAT(cc_to_iban(CC),CC) AS Iban, - CONVERT(left(CC,4),UNSIGNED INT) AS nrbe , - IF(c.empresa_id=442,sepavnl,sepafth) as SEPA, - IF(c.empresa_id=442,corevnl,corefth) as RecibidoCORE - - FROM Clientes cli - JOIN - (SELECT empresa_id, - c.Id_Cliente, - sum(Importe) as Recibo, - IF((c.Vencimiento + graceDays) mod 30.001 <= day(vFechaRemesa) - ,TIMESTAMPADD(DAY, (c.Vencimiento + graceDays) MOD 30.001, LAST_DAY(TIMESTAMPADD(MONTH,-1,vFechaRemesa))) - ,TIMESTAMPADD(DAY, (c.Vencimiento + graceDays) MOD 30.001, LAST_DAY(TIMESTAMPADD(MONTH,-2,vFechaRemesa))) - ) as PaymentDate - FROM Clientes c - JOIN pay_met pm on pm.id = pay_met_id - JOIN - ( - SELECT empresa_id, Id_Cliente, Importe - FROM Facturas f - JOIN Clientes c using(Id_Cliente) - JOIN pay_met pm on pm.id = pay_met_id - WHERE IF(Importe > 0,paymentday(Fecha,c.Vencimiento + graceDays), Fecha) <= vFechaRemesa - AND pay_met_id = 4 AND deudaviva - - UNION ALL - - SELECT empresa_id, Id_Cliente, - Entregado - FROM Recibos r - JOIN Clientes c using(Id_Cliente) - JOIN pay_met pm on pm.id = pay_met_id - WHERE pay_met_id = 4 AND deudaviva - - ) sub using(Id_Cliente) - GROUP BY empresa_id, Id_Cliente - HAVING Recibo > 10 - ) c on c.Id_Cliente = cli.Id_Cliente - JOIN Proveedores p on p.Id_Proveedor = c.empresa_id - JOIN empresa e on e.id = c.empresa_id; - - - END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -22626,8 +21462,7 @@ DELIMITER ; DELIMITER ;; CREATE DEFINER=`root`@`%` PROCEDURE `calling`() BEGIN - -DROP TEMPORARY TABLE IF EXISTS Agenda, Agenda2; + DROP TEMPORARY TABLE IF EXISTS Agenda, Agenda2; CREATE TEMPORARY TABLE IF NOT EXISTS Agenda (Telefono varchar(15) PRIMARY KEY, Cliente VARCHAR(45)); @@ -22709,70 +21544,6 @@ FROM Movimientos M INNER JOIN Tickets T ON T.Id_Ticket = M.Id_Ticket WHERE Date(T.Fecha) BETWEEN ADDDATE(datFEC,-1 * intDAYS) AND datFEC GROUP BY T.Id_Cliente; -END ;; -DELIMITER ; -/*!50003 SET sql_mode = @saved_sql_mode */ ; -/*!50003 SET character_set_client = @saved_cs_client */ ; -/*!50003 SET character_set_results = @saved_cs_results */ ; -/*!50003 SET collation_connection = @saved_col_connection */ ; -/*!50003 DROP PROCEDURE IF EXISTS `Campaigns_GeneratorKK` */; -/*!50003 SET @saved_cs_client = @@character_set_client */ ; -/*!50003 SET @saved_cs_results = @@character_set_results */ ; -/*!50003 SET @saved_col_connection = @@collation_connection */ ; -/*!50003 SET character_set_client = utf8 */ ; -/*!50003 SET character_set_results = utf8 */ ; -/*!50003 SET collation_connection = utf8_general_ci */ ; -/*!50003 SET @saved_sql_mode = @@sql_mode */ ; -/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; -DELIMITER ;; -CREATE DEFINER=`root`@`%` PROCEDURE `Campaigns_GeneratorKK`(IN datFEC DATE, IN intDAYS INT, IN intIMP INT) -BEGIN -DELETE FROM Campaigns; - -INSERT INTO Campaigns(Id_Cliente, Notas) -SELECT T.Id_Cliente, CONCAT('Consumo año anterior: ',FORMAT(SUM(M.Cantidad * M.Preu * (100 - M.Descuento) / 100), 0), ' € ') as Total -FROM Movimientos M -INNER JOIN Tickets T ON T.Id_Ticket = M.Id_Ticket -WHERE Date(T.Fecha) BETWEEN ADDDATE(datFEC,-1 * intDAYS) AND datFEC -GROUP BY T.Id_Cliente; -END ;; -DELIMITER ; -/*!50003 SET sql_mode = @saved_sql_mode */ ; -/*!50003 SET character_set_client = @saved_cs_client */ ; -/*!50003 SET character_set_results = @saved_cs_results */ ; -/*!50003 SET collation_connection = @saved_col_connection */ ; -/*!50003 DROP PROCEDURE IF EXISTS `Canariaskk` */; -/*!50003 SET @saved_cs_client = @@character_set_client */ ; -/*!50003 SET @saved_cs_results = @@character_set_results */ ; -/*!50003 SET @saved_col_connection = @@collation_connection */ ; -/*!50003 SET character_set_client = utf8 */ ; -/*!50003 SET character_set_results = utf8 */ ; -/*!50003 SET collation_connection = utf8_general_ci */ ; -/*!50003 SET @saved_sql_mode = @@sql_mode */ ; -/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; -DELIMITER ;; -CREATE DEFINER=`root`@`%` PROCEDURE `Canariaskk`(IN datFEC DATE, IN idWH INT , IN idEMP INT) -BEGIN - -DECLARE idTICKET DOUBLE; - - -CALL ticket_new_complet(4712, datFEC, idWH , 20, idEMP, NULL, NULL,NULL, idTICKET); - - -INSERT INTO Movimientos (Id_Ticket, Id_Article, Concepte, Cantidad, Preu, PrecioFijado) -SELECT idTICKET, 95, CONCAT(Codintrastat, ' : ', IF(Abreviatura = 'XYZ', 'NAC', Abreviatura), ' : ' , Nombotanic), sum(Cantidad), Preu, TRUE -FROM Articles INNER JOIN Movimientos ON Articles.Id_Article = Movimientos.Id_Article - INNER JOIN Tickets ON Movimientos.Id_Ticket = Tickets.Id_Ticket - INNER JOIN Consignatarios ON Tickets.Id_Consigna = Consignatarios.Id_Consigna - INNER JOIN province ON Consignatarios.province_id = province.province_id - INNER JOIN Origen ON Articles.id_origen = Origen.id -WHERE date(Tickets.Fecha) = datFEC AND province.name IN ('SANTA CRUZ DE TENERIFE','LAS PALMAS DE GRAN CANARIA') -GROUP BY Nombotanic, Preu; - - - - END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -22875,7 +21646,8 @@ BEGIN DELETE FROM bi.comparativa_clientes WHERE Fecha < v_date18; -- DELETE FROM reference_rate WHERE date < v_date18; DELETE tt.* FROM Tickets_turno tt LEFT JOIN Movimientos m using(Id_Ticket) WHERE m.Id_Article IS NULL; - + DELETE FROM cl_main WHERE Fecha < v_date18; + SELECT MAX(inter_id) INTO @id FROM vncontrol.inter @@ -23762,170 +22534,6 @@ JOIN Trabajadores T2 ON T2.Id_Trabajador = TP.Id_Trabajador GROUP BY Id_Article,Id_Cliente; -END ;; -DELIMITER ; -/*!50003 SET sql_mode = @saved_sql_mode */ ; -/*!50003 SET character_set_client = @saved_cs_client */ ; -/*!50003 SET character_set_results = @saved_cs_results */ ; -/*!50003 SET collation_connection = @saved_col_connection */ ; -/*!50003 DROP PROCEDURE IF EXISTS `comparativa_clienteskk` */; -/*!50003 SET @saved_cs_client = @@character_set_client */ ; -/*!50003 SET @saved_cs_results = @@character_set_results */ ; -/*!50003 SET @saved_col_connection = @@collation_connection */ ; -/*!50003 SET character_set_client = utf8 */ ; -/*!50003 SET character_set_results = utf8 */ ; -/*!50003 SET collation_connection = utf8_general_ci */ ; -/*!50003 SET @saved_sql_mode = @@sql_mode */ ; -/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; -DELIMITER ;; -CREATE DEFINER=`root`@`%` PROCEDURE `comparativa_clienteskk`(IN v_date DATE,IN i_vendedor INT, IN i_comprador INT, IN i_tipo INT, IN i_wh INT, IN days INT) -BEGIN - -DECLARE date_cyear_ini DATETIME; -DECLARE date_cyear_end DATETIME; -DECLARE date_lyear_ini DATETIME; -DECLARE date_lyear_end DATETIME; -DECLARE week_count TINYINT DEFAULT 7; - - -SET date_cyear_ini = TIMESTAMP(DATE(TIMESTAMPADD(DAY, -22 - WEEKDAY(v_date), v_date)), '00:00:00'); -SET date_cyear_end = TIMESTAMP(DATE(TIMESTAMPADD(DAY, (7 * week_count) -1, date_cyear_ini)), '23:59:59'); -SET date_lyear_ini = TIMESTAMPADD(DAY,-364,date_cyear_ini); -SET date_lyear_end = TIMESTAMPADD(DAY,-364,date_cyear_end); - - CALL article (); - - INSERT INTO article_inventory (article_id) - SELECT Id_Article FROM Articles a - JOIN Tipos t using(tipo_id) - WHERE i_tipo = 0 OR a.tipo_id = i_tipo - AND reino_id <> 6; - - IF v_date < CURDATE() - THEN - ALTER TABLE `article_inventory` - ADD `buy_id` INT NOT NULL DEFAULT 0, - ADD `buy_date` DATE DEFAULT '2000-01-01', - ADD `life` INT DEFAULT 0, - ADD `sd` INT DEFAULT 0, - ADD `avalaible` INT DEFAULT 0, - ADD `visible` INT DEFAULT 0; - - ELSE - CALL inventario_multiple_2 (v_date, i_wh, days); - CALL article_multiple_buy (v_date, i_wh); - CALL article_multiple_buy_date (v_date, i_wh); - END IF; - - - -DROP TEMPORARY TABLE IF EXISTS clientcom; -CREATE TEMPORARY TABLE clientcom -SELECT vnperiod(Fecha) as period - ,Id_Article - , Cantidad - , Preu - , CS.Id_Cliente - FROM vn2008.Movimientos M - JOIN vn2008.Tickets T USING (Id_Ticket) - JOIN vn2008.Consignatarios CS USING(Id_Consigna) - JOIN vn2008.Clientes C ON C.Id_Cliente = CS.Id_Cliente - JOIN vn2008.Articles A USING (Id_Article) - LEFT JOIN vn2008.Tipos USING(tipo_id) - WHERE (T.Fecha BETWEEN date_cyear_ini AND date_cyear_end or T.Fecha BETWEEN date_lyear_ini AND date_lyear_end) - AND T.Id_Cliente NOT IN(400,200) - AND i_vendedor IN (0, C.Id_Trabajador ) - AND i_comprador IN (0, Tipos.Id_Trabajador) - AND i_tipo IN (0,Tipos.tipo_id) - AND reino_id <> 6 AND T.warehouse_id NOT IN (0,13) - ORDER BY period; - -DROP TEMPORARY TABLE IF EXISTS clientcom_periods; -CREATE TEMPORARY TABLE clientcom_periods -SELECT period, @order:= @order + 1 as period_order -FROM ( -SELECT DISTINCT period, @order:=0 -FROM clientcom -ORDER BY period) sub; - -SELECT cc.Id_Article - , cc.Id_Cliente - ,CAST(SUM(IF(period_order = 1, cc.Cantidad, 0)) AS SIGNED) AS lweek1 - ,CAST(SUM(IF(period_order = 2, cc.Cantidad, 0)) AS SIGNED) AS lweek2 - ,CAST(SUM(IF(period_order = 3, cc.Cantidad, 0)) AS SIGNED) AS lweek3 - ,CAST(SUM(IF(period_order = 4, cc.Cantidad, 0)) AS SIGNED) AS lweek4 - ,CAST(SUM(IF(period_order = 5, cc.Cantidad, 0)) AS SIGNED) AS lweek5 - ,CAST(SUM(IF(period_order = 6, cc.Cantidad, 0)) AS SIGNED) AS lweek6 - ,CAST(SUM(IF(period_order = 7, cc.Cantidad, 0)) AS SIGNED) AS lweek7 - ,CAST(SUM(IF(period_order = 7+1, cc.Cantidad, 0)) AS SIGNED) AS cweek1 - ,CAST(SUM(IF(period_order = 7+2, cc.Cantidad, 0)) AS SIGNED) AS cweek2 - ,CAST(SUM(IF(period_order = 7+3, cc.Cantidad, 0)) AS SIGNED) AS cweek3 - ,CAST(SUM(IF(period_order = 7+4, cc.Cantidad, 0)) AS SIGNED) AS cweek4 - ,CAST(SUM(IF(period_order = 7+5, cc.Cantidad, 0)) AS SIGNED) AS cweek5 - ,CAST(SUM(IF(period_order = 7+6, cc.Cantidad, 0)) AS SIGNED) AS cweek6 - ,CAST(SUM(IF(period_order = 7+7, cc.Cantidad, 0)) AS SIGNED) AS cweek7 - - ,CAST(SUM(IF(period_order = 1, cc.Cantidad* Preu, 0)) AS SIGNED) AS lprice1 - ,CAST(SUM(IF(period_order = 2, cc.Cantidad* Preu, 0)) AS SIGNED) AS lprice2 - ,CAST(SUM(IF(period_order = 3, cc.Cantidad* Preu, 0)) AS SIGNED) AS lprice3 - ,CAST(SUM(IF(period_order = 4, cc.Cantidad* Preu, 0)) AS SIGNED) AS lprice4 - ,CAST(SUM(IF(period_order = 5, cc.Cantidad* Preu, 0)) AS SIGNED) AS lprice5 - ,CAST(SUM(IF(period_order = 6, cc.Cantidad* Preu, 0)) AS SIGNED) AS lprice6 - ,CAST(SUM(IF(period_order = 7, cc.Cantidad* Preu, 0)) AS SIGNED) AS lprice7 - ,CAST(SUM(IF(period_order = 7+1, cc.Cantidad* Preu, 0)) AS SIGNED) AS cprice1 - ,CAST(SUM(IF(period_order = 7+2, cc.Cantidad* Preu, 0)) AS SIGNED) AS cprice2 - ,CAST(SUM(IF(period_order = 7+3, cc.Cantidad* Preu, 0)) AS SIGNED) AS cprice3 - ,CAST(SUM(IF(period_order = 7+4, cc.Cantidad* Preu, 0)) AS SIGNED) AS cprice4 - ,CAST(SUM(IF(period_order = 7+5, cc.Cantidad* Preu, 0)) AS SIGNED) AS cprice5 - ,CAST(SUM(IF(period_order = 7+6, cc.Cantidad* Preu, 0)) AS SIGNED) AS cprice6 - ,CAST(SUM(IF(period_order = 7+7, cc.Cantidad* Preu, 0)) AS SIGNED) AS cprice7 - - ,A.Article - ,A.Medida - ,A.Color - ,A.tipo_id - ,C.Cliente - ,T1.CodigoTrabajador as Comercial - ,O.Abreviatura as Origen - ,TT.ball as Tinta - ,r.reino as Reino - ,TP.Id_Tipo - ,JF.CodigoTrabajador as Equipo - ,T2.CodigoTrabajador as Comprador - ,TT.orden as Orden_Color - -,i.buy_id -, i.life -, CAST(IFNULL(i.sd,0) AS SIGNED) as sd -,CAST(i.avalaible AS SIGNED) avalaible -, CAST(i.visible AS SIGNED) visible -, i.buy_date -,P.Proveedor - -FROM clientcom cc -JOIN clientcom_periods ccp using(period) --- La parte del inventario -LEFT JOIN article_inventory i ON i.article_id = cc.Id_Article -LEFT JOIN Compres CM ON i.buy_id = CM.Id_Compra -LEFT JOIN Entradas E USING(Id_Entrada) -LEFT JOIN Proveedores P ON P.Id_Proveedor = E.Id_Proveedor --- Ahora la parte de los vendedores -JOIN Clientes C ON C.Id_Cliente = cc.Id_Cliente -JOIN Trabajadores T1 ON C.Id_Trabajador = T1.Id_Trabajador -LEFT JOIN jerarquia J ON J.worker_id = T1.Id_Trabajador -JOIN Trabajadores JF ON JF.Id_Trabajador = J.boss_id --- JOIN Trabajadores JF ON T1.Id_Trabajador = JF.boss JGF propuesta para sustituir por las dos lineas superiores - --- Ahora la parte de los compradores -JOIN Articles A ON A.Id_Article = cc.Id_Article -JOIN Origen O ON O.id = A.id_origen -JOIN Tintas TT ON TT.Id_Tinta = A.Color -JOIN Tipos TP ON TP.tipo_id = A.tipo_id -JOIN reinos r ON r.id = TP.reino_id -JOIN Trabajadores T2 ON T2.Id_Trabajador = TP.Id_Trabajador - -GROUP BY Id_Article,Id_Cliente; - END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -24180,7 +22788,7 @@ BEGIN ( 'CREATE TEMPORARY TABLE tmp.comparative ENGINE = MEMORY SELECT - an.nicho, p.name Productor, C.Packing, C.Costefijo + an.nicho, p.name Productor, C.Packing, C.Costefijo, C.caja ,A.Color, Id_Tipo as Tipo,A.tipo_id, o.Abreviatura as Origen, A.Categoria ,A.Tallos, A.Medida, A.Article, TR.CodigoTrabajador @@ -24197,7 +22805,8 @@ BEGIN ,IF(cy.Id_Article IS NULL AND i.visible = 0 AND i.avalaible = 0 AND IFNULL(i.sd, 0) = 0, FALSE, TRUE) AS filtret ,(IFNULL(it.itemFk,0) != 0) isTagged - ,A.tag5, A.value5, A.tag6, A.value6, A.tag7, A.value7, A.tag8, A.value8, A.description + ,A.tag5, A.value5, A.tag6, A.value6, A.tag7, A.value7, A.tag8, A.value8 + ,A.tag9, A.value9, A.tag10, A.value10, A.description FROM vn2008.article_inventory i JOIN vn2008.Articles A ON A.Id_Article = i.article_id LEFT JOIN vn.itemTagged it ON it.itemFk = i.article_id @@ -24229,258 +22838,6 @@ DELIMITER ; /*!50003 SET character_set_client = @saved_cs_client */ ; /*!50003 SET character_set_results = @saved_cs_results */ ; /*!50003 SET collation_connection = @saved_col_connection */ ; -/*!50003 DROP PROCEDURE IF EXISTS `comparativeKk` */; -/*!50003 SET @saved_cs_client = @@character_set_client */ ; -/*!50003 SET @saved_cs_results = @@character_set_results */ ; -/*!50003 SET @saved_col_connection = @@collation_connection */ ; -/*!50003 SET character_set_client = utf8 */ ; -/*!50003 SET character_set_results = utf8 */ ; -/*!50003 SET collation_connection = utf8_general_ci */ ; -/*!50003 SET @saved_sql_mode = @@sql_mode */ ; -/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; -DELIMITER ;; -CREATE DEFINER=`root`@`%` PROCEDURE `comparativeKk`( - v_date DATETIME - ,days TINYINT - ,i_wh TINYINT - ,i_tipo INT - ,i_filtro INT -) -BEGIN - DECLARE wstart INT; - DECLARE wend INT; - DECLARE cyear INT; - DECLARE date_cyear_ini DATETIME; - DECLARE date_cyear_end DATETIME; - DECLARE week_count TINYINT DEFAULT 7; - DECLARE date_lyear_ini DATETIME; - DECLARE date_lyear_end DATETIME; - DECLARE corrector INT; - DECLARE w1, w2, w3, w4, w5, w6, w7 INT; - DECLARE y1, y2, y3, y4, y5, y6, y7 INT; - DECLARE wperiod INT;-- DECLARE ws, ys INT; -- PAK 11/01/2016 - DECLARE i INT DEFAULT 0; - DECLARE lastCOMP BIGINT; -- Almacena el ultimo valor del Periodo - DECLARE strFILTRO VARCHAR(255) DEFAULT 'TRUE'; - - IF i_filtro THEN - SELECT `sql` INTO strFILTRO FROM filtros WHERE id = i_filtro; - END IF; - - SET corrector = 1; - - IF days < 0 OR days > 30 THEN - SET days = 15; - END IF; - - IF i_wh = NULL THEN - SET i_wh = 0; - END IF; - -- JGF 2015-04-16 cambio -21 por -22 para que la semana cuente de domingo a sabado - SET date_cyear_ini = TIMESTAMP(DATE(TIMESTAMPADD(DAY, -22 - WEEKDAY(v_date), v_date)), '00:00:00'); - SET date_cyear_end = TIMESTAMP(DATE(TIMESTAMPADD(DAY, (7 * week_count) -1, date_cyear_ini)), '23:59:59'); - -- Eliminamos el calculo del inventario para fechas en el pasado - - DROP TEMPORARY TABLE IF EXISTS `article_inventory`; - CREATE TEMPORARY TABLE `article_inventory` - ( - `article_id` INT(11) NOT NULL PRIMARY KEY, - `future` DATETIME - ) - ENGINE = MEMORY; - - INSERT INTO article_inventory (article_id) - SELECT Id_Article FROM Articles a - JOIN Tipos t ON a.tipo_id = t.tipo_id - LEFT JOIN vn2008.reinos r ON r.id = t.reino_id - WHERE (i_tipo = 0 OR a.tipo_id = i_tipo) - AND r.display <> 0; - - IF v_date < CURDATE() - THEN - ALTER TABLE `article_inventory` - ADD `buy_id` INT NOT NULL DEFAULT 0, - ADD `buy_date` DATE DEFAULT '2000-01-01', - ADD `life` INT DEFAULT 0, - ADD `sd` INT DEFAULT 0, - ADD `avalaible` INT DEFAULT 0, - ADD `visible` INT DEFAULT 0; - - ELSE - - CALL inventario_multiple_2 (v_date, i_wh, days); - - CALL article_multiple_buy (v_date, i_wh); - - CALL article_multiple_buy_date (v_date, i_wh); - - - END IF; - - - DROP TEMPORARY TABLE IF EXISTS wtable; - - CREATE TEMPORARY TABLE wtable ( - cy INT(6), - ly INT(6) - ); - - REPEAT - SET i = i + 1; - SET wperiod = vnperiod(TIMESTAMPADD(DAY, 7*(i - 1), date_cyear_ini)); -- PAK 11/01/2016 - INSERT INTO wtable(cy, ly) VALUES(wperiod, wperiod - 100); -- VALUES( ys * 100 + ws, (ys -1) * 100 + ws); -- PAK 11/01/2016 - - UNTIL i = 7 END REPEAT; - - - SELECT cy, ly INTO w1, y1 FROM wtable limit 1; - SELECT cy, ly INTO w2, y2 FROM wtable WHERE cy > w1 limit 1; - SELECT cy, ly INTO w3, y3 FROM wtable WHERE cy > w2 limit 1; - SELECT cy, ly INTO w4, y4 FROM wtable WHERE cy > w3 limit 1; - - SELECT cy, ly INTO w5, y5 FROM wtable WHERE cy > w4 limit 1; - SELECT cy, ly INTO w6, y6 FROM wtable WHERE cy > w5 limit 1; - SELECT cy, ly INTO w7, y7 FROM wtable WHERE cy > w6 limit 1; - DROP TEMPORARY TABLE wtable; - - SET cyear = YEAR(date_cyear_ini); - - -- Genera una tabla con los datos del año pasado. - - DROP TEMPORARY TABLE IF EXISTS last_year; - CREATE TEMPORARY TABLE last_year - (KEY (Id_Article)) - ENGINE = MEMORY - SELECT Id_Article - - ,CAST(SUM(IF(Periodo = y1, Cantidad, 0)) AS DECIMAL(10,0)) AS lweek1 - ,CAST(SUM(IF(Periodo = y2, Cantidad, 0)) AS DECIMAL(10,0)) AS lweek2 - ,CAST(SUM(IF(Periodo = y3, Cantidad, 0)) AS DECIMAL(10,0)) AS lweek3 - ,CAST(SUM(IF(Periodo = y4, Cantidad, 0)) AS DECIMAL(10,0)) AS lweek4 - ,CAST(SUM(IF(Periodo = y5, Cantidad, 0)) AS DECIMAL(10,0)) AS lweek5 - ,CAST(SUM(IF(Periodo = y6, Cantidad, 0)) AS DECIMAL(10,0)) AS lweek6 - ,CAST(SUM(IF(Periodo = y7, Cantidad, 0)) AS DECIMAL(10,0)) AS lweek7 - - ,CAST(SUM(IF(Periodo = y1, price, 0)) AS DECIMAL(10,0)) AS lprice1 - ,CAST(SUM(IF(Periodo = y2, price, 0)) AS DECIMAL(10,0)) AS lprice2 - ,CAST(SUM(IF(Periodo = y3, price, 0)) AS DECIMAL(10,0)) AS lprice3 - ,CAST(SUM(IF(Periodo = y4, price, 0)) AS DECIMAL(10,0)) AS lprice4 - ,CAST(SUM(IF(Periodo = y5, price, 0)) AS DECIMAL(10,0)) AS lprice5 - ,CAST(SUM(IF(Periodo = y6, price, 0)) AS DECIMAL(10,0)) AS lprice6 - ,CAST(SUM(IF(Periodo = y7, price, 0)) AS DECIMAL(10,0)) AS lprice7 - - FROM Comparativa - JOIN warehouse W on W.id = warehouse_id - WHERE (Periodo BETWEEN y1 and y7) - AND IF(i_wh = 0, W.is_comparative, i_wh = warehouse_id) - GROUP BY Id_Article; - - -- Genera una tabla con los datos de este año. - - DROP TEMPORARY TABLE IF EXISTS cur_year; - CREATE TEMPORARY TABLE cur_year - (KEY (Id_Article)) - ENGINE = MEMORY - SELECT Id_Article - - ,CAST(SUM(IF(week = w1, Total, 0)) AS DECIMAL(10,0)) AS cweek1 - ,CAST(SUM(IF(week = w2, Total, 0)) AS DECIMAL(10,0)) AS cweek2 - ,CAST(SUM(IF(week = w3, Total, 0)) AS DECIMAL(10,0)) AS cweek3 - ,CAST(SUM(IF(week = w4, Total, 0)) AS DECIMAL(10,0)) AS cweek4 - ,CAST(SUM(IF(week = w5, Total, 0)) AS DECIMAL(10,0)) AS cweek5 - ,CAST(SUM(IF(week = w6, Total, 0)) AS DECIMAL(10,0)) AS cweek6 - ,CAST(SUM(IF(week = w7, Total, 0)) AS DECIMAL(10,0)) AS cweek7 - - ,CAST(SUM(IF(week = w1, price, 0)) AS DECIMAL(10,0)) AS cprice1 - ,CAST(SUM(IF(week = w2, price, 0)) AS DECIMAL(10,0)) AS cprice2 - ,CAST(SUM(IF(week = w3, price, 0)) AS DECIMAL(10,0)) AS cprice3 - ,CAST(SUM(IF(week = w4, price, 0)) AS DECIMAL(10,0)) AS cprice4 - ,CAST(SUM(IF(week = w5, price, 0)) AS DECIMAL(10,0)) AS cprice5 - ,CAST(SUM(IF(week = w6, price, 0)) AS DECIMAL(10,0)) AS cprice6 - ,CAST(SUM(IF(week = w7, price, 0)) AS DECIMAL(10,0)) AS cprice7 - - FROM ( - SELECT A.Id_Article - ,CTS.period week - ,SUM(Cantidad) AS Total - ,TRUNCATE(SUM(Cantidad * IF(T.Fecha >= '2015-10-01',M.CostFixat,Preu * (100 - Descuento) / 100)),0) AS price - FROM Movimientos M - LEFT JOIN Tickets T ON T.Id_Ticket = M.Id_Ticket - INNER JOIN `time` CTS ON CTS.`date` = DATE(T.Fecha) - INNER JOIN Articles A USING (Id_Article) - INNER JOIN Tipos tp ON tp.tipo_id = A.tipo_id - LEFT JOIN reinos r ON r.id = tp.reino_id - JOIN warehouse W ON W.id = T.warehouse_id - WHERE Fecha BETWEEN date_cyear_ini AND date_cyear_end - AND T.Id_Cliente NOT IN(400,200) - AND IF(i_wh = 0, W.is_comparative, i_wh = T.warehouse_id) - AND r.display <> 0 - - GROUP BY A.Id_Article, week - ) t - GROUP BY Id_Article; - -- Genera la tabla con la comparativa. - - DROP TEMPORARY TABLE IF EXISTS remcom; - - SET strFILTRO = REPLACE(strFILTRO, 'Id_Article','A.Id_Article'); - SET strFILTRO = REPLACE(strFILTRO, 'tipo_id','tp.tipo_id'); - -- select * from article_inventory; - - DROP TEMPORARY TABLE IF EXISTS tmp.comparative; - - CALL util.exec (sql_printf - ( - 'CREATE TEMPORARY TABLE tmp.comparative ENGINE = MEMORY - SELECT - an.nicho, p.name Productor, C.Packing, C.Costefijo - ,A.Color, Id_Tipo as Tipo,A.tipo_id, o.Abreviatura as Origen, A.Categoria - ,A.Tallos, A.Medida, A.Article, TR.CodigoTrabajador - - ,cweek1, cweek2, cweek3, cweek4, cweek5, cweek6, cweek7 - ,lweek1, lweek2, lweek3, lweek4, lweek5, lweek6, lweek7 - - ,cprice1, cprice2, cprice3, cprice4, cprice5, cprice6, cprice7 - ,lprice1, lprice2, lprice3, lprice4, lprice5, lprice6, lprice7 - - ,A.Id_Article, i.buy_id , tp.life , CAST(IFNULL(i.sd,0) AS SIGNED) as sd - ,CAST(i.avalaible AS SIGNED) avalaible, CAST(i.visible AS SIGNED) visible, i.buy_date - ,E.Id_Proveedor AS provider_id - ,A.offer, A.bargain, A.comments, A.relevancy, A.description itemDescription - ,IF(cy.Id_Article IS NULL AND i.visible = 0 AND i.avalaible = 0 AND IFNULL(i.sd, 0) = 0, FALSE, TRUE) AS filtret - ,(IFNULL(it.itemFk,0) != 0) isTagged - FROM vn2008.article_inventory i - JOIN vn2008.Articles A ON A.Id_Article = i.article_id - LEFT JOIN vn.itemTagged it ON it.itemFk = i.article_id - LEFT JOIN vn2008.Articles_nicho an ON A.Id_Article = an.Id_Article AND an.warehouse_id = %s - LEFT JOIN vn2008.producer p ON p.producer_id = A.producer_id - LEFT JOIN vn2008.Tipos tp ON A.tipo_id = tp.tipo_id - LEFT JOIN vn2008.reinos r ON r.id = tp.reino_id - LEFT JOIN vn2008.Trabajadores TR ON TR.Id_Trabajador = tp.Id_Trabajador - - LEFT JOIN vn2008.Compres C ON i.buy_id = C.Id_Compra - LEFT JOIN vn2008.Entradas E USING(Id_Entrada) - LEFT JOIN vn2008.Origen o ON o.id = A.id_origen - LEFT JOIN vn2008.last_year ly ON ly.Id_Article = A.Id_Article - LEFT JOIN vn2008.cur_year cy ON cy.Id_Article = A.Id_Article AND (i.avalaible <> 0 OR i.visible <> 0 OR cweek1 OR cweek2 OR cweek3 OR cweek4 - OR cweek5 OR cweek6 OR cweek7 OR lweek1 OR lweek2 OR lweek3 OR lweek4 OR lweek5 - OR lweek6 OR lweek7) - WHERE r.display <> 0 AND %s ' - - ,i_wh,strFILTRO - )); - - -- Destruye las tablas temporales creadas. - - DROP TEMPORARY TABLE last_year; - DROP TEMPORARY TABLE cur_year; - DROP TEMPORARY TABLE article_inventory; -END ;; -DELIMITER ; -/*!50003 SET sql_mode = @saved_sql_mode */ ; -/*!50003 SET character_set_client = @saved_cs_client */ ; -/*!50003 SET character_set_results = @saved_cs_results */ ; -/*!50003 SET collation_connection = @saved_col_connection */ ; /*!50003 DROP PROCEDURE IF EXISTS `compresFromTicket` */; /*!50003 SET @saved_cs_client = @@character_set_client */ ; /*!50003 SET @saved_cs_results = @@character_set_results */ ; @@ -25097,81 +23454,6 @@ WHERE E.cyc AND periodo(Fecha) = periodo(@fecha) ; -END ;; -DELIMITER ; -/*!50003 SET sql_mode = @saved_sql_mode */ ; -/*!50003 SET character_set_client = @saved_cs_client */ ; -/*!50003 SET character_set_results = @saved_cs_results */ ; -/*!50003 SET collation_connection = @saved_col_connection */ ; -/*!50003 DROP PROCEDURE IF EXISTS `cyc_report2kk` */; -/*!50003 SET @saved_cs_client = @@character_set_client */ ; -/*!50003 SET @saved_cs_results = @@character_set_results */ ; -/*!50003 SET @saved_col_connection = @@collation_connection */ ; -/*!50003 SET character_set_client = utf8 */ ; -/*!50003 SET character_set_results = utf8 */ ; -/*!50003 SET collation_connection = utf8_general_ci */ ; -/*!50003 SET @saved_sql_mode = @@sql_mode */ ; -/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; -DELIMITER ;; -CREATE DEFINER=`root`@`%` PROCEDURE `cyc_report2kk`() -BEGIN - -SELECT Fecha, Clasificacion, CAST(SUM(Importe) AS DECIMAL(10,2)) as Importe, empresa_id -FROM -( - SELECT CASE - WHEN C.Vencimiento <= 30 THEN '0-30 dias' - WHEN C.Vencimiento BETWEEN 31 AND 60 THEN '31-60 dias' - WHEN C.Vencimiento BETWEEN 61 AND 90 THEN '61-90 dias' - ELSE '> 90 dias' - END AS Clasificacion, - F.Importe, - C.Fecha, - F.empresa_id - - FROM cyc_declaration C - INNER JOIN Facturas F USING(factura_id) - WHERE C.Riesgo > 0 - -) cyc -GROUP BY Fecha, Clasificacion, empresa_id; -END ;; -DELIMITER ; -/*!50003 SET sql_mode = @saved_sql_mode */ ; -/*!50003 SET character_set_client = @saved_cs_client */ ; -/*!50003 SET character_set_results = @saved_cs_results */ ; -/*!50003 SET collation_connection = @saved_col_connection */ ; -/*!50003 DROP PROCEDURE IF EXISTS `cyc_reportkk` */; -/*!50003 SET @saved_cs_client = @@character_set_client */ ; -/*!50003 SET @saved_cs_results = @@character_set_results */ ; -/*!50003 SET @saved_col_connection = @@collation_connection */ ; -/*!50003 SET character_set_client = utf8 */ ; -/*!50003 SET character_set_results = utf8 */ ; -/*!50003 SET collation_connection = utf8_general_ci */ ; -/*!50003 SET @saved_sql_mode = @@sql_mode */ ; -/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; -DELIMITER ;; -CREATE DEFINER=`root`@`%` PROCEDURE `cyc_reportkk`() -BEGIN - -SELECT Fecha, Clasificacion, CAST(SUM(Importe) AS DECIMAL(10,2)) as Importe, empresa_id -FROM -( - SELECT CASE IFNULL(C.Riesgo,-1) - WHEN 0 THEN 'No aseguradas' - WHEN -1 THEN 'Sin clasificar' - ELSE 'Asegurados' - END AS Clasificacion, - F.Importe, - C.Fecha, - F.empresa_id - - FROM cyc_declaration C - INNER JOIN Facturas F USING(factura_id) - -) cyc -GROUP BY Fecha, Clasificacion, empresa_id; - END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -25284,8 +23566,7 @@ BEGIN -- Insertamos los tickets que ya tienen expediciones, que fallaran si se repite la clave primaria. - INSERT INTO zeleVOL(Provincia, Id_Ticket, Bultos) - SELECT p.name, e.ticket_id, COUNT(e.ticket_id) + INSERT INTO zeleVOL(Provincia, Id_Ticket, Bultos) SELECT p.name, e.ticket_id, COUNT(e.ticket_id) FROM expeditions e JOIN Tickets t ON ticket_id = Id_Ticket JOIN Consignatarios c USING(Id_Consigna) @@ -25319,8 +23600,7 @@ BEGIN GROUP BY p.name, Id_Ticket ) sub GROUP BY province ON DUPLICATE KEY UPDATE Faltan = Faltan; - - -- Mostramos el resultado + -- Mostramos el resultado SELECT Provincia, COUNT(Id_Ticket) expediciones, SUM(Bultos) Bultos, SUM(Faltan) Prevision FROM zeleVOL @@ -26131,80 +24411,6 @@ DELIMITER ; /*!50003 SET character_set_client = @saved_cs_client */ ; /*!50003 SET character_set_results = @saved_cs_results */ ; /*!50003 SET collation_connection = @saved_col_connection */ ; -/*!50003 DROP PROCEDURE IF EXISTS `entryWithItemkk` */; -/*!50003 SET @saved_cs_client = @@character_set_client */ ; -/*!50003 SET @saved_cs_results = @@character_set_results */ ; -/*!50003 SET @saved_col_connection = @@collation_connection */ ; -/*!50003 SET character_set_client = utf8 */ ; -/*!50003 SET character_set_results = utf8 */ ; -/*!50003 SET collation_connection = utf8_general_ci */ ; -/*!50003 SET @saved_sql_mode = @@sql_mode */ ; -/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; -DELIMITER ;; -CREATE DEFINER=`root`@`%` PROCEDURE `entryWithItemkk`(IN vShipmentWarehouse INTEGER, IN vLandingWarehouse INTEGER, - IN vItem INTEGER, IN vAmount INTEGER,IN vVolume INTEGER, IN vGrossMargin DECIMAL(10,2), vInOutDate DATE) -BEGIN - - DECLARE vLandingWarehouse INT; - DECLARE vLandingDate DATE; - DECLARE vShipmentDate DATE; - DECLARE vTravel INT; - DECLARE vEntry INT; - DECLARE vBucket VARCHAR(10); - - -- seleccionamos travel - SELECT id, Id_Entrada INTO vTravel, vEntry - FROM travel t LEFT JOIN Entradas e ON t.id = e.travel_id - WHERE t.landing = vInOutDate AND t.shipment = vInOutDate AND t.warehouse_id_out = vShipmentWarehouse - AND t.warehouse_id = vLandingWarehouse AND agency_id = 15 - LIMIT 1; - - -- creamos el travel si es necesario - IF NOT vTravel THEN - INSERT INTO travel (shipment, landing, warehouse_id, warehouse_id_out, agency_id) - VALUES (vShipmentDate, vLandingDate, vLandingWarehouse, vLandingWarehouse, 15); - SELECT LAST_INSERT_ID() INTO vTravel; - END IF; - - -- creamos la Entrada si es necesario - IF NOT vEntry THEN - INSERT INTO Entradas (Id_Proveedor, travel_id) - VALUES (13, vTravel); -- proveedor 'MOVIMIENTO ALMACEN' - SELECT LAST_INSERT_ID() INTO vEntry; - END IF; - - -- creamos el cubo si es necesario - SELECT Id_Cubo INTO vBucket FROM Cubos WHERE Volumen = vVolume LIMIT 1; - IF vBucket IS NULL THEN - INSERT INTO Cubos (Id_Cubo, Volumen) - VALUES (CONCAT('dm',vVolume/1000), vVolume); - SELECT LAST_INSERT_ID() INTO vBucket; - END IF; - - INSERT INTO Compres(Id_Article,Cantidad, Id_Entrada, Id_Cubo, Packing, grouping, caja, Costefijo, Portefijo, Embalajefijo, - Comisionfija, Tarifa2, Tarifa3) - SELECT vItem, - vAmount, - vEntry, - vBucket, - 1 Packing, - 1 grouping, - 0 caja, - SUM(m.Preu), - 0 Portefijo, - 0 Embalajefijo, - 0 Comisionfija, - SUM(m.Preu) + vGrossMargin Tarifa2, - SUM(m.Preu) + vGrossMargin Tarifa3 - FROM - Movimientos m - WHERE m.Id_Ticket = vTicket; -END ;; -DELIMITER ; -/*!50003 SET sql_mode = @saved_sql_mode */ ; -/*!50003 SET character_set_client = @saved_cs_client */ ; -/*!50003 SET character_set_results = @saved_cs_results */ ; -/*!50003 SET collation_connection = @saved_col_connection */ ; /*!50003 DROP PROCEDURE IF EXISTS `envios_masivos` */; /*!50003 SET @saved_cs_client = @@character_set_client */ ; /*!50003 SET @saved_cs_results = @@character_set_results */ ; @@ -26721,7 +24927,7 @@ WHEN 19 THEN IF(LEFT(Article,3) IN ('HEL','GIN'),0,R.orden) WHEN 70 THEN IF(Article like '%red beauty%' or Article like '%clarinervium%',0,R.orden) WHEN 86 THEN 1 ELSE R.orden -END as*/ R.orden, +END as*/R.orden, CS.Consignatario, T.Id_Cliente, NULL AS Id_Trabajador, @@ -26731,7 +24937,7 @@ END as*/ R.orden, M.Cantidad, M.quantity, M.Cantidad / IF(nz(Gro.Grouping) = 0,1,nz(Gro.Grouping)) as Paquetes, - M.Concepte, + IF(sis.vHasBeenPrepared, CONCAT(' ----- PREPARADO ----- ', M.Concepte), M.Concepte) as Concepte, A.Medida, A.Color, A.Categoria, @@ -26742,13 +24948,12 @@ END as*/ R.orden, T.Observaciones, Ag.Agencia Tipo, NULL AS CodigoTrabajador, - /*0 Seguro,*/ M.OK, M.Reservado, A.Tallos, Gro.Grouping, IF(`transaction`,right(concat('000000' ,M.Id_Article),6),M.Id_Movimiento) Id_Movimiento, - an.Nicho, + IF(sis.vHasBeenPrepared,'RES',an.Nicho) as Nicho, 'PEDIDO ASEGURADO' AS MSG, T.Id_Ruta, RT.Id_Vehiculo, @@ -26757,13 +24962,21 @@ END as*/ R.orden, group_concat(IF(observation_type_id = 2,text,'') SEPARATOR '') 'encajador', A.Foto, M.Id_Movimiento movement_id, - lpad(ifnull(cooler_path_detail_id, an.Nicho),5,'0') as path, + lpad(IF(sis.vHasBeenPrepared,99999,ifnull(cooler_path_detail_id, an.Nicho)),5,'0') as path, M.Descuento,M.Preu, mm.valor as Preparado, mm.original_quantity - , p.`name` producer, T.warehouse_id, CS.POBLACION -- JGF 2016-02-16 + , p.`name` producer, + T.warehouse_id, + CS.POBLACION -- JGF 2016-02-16 FROM Tickets T LEFT JOIN Movimientos M USING(Id_Ticket) + LEFT JOIN (SELECT DISTINCT saleFk, TRUE as vHasBeenPrepared + FROM vn.saleItemShelving sis + JOIN vn.sale s ON s.id = sis.saleFk + WHERE s.ticketFk = idT + AND sis.quantity > 0 + ) sis ON sis.saleFk = M.Id_Movimiento LEFT JOIN Articles A on A.Id_Article = M.Id_Article LEFT JOIN Articles_nicho an ON A.Id_Article = an.Id_Article AND an.warehouse_id = T.warehouse_id LEFT JOIN producer p on p.producer_id = A.producer_id -- JGF 2016-02-16 @@ -26771,7 +24984,6 @@ FROM LEFT JOIN Origen O ON A.id_origen = O.id LEFT JOIN Clientes C USING(Id_Cliente) LEFT JOIN Trabajadores CT ON C.Id_Trabajador = CT.Id_Trabajador - -- LEFT JOIN Trabajadores TR ON TR.Id_Trabajador = T.Id_Trabajador INNER JOIN Consignatarios CS ON T.Id_Consigna = CS.Id_Consigna INNER JOIN Agencias Ag ON Ag.Id_Agencia = T.Id_Agencia LEFT JOIN ( @@ -26805,7 +25017,8 @@ FROM ) Gro ON Gro.Id_Article = M.Id_Article LEFT JOIN Movimientos_mark mm ON mm.Id_Movimiento = M.Id_Movimiento - WHERE T.Id_Ticket = idT group by M.Id_Movimiento; + WHERE T.Id_Ticket = idT + group by M.Id_Movimiento; END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -26903,103 +25116,6 @@ WHERE AND v.reino_id <> 8 ; -END ;; -DELIMITER ; -/*!50003 SET sql_mode = @saved_sql_mode */ ; -/*!50003 SET character_set_client = @saved_cs_client */ ; -/*!50003 SET character_set_results = @saved_cs_results */ ; -/*!50003 SET collation_connection = @saved_col_connection */ ; -/*!50003 DROP PROCEDURE IF EXISTS `F5_entradakk` */; -/*!50003 SET @saved_cs_client = @@character_set_client */ ; -/*!50003 SET @saved_cs_results = @@character_set_results */ ; -/*!50003 SET @saved_col_connection = @@collation_connection */ ; -/*!50003 SET character_set_client = utf8 */ ; -/*!50003 SET character_set_results = utf8 */ ; -/*!50003 SET collation_connection = utf8_general_ci */ ; -/*!50003 SET @saved_sql_mode = @@sql_mode */ ; -/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; -DELIMITER ;; -CREATE DEFINER=`root`@`%` PROCEDURE `F5_entradakk`(IN idE BIGINT) -BEGIN - - -SELECT - NULL AS Sacador, - NULL AS Encajador, - v.Cantidad / v.Packing AS Paquetes, - v.Packing AS Grouping, - barcode, - 'ASEGURADO' AS asegurado, - reino, - r.orden, - Alias AS Consignatario, - v.Id_Proveedor AS Id_Cliente, - v.Pedida, - v.Confirmada, - NULL AS vendedor, - 10 AS Calidad, - LPAD(IFNULL(cooler_path_detail_id, an.Nicho), - 5, - '0') AS path, - TB.Id_Trabajador, - v.Id_Entrada AS Id_Ticket, - landing AS Fecha, - v.Id_Article, - v.Cantidad, - v.article AS Concepte, - v.Medida, - v.Color, - v.Categoria, - Abreviatura AS Origen, - NULL AS Localizacion, - 0 AS Bultos, - w.`name` AS Tipo, - CodigoTrabajador, - 0 AS OK, - 0 AS Reservado, - v.Tallos, - v.Id_Compra AS Id_Movimiento, - an.Nicho, - 'PEDIDO ASEGURADO' AS MSG, - 0 AS Seguro, - 0 AS Id_Ruta, - 0 AS Id_Vehiculo, - a.Foto, - pr.name as producer -FROM - v_compres v - LEFT JOIN - Articles_nicho an ON v.Id_Article = an.Id_Article AND an.warehouse_id = v.warehouse_id_out - JOIN - warehouse w ON w.id = v.warehouse_id - LEFT JOIN - Tipos USING (tipo_id) - LEFT JOIN - reinos r ON r.id = Tipos.reino_id - LEFT JOIN - Trabajadores TB ON TB.Id_Trabajador = v.Id_Trabajador - LEFT JOIN - Proveedores p ON p.Id_Proveedor = v.Id_Proveedor - LEFT JOIN - (SELECT - Id_Article, code AS barcode - FROM - barcodes - GROUP BY Id_Article) BC ON BC.Id_Article = v.Id_Article - LEFT JOIN - Articles a ON a.Id_Article = v.Id_Article - LEFT JOIN - producer pr on pr.producer_id = a.producer_id - LEFT JOIN - cooler_path_detail c ON LEFT(v.Nicho, 3) = pasillo - LEFT JOIN - Origen o ON o.id = v.Id_origen -WHERE - v.Id_Entrada = idE - AND v.tipo_id IS NOT NULL - AND v.tipo_id <> 77 - ; - END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -27202,79 +25318,6 @@ VALUES (strFactura -END ;; -DELIMITER ; -/*!50003 SET sql_mode = @saved_sql_mode */ ; -/*!50003 SET character_set_client = @saved_cs_client */ ; -/*!50003 SET character_set_results = @saved_cs_results */ ; -/*!50003 SET collation_connection = @saved_col_connection */ ; -/*!50003 DROP PROCEDURE IF EXISTS `fv_to_pcakk` */; -/*!50003 SET @saved_cs_client = @@character_set_client */ ; -/*!50003 SET @saved_cs_results = @@character_set_results */ ; -/*!50003 SET @saved_col_connection = @@collation_connection */ ; -/*!50003 SET character_set_client = utf8 */ ; -/*!50003 SET character_set_results = utf8 */ ; -/*!50003 SET collation_connection = utf8_general_ci */ ; -/*!50003 SET @saved_sql_mode = @@sql_mode */ ; -/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; -DELIMITER ;; -CREATE DEFINER=`root`@`%` PROCEDURE `fv_to_pcakk`() -BEGIN - -DECLARE idT INT; - -DECLARE idC INT; -DECLARE newFEC DATE; -DECLARE idEMP INT; -DECLARE idCON INT; -DECLARE intTIPO INT; -DECLARE newTICKET INT; -DECLARE newLANDING DATE; - -SELECT DISTINCT Id_Ticket INTO idT -FROM Movimientos m -JOIN Tickets t using(Id_Ticket) -JOIN Articles a using(Id_Article) -WHERE tipo_id = 19 AND Article like 'HEL %' -AND Fecha between '2015-10-22' and '2015-10-31' -AND warehouse_id =1 LIMIT 1; - -WHILE idT IS NOT NULL DO - - SELECT Id_Cliente,Fecha,empresa_id,Id_Consigna,Id_Agencia , landing - INTO idC , newFEC, idEMP , idCON , intTIPO , newLANDING - FROM Tickets - WHERE Id_Ticket = idT; - - CALL `ticket_new_complet`(idC ,newFEC, 44, 20, idEMP , idCON , intTIPO , NULL , newTICKET); - - UPDATE Movimientos - JOIN Articles a using(Id_Article) - SET Id_Ticket = newTICKET - WHERE tipo_id = 19 AND Article like 'HEL %' - AND Id_Ticket = idT; - - INSERT INTO order_Tickets (Id_Ticket, order_id) - SELECT newTICKET, order_id - FROM order_Tickets - WHERE Id_Ticket = idT; - - UPDATE Tickets - SET landing = newLANDING - WHERE Id_Ticket = newTICKET; - -SET idT = NULL; - -SELECT DISTINCT Id_Ticket INTO idT -FROM Movimientos m -JOIN Tickets t using(Id_Ticket) -JOIN Articles a using(Id_Article) -WHERE tipo_id = 19 AND Article like 'HEL %' -AND Fecha between '2015-10-22' and '2015-10-31' -AND warehouse_id =1 LIMIT 1; - -END WHILE; - END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -27569,114 +25612,6 @@ FROM ORDER BY Fecha, OK DESC, Entrada DESC; -END ;; -DELIMITER ; -/*!50003 SET sql_mode = @saved_sql_mode */ ; -/*!50003 SET character_set_client = @saved_cs_client */ ; -/*!50003 SET character_set_results = @saved_cs_results */ ; -/*!50003 SET collation_connection = @saved_col_connection */ ; -/*!50003 DROP PROCEDURE IF EXISTS `historicokk` */; -/*!50003 SET @saved_cs_client = @@character_set_client */ ; -/*!50003 SET @saved_cs_results = @@character_set_results */ ; -/*!50003 SET @saved_col_connection = @@collation_connection */ ; -/*!50003 SET character_set_client = utf8 */ ; -/*!50003 SET character_set_results = utf8 */ ; -/*!50003 SET collation_connection = utf8_general_ci */ ; -/*!50003 SET @saved_sql_mode = @@sql_mode */ ; -/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; -DELIMITER ;; -CREATE DEFINER=`root`@`%` PROCEDURE `historicokk`(IN idART INT, IN wh INT, IN v_virtual INT) -BEGIN -DECLARE datFEC DATETIME; - -SELECT Fechainventario INTO datFEC FROM tblContadores; -SET @a = 0; -SELECT DATE(Fecha) AS Fecha, - Entrada, - Salida, - OK, - Alias, - Referencia, - id, - @a := @a + IFNULL(Entrada,0) - IFNULL(Salida,0) as acumulado, - F5, - v_virtual, - Calidad,CodigoTrabajador -FROM - - ( SELECT TR.landing as Fecha, - C.Cantidad as Entrada, - NULL as Salida, - (TR.received != FALSE) as OK, - P.Proveedor as Alias, - E.Referencia as Referencia, - E.Id_Entrada as id, - TR.delivered as F5, - 0 as Calidad, tra.CodigoTrabajador - FROM Compres C - JOIN Entradas E USING (Id_Entrada) - JOIN travel TR ON TR.id = E.travel_id - JOIN Proveedores P USING (Id_Proveedor) - LEFT JOIN Articles a ON a.Id_Article = C.Id_Article - LEFT JOIN Tipos ti ON ti.Id_Tipo = a.tipo_id - LEFT JOIN Trabajadores tra ON tra.Id_Trabajador = ti.Id_Trabajador - WHERE TR.landing >= datFEC - AND wh IN (TR.warehouse_id , 0) - AND C.Id_Article = idART - AND E.Inventario = 0 - - UNION ALL - - SELECT TR.shipment as Fecha, - NULL as Entrada, - C.Cantidad as Salida, - TR.delivered as OK, - P.Proveedor as Alias, - E.Referencia as Referencia, - E.Id_Entrada as id, - TR.delivered as F5, - 0 as Calidad, tra.CodigoTrabajador - - FROM Compres C - JOIN Entradas E USING (Id_Entrada) - JOIN travel TR ON TR.id = E.travel_id - JOIN warehouse ON warehouse.id = TR.warehouse_id_out - JOIN Proveedores P USING (Id_Proveedor) - LEFT JOIN Articles a ON a.Id_Article = C.Id_Article - LEFT JOIN Tipos ti ON ti.Id_Tipo = a.tipo_id - LEFT JOIN Trabajadores tra ON tra.Id_Trabajador = ti.Id_Trabajador - WHERE TR.shipment >= datFEC - AND wh IN (TR.warehouse_id_out,0) - AND Id_Proveedor <> 4 - AND C.Id_Article = idART - AND E.Inventario = 0 - AND fuente = 0 - - UNION ALL - - SELECT T.Fecha as Fecha, - NULL as Entrada, - M.Cantidad as Salida, - (IFNULL(ts.alertLevel,0) > 0) as OK, - T.Alias as Alias, - T.Localizacion as Referencia, - T.Id_Ticket as id, - T.PedidoImpreso EtiquetasEmitidas, - C.Calidad, tr.CodigoTrabajador - - FROM Movimientos M - JOIN Tickets T USING (Id_Ticket) - LEFT JOIN vn.ticketState ts ON ts.ticket = T.Id_Ticket - JOIN Clientes C ON C.Id_Cliente = T.Id_Cliente - LEFT JOIN Trabajadores tr ON tr.Id_Trabajador = C.Id_Trabajador - WHERE T.Fecha >= datFEC - AND M.Id_Article = idART - AND wh IN (T.warehouse_id , 0) - - ) AS Historico -ORDER BY Fecha, OK DESC, Entrada DESC; - - END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -30006,223 +27941,6 @@ DELIMITER ; /*!50003 SET character_set_client = @saved_cs_client */ ; /*!50003 SET character_set_results = @saved_cs_results */ ; /*!50003 SET collation_connection = @saved_col_connection */ ; -/*!50003 DROP PROCEDURE IF EXISTS `invoice_newkk` */; -/*!50003 SET @saved_cs_client = @@character_set_client */ ; -/*!50003 SET @saved_cs_results = @@character_set_results */ ; -/*!50003 SET @saved_col_connection = @@collation_connection */ ; -/*!50003 SET character_set_client = utf8 */ ; -/*!50003 SET character_set_results = utf8 */ ; -/*!50003 SET collation_connection = utf8_general_ci */ ; -/*!50003 SET @saved_sql_mode = @@sql_mode */ ; -/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; -DELIMITER ;; -CREATE DEFINER=`root`@`%` PROCEDURE `invoice_newkk`( - customer_id INT, - serie VARCHAR(10), - date_ini DATE, - date_end DATE, - date_invoice DATETIME, - ticket_id INT, - empresa_act INT, - Id_Trabajador INT -) -BEGIN - DECLARE invoice_id VARCHAR(30) DEFAULT NULL; - DECLARE date_vec DATE DEFAULT date_invoice; - DECLARE day_vec INT; - DECLARE bi_r DOUBLE DEFAULT 0; - DECLARE bi_g DOUBLE DEFAULT 0; - DECLARE bi_n DOUBLE DEFAULT 0; - DECLARE iva_r DOUBLE DEFAULT 0; - DECLARE iva_g DOUBLE DEFAULT 0; - DECLARE re_r DOUBLE DEFAULT 0; - DECLARE re_g DOUBLE DEFAULT 0; - DECLARE dblImporte DOUBLE DEFAULT 0; - DECLARE intpais_id TINYINT DEFAULT 1; - DECLARE intFac INTEGER; - - DECLARE EXIT HANDLER FOR SQLEXCEPTION - BEGIN - ROLLBACK; - RESIGNAL; - END; - - SELECT TIMESTAMP (date_ini, '00:00:00') into date_ini; - - SET date_invoice = IFNULL(date_invoice,CURDATE()); - - IF date_invoice >= '2015-12-01' AND empresa_act = 791 AND serie <> 'A' THEN - SIGNAL SQLSTATE '45000' - SET MESSAGE_TEXT ='ERROR_FTH_NO_EXISTE'; - END IF; - - DROP TEMPORARY TABLE IF EXISTS `iva_base`; - CREATE TEMPORARY TABLE `iva_base` - ( - `id` VARCHAR(3) NOT NULL, - `base` DOUBLE NOT NULL DEFAULT 0, - PRIMARY KEY (`id`) - ) - ENGINE = MEMORY; - - DROP TEMPORARY TABLE IF EXISTS `ticket_invoice`; - CREATE TEMPORARY TABLE `ticket_invoice` - ( - `ticket_id` INT NOT NULL, - PRIMARY KEY (`ticket_id`) - ) - ENGINE = MEMORY; - - START TRANSACTION; - - SELECT pais_id INTO intpais_id FROM Proveedores WHERE Id_Proveedor = empresa_act; - - IF ticket_id = 0 THEN - - INSERT INTO ticket_invoice (ticket_id) SELECT Id_Ticket FROM Tickets WHERE (Fecha BETWEEN date_ini - AND DAYEND(date_end)) AND Id_Cliente = customer_id AND Factura IS NULL AND empresa_id = empresa_act ; - - ELSE - - INSERT INTO ticket_invoice (ticket_id) SELECT Id_Ticket FROM Tickets WHERE Id_Ticket = ticket_id - AND Factura IS NULL ; - - END IF; --- Elimina tickets sense moviments - UPDATE Tickets INNER JOIN (SELECT COUNT(Movimientos.Id_Movimiento) AS num, ticket_invoice.ticket_id AS ticket_id - FROM ticket_invoice LEFT JOIN Movimientos ON ticket_invoice.ticket_id = Movimientos.Id_Ticket - GROUP BY ticket_invoice.ticket_id HAVING num = 0) counter - ON Tickets.Id_Ticket = counter.ticket_id SET Tickets.Fecha = '1999-01-01 00:00:00'; - - -- Eliminem els tickets que no han de ser facturats - DELETE ticket_invoice.* FROM ticket_invoice INNER JOIN Tickets ON ticket_invoice.ticket_id = Tickets.Id_Ticket - INNER JOIN Clientes ON Tickets.Id_Cliente = Clientes.Id_cliente WHERE YEAR(Tickets.Fecha) < 2001 AND invoice; - - IF (SELECT COUNT(*) FROM ticket_invoice) > 0 THEN - - INSERT INTO iva_base (id) SELECT tipoiva FROM tblIVA; - - UPDATE iva_base - INNER JOIN - (SELECT tipo, SUM(base) base - FROM - (SELECT t.tipo, red(m.Cantidad * m.Preu * (100 - Descuento) / 100) AS base - FROM - Movimientos m - INNER JOIN ticket_invoice ti ON m.Id_Ticket = ti.ticket_id - INNER JOIN (SELECT t.tipo, Id_Article - FROM - (SELECT - date, iva_codigo_id, ic.tipo, iva_group_id - FROM - iva_group_codigo gi - INNER JOIN iva_codigo ic ON gi.iva_codigo_id = ic.id - INNER JOIN iva_tipo itp ON itp.id = ic.iva_tipo_id - WHERE - date <= date_invoice - AND Id_Pais = intpais_id - ORDER BY date DESC) t - INNER JOIN Articles USING (iva_group_id) - GROUP BY Id_Article) t USING (Id_Article)) sub - GROUP BY tipo) iva_movement ON iva_base.id = iva_movement.tipo - SET - iva_base.base = iva_movement.base; - - IF (serie = 'H' OR serie = 'V' OR serie = 'E' OR serie = 'X') then - SELECT SUM(base) into dblImporte from iva_base; - ELSE - - SET bi_r = (SELECT base FROM iva_base WHERE id = 'R'); - - SET bi_g = (SELECT base FROM iva_base WHERE id = 'G'); - SET bi_n = (SELECT base FROM iva_base WHERE id = '0'); - SET iva_r = red(bi_r * (SELECT iva FROM iva_codigo INNER JOIN iva_tipo it ON it.id = iva_tipo_id - WHERE tipo = 'R' AND Id_Pais = intpais_id AND Fecha <= date_invoice and iva ORDER BY fecha DESC, recargo DESC LIMIT 1) / 100 ); - SET iva_g = red(bi_g * (SELECT iva FROM iva_codigo INNER JOIN iva_tipo it ON it.id = iva_tipo_id - WHERE tipo = 'G' AND Id_Pais = intpais_id AND Fecha <= date_invoice and iva ORDER BY fecha DESC, recargo DESC LIMIT 1) / 100 ); - IF (SELECT IF(RE = 0, FALSE, TRUE) FROM Clientes WHERE Clientes.Id_cliente = customer_id) THEN - - SET re_r = red(bi_r * (SELECT recargo FROM iva_codigo INNER JOIN iva_tipo it ON it.id = iva_tipo_id - WHERE tipo = 'R' AND Id_Pais = intpais_id AND Fecha <= date_invoice and iva ORDER BY fecha DESC, recargo DESC LIMIT 1) / 100 ); - SET re_g = red(bi_g * (SELECT recargo FROM iva_codigo INNER JOIN iva_tipo it ON it.id = iva_tipo_id - WHERE tipo = 'G' AND Id_Pais = intpais_id AND Fecha <= date_invoice and iva ORDER BY fecha DESC, recargo DESC LIMIT 1) / 100 ); - END IF; - SET dblImporte = bi_r + bi_g + bi_n + iva_r + iva_g + re_r + re_g ; - END IF; - - END IF; - - IF dblImporte <> 0 THEN - - SELECT Vencimiento INTO day_vec FROM Clientes WHERE Id_cliente = customer_id; - SET date_vec = TIMESTAMPADD(DAY, day_vec, date_vec); - - -- el trigger añade el siguiente Id_Factura correspondiente a la serie - INSERT INTO Facturas - ( - Id_Factura, - Serie, - Fecha, - Id_Cliente, - BI7, - BI16, - IVA7, - IVA16, - RE1, - RE4, - Importe, - Vencimiento, - empresa_id - ) - VALUES - ( - 1, - serie, - date_invoice, - customer_id, - bi_r, - bi_g, - iva_r, - iva_g, - re_r, - re_g, - dblImporte, - date_vec, - empresa_act - ); - - SET intFac = LAST_INSERT_ID(); - - SELECT Id_Factura INTO invoice_id FROM Facturas - WHERE factura_id = intFac; - - UPDATE Tickets INNER JOIN ticket_invoice ON Tickets.Id_Ticket = ticket_invoice.ticket_id - SET Factura = invoice_id, Etiquetasemitidas = TRUE; - - DROP TEMPORARY TABLE IF EXISTS tmp.updateInter; - CREATE TEMPORARY TABLE tmp.updateInter ENGINE = MEMORY - SELECT s.id,ti.ticket_id,Id_Trabajador - FROM ticket_invoice ti - JOIN vn.ticketState ts ON ti.ticket_id = ts.ticket - JOIN state s - WHERE IFNULL(ts.alertLevel,0) < 3 and s.`code` = vn.getAlert3State(ti.ticket_id); - - INSERT INTO vncontrol.inter(state_id,Id_Ticket,Id_Trabajador) - SELECT * FROM tmp.updateInter; - - INSERT INTO Tickets_dits (idaccion_dits,Id_Trabajador,Id_Ticket,value_old,value_new) - SELECT 111/*Factura serie*/ ,Id_Trabajador,ti.ticket_id,NULL,serie FROM ticket_invoice ti; - END IF; - - DROP TEMPORARY TABLE `iva_base`; - DROP TEMPORARY TABLE `ticket_invoice`; - COMMIT; -END ;; -DELIMITER ; -/*!50003 SET sql_mode = @saved_sql_mode */ ; -/*!50003 SET character_set_client = @saved_cs_client */ ; -/*!50003 SET character_set_results = @saved_cs_results */ ; -/*!50003 SET collation_connection = @saved_col_connection */ ; /*!50003 DROP PROCEDURE IF EXISTS `itemTagArrangedUpdate` */; /*!50003 SET @saved_cs_client = @@character_set_client */ ; /*!50003 SET @saved_cs_results = @@character_set_results */ ; @@ -30261,30 +27979,6 @@ BEGIN call vn2008.itemTagArrangedUpdate(0); -END ;; -DELIMITER ; -/*!50003 SET sql_mode = @saved_sql_mode */ ; -/*!50003 SET character_set_client = @saved_cs_client */ ; -/*!50003 SET character_set_results = @saved_cs_results */ ; -/*!50003 SET collation_connection = @saved_col_connection */ ; -/*!50003 DROP PROCEDURE IF EXISTS `itemTagUpdatePriorityKk` */; -/*!50003 SET @saved_cs_client = @@character_set_client */ ; -/*!50003 SET @saved_cs_results = @@character_set_results */ ; -/*!50003 SET @saved_col_connection = @@collation_connection */ ; -/*!50003 SET character_set_client = utf8 */ ; -/*!50003 SET character_set_results = utf8 */ ; -/*!50003 SET collation_connection = utf8_general_ci */ ; -/*!50003 SET @saved_sql_mode = @@sql_mode */ ; -/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; -DELIMITER ;; -CREATE DEFINER=`root`@`%` PROCEDURE `itemTagUpdatePriorityKk`(IN vItem INT) -BEGIN -/* -* DEPRECATED -*/ - -CALL vn.itemTagUpdatePriority(vItem); - END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -30583,6 +28277,8 @@ DELIMITER ; DELIMITER ;; CREATE DEFINER=`root`@`%` PROCEDURE `item_last_buy_`(v_wh SMALLINT, v_date DATE) BEGIN + +-- DEPRECATED USE vn.buyUltimate -- Ultima compra hasta hoy CALL cache.last_buy_refresh (FALSE); @@ -30629,6 +28325,7 @@ DELIMITER ;; CREATE DEFINER=`root`@`%` PROCEDURE `item_last_buy_from_interval`(v_wh SMALLINT, v_date_ini DATE, v_date_end DATE) BEGIN /** + * DEPRECATED USE vn.buyUltimateFromInterval * Obtiene la ultima compra a partir de un intervalo * de fechas dado. * @@ -31725,114 +29422,6 @@ INNER JOIN Permisos USING(Id_Trabajador) WHERE Id_Grupo = 6 GROUP BY Id_Trabajador, Fecha, Hora; */ -END ;; -DELIMITER ; -/*!50003 SET sql_mode = @saved_sql_mode */ ; -/*!50003 SET character_set_client = @saved_cs_client */ ; -/*!50003 SET character_set_results = @saved_cs_results */ ; -/*!50003 SET collation_connection = @saved_col_connection */ ; -/*!50003 DROP PROCEDURE IF EXISTS `Movimiento_rechazokk` */; -/*!50003 SET @saved_cs_client = @@character_set_client */ ; -/*!50003 SET @saved_cs_results = @@character_set_results */ ; -/*!50003 SET @saved_col_connection = @@collation_connection */ ; -/*!50003 SET character_set_client = utf8 */ ; -/*!50003 SET character_set_results = utf8 */ ; -/*!50003 SET collation_connection = utf8_general_ci */ ; -/*!50003 SET @saved_sql_mode = @@sql_mode */ ; -/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; -DELIMITER ;; -CREATE DEFINER=`root`@`%` PROCEDURE `Movimiento_rechazokk`(IN idMOV BIGINT) -BEGIN --- DEPRECATED use vn.saleSplit - DECLARE idC INT; - DECLARE newFEC DATE; - DECLARE intWarehouse INT; - DECLARE intEmpresa INT; - DECLARE IdConsignatario INT; - DECLARE intIdAgencia INT; - DECLARE Id_NEWTICKET BIGINT; - DECLARE Id_NEWMOVIMIENTO BIGINT; - DECLARE datLanding DATE; - DECLARE v_start DATETIME; - DECLARE v_end DATETIME; - DECLARE intTicketActual INT; - DECLARE SYSTEM_WORKER INT DEFAULT 20; - - SELECT Id_Cliente - , Fecha - , warehouse_id - , empresa_id - , Id_Consigna - , Id_Agencia - , Landing - , Id_Ticket - - INTO idC - , newFEC - , intWarehouse - , intEmpresa - , IdConsignatario - , intIdAgencia - , datLanding - , intTicketActual - - FROM Tickets t - JOIN Movimientos m using(Id_Ticket) - WHERE Id_Movimiento = idMOV; - - -- Busca un ticket existente que coincida con los parametros del nuevo pedido - - SET v_start = TIMESTAMP(newFEC); - SET v_end = TIMESTAMP(newFEC, '23:59:59'); - - SELECT Id_Ticket INTO Id_NEWTICKET - FROM vn2008.Tickets t - WHERE IdConsignatario = t.Id_Consigna - AND intWarehouse = t.warehouse_id - AND intIdAgencia = t.Id_Agencia - AND datLanding <=> t.Landing - AND t.Fecha BETWEEN v_start AND v_end -- uso BETWEEN para aprovechar el indice - AND t.Factura IS NULL - AND t.Localizacion = 'RECHAZO' - AND t.PedidoImpreso = 0 - AND t.Etiquetasemitidas = 0 - AND vn2008.is_bionic(t.Id_Ticket) - AND t.Id_Cliente <> 1118 - AND t.Id_Ticket <> intTicketActual - LIMIT 1; - - IF Id_NEWTICKET IS NULL - THEN - CALL vn.ticketCreate(idC - , newFEC - , intWarehouse - , intEmpresa - , IdConsignatario - , intIdAgencia - , NULL - ,datLanding - , Id_NEWTICKET); - - CALL bionic_calc_ticket(Id_NEWTICKET); - END IF; - - INSERT INTO vncontrol.inter(Id_Ticket, Id_Trabajador, state_id) - SELECT Id_NEWTICKET, SYSTEM_WORKER, s.id - FROM vn2008.state s - WHERE s.code = 'FIXING'; - - INSERT INTO Movimientos(Id_Ticket, Id_Article, Concepte, Cantidad, Preu, Descuento) - SELECT Id_NEWTICKET, Id_Article, Concepte, Cantidad, Preu, Descuento - FROM Movimientos - WHERE Id_Movimiento = idMOV; - - SELECT LAST_INSERT_ID() INTO Id_NEWMOVIMIENTO; - - INSERT INTO Movimientos_componentes(Id_Movimiento, Id_Componente, Valor) - SELECT Id_NEWMOVIMIENTO, Id_Componente, Valor - FROM Movimientos_componentes - WHERE Id_Movimiento = idMOV; - END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -31858,8 +29447,7 @@ BEGIN INSERT INTO Mensajes(Mensaje,Fecha,Remitente,Destinatario) VALUES(memTXT, NOW(),idREM, idDES); - - SELECT LAST_INSERT_ID() INTO last_ID; + SELECT LAST_INSERT_ID() INTO last_ID; INSERT INTO Incidencias(Incidencia,Id_Trabajador,Destino,Fecha,Fecha_Mod) @@ -32646,98 +30234,6 @@ BEGIN DECLARE AUX INT; -DECLARE EXIT HANDLER FOR SQLEXCEPTION BEGIN - GET DIAGNOSTICS CONDITION 2 @errno = MYSQL_ERRNO, @text = MESSAGE_TEXT; - SELECT CONCAT('ERROR ', IFNULL(@errno,0), ': ', ifnull(@text,'texto')); - INSERT INTO vn2008.mail (`to`,`subject`,`text`) VALUES ('jgallego@verdnatura.es', 'error nightly tasks' ,CONCAT('ERROR ', IFNULL(@errno,0), ': ', ifnull(@text,'texto'))); - INSERT INTO vn2008.mail (`to`,`subject`,`text`) VALUES ('pako@verdnatura.es', 'error nightly tasks' ,CONCAT('ERROR ', IFNULL(@errno,0), ': ', ifnull(@text,'texto'))); - -END; - - INSERT INTO vn2008.daily_task_log(consulta) VALUES('arranca el event vn2008.nightly_tasks'); - - SELECT SLEEP(1) INTO AUX; - CALL vn2008.emailYesterdayPurchasesLauncher(); - INSERT INTO vn2008.daily_task_log(consulta) VALUES('emailYesterdayPurchasesLauncher END'); - - SELECT SLEEP(1) INTO AUX; - CALL vn2008.inventory_refresh(); - INSERT INTO vn2008.daily_task_log(consulta) VALUES('inventory refresh END'); - - SELECT SLEEP(1) INTO AUX; - CALL bi.last_buy_id_add; - INSERT INTO vn2008.daily_task_log(consulta) VALUES('last buy id END'); - - SELECT SLEEP(1) INTO AUX; - CALL bi.defaulting(curdate()); - INSERT INTO vn2008.daily_task_log(consulta) VALUES('defaulting END'); - - INSERT INTO vn2008.Colas(Id_Informe,Id_Trabajador) VALUES (11,57); - - SELECT SLEEP(1) INTO AUX; - CALL `bi`.`Ultima_Accion`; - INSERT INTO vn2008.daily_task_log(consulta) VALUES('ultima accion END'); - - SELECT SLEEP(1) INTO AUX; - CALL `bi`.`facturacion_media_anual_update`(); - INSERT INTO vn2008.daily_task_log(consulta) VALUES('facturacion media anual END'); - - SELECT SLEEP(1) INTO AUX; - CALL vn2008.Clientes_calidad; - INSERT INTO vn2008.daily_task_log(consulta) VALUES('clientes calidad END'); - - SELECT SLEEP(1) INTO AUX; - CALL bi.rotacion_update; - INSERT INTO vn2008.daily_task_log(consulta) VALUES('rotation update END'); - - SELECT SLEEP(1) INTO AUX; - CALL bi.rutas_m3_add; - INSERT INTO vn2008.daily_task_log(consulta) VALUES('rutas_m3 END'); - - SELECT SLEEP(1) INTO AUX; - CALL vn2008.tarjetas_credito_0; - INSERT INTO vn2008.daily_task_log(consulta) VALUES('tarjetas credito 0 END'); - - SELECT SLEEP(1) INTO AUX; - CALL bi.comparativa_add(); - INSERT INTO vn2008.daily_task_log(consulta) VALUES('comparativa add END'); - - SELECT SLEEP(1) INTO AUX; - call vn2008.recobro_credito(); -- PAK 12/01/2016 - INSERT INTO vn2008.daily_task_log(consulta) VALUES('recobro_credito END'); - - SELECT SLEEP(1) INTO AUX; - CALL vn2008.accumulatorsReadingDateUpdate(); - INSERT INTO vn2008.daily_task_log(consulta) VALUES('accumulatorsReadingDateUpdate END'); - - SELECT SLEEP(1) INTO AUX; - call vn2008.itemTagArrangedUpdate(0); - INSERT INTO vn2008.daily_task_log(consulta) VALUES('itemTagFormatUpdate END'); - - SELECT SLEEP(1) INTO AUX; - INSERT INTO vn2008.daily_task_log(consulta) VALUES('finalitza el event vn2008.nightly_tasks'); - -END ;; -DELIMITER ; -/*!50003 SET sql_mode = @saved_sql_mode */ ; -/*!50003 SET character_set_client = @saved_cs_client */ ; -/*!50003 SET character_set_results = @saved_cs_results */ ; -/*!50003 SET collation_connection = @saved_col_connection */ ; -/*!50003 DROP PROCEDURE IF EXISTS `nightly_tasksKk` */; -/*!50003 SET @saved_cs_client = @@character_set_client */ ; -/*!50003 SET @saved_cs_results = @@character_set_results */ ; -/*!50003 SET @saved_col_connection = @@collation_connection */ ; -/*!50003 SET character_set_client = utf8 */ ; -/*!50003 SET character_set_results = utf8 */ ; -/*!50003 SET collation_connection = utf8_general_ci */ ; -/*!50003 SET @saved_sql_mode = @@sql_mode */ ; -/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; -DELIMITER ;; -CREATE DEFINER=`root`@`%` PROCEDURE `nightly_tasksKk`() -BEGIN - -DECLARE AUX INT; - DECLARE EXIT HANDLER FOR SQLEXCEPTION BEGIN GET DIAGNOSTICS CONDITION 2 @errno = MYSQL_ERRNO, @text = MESSAGE_TEXT; SELECT CONCAT('ERROR ', IFNULL(@errno,0), ': ', ifnull(@text,'texto')); @@ -32847,248 +30343,6 @@ DELIMITER ; /*!50003 SET character_set_client = @saved_cs_client */ ; /*!50003 SET character_set_results = @saved_cs_results */ ; /*!50003 SET collation_connection = @saved_col_connection */ ; -/*!50003 DROP PROCEDURE IF EXISTS `orderConfirmkk` */; -/*!50003 SET @saved_cs_client = @@character_set_client */ ; -/*!50003 SET @saved_cs_results = @@character_set_results */ ; -/*!50003 SET @saved_col_connection = @@collation_connection */ ; -/*!50003 SET character_set_client = utf8 */ ; -/*!50003 SET character_set_results = utf8 */ ; -/*!50003 SET collation_connection = utf8_general_ci */ ; -/*!50003 SET @saved_sql_mode = @@sql_mode */ ; -/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; -DELIMITER ;; -CREATE DEFINER=`root`@`%` PROCEDURE `orderConfirmkk`(vOrder INT) -BEGIN -/** - * Confirms an order, creating each of its tickets on - * the corresponding date and store. - * - * @param vOrder The order identifier - */ - DECLARE vOk BOOL; - DECLARE vDone BOOL DEFAULT FALSE; - DECLARE vWarehouse INT; - DECLARE vShipment DATETIME; - DECLARE vTicket INT; - DECLARE vNotes VARCHAR(255); - DECLARE vItem INT; - DECLARE vConcept VARCHAR(30); - DECLARE vAmount INT; - DECLARE vPrice DECIMAL(10,2); - DECLARE vSale INT; - DECLARE vRate INT; - DECLARE vEmployee INT; - DECLARE vRowId INT; - DECLARE vDelivery DATE; - DECLARE vAddress INT; - DECLARE vAgency INT; - DECLARE vIsConfirmed BOOL; - DECLARE vClientId INT; - DECLARE vCompanyId INT; - DECLARE vAgencyModeId INT; - - DECLARE TICKET_FREE INT DEFAULT 2; - DECLARE SYSTEM_WORKER INT DEFAULT 20; - - DECLARE cDates CURSOR FOR - SELECT t.Fecha_envio, r.warehouse_id - FROM `order` o - JOIN order_row r ON r.order_id = o.id - LEFT JOIN vn2008.travel_tree t ON t.warehouse_id = r.warehouse_id - WHERE o.id = vOrder AND r.amount != 0 - GROUP BY warehouse_id; - - DECLARE cRows CURSOR FOR - SELECT r.id, r.item_id, a.Article, r.amount, r.price, r.rate - FROM order_row r - JOIN vn2008.Articles a ON a.Id_Article = r.item_id - WHERE r.amount != 0 - AND r.warehouse_id = vWarehouse - AND r.order_id = vOrder - ORDER BY r.rate DESC; - - DECLARE CONTINUE HANDLER FOR NOT FOUND - SET vDone = TRUE; - - DECLARE EXIT HANDLER FOR SQLEXCEPTION - BEGIN - ROLLBACK; - RESIGNAL; - END; - - -- Carga los datos del pedido - - SELECT o.date_send, o.address_id, o.note, a.agency_id, - o.confirmed, cs.Id_Cliente, o.company_id, o.agency_id - INTO vDelivery, vAddress, vNotes, vAgency, - vIsConfirmed, vClientId, vCompanyId, vAgencyModeId - FROM hedera.`order` o - JOIN vn2008.Agencias a ON a.Id_Agencia = o.agency_id - JOIN vn2008.Consignatarios cs ON cs.Id_Consigna = o.address_id - WHERE id = vOrder; - - -- Comprueba que el pedido no está confirmado - - IF vIsConfirmed THEN - CALL util.throw ('ORDER_ALREADY_CONFIRMED'); - END IF; - - -- Comprueba que el pedido no está vacío - - SELECT COUNT(*) > 0 INTO vOk - FROM order_row WHERE order_id = vOrder AND amount > 0; - - IF !vOk THEN - CALL util.throw ('ORDER_EMPTY'); - END IF; - - -- Carga las fechas de salida de cada almacén - - CALL vn2008.travel_tree (vDelivery, vAddress, vAgency); - - -- Trabajador que realiza la acción - - SELECT Id_Trabajador INTO vEmployee - FROM vn2008.Trabajadores - WHERE user_id = account.userGetId(); - - IF vEmployee IS NULL THEN - SELECT employeeFk INTO vEmployee FROM orderConfig; - END IF; - - -- Crea los tickets del pedido - - START TRANSACTION; - - OPEN cDates; - - lDates: - LOOP - SET vTicket = NULL; - SET vDone = FALSE; - FETCH cDates INTO vShipment, vWarehouse; - - IF vDone THEN - LEAVE lDates; - END IF; - - -- Busca un ticket existente que coincida con los parametros del nuevo pedido - - SELECT Id_Ticket INTO vTicket - FROM vn2008.Tickets t - LEFT JOIN vn.ticketState tls on tls.ticket = t.Id_Ticket - JOIN `order` o - ON o.address_id = t.Id_Consigna - AND vWarehouse = t.warehouse_id - AND o.agency_id = t.Id_Agencia - AND t.landing = o.date_send - AND vShipment = DATE(t.Fecha) - WHERE o.id = vOrder - AND t.Factura IS NULL - AND IFNULL(tls.alertLevel,0) = 0 - AND t.Id_Cliente <> 1118 - LIMIT 1; - - -- Crea el ticket en el caso de no existir uno adecuado - - IF vTicket IS NULL - THEN - CALL vn.ticketCreate ( - vClientId, - IFNULL(vShipment, CURDATE()), - vWarehouse, - vCompanyId, - vAddress, - vAgencyModeId, - NULL, - vDelivery, - vTicket - ); - ELSE - INSERT INTO vncontrol.inter - SET Id_Ticket = vTicket, - Id_Trabajador = SYSTEM_WORKER, - state_id = TICKET_FREE; - END IF; - - INSERT IGNORE INTO vn2008.order_Tickets - SET order_id = vOrder, - Id_Ticket = vTicket; - - -- Añade las notas - - IF vNotes IS NOT NULL AND vNotes != '' - THEN - INSERT INTO vn2008.ticket_observation (Id_Ticket, observation_type_id, text) - VALUES (vTicket, 4/*comercial*/ , vNotes) - ON DUPLICATE KEY UPDATE text = CONCAT(VALUES(text),'. ', text); - END IF; - - -- Añade los movimientos y sus componentes - - OPEN cRows; - - lRows: - LOOP - SET vDone = FALSE; - FETCH cRows INTO vRowId, vItem, vConcept, vAmount, vPrice, vRate; - - IF vDone THEN - LEAVE lRows; - END IF; - - INSERT INTO vn2008.Movimientos - SET - Id_Article = vItem, - Id_Ticket = vTicket, - Concepte = vConcept, - Cantidad = vAmount, - Preu = vPrice, - CostFixat = 0, - PrecioFijado = TRUE; - - SET vSale = LAST_INSERT_ID(); - - INSERT INTO vn2008.Movimientos_componentes (Id_Movimiento, Id_Componente, Valor) - SELECT vSale, cm.component_id, cm.price - FROM order_component cm - JOIN bi.tarifa_componentes tc ON tc.Id_Componente = cm.component_id - WHERE cm.order_row_id = vRowId - GROUP BY vSale, cm.component_id; - - UPDATE order_row SET Id_Movimiento = vSale - WHERE id = vRowId; - - END LOOP; - - CLOSE cRows; - - -- Fija el Costfixat - - UPDATE vn2008.Movimientos m - JOIN (SELECT SUM(mc.Valor) sum_valor,mc.Id_Movimiento - FROM vn2008.Movimientos_componentes mc - JOIN bi.tarifa_componentes tc USING(Id_Componente) - JOIN bi.tarifa_componentes_series tcs on tcs.tarifa_componentes_series_id = tc.tarifa_componentes_series_id AND tcs.base - JOIN vn2008.Movimientos m ON m.Id_Movimiento = mc.Id_Movimiento - WHERE m.Id_Ticket = vTicket - GROUP BY mc.Id_Movimiento) mc ON mc.Id_Movimiento = m.Id_Movimiento - SET m.CostFixat = sum_valor; - END LOOP; - - CLOSE cDates; - - DELETE FROM basketOrder WHERE orderFk = vOrder; - UPDATE `order` SET confirmed = TRUE, confirm_date = NOW() - WHERE id = vOrder; - - COMMIT; -END ;; -DELIMITER ; -/*!50003 SET sql_mode = @saved_sql_mode */ ; -/*!50003 SET character_set_client = @saved_cs_client */ ; -/*!50003 SET character_set_results = @saved_cs_results */ ; -/*!50003 SET collation_connection = @saved_col_connection */ ; /*!50003 DROP PROCEDURE IF EXISTS `pay` */; /*!50003 SET @saved_cs_client = @@character_set_client */ ; /*!50003 SET @saved_cs_results = @@character_set_results */ ; @@ -33207,159 +30461,6 @@ UPDATE Clientes SET percentil = 0; UPDATE Clientes INNER JOIN previa USING(Id_Cliente) SET Clientes.percentil = ROUND(Posicion *100 / max_range,0); -END ;; -DELIMITER ; -/*!50003 SET sql_mode = @saved_sql_mode */ ; -/*!50003 SET character_set_client = @saved_cs_client */ ; -/*!50003 SET character_set_results = @saved_cs_results */ ; -/*!50003 SET collation_connection = @saved_col_connection */ ; -/*!50003 DROP PROCEDURE IF EXISTS `portekk` */; -/*!50003 SET @saved_cs_client = @@character_set_client */ ; -/*!50003 SET @saved_cs_results = @@character_set_results */ ; -/*!50003 SET @saved_col_connection = @@collation_connection */ ; -/*!50003 SET character_set_client = utf8 */ ; -/*!50003 SET character_set_results = utf8 */ ; -/*!50003 SET collation_connection = utf8_general_ci */ ; -/*!50003 SET @saved_sql_mode = @@sql_mode */ ; -/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; -DELIMITER ;; -CREATE DEFINER=`root`@`%` PROCEDURE `portekk`(IN intId_Ticket INT,IN intbultos INT, IN intId_Article INT) -BEGIN - - -- Deprecated!! Usar la funcion porte en lugar de este procedure - DECLARE intId_Agencia INT; - DECLARE int_agency_id SMALLINT; - DECLARE int_province_id SMALLINT; - DECLARE bolCOD71 TINYINT(1); - DECLARE intPorte DOUBLE DEFAULT -1; - DECLARE dayofweek TINYINT(1) default 0; - DECLARE suplemento DOUBLE DEFAULT 9.41; - DECLARE strCodPostal VARCHAR(5); - DECLARE intWarehouse_id SMALLINT; - DECLARE dbldescuento DOUBLE DEFAULT 0; - DECLARE intVista TINYINT(1); - DECLARE dblvolumen DOUBLE; - DECLARE intPROVINCIA INT; - - SET @porte := 0; - SELECT c.province_id, a.agency_id, t.Id_Agencia, cod71, Porte,c.CODPOSTAL,t.warehouse_id,c.province_id,cli.Descuento,IFNULL(ag.Vista,a.Vista), por_volumen - INTO intPROVINCIA, int_agency_id,intId_Agencia, bolCOD71,intPorte,strCodPostal,intWarehouse_id,int_province_id,dbldescuento,intVista,dblvolumen - FROM Tickets t - JOIN Consignatarios c USING(Id_Consigna) - JOIN Agencias a ON t.Id_Agencia = a.Id_Agencia - JOIN agency agn ON agn.agency_id = a.agency_id - JOIN Clientes cli on c.Id_Cliente=cli.Id_Cliente - LEFT JOIN agency_warehouse ag ON ag.agency_id = a.agency_id - WHERE Id_Ticket = intId_Ticket limit 1; --- Fusionar con lo de arriba -/*SELECT IFNULL(MAX(counter),0) +1 INTO intcounter FROM expeditions e - INNER JOIN Tickets t1 ON e.ticket_id = t1.Id_Ticket - INNER JOIN Tickets t2 ON t2.Id_Consigna = t1.Id_Consigna AND DATE(t2.Fecha) = DATE(t1.Fecha) - WHERE t2.Id_Ticket = NEW.ticket_id AND t1.Etiquetasemitidas = FALSE AND t1.empresa_id = t2.empresa_id;*/ - - - IF (intPorte >= 0 or dbldescuento BETWEEN 0 AND 1 ) THEN - IF intPorte or base_ticket(intId_Ticket) < 50 THEN - SELECT IFNULL(intPorte,10)/intbultos price;/*en el cas dels tarifa 1 els cobren 10€ de ports*/ - ELSE - SELECT 0 price; - END IF; - ELSE - IF NOT dblvolumen THEN - IF bolCOD71 THEN - IF intVista = 2 AND intbultos BETWEEN 1 AND 2 THEN - SELECT IF(price * intbultos < 10 AND porte_minimo, 10 / intbultos, price) price FROM Agencias_zonas az - WHERE zona = 1 AND Id_Agencia = intId_Agencia AND az.warehouse_id = intWarehouse_id; - ELSE - IF intId_Agencia = 47 THEN -- Si es viaxpress - SELECT price price FROM Agencias_zonas az INNER JOIN viaxpress USING(zona) - WHERE Id_Agencia = 47 AND codigo_postal = strCodPostal AND az.warehouse_id = intWarehouse_id; - ELSE - CALL util.exec (sql_printf (' - SELECT price FROM vn2008.Agencias_zonas az - WHERE Id_Agencia = %v AND %v = Id_Article AND az.warehouse_id = %v - AND zona = (SELECT zona FROM vn2008.Agencias_province - WHERE warehouse_id = %v AND agency_id = %v and province_id = %v)' - ,intId_Agencia,intId_Article,intWarehouse_id,intWarehouse_id,int_agency_id,int_province_id)); - END IF; - END IF; - ELSE - SELECT 0 price; - END IF; - ELSE -- Si es una agency con la columna por_volumen <> 0 calcula el porte por Volumen - - CALL ticket_volumen(intId_Ticket); - SELECT MAX(Porte_total)/intbultos price FROM ticket_volumen; - DROP TEMPORARY TABLE IF EXISTS ticket_volumen; - END IF; - END IF; - - - SET @porte = price; -END ;; -DELIMITER ; -/*!50003 SET sql_mode = @saved_sql_mode */ ; -/*!50003 SET character_set_client = @saved_cs_client */ ; -/*!50003 SET character_set_results = @saved_cs_results */ ; -/*!50003 SET collation_connection = @saved_col_connection */ ; -/*!50003 DROP PROCEDURE IF EXISTS `PortesDesdeTicketkk` */; -/*!50003 SET @saved_cs_client = @@character_set_client */ ; -/*!50003 SET @saved_cs_results = @@character_set_results */ ; -/*!50003 SET @saved_col_connection = @@collation_connection */ ; -/*!50003 SET character_set_client = utf8 */ ; -/*!50003 SET character_set_results = utf8 */ ; -/*!50003 SET collation_connection = utf8_general_ci */ ; -/*!50003 SET @saved_sql_mode = @@sql_mode */ ; -/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; -DELIMITER ;; -CREATE DEFINER=`root`@`%` PROCEDURE `PortesDesdeTicketkk`( intTicket INTEGER) -BEGIN - -- DEPRECATED! con el bionic esto ya no se usa - DECLARE done BIT DEFAULT 0; - DECLARE v_date_ini,v_date_end DATE; - -- JGF 21/08/14 A partir de un intTicket se calcula lo que se ha cobrado en concepto de portes - -- restando la tarifa dos en esa fecha al valor del ticket - DROP TEMPORARY TABLE IF EXISTS portes; - IF (SELECT Descuento FROM Clientes c JOIN Tickets t ON t.Id_Cliente = c.Id_Cliente WHERE t.Id_Ticket = intTicket) BETWEEN 0 AND 1 THEN - SELECT TIMESTAMPADD(MONTH,-12,Fecha),Fecha INTO v_date_ini,v_date_end FROM Tickets WHERE Id_Ticket = intTicket LIMIT 1; - - - CREATE TEMPORARY TABLE portes (KEY (Id_Article)) ENGINE = MEMORY - SELECT Id_Article,round(SUM(Preu * (1 - (Descuento / 100)) * Cantidad)/ SUM(Cantidad),2) price, round(SUM(Preu * (1 - (Descuento / 100)) * Cantidad),2) importe, - round((SUM(Preu * (1 - (Descuento / 100)) * Cantidad) / SUM(Cantidad) - Tarifa2) * SUM(Cantidad),2) diferencia,Tarifa2, - v_date_end Fecha,SUM(Cantidad) Cantidad - FROM - (SELECT * FROM ( - SELECT m.Id_Article, Tarifa2,m.Preu,m.Descuento,m.Cantidad,t.Fecha,t.warehouse_id,Id_Movimiento - FROM Compres c - JOIN Movimientos m ON m.Id_Article = c.Id_Article - JOIN Articles a ON a.Id_Article = c.Id_Article - JOIN Tipos tp ON tp.tipo_id = a.tipo_id - JOIN Tickets t ON t.Id_Ticket = m.Id_Ticket - JOIN Entradas e ON e.Id_Entrada = c.Id_Entrada - JOIN travel tr ON tr.id = e.travel_id - WHERE t.Id_Ticket = intTicket AND Novincular = FALSE AND Tarifa2 > 0 - AND t.warehouse_id = tr.warehouse_id AND tr.landing BETWEEN v_date_ini AND v_date_end - AND reino_id <> 6 ORDER BY tr.landing DESC) t - GROUP BY t.Id_Movimiento) t - GROUP BY Id_Article, warehouse_id - UNION all - SELECT Id_Article,Preu * (1 - (Descuento / 100)) ,Preu * (1 - (Descuento / 100)) * Cantidad , - Preu * (1 - (Descuento / 100)) * Cantidad ,0 ,v_date_end, Cantidad FROM Movimientos - WHERE Id_Ticket= intTicket AND Id_Article = 71; - - UPDATE portes p JOIN price_fixed pf ON p.Id_Article = pf.item_id AND Fecha BETWEEN date_start AND date_end AND pf.rate_2 - SET diferencia = (price - rate_2) * Cantidad,Tarifa2 = rate_2; - ELSE - CREATE TEMPORARY TABLE portes (KEY (Id_Article)) ENGINE = MEMORY - SELECT Id_Article,Preu * (1 - (Descuento / 100)) price,Preu * (1 - (Descuento / 100)) * Cantidad importe, - Preu * (1 - (Descuento / 100)) * Cantidad diferencia,0 Tarifa2, Cantidad FROM Movimientos - WHERE Id_Ticket= intTicket AND Id_Article = 71; - END IF; - -- SELECT * FROM vn2008.portes; - - -- SELECT NULL, NULL, NULL, sum(diferencia) as Porte, NULL FROM portes p; - END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -33654,6 +30755,7 @@ DELIMITER ;; CREATE DEFINER=`root`@`%` PROCEDURE `production_buffer_problems`() BEGIN /** + * @deprecated Use vn.ticketGetProblems * Necesita la tabla tmp.ticket_list */ DECLARE vToday DATETIME; @@ -34782,177 +31884,6 @@ BEGIN DROP TEMPORARY TABLE saldos_iniciales; DROP TEMPORARY TABLE rowsToDelete; -END ;; -DELIMITER ; -/*!50003 SET sql_mode = @saved_sql_mode */ ; -/*!50003 SET character_set_client = @saved_cs_client */ ; -/*!50003 SET character_set_results = @saved_cs_results */ ; -/*!50003 SET collation_connection = @saved_col_connection */ ; -/*!50003 DROP PROCEDURE IF EXISTS `proveedores_saldoskk` */; -/*!50003 SET @saved_cs_client = @@character_set_client */ ; -/*!50003 SET @saved_cs_results = @@character_set_results */ ; -/*!50003 SET @saved_col_connection = @@collation_connection */ ; -/*!50003 SET character_set_client = utf8 */ ; -/*!50003 SET character_set_results = utf8 */ ; -/*!50003 SET collation_connection = utf8_general_ci */ ; -/*!50003 SET @saved_sql_mode = @@sql_mode */ ; -/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; -DELIMITER ;; -CREATE DEFINER=`root`@`%` PROCEDURE `proveedores_saldoskk`() -BEGIN - - - -DROP TEMPORARY TABLE IF EXISTS proveedores_pendientes; - -CREATE TEMPORARY TABLE proveedores_pendientes -( proveedor_id INT NOT NULL -, empresa_id INT NOT NULL -, saldo double NOT NULL -, moneda_id INT NOT NULL -, PRIMARY KEY(proveedor_id, empresa_id, moneda_id)); - -INSERT INTO proveedores_pendientes -SELECT id_proveedor, empresa_id, sum(importe) as saldo, id_moneda as moneda_id - FROM - ( - SELECT - p.id_proveedor, - p.empresa_id, - - if(p.id_moneda = 1, p.importe, p.divisa) as importe, - p.id_moneda - - FROM - pago p - - WHERE - - p.fecha > '2014-12-31' - - UNION ALL - - SELECT - r.proveedor_id, - r.empresa_id, - if(r.moneda_id = 1, rv.cantidad, rv.divisa) AS Total, - r.moneda_id - - FROM - recibida r - INNER JOIN recibida_vencimiento rv ON r.id = rv.recibida_id - WHERE r.fecha > '2014-12-31' AND r.contabilizada - ) sub - GROUP BY empresa_id, id_proveedor, moneda_id - having saldo > 0; - - - - DROP TEMPORARY TABLE IF EXISTS vencimientos_pendientes_aux; - - CREATE TEMPORARY TABLE vencimientos_pendientes_aux - (vencimiento_id INT, id INT auto_increment - ,fecha DATE - ,proveedor_id INT NOT NULL - ,empresa_id INT NOT NULL - ,importe double NOT NULL - ,moneda_id INT NOT NULL - ,pendiente DOUBLE DEFAULT 0 - ,PRIMARY KEY(id)); - - SET @imp:= 0; - - INSERT INTO vencimientos_pendientes_aux(vencimiento_id - , fecha - , proveedor_id - , empresa_id - , importe - , moneda_id - , pendiente) - - - - SELECT rv.id - , rv.fecha - , r.proveedor_id - , r.empresa_id - , @imp:= if(r.moneda_id = 1, rv.cantidad, rv.divisa) as importe - , r.moneda_id - , pp.saldo - FROM recibida r - INNER JOIN recibida_vencimiento rv ON r.id = rv.recibida_id - JOIN proveedores_pendientes pp ON pp.proveedor_id = r.proveedor_id AND pp.empresa_id = r.empresa_id AND pp.moneda_id = r.moneda_id - WHERE r.fecha > '2010-12-31' - and rv.fecha > TIMESTAMPADD(MONTH,-3,CURDATE()) - and r.contabilizada; - - - DROP TEMPORARY TABLE IF EXISTS vencimientos_pendientes; - - CREATE TEMPORARY TABLE vencimientos_pendientes - (vencimiento_id INT, id INT , id2 INT auto_increment - ,fecha DATE - ,proveedor_id INT NOT NULL - ,empresa_id INT NOT NULL - ,importe double NOT NULL - ,moneda_id INT NOT NULL - ,pendiente DOUBLE DEFAULT 0 - ,saldo DOUBLE - ,PRIMARY KEY(id2)); - - - - INSERT INTO vencimientos_pendientes(vencimiento_id - , id - , fecha - , proveedor_id - , empresa_id - , importe - , moneda_id - , pendiente - , saldo) - - - - SELECT vencimiento_id, id, fecha, proveedor_id, empresa_id, importe, moneda_id, 0, pp.saldo - FROM vencimientos_pendientes_aux vp - JOIN proveedores_pendientes pp USING(proveedor_id, empresa_id, moneda_id) - ORDER BY proveedor_id, empresa_id, moneda_id, fecha DESC, importe; - - DROP TEMPORARY TABLE vencimientos_pendientes_aux; - - - -- Ahora, al fin, calculamos el importe pendiente para cada recibo en orden descendente - - -- Cogemos los valores del primer registro como semilla - SELECT proveedor_id, empresa_id, saldo, moneda_id, 0 - INTO @prov, @emp, @saldo, @moneda, @pend - FROM vencimientos_pendientes WHERE id2 = 1; - - - UPDATE vencimientos_pendientes - SET saldo = @saldo:= IF(@emp <> empresa_id OR @prov <>proveedor_id OR @moneda <> moneda_id,saldo,@saldo) -- si hay cambio de empresa o proveedor o moneda, el saldo se reinicia - , pendiente = @pend:= IF(saldo >= importe AND saldo > 0, importe, saldo) - , saldo = @saldo:= @saldo - @pend - , empresa_id = @emp:= empresa_id - , proveedor_id = @prov:= proveedor_id - , moneda_id = @moneda:= moneda_id; - - SELECT vp.vencimiento_id - , vp.fecha - , vp.proveedor_id - , vp.empresa_id - , vp.moneda_id - , vp.importe - , vp.pendiente - , pp.saldo - FROM vencimientos_pendientes vp - JOIN proveedores_pendientes pp USING(proveedor_id, empresa_id, moneda_id) - WHERE pendiente > 0; - - DROP TEMPORARY TABLE vencimientos_pendientes; - DROP TEMPORARY TABLE proveedores_pendientes; - - END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -38821,52 +35752,6 @@ REPEAT UNTIL done END REPEAT; -END ;; -DELIMITER ; -/*!50003 SET sql_mode = @saved_sql_mode */ ; -/*!50003 SET character_set_client = @saved_cs_client */ ; -/*!50003 SET character_set_results = @saved_cs_results */ ; -/*!50003 SET collation_connection = @saved_col_connection */ ; -/*!50003 DROP PROCEDURE IF EXISTS `ticket_ivakk` */; -/*!50003 SET @saved_cs_client = @@character_set_client */ ; -/*!50003 SET @saved_cs_results = @@character_set_results */ ; -/*!50003 SET @saved_col_connection = @@collation_connection */ ; -/*!50003 SET character_set_client = utf8 */ ; -/*!50003 SET character_set_results = utf8 */ ; -/*!50003 SET collation_connection = utf8_general_ci */ ; -/*!50003 SET @saved_sql_mode = @@sql_mode */ ; -/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; -DELIMITER ;; -CREATE DEFINER=`root`@`%` PROCEDURE `ticket_ivakk`(vBillingDate DATE) - READS SQL DATA -BEGIN -/** - * Calcula la base imponible, el IVA y el recargo de equivalencia para - * un conjunto de tickets. - * - * @deprecated Use procedure vn.ticketGetTax() instead - * - * @table ticket_tmp(ticket_id) Tabla con el listado de tickets - * @param billing_date Fecha de facturación - * @treturn ticket_iva - */ - DROP TEMPORARY TABLE IF EXISTS tmp.ticket; - CREATE TEMPORARY TABLE tmp.ticket - (INDEX (ticketFk)) - ENGINE = MEMORY - SELECT ticket_id ticketFk FROM ticket_tmp; - - CALL vn.ticketGetTax (); - - CREATE TEMPORARY TABLE ticket_iva - (INDEX (ticket_id)) - ENGINE = MEMORY - SELECT ticketFk ticket_id, type tipo, taxBase bi, tax iva, equalizationTax re - FROM tmp.ticketTax; - - DROP TEMPORARY TABLE - tmp.ticketTax, - tmp.ticket; END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -39068,42 +35953,6 @@ DELIMITER ; /*!50003 SET character_set_client = @saved_cs_client */ ; /*!50003 SET character_set_results = @saved_cs_results */ ; /*!50003 SET collation_connection = @saved_col_connection */ ; -/*!50003 DROP PROCEDURE IF EXISTS `ticket_totalkk` */; -/*!50003 SET @saved_cs_client = @@character_set_client */ ; -/*!50003 SET @saved_cs_results = @@character_set_results */ ; -/*!50003 SET @saved_col_connection = @@collation_connection */ ; -/*!50003 SET character_set_client = utf8 */ ; -/*!50003 SET character_set_results = utf8 */ ; -/*!50003 SET collation_connection = utf8_general_ci */ ; -/*!50003 SET @saved_sql_mode = @@sql_mode */ ; -/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; -DELIMITER ;; -CREATE DEFINER=`root`@`%` PROCEDURE `ticket_totalkk`() -BEGIN -/** - * Calcula el total con IVA de un conjunto de tickets. - * - * @deprecated Use procedure vn.ticketGetTotal() instead - * - * @table ticket_tmp(ticket_id) Tabla con el listado de tickets - * @return table ticket_total - */ - CALL ticket_iva (NULL); - - DROP TEMPORARY TABLE IF EXISTS ticket_total; - CREATE TEMPORARY TABLE ticket_total - (INDEX (ticket_id)) - ENGINE = MEMORY - SELECT ticket_id, red(SUM(bi + iva + re)) AS total - FROM ticket_iva GROUP BY ticket_id; - - DROP TEMPORARY TABLE ticket_iva; -END ;; -DELIMITER ; -/*!50003 SET sql_mode = @saved_sql_mode */ ; -/*!50003 SET character_set_client = @saved_cs_client */ ; -/*!50003 SET character_set_results = @saved_cs_results */ ; -/*!50003 SET collation_connection = @saved_col_connection */ ; /*!50003 DROP PROCEDURE IF EXISTS `ticket_volumen` */; /*!50003 SET @saved_cs_client = @@character_set_client */ ; /*!50003 SET @saved_cs_results = @@character_set_results */ ; @@ -39756,213 +36605,6 @@ BEGIN DROP TEMPORARY TABLE IF EXISTS Traslados; -END ;; -DELIMITER ; -/*!50003 SET sql_mode = @saved_sql_mode */ ; -/*!50003 SET character_set_client = @saved_cs_client */ ; -/*!50003 SET character_set_results = @saved_cs_results */ ; -/*!50003 SET collation_connection = @saved_col_connection */ ; -/*!50003 DROP PROCEDURE IF EXISTS `trasladoKK` */; -/*!50003 SET @saved_cs_client = @@character_set_client */ ; -/*!50003 SET @saved_cs_results = @@character_set_results */ ; -/*!50003 SET @saved_col_connection = @@collation_connection */ ; -/*!50003 SET character_set_client = utf8 */ ; -/*!50003 SET character_set_results = utf8 */ ; -/*!50003 SET collation_connection = utf8_general_ci */ ; -/*!50003 SET @saved_sql_mode = @@sql_mode */ ; -/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; -DELIMITER ;; -CREATE DEFINER=`root`@`%` PROCEDURE `trasladoKK`(IN i_entrada INTEGER) -BEGIN - DECLARE dateShipment DATE; - DECLARE dateLanding DATE; - DECLARE warehouseShipment INTEGER; - DECLARE warehouseLanding INTEGER; - DECLARE v_calc_available INTEGER; - DECLARE v_calc_visible INTEGER; - - - SELECT shipment, landing, warehouse_id_out, warehouse_id - INTO dateShipment, dateLanding, warehouseShipment, warehouseLanding - FROM travel t JOIN Entradas e ON t.id = e.travel_id - WHERE Id_Entrada = i_entrada; - - CALL buy_tarifas_table(i_entrada); - - -- Traslado en almacen origen - - DROP TEMPORARY TABLE IF EXISTS buy_edi_temp; - - CREATE TEMPORARY TABLE buy_edi_temp - (KEY (Id_Article)) ENGINE = MEMORY - - SELECT * - FROM (SELECT c.Id_Article, c.Id_Compra - FROM Compres c INNER JOIN Entradas e USING(Id_Entrada) - INNER JOIN travel t ON t.id = e.travel_id - WHERE t.landing BETWEEN date_inv() AND dateShipment - AND c.Novincular = FALSE - AND c.Tarifa2 >= 0 - ORDER BY (warehouseShipment = t.warehouse_id) DESC, t.landing DESC) t - GROUP BY Id_Article; - - IF dateShipment >= CURDATE() THEN - - CALL availableTraslate(warehouseShipment, dateShipment,NULL); - CALL `cache`.visible_refresh(v_calc_visible,TRUE,warehouseShipment); - DROP TEMPORARY TABLE IF EXISTS tmp_item; - CREATE TEMPORARY TABLE tmp_item (UNIQUE INDEX i USING HASH (item_id)) ENGINE = MEMORY - SELECT item_id, visible,0 available FROM `cache`.visible WHERE calc_id = v_calc_visible; - INSERT INTO tmp_item(item_id, available) - SELECT a.item_id, a.available FROM availableTraslate a - ON DUPLICATE KEY UPDATE available = a.available; - ELSE - CALL item_stock(warehouseShipment, dateShipment,NULL); - END IF; - - DROP TEMPORARY TABLE IF EXISTS Traslados; - CREATE TEMPORARY TABLE Traslados ENGINE MEMORY - SELECT tp.Id_Tipo AS Tipo, - - tp.reino_id, - - ar.tipo_id, - - ar.Id_Article AS article_id, - - ar.Article, - - ar.Medida, - - ar.Categoria, - - ar.Color, - - Origen.abreviatura as Origen, - - CE.Cantidad, - - ar.Tallos, - - CAST(AIM.visible AS DECIMAL(10,0)) as vis1, - - CAST(AIM.available AS DECIMAL(10,0)) as dis1, - - 0 as vis2, - - 0 as dis2, - - IFNULL(CE.grouping,C.grouping) as grouping, - - IFNULL(CE.Packing,C.Packing) as Packing, - - IFNULL(CE.caja,C.caja) as caja, - - IFNULL(C.Productor, P2.Alias) AS Productor, - - C.Id_Cubo, - - 1 Tinta, - - CE.Id_Compra, - - CE.Etiquetas, - - C.buy_edi_id, - - tp.Id_Trabajador, - - CB.Volumen, - - CB.x, CB.y, CB.z, - - IFNULL(C.Costefijo,0) Costefijo, - - IFNULL(C.Comisionfija,0) Comisionfija, - - IFNULL(C.Portefijo,0) Portefijo, - - A.m3, - - E.comision, - - CB.Retornable, - - IFNULL(CEB.Valor,CB.Valor) Valor, - - t3, t2, tp.promo, - - C.grouping groupingOrigin, - - C.Packing PackingOrigin, - - C.Id_Compra CompraOrigin - - FROM Articles ar - LEFT JOIN tmp_item AIM ON AIM.item_id = ar.Id_Article - LEFT JOIN Tipos tp ON tp.tipo_id = ar.tipo_id - LEFT JOIN Origen ON Origen.id = ar.id_origen - LEFT JOIN buy_edi_temp lb ON lb.Id_Article = ar.Id_Article - LEFT JOIN Compres C ON C.Id_Compra = lb.Id_Compra - LEFT JOIN Cubos CB ON CB.Id_Cubo = C.Id_Cubo - LEFT JOIN Entradas E2 ON E2.Id_Entrada = C.Id_Entrada - LEFT JOIN Proveedores P2 ON P2.Id_Proveedor = E2.Id_Proveedor - LEFT JOIN Entradas E ON E.Id_Entrada = i_entrada - LEFT JOIN travel TR ON TR.id = E.travel_id - LEFT JOIN Agencias A ON A.Id_Agencia = TR.agency_id - LEFT JOIN Compres CE ON CE.Id_Article = ar.Id_Article AND CE.Id_Entrada = i_entrada - LEFT JOIN Cubos CEB ON CEB.Id_Cubo = CE.Id_Cubo - LEFT JOIN tblTARIFAS ON TRUE - WHERE tp.reino_id <> 6 AND tp.reino_id <> 8 - AND E.Redada = FALSE; - - CREATE INDEX tindex USING HASH ON Traslados (article_id); - --- Inventario en el warehouse destino - IF dateShipment >= CURDATE() THEN - - CALL cache.visible_refresh(v_calc_visible, TRUE, warehouseLanding); - CALL availableTraslate(warehouseLanding, dateLanding,warehouseShipment); - - UPDATE Traslados t - LEFT JOIN availableTraslate a ON t.article_id = a.item_id - LEFT JOIN `cache`.visible v ON v.calc_id = v_calc_visible AND t.article_id = v.item_id - SET vis2 = v.visible, dis2 = a.available; - - END IF; --- --------------------------------------------- - - SELECT t.*, - - Cantidad - MOD(Cantidad , grouping) as Subcantidad, - - MOD(Cantidad , grouping) as Soll, - - (IF(Volumen > 0,Volumen,x * y * IF(z = 0, Medida + 10, z))) / Packing as cm3, - - Costefijo + Comisionfija + Portefijo AS Cost, - - @porte := ROUND((IF(Volumen > 0,Volumen,x * y * IF(z = 0, Medida + 10, z))) * m3 / 1000000 / Packing ,3) AS Porte, - - @comision := ROUND((Costefijo + Comisionfija + Portefijo) * comision / 100 ,3) AS Comision, - - @embalaje := IF(Retornable != 0, 0,ROUND(Valor / Packing,3)) AS Embalaje, - - @coste := IFNULL((Costefijo + Comisionfija + Portefijo),0) + IFNULL(@embalaje,0) + IFNULL(@porte,0) + IFNULL(@comision,0) AS Coste, - - @t3 := ROUND(@coste / ( (100 - t3 - t.promo)/100),2) AS Tarifa3, - - ROUND(@t3 * (1 + ((t2 - t3)/100)),2) AS Tarifa2, - - 0 selected - - FROM Traslados t - WHERE vis1 <> 0 OR dis1 <> 0 OR vis2 <> 0 OR dis2 <> 0 - ORDER BY tipo_id, Article, Medida, Categoria, Origen; - - DROP TEMPORARY TABLE IF EXISTS Traslados; - DROP TEMPORARY TABLE IF EXISTS tmp_item; - END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -40192,185 +36834,6 @@ WHERE a.Id_Article = intArticle; SET intEntrada = IF(i_FV, i_entrada_FV,i_entrada_PCA); -SET intEntrada = IF(intEntrada = 0, i_entrada_PCA + i_entrada_FV, intEntrada); - - - IF intEntrada > 0 THEN - - CALL buy_tarifas_table(intEntrada); - - INSERT INTO Compres (Id_Article, Etiquetas, Cantidad, Id_Entrada, Id_Cubo, Packing,grouping,caja, - Costefijo, Portefijo, Embalajefijo, Comisionfija, novincular,buy_edi_id) - SELECT - land.Id_Article, - land.Etiquetas - IFNULL(ship.Etiquetas,0) - (IFNULL(Ventas,0) / land.Packing), - land.Cantidad - IFNULL(ship.Cantidad,0) - IFNULL(Ventas,0), - intEntrada, - land.Id_Cubo, - land.Packing, - land.grouping, - land.caja, - @cost := ROUND(IFNULL(land.Costefijo, 0) + IFNULL(land.Comisionfija, 0) + IFNULL(land.Portefijo, 0), - 3) Costefij, - @porte := ROUND((@cm3:= cm3_2(land.Id_Cubo, land.Id_Article)) * a.m3 / 1000000 / land.Packing, - 3) Porte, - land.EmbalajeFijo AS Embalaje, - @comision := ROUND(land.Costefijo * e2.comision / 100, 3) Comision, - land.novincular,land.buy_edi_id - FROM ( - select c_land.Id_Cubo,c_land.Packing,c_land.grouping,c_land.Costefijo,c_land.Comisionfija,c_land.Portefijo,c_land.caja,SUM(c_land.Etiquetas) Etiquetas,c_land.EmbalajeFijo, - c_land.novincular,c_land.buy_edi_id,c_land.Id_Article,SUM(c_land.Cantidad) Cantidad - from - -- Entradas que llegan a vnh - Compres c_land - JOIN - Entradas e_land ON c_land.Id_Entrada = e_land.Id_Entrada AND c_land.Id_Article = intArticle - JOIN - travel t_land ON t_land.id = e_land.travel_id - JOIN - Cubos cu ON cu.Id_Cubo = c_land.Id_Cubo - WHERE - -- Entradas que llegan a vnh - (t_land.warehouse_id = 7 AND t_land.landing = CURDATE()) - ) land - LEFT JOIN -- Entradas que salen de vnh - (SELECT SUM(c_ship.Etiquetas) Etiquetas,c_ship.Packing,SUM(c_ship.Cantidad) Cantidad - FROM Compres c_ship - LEFT JOIN Entradas e_ship ON c_ship.Id_Entrada = e_ship.Id_Entrada AND c_ship.Id_Article = intArticle - LEFT JOIN travel t_ship ON t_ship.id = e_ship.travel_id - WHERE t_ship.warehouse_id_out = 7 AND t_ship.shipment = CURDATE() - -- Entrada destino - ) ship ON TRUE - JOIN Entradas e2 ON e2.Id_Entrada = intEntrada - JOIN travel t ON t.id = e2.travel_id - JOIN Agencias a ON t.agency_id = a.Id_Agencia - -- Ventas ese dia en VNH - LEFT JOIN - (SELECT sum(Cantidad) as Ventas - FROM Movimientos m - JOIN Tickets t on t.Id_Ticket = m.Id_Ticket - WHERE t.Fecha = CURDATE() AND m.Id_Article = intArticle AND t.warehouse_id = 7) v on true - GROUP BY land.Id_Article; - CALL buy_tarifas(LAST_INSERT_ID()); - - END IF; - -END ;; -DELIMITER ; -/*!50003 SET sql_mode = @saved_sql_mode */ ; -/*!50003 SET character_set_client = @saved_cs_client */ ; -/*!50003 SET character_set_results = @saved_cs_results */ ; -/*!50003 SET collation_connection = @saved_col_connection */ ; -/*!50003 DROP PROCEDURE IF EXISTS `traslado_label_2kk` */; -/*!50003 SET @saved_cs_client = @@character_set_client */ ; -/*!50003 SET @saved_cs_results = @@character_set_results */ ; -/*!50003 SET @saved_col_connection = @@collation_connection */ ; -/*!50003 SET character_set_client = utf8 */ ; -/*!50003 SET character_set_results = utf8 */ ; -/*!50003 SET collation_connection = utf8_general_ci */ ; -/*!50003 SET @saved_sql_mode = @@sql_mode */ ; -/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; -DELIMITER ;; -CREATE DEFINER=`root`@`%` PROCEDURE `traslado_label_2kk`(IN i_compra INTEGER,IN i_entrada_FV INTEGER, IN i_entrada_PCA INTEGER, i_cantidad INTEGER) -BEGIN - --- PAK 2015-09-15 -DECLARE idARTICLE INT; - -SELECT Id_Article INTO idARTICLE FROM Compres WHERE Id_Compra = i_compra; - -call traslado_label_3(idARTICLE,i_entrada_FV,i_entrada_PCA); - -/* -DECLARE i_entrada_shipment INTEGER; -DECLARE i_entrada_landing INTEGER; -DECLARE i_FV INTEGER; - -SELECT c.Id_Entrada, FV INTO i_entrada_shipment, i_FV -FROM Compres c -JOIN Articles a ON a.Id_Article = c.Id_Article -JOIN Tipos tp ON tp.tipo_id = a.tipo_id -WHERE Id_Compra = i_compra; - -SET i_entrada_landing = IF(i_FV, i_entrada_FV,i_entrada_PCA); - -SET i_entrada_landing = IF(i_entrada_landing = 0, i_entrada_PCA + i_entrada_FV, i_entrada_landing); - -IF i_entrada_landing > 0 THEN - - CALL buy_tarifas_table(i_entrada_landing); - - INSERT INTO Compres (Id_Article, Etiquetas, Cantidad, Id_Entrada, Id_Cubo, Packing,grouping,caja, - Costefijo, Portefijo, Embalajefijo, Comisionfija, Productor, S3, S4, S2, novincular,k01,k02,k03,k04,buy_edi_id) - SELECT - Id_Article, - i_cantidad / Packing, - i_cantidad, - i_entrada_landing, - Id_Cubo, - Packing, - c.grouping, - c.caja, - @cost := ROUND(IFNULL(Costefijo, 0) + IFNULL(Comisionfija, 0) + IFNULL(Portefijo, 0), - 3) Costefij, - @porte := ROUND((@cm3:= cm3_2(Id_Cubo, Id_Article)) * a.m3 / 1000000 / Packing, - 3) Porte, - EmbalajeFijo AS Embalaje, - @comision := ROUND(Costefijo * e2.comision / 100, 3) Comision, - Productor, - S3, - S4, - S2, - novincular,c.k01,c.k02,c.k03,c.k04,c.buy_edi_id - FROM - Compres c - JOIN - Entradas e USING (Id_Entrada) - JOIN - Cubos cu USING (Id_Cubo) - JOIN - Entradas e2 ON e2.Id_Entrada = i_entrada_landing - JOIN - travel t ON t.id = e2.travel_id - JOIN - Agencias a ON t.agency_id = a.Id_Agencia - WHERE - Id_Compra = i_compra and i_cantidad; - - -CALL buy_tarifas(LAST_INSERT_ID()); - -END IF; -*/ -END ;; -DELIMITER ; -/*!50003 SET sql_mode = @saved_sql_mode */ ; -/*!50003 SET character_set_client = @saved_cs_client */ ; -/*!50003 SET character_set_results = @saved_cs_results */ ; -/*!50003 SET collation_connection = @saved_col_connection */ ; -/*!50003 DROP PROCEDURE IF EXISTS `traslado_label_3kk` */; -/*!50003 SET @saved_cs_client = @@character_set_client */ ; -/*!50003 SET @saved_cs_results = @@character_set_results */ ; -/*!50003 SET @saved_col_connection = @@collation_connection */ ; -/*!50003 SET character_set_client = utf8 */ ; -/*!50003 SET character_set_results = utf8 */ ; -/*!50003 SET collation_connection = utf8_general_ci */ ; -/*!50003 SET @saved_sql_mode = @@sql_mode */ ; -/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; -DELIMITER ;; -CREATE DEFINER=`root`@`%` PROCEDURE `traslado_label_3kk`(IN intArticle INTEGER,IN i_entrada_FV INTEGER, IN i_entrada_PCA INTEGER) -BEGIN --- DEPRECATED usar traslado_label -DECLARE intEntrada INTEGER; -DECLARE i_FV INTEGER; - -SELECT FV INTO i_FV -FROM Articles a -JOIN Tipos tp ON tp.tipo_id = a.tipo_id -WHERE a.Id_Article = intArticle; - -SET intEntrada = IF(i_FV, i_entrada_FV,i_entrada_PCA); - SET intEntrada = IF(intEntrada = 0, i_entrada_PCA + i_entrada_FV, intEntrada); @@ -40615,167 +37078,6 @@ DELIMITER ; /*!50003 SET character_set_client = @saved_cs_client */ ; /*!50003 SET character_set_results = @saved_cs_results */ ; /*!50003 SET collation_connection = @saved_col_connection */ ; -/*!50003 DROP PROCEDURE IF EXISTS `travel_treekk` */; -/*!50003 SET @saved_cs_client = @@character_set_client */ ; -/*!50003 SET @saved_cs_results = @@character_set_results */ ; -/*!50003 SET @saved_col_connection = @@collation_connection */ ; -/*!50003 SET character_set_client = utf8 */ ; -/*!50003 SET character_set_results = utf8 */ ; -/*!50003 SET collation_connection = utf8_general_ci */ ; -/*!50003 SET @saved_sql_mode = @@sql_mode */ ; -/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; -DELIMITER ;; -CREATE DEFINER=`root`@`%` PROCEDURE `travel_treekk`(vDate DATE, vAddress INT, vAgency INT) -BEGIN -/** - *DEPRECATED use vn.agencyHourGetShipped - * - * Devuelve la lista de almacenes disponibles y la fecha de - * envío desde cada uno. - * - * @param vDate Fecha de recepción de mercancía - * @param vAddress Id consignatario, %NULL para recogida - * @param vAgency Id de subagencia - * @table travel_tree Lista de almacenes disponibles - */ - DECLARE vDone BOOL; - DECLARE vWh SMALLINT; - - DECLARE vCur CURSOR FOR - SELECT w.id warehouse_id - FROM warehouse w - WHERE reserve; - - DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE; - - DROP TEMPORARY TABLE IF EXISTS travel_tree; - CREATE TEMPORARY TABLE travel_tree - ( - warehouse_id TINYINT NOT NULL PRIMARY KEY, - Fecha_envio DATE NOT NULL, - Fecha_recepcion DATE NOT NULL - ) - ENGINE = MEMORY; - - -- Establecemos los almacenes y las fechas que van a entrar - - OPEN vCur; - - l: LOOP - SET vDone = FALSE; - FETCH vCur INTO vWh; - - IF vDone THEN - LEAVE l; - END IF; - - INSERT INTO travel_tree (warehouse_id, Fecha_envio, Fecha_recepcion) - SELECT vWh, shipping, vDate FROM ( - SELECT TIMESTAMPADD(DAY, -ah.subtract_day, vDate) shipping, ah.max_hour - FROM agency_hour ah - LEFT JOIN Consignatarios c ON c.Id_Consigna = vAddress - WHERE ah.warehouse_id = vWh - AND (week_day = WEEKDAY(vDate) - OR week_day IS NULL) - AND (ah.agency_id = vAgency - OR ah.agency_id IS NULL) - AND (ah.province_id = c.province_id - OR ah.province_id IS NULL - OR vAddress IS NULL) - ORDER BY ( - (ah.week_day IS NOT NULL) + - (ah.agency_id IS NOT NULL) + - ((ah.province_id IS NOT NULL) * 3) - ) DESC - LIMIT 1 - ) t - WHERE shipping >= CURDATE() - AND IF(shipping = CURDATE(), max_hour > HOUR(NOW()), TRUE); - END LOOP; - - CLOSE vCur; -END ;; -DELIMITER ; -/*!50003 SET sql_mode = @saved_sql_mode */ ; -/*!50003 SET character_set_client = @saved_cs_client */ ; -/*!50003 SET character_set_results = @saved_cs_results */ ; -/*!50003 SET collation_connection = @saved_col_connection */ ; -/*!50003 DROP PROCEDURE IF EXISTS `travel_tree_listkk` */; -/*!50003 SET @saved_cs_client = @@character_set_client */ ; -/*!50003 SET @saved_cs_results = @@character_set_results */ ; -/*!50003 SET @saved_col_connection = @@collation_connection */ ; -/*!50003 SET character_set_client = utf8 */ ; -/*!50003 SET character_set_results = utf8 */ ; -/*!50003 SET collation_connection = utf8_general_ci */ ; -/*!50003 SET @saved_sql_mode = @@sql_mode */ ; -/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; -DELIMITER ;; -CREATE DEFINER=`root`@`%` PROCEDURE `travel_tree_listkk`(vAddress INT, vDate DATE) -BEGIN -/** - *DEPRECATED use vn.agencyHourGetAgency - * - * Devuelve el listado de agencias disponibles para la fecha - * y dirección pasadas. - * - * @param vAddress Id de dirección de envío, %NULL si es recogida - * @param vDate Fecha de recogida - * @table agency_list Listado de agencias disponibles - */ - DECLARE vAgency INT; - DECLARE vDone BOOL DEFAULT FALSE; - - DECLARE vCur CURSOR FOR - SELECT DISTINCT agency_id - FROM agency - JOIN agency_hour USING(agency_id); - - DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE; - - DROP TEMPORARY TABLE IF EXISTS agency_list; - CREATE TEMPORARY TABLE agency_list ( - Id_Agencia INT NOT NULL, - Agencia VARCHAR(20), - description VARCHAR(45), - Vista VARCHAR(45), - shipment DATE, - Descripcion VARCHAR(45), - PRIMARY KEY(Id_Agencia) - ) - ENGINE = MEMORY; - - OPEN vCur; - FETCH vCur INTO vAgency; - - WHILE NOT vDone - DO - CALL travel_tree (vDate, vAddress, vAgency); - - INSERT INTO agency_list - SELECT a.Id_Agencia, a.Agencia, a.description, - a.Vista, t.Fecha_Envio, w.name as Descripcion - FROM Agencias a - JOIN travel_tree t - JOIN warehouse w on w.id = t.warehouse_id - WHERE agency_id = vAgency - AND a.web - ON DUPLICATE KEY UPDATE - Descripcion = CONCAT(Descripcion, ', ', w.name); - - FETCH vCur INTO vAgency; - END WHILE; - - CLOSE vCur; - - SELECT * FROM agency_list; - DROP TEMPORARY TABLE agency_list; - DROP TEMPORARY TABLE travel_tree; -END ;; -DELIMITER ; -/*!50003 SET sql_mode = @saved_sql_mode */ ; -/*!50003 SET character_set_client = @saved_cs_client */ ; -/*!50003 SET character_set_results = @saved_cs_results */ ; -/*!50003 SET collation_connection = @saved_col_connection */ ; /*!50003 DROP PROCEDURE IF EXISTS `travel_tree_shipment` */; /*!50003 SET @saved_cs_client = @@character_set_client */ ; /*!50003 SET @saved_cs_results = @@character_set_results */ ; @@ -42437,148 +38739,6 @@ DELIMITER ; /*!50003 SET character_set_client = @saved_cs_client */ ; /*!50003 SET character_set_results = @saved_cs_results */ ; /*!50003 SET collation_connection = @saved_col_connection */ ; -/*!50003 DROP PROCEDURE IF EXISTS `workerCreatekk` */; -/*!50003 SET @saved_cs_client = @@character_set_client */ ; -/*!50003 SET @saved_cs_results = @@character_set_results */ ; -/*!50003 SET @saved_col_connection = @@collation_connection */ ; -/*!50003 SET character_set_client = utf8 */ ; -/*!50003 SET character_set_results = utf8 */ ; -/*!50003 SET collation_connection = utf8_general_ci */ ; -/*!50003 SET @saved_sql_mode = @@sql_mode */ ; -/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; -DELIMITER ;; -CREATE DEFINER=`root`@`%` PROCEDURE `workerCreatekk`( - vName VARCHAR(50), - vCognames VARCHAR(50), - vDNI VARCHAR(9), - vAddress TEXT, - vPostalCode VARCHAR(5), - vTown VARCHAR(25), - vProvince SMALLINT(5), - vCompany SMALLINT(5), - vPhone VARCHAR(11), - vMail VARCHAR(80) CHARSET utf8, - vDniExpiration DATETIME, - vEmployeeBoss INT, - vRole INT, - vUsername VARCHAR(50) CHARSET utf8, - vPassword VARCHAR(50), - vWorkerCode VARCHAR(8) -) -BEGIN - DECLARE vClient INT; - DECLARE vUser INT; - DECLARE vWorker INT; - DECLARE vOficial INT DEFAULT 1; - DECLARE vDiscount INT DEFAULT 3; - DECLARE vPayMethodFk INT DEFAULT 4; - DECLARE vDueDay INT DEFAULT 5; - DECLARE vDefaultCredit DECIMAL(10, 2) DEFAULT 300.00; - DECLARE vIsTaxDataChecked TINYINT(1) DEFAULT 1; - DECLARE vHasCoreVnl TINYINT(1) DEFAULT 1; - DECLARE vMandateType INT DEFAULT 2; - - -############################################################################## -#### GENERAR CLIENTE -############################################################################## - - -- Comprobar si existe un cliente con el mismo DNI. - SELECT Id_cliente INTO vClient FROM vn2008.Clientes WHERE `if` = vDNI; - - -- Si no existe el cliente creamos uno nuevo. - IF vClient IS NULL THEN - SELECT (MAX(Id_Cliente) + 1) INTO vClient FROM Clientes WHERE Id_Cliente < 999999; - END IF; - - REPLACE INTO Clientes ( - Id_Cliente, - Cliente, - Domicilio, - `IF`, - Telefono, - province_id, - Poblacion, - CodPostal, - RazonSocial, - Contacto, - Oficial, - Descuento, - Codpos, - pay_met_id, - Vencimiento, - credito, - contabilizado, - coreVnl) - SELECT - vClient, - Concat('TR ', vName, ' ', vCognames), - vAddress, - vDNI, - vPhone, - vProvince, - vTown, - vPostalCode, - CONCAT(vCognames, ' ', vName), - vName, - vOficial, - vDiscount, - vPostalCode, - vPayMethodFk, - vDueDay, - vDefaultCredit, - vIsTaxDataChecked, - vHasCoreVnl; - - REPLACE INTO mandato (Id_Cliente, empresa_id, idmandato_tipo) - VALUES (vClient, vCompany, vMandateType); - -############################################################################## -#### GENERAR USUARIO -############################################################################## - - -- Comprobamos si existe un usuario con el mismo ID de cliente. - IF NOT (SELECT COUNT(*) FROM account.user where id = vClient) THEN - - -- Alta del usuario. - INSERT INTO account.user (id, role, `name`, `password`, active) VALUES (vClient, vRole, LCASE(vUsername), MD5(LCASE(vPassword)), TRUE); - SET vUser = vClient; - INSERT INTO account.account SET id = vClient; - - END IF; - -############################################################################## -#### GENERAR TRABAJADOR -############################################################################## - - - -- Comprobamos si ya existe un trabajador con el mismo DNI. - IF NOT (SELECT COUNT(*) FROM Trabajadores WHERE dni = vDNI) THEN - - -- Alta en la tabla trabajadores. - INSERT INTO Trabajadores (CodigoTrabajador, Nombre, Apellidos, `Password`, dni, empresa_id, user_id, boss, DniExpiration) - VALUES (vWorkerCode, vName, vCognames, LCASE(vPassword), vDNI, vCompany, vUser, vEmployeeBoss, VDniExpiration); - - SET vWorker = LAST_INSERT_ID(); - ELSE - UPDATE Trabajadores SET user_id = vUser WHERE dni = vDNI; - END IF; - -############################################################################## -#### REENVIO EMAIL -############################################################################## - - IF vMail IS NOT NULL AND NOT (SELECT COUNT(*) FROM account.mailForward WHERE forwardTo = vMail) THEN - INSERT INTO account.mailForward (account, forwardTo) VALUES (vUser, vMail); - UPDATE Trabajadores SET email = CONCAT(vUsername, '@verdnatura.es') WHERE user_id = vUser; - END IF; - -END ;; -DELIMITER ; -/*!50003 SET sql_mode = @saved_sql_mode */ ; -/*!50003 SET character_set_client = @saved_cs_client */ ; -/*!50003 SET character_set_results = @saved_cs_results */ ; -/*!50003 SET collation_connection = @saved_col_connection */ ; /*!50003 DROP PROCEDURE IF EXISTS `XDiario_Quadrator` */; /*!50003 SET @saved_cs_client = @@character_set_client */ ; /*!50003 SET @saved_cs_results = @@character_set_results */ ; @@ -43026,8 +39186,7 @@ SET character_set_client = utf8; 1 AS `provinceFk`, 1 AS `agencyFk`, 1 AS `zone`, - 1 AS `warehouseFk`, - 1 AS `route`*/; + 1 AS `warehouseFk`*/; SET character_set_client = @saved_cs_client; -- @@ -43411,6 +39570,7 @@ SET character_set_client = utf8; 1 AS `workerFk`, 1 AS `responsibility`, 1 AS `isChargedToMana`, + 1 AS `ticketFk`, 1 AS `created`*/; SET character_set_client = @saved_cs_client; @@ -43426,7 +39586,7 @@ SET character_set_client = utf8; 1 AS `id`, 1 AS `claimFk`, 1 AS `saleFk`, - 1 AS `claimed`*/; + 1 AS `quantity`*/; SET character_set_client = @saved_cs_client; -- @@ -43630,7 +39790,7 @@ CREATE TABLE `clientContact` ( `name` varchar(45) COLLATE utf8_unicode_ci DEFAULT NULL, `phone` varchar(15) COLLATE utf8_unicode_ci DEFAULT NULL, PRIMARY KEY (`id`) -) ENGINE=InnoDB AUTO_INCREMENT=4093 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=4095 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -43699,7 +39859,7 @@ CREATE TABLE `clientLog` ( KEY `userFk` (`userFk`), CONSTRAINT `clientLog_ibfk_1` FOREIGN KEY (`originFk`) REFERENCES `vn2008`.`Clientes` (`id_cliente`) ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT `clientLog_ibfk_2` FOREIGN KEY (`userFk`) REFERENCES `account`.`user` (`id`) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=168844 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=172108 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -43716,38 +39876,6 @@ SET character_set_client = utf8; 1 AS `dated`*/; SET character_set_client = @saved_cs_client; --- --- Temporary table structure for view `clientNotificationTypekk` --- - -DROP TABLE IF EXISTS `clientNotificationTypekk`; -/*!50001 DROP VIEW IF EXISTS `clientNotificationTypekk`*/; -SET @saved_cs_client = @@character_set_client; -SET character_set_client = utf8; -/*!50001 CREATE VIEW `clientNotificationTypekk` AS SELECT - 1 AS `id`, - 1 AS `code`, - 1 AS `description`, - 1 AS `isVisible`*/; -SET character_set_client = @saved_cs_client; - --- --- Temporary table structure for view `clientNotificationkk` --- - -DROP TABLE IF EXISTS `clientNotificationkk`; -/*!50001 DROP VIEW IF EXISTS `clientNotificationkk`*/; -SET @saved_cs_client = @@character_set_client; -SET character_set_client = utf8; -/*!50001 CREATE VIEW `clientNotificationkk` AS SELECT - 1 AS `id`, - 1 AS `clientFk`, - 1 AS `clientNotificationTypeFk`, - 1 AS `created`, - 1 AS `workerFk`, - 1 AS `userFk`*/; -SET character_set_client = @saved_cs_client; - -- -- Temporary table structure for view `clientObservation` -- @@ -43764,6 +39892,24 @@ SET character_set_client = utf8; 1 AS `created`*/; SET character_set_client = @saved_cs_client; +-- +-- Table structure for table `clientProtected` +-- + +DROP TABLE IF EXISTS `clientProtected`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `clientProtected` ( + `clientFk` int(11) NOT NULL, + `workerFk` int(11) NOT NULL, + `isValidated` tinyint(1) NOT NULL DEFAULT '0', + PRIMARY KEY (`clientFk`), + KEY `clientProtected_fk2_idx` (`workerFk`), + CONSTRAINT `clientProtected_fk1` FOREIGN KEY (`clientFk`) REFERENCES `vn2008`.`Clientes` (`id_cliente`) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT `clientProtected_fk2` FOREIGN KEY (`workerFk`) REFERENCES `vn2008`.`Trabajadores` (`Id_Trabajador`) ON DELETE CASCADE ON UPDATE CASCADE +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Lista de clientes y comerciales que no se van a ver afectados por las desagsignaciones mensuales automaticas'; +/*!40101 SET character_set_client = @saved_cs_client */; + -- -- Temporary table structure for view `clientSample` -- @@ -44136,7 +40282,7 @@ CREATE TABLE `creditClassification` ( KEY `creditClassifClientFk_idx` (`client`), KEY `creditClassifdateEnd_idx` (`dateEnd`), CONSTRAINT `creditClassifClientFk` FOREIGN KEY (`client`) REFERENCES `vn2008`.`Clientes` (`id_cliente`) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=2805 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=2835 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; ALTER DATABASE `vn` CHARACTER SET utf8 COLLATE utf8_general_ci ; /*!50003 SET @saved_cs_client = @@character_set_client */ ; @@ -44181,7 +40327,7 @@ CREATE TABLE `creditInsurance` ( PRIMARY KEY (`id`), KEY `CreditInsurance_Fk1_idx` (`creditClassification`), CONSTRAINT `CreditInsurance_Fk1` FOREIGN KEY (`creditClassification`) REFERENCES `creditClassification` (`id`) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=2011 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Detalla los clientes que tienen seguro de credito'; +) ENGINE=InnoDB AUTO_INCREMENT=2090 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Detalla los clientes que tienen seguro de credito'; /*!40101 SET character_set_client = @saved_cs_client */; ALTER DATABASE `vn` CHARACTER SET utf8 COLLATE utf8_general_ci ; /*!50003 SET @saved_cs_client = @@character_set_client */ ; @@ -44336,7 +40482,7 @@ CREATE TABLE `dua` ( CONSTRAINT `dua_fk1` FOREIGN KEY (`gestdocFk`) REFERENCES `vn2008`.`gestdoc` (`id`) ON DELETE SET NULL ON UPDATE CASCADE, CONSTRAINT `dua_fk2` FOREIGN KEY (`awbFk`) REFERENCES `vn2008`.`awb` (`id`) ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT `dua_fk4` FOREIGN KEY (`companyFk`) REFERENCES `vn2008`.`empresa` (`id`) ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=3255 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=3320 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -44377,7 +40523,7 @@ CREATE TABLE `duaIntrastat` ( KEY `duaIntrastat_fk2_idx` (`duaFk`), CONSTRAINT `duaIntrastat_fk1` FOREIGN KEY (`intrastatFk`) REFERENCES `vn2008`.`Intrastat` (`Codintrastat`) ON UPDATE CASCADE, CONSTRAINT `duaIntrastat_fk2` FOREIGN KEY (`duaFk`) REFERENCES `dua` (`id`) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=4542 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=4748 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -44397,7 +40543,7 @@ CREATE TABLE `duaInvoiceIn` ( KEY `duaInvoiceIn_fk2_idx` (`invoiceInFk`), CONSTRAINT `duaInvoiceIn_fk1` FOREIGN KEY (`duaFk`) REFERENCES `dua` (`id`) ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT `duaInvoiceIn_fk2` FOREIGN KEY (`invoiceInFk`) REFERENCES `vn2008`.`recibida` (`id`) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=4191 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Facturas asociadas a la declaración aduanera, básicamente la del agente transitario'; +) ENGINE=InnoDB AUTO_INCREMENT=4255 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Facturas asociadas a la declaración aduanera, básicamente la del agente transitario'; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -44422,7 +40568,7 @@ CREATE TABLE `duaTax` ( CONSTRAINT `duaTax_fk1` FOREIGN KEY (`duaFk`) REFERENCES `dua` (`id`) ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT `duaTax_fk2` FOREIGN KEY (`supplierFk`) REFERENCES `vn2008`.`Proveedores` (`Id_Proveedor`) ON UPDATE CASCADE, CONSTRAINT `duaTax_fk3` FOREIGN KEY (`taxClassFk`) REFERENCES `vn2008`.`iva_group` (`iva_group_id`) ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=1496 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=2057 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -44518,7 +40664,7 @@ CREATE TABLE `entryLog` ( KEY `entryLog_ibfk_2` (`userFk`), CONSTRAINT `entryLog_ibfk_1` FOREIGN KEY (`originFk`) REFERENCES `vn2008`.`Entradas` (`Id_Entrada`) ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT `entryLog_ibfk_2` FOREIGN KEY (`userFk`) REFERENCES `account`.`user` (`id`) ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=57981 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=65086 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -45102,7 +41248,7 @@ CREATE TABLE `invoiceOutExpence` ( KEY `invoiceOutExpence_FK_2_idx` (`expenceFk`), CONSTRAINT `invoiceOutExpence_FK_1` FOREIGN KEY (`invoiceOutFk`) REFERENCES `vn2008`.`Facturas` (`factura_id`) ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT `invoiceOutExpence_FK_2` FOREIGN KEY (`expenceFk`) REFERENCES `vn2008`.`Gastos` (`Id_Gasto`) ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=70719 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Desglosa la base imponible de una factura en funcion del tipo de gasto/venta'; +) ENGINE=InnoDB AUTO_INCREMENT=77564 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Desglosa la base imponible de una factura en funcion del tipo de gasto/venta'; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -45145,7 +41291,7 @@ CREATE TABLE `invoiceOutTax` ( KEY `pgcFk` (`pgcFk`), CONSTRAINT `invoiceOutFk` FOREIGN KEY (`invoiceOutFk`) REFERENCES `vn2008`.`Facturas` (`factura_id`) ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT `invoiceOutTax_ibfk_1` FOREIGN KEY (`pgcFk`) REFERENCES `pgc` (`code`) ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=940976 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=965282 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -45190,7 +41336,13 @@ SET character_set_client = utf8; 1 AS `tag7`, 1 AS `value7`, 1 AS `tag8`, - 1 AS `value8`*/; + 1 AS `value8`, + 1 AS `tag9`, + 1 AS `value9`, + 1 AS `tag10`, + 1 AS `value10`, + 1 AS `minimum`, + 1 AS `upToDown`*/; SET character_set_client = @saved_cs_client; -- @@ -45247,7 +41399,8 @@ SET character_set_client = utf8; 1 AS `id`, 1 AS `name`, 1 AS `display`, - 1 AS `color`*/; + 1 AS `color`, + 1 AS `icon`*/; SET character_set_client = @saved_cs_client; -- @@ -45351,6 +41504,21 @@ CREATE TABLE `itemPlacement2` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; +-- +-- Table structure for table `itemRepo` +-- + +DROP TABLE IF EXISTS `itemRepo`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `itemRepo` ( + `itemFk` int(11) NOT NULL, + `quantity` int(10) unsigned NOT NULL DEFAULT '0', + PRIMARY KEY (`itemFk`), + CONSTRAINT `itemRepo_fk1` FOREIGN KEY (`itemFk`) REFERENCES `vn2008`.`Articles` (`Id_Article`) ON DELETE CASCADE ON UPDATE CASCADE +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +/*!40101 SET character_set_client = @saved_cs_client */; + -- -- Table structure for table `itemShelving` -- @@ -45361,26 +41529,25 @@ DROP TABLE IF EXISTS `itemShelving`; CREATE TABLE `itemShelving` ( `id` int(10) unsigned NOT NULL AUTO_INCREMENT, `itemFk` int(11) NOT NULL, - `shelvingFk` varchar(5) COLLATE utf8_unicode_ci NOT NULL, + `shelvingFk` varchar(10) CHARACTER SET utf8 NOT NULL, `shelve` varchar(2) COLLATE utf8_unicode_ci NOT NULL DEFAULT 'A', `deep` int(11) unsigned NOT NULL DEFAULT '1', - `quantity` int(11) unsigned NOT NULL DEFAULT '0', - `visible` int(11) unsigned NOT NULL DEFAULT '0', - `available` int(11) unsigned NOT NULL DEFAULT '0', + `quantity` decimal(10,0) NOT NULL DEFAULT '0', + `visible` decimal(10,0) NOT NULL DEFAULT '0', + `available` decimal(10,0) NOT NULL DEFAULT '0', `created` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, `priority` int(11) unsigned NOT NULL DEFAULT '0' COMMENT 'El 0 es la mínima prioridad', `grouping` smallint(5) unsigned DEFAULT NULL, `packing` int(11) unsigned DEFAULT NULL, `packagingFk` varchar(10) COLLATE utf8_unicode_ci DEFAULT NULL, PRIMARY KEY (`id`), - UNIQUE KEY `itemShelving_UNIQUE` (`shelvingFk`,`shelve`,`deep`), KEY `itemShelving_fk1_idx` (`itemFk`), KEY `itemShelving_fk2_idx` (`shelvingFk`), KEY `itemShelving_fk3_idx` (`packagingFk`), CONSTRAINT `itemShelving_fk1` FOREIGN KEY (`itemFk`) REFERENCES `vn2008`.`Articles` (`Id_Article`) ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT `itemShelving_fk2` FOREIGN KEY (`shelvingFk`) REFERENCES `shelving` (`code`) ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT `itemShelving_fk3` FOREIGN KEY (`packagingFk`) REFERENCES `vn2008`.`Cubos` (`Id_Cubo`) ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=40 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=2975 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -45401,12 +41568,29 @@ SET character_set_client = utf8; 1 AS `concept`, 1 AS `size`, 1 AS `Estado`, - 1 AS `orden`, + 1 AS `sectorProdPriority`, 1 AS `available`, 1 AS `sectorFk`, 1 AS `matricula`, 1 AS `parking`, - 1 AS `itemShelving`*/; + 1 AS `itemShelving`, + 1 AS `Agency`, + 1 AS `shipped`, + 1 AS `grouping`*/; +SET character_set_client = @saved_cs_client; + +-- +-- Temporary table structure for view `itemShelvingStock` +-- + +DROP TABLE IF EXISTS `itemShelvingStock`; +/*!50001 DROP VIEW IF EXISTS `itemShelvingStock`*/; +SET @saved_cs_client = @@character_set_client; +SET character_set_client = utf8; +/*!50001 CREATE VIEW `itemShelvingStock` AS SELECT + 1 AS `itemFk`, + 1 AS `visible`, + 1 AS `packing`*/; SET character_set_client = @saved_cs_client; -- @@ -45427,7 +41611,7 @@ CREATE TABLE `itemTag` ( KEY `priorityItem` (`itemFk`,`priority`), KEY `tagFk` (`tagFk`,`value`), CONSTRAINT `itemFK` FOREIGN KEY (`itemFk`) REFERENCES `vn2008`.`Articles` (`Id_Article`) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=414080 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=524926 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; /*!50003 SET @saved_cs_client = @@character_set_client */ ; /*!50003 SET @saved_cs_results = @@character_set_results */ ; @@ -45441,34 +41625,71 @@ DELIMITER ;; /*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `vn`.`itemTag_BEFORE_INSERT` BEFORE INSERT ON `itemTag` FOR EACH ROW BEGIN - IF NEW.priority = 1 AND NEW.value IS NOT NULL THEN + IF NEW.priority = 1 AND NEW.value IS NOT NULL THEN UPDATE item i JOIN tag t ON t.id = NEW.tagFk SET tag5 = t.name, value5 = NEW.value WHERE i.id = NEW.itemFk; END IF; - IF NEW.priority = 2 AND NEW.value IS NOT NULL THEN + IF NEW.priority = 2 AND NEW.value IS NOT NULL THEN UPDATE item i JOIN tag t ON t.id = NEW.tagFk SET tag6 = t.name, value6 = NEW.value WHERE i.id = NEW.itemFk; END IF; - IF NEW.priority = 3 AND NEW.value IS NOT NULL THEN + IF NEW.priority = 3 AND NEW.value IS NOT NULL THEN UPDATE item i JOIN tag t ON t.id = NEW.tagFk SET tag7 = t.name, value7 = NEW.value WHERE i.id = NEW.itemFk; END IF; - IF NEW.priority = 4 AND NEW.value IS NOT NULL then + IF NEW.priority = 4 AND NEW.value IS NOT NULL then UPDATE item i JOIN tag t ON t.id = NEW.tagFk - SET tag8 = t.name, value8 = NEW.value + SET tag8 = t.name, value8 = NEW.value, subname = NEW.value WHERE i.id = NEW.itemFk; END IF; + IF NEW.priority = 5 AND NEW.value IS NOT NULL THEN + UPDATE item i + JOIN tag t ON t.id = NEW.tagFk + SET tag9 = t.name, value9 = NEW.value + WHERE i.id = NEW.itemFk; + END IF; + + IF NEW.priority = 6 AND NEW.value IS NOT NULL then + UPDATE item i + JOIN tag t ON t.id = NEW.tagFk + SET tag10 = t.name, value10 = NEW.value + WHERE i.id = NEW.itemFk; + END IF; + +END */;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8 */ ; +/*!50003 SET character_set_results = utf8 */ ; +/*!50003 SET collation_connection = utf8_general_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `vn`.`itemTag_AFTER_INSERT` AFTER INSERT ON `itemTag` FOR EACH ROW +BEGIN +-- Al insertar el tag color se modifica también el antiguo campo color + DECLARE vInkId VARCHAR(3) DEFAULT NULL; + IF NEW.tagFk = 1 THEN + SELECT id INTO vInkId FROM ink WHERE name = NEW.value; + UPDATE item SET inkFk = vInkId WHERE id = NEW.itemFk; + END IF; END */;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -45511,10 +41732,102 @@ BEGIN IF NEW.priority = 4 AND NEW.value IS NOT NULL then UPDATE item i JOIN tag t ON t.id = NEW.tagFk - SET tag8 = t.name, value8 = NEW.value + SET tag8 = t.name, value8 = NEW.value, subname = NEW.value WHERE i.id = NEW.itemFk; END IF; + IF NEW.priority = 5 AND NEW.value IS NOT NULL then + UPDATE item i + JOIN tag t ON t.id = NEW.tagFk + SET tag9 = t.name, value9 = NEW.value + WHERE i.id = NEW.itemFk; + END IF; + + IF NEW.priority = 6 AND NEW.value IS NOT NULL then + UPDATE item i + JOIN tag t ON t.id = NEW.tagFk + SET tag10 = t.name, value10 = NEW.value + WHERE i.id = NEW.itemFk; + END IF; + +END */;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8 */ ; +/*!50003 SET character_set_results = utf8 */ ; +/*!50003 SET collation_connection = utf8_general_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `vn`.`itemTag_AFTER_UPDATE` AFTER UPDATE ON `itemTag` FOR EACH ROW +BEGIN + -- Al modificar el tag color se modifica también el antiguo campo color + DECLARE vInkId VARCHAR(3) DEFAULT NULL; + IF (NEW.tagFk = 1) THEN + SELECT id INTO vInkId FROM ink WHERE `name` = NEW.`value`; + IF vInkId > '' THEN + UPDATE item SET inkFk = vInkId WHERE id = NEW.itemFk; + END IF; + END IF; +END */;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8 */ ; +/*!50003 SET character_set_results = utf8 */ ; +/*!50003 SET collation_connection = utf8_general_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `vn`.`itemTag_AFTER_DELETE` AFTER DELETE ON `itemTag` FOR EACH ROW +BEGIN + + IF OLD.priority = 1 THEN + UPDATE item i + SET tag5 = '', value5 = '' + WHERE i.id = OLD.itemFk; + END IF; + + IF OLD.priority = 2 THEN + UPDATE item i + SET tag6 = '', value6 = '' + WHERE i.id = OLD.itemFk; + END IF; + + IF OLD.priority = 3 THEN + UPDATE item i + SET tag7 = '', value7 = '' + WHERE i.id = OLD.itemFk; + END IF; + + IF OLD.priority = 4 THEN + UPDATE item i + SET tag8 = '', value8 = '', subname = '' + WHERE i.id = OLD.itemFk; + END IF; + + IF OLD.priority = 5 THEN + UPDATE item i + SET tag9 = '', value9 = '' + WHERE i.id = OLD.itemFk; + END IF; + + IF OLD.priority = 6 THEN + UPDATE item i + SET tag10 = '', value10 = '' + WHERE i.id = OLD.itemFk; + END IF; END */;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -45581,7 +41894,7 @@ CREATE TABLE `itemTaxCountry` ( CONSTRAINT `countryFK_paises` FOREIGN KEY (`countryFk`) REFERENCES `vn2008`.`Paises` (`Id`) ON UPDATE CASCADE, CONSTRAINT `itemFK_Article` FOREIGN KEY (`itemFk`) REFERENCES `vn2008`.`Articles` (`Id_Article`) ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT `taxClassFK_Iva_Group` FOREIGN KEY (`taxClassFk`) REFERENCES `vn2008`.`iva_group` (`iva_group_id`) ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=509366 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Define la clase de iva por artículo y pais'; +) ENGINE=InnoDB AUTO_INCREMENT=523343 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Define la clase de iva por artículo y pais'; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -45620,6 +41933,7 @@ SET character_set_client = utf8; 1 AS `code`, 1 AS `name`, 1 AS `categoryFk`, + 1 AS `kingdomFk`, 1 AS `life`, 1 AS `workerFk`, 1 AS `warehouseFk`, @@ -45672,7 +41986,7 @@ CREATE TABLE `itemTypeTag` ( KEY `itemTypeTagTag_idx` (`tagFk`), CONSTRAINT `itemTypeTagTag` FOREIGN KEY (`tagFk`) REFERENCES `tag` (`id`) ON DELETE NO ACTION ON UPDATE NO ACTION, CONSTRAINT `itemTypeTagTipos` FOREIGN KEY (`itemTypeFk`) REFERENCES `vn2008`.`Tipos` (`tipo_id`) ON DELETE NO ACTION ON UPDATE NO ACTION -) ENGINE=InnoDB AUTO_INCREMENT=17 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=23 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -45690,6 +42004,25 @@ CREATE TABLE `itemVerdecora` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Relaciona nuestros articulos con los de Verdecora'; /*!40101 SET character_set_client = @saved_cs_client */; +-- +-- Temporary table structure for view `kingdom` +-- + +DROP TABLE IF EXISTS `kingdom`; +/*!50001 DROP VIEW IF EXISTS `kingdom`*/; +SET @saved_cs_client = @@character_set_client; +SET character_set_client = utf8; +/*!50001 CREATE VIEW `kingdom` AS SELECT + 1 AS `id`, + 1 AS `kingdom`, + 1 AS `order`, + 1 AS `display`, + 1 AS `color`, + 1 AS `shortLife`, + 1 AS `merchandise`, + 1 AS `icon`*/; +SET character_set_client = @saved_cs_client; + -- -- Temporary table structure for view `mail` -- @@ -45795,6 +42128,45 @@ CREATE TABLE `manuscript` ( ) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; +-- +-- Table structure for table `medicalCenter` +-- + +DROP TABLE IF EXISTS `medicalCenter`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `medicalCenter` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `name` varchar(45) COLLATE utf8_unicode_ci NOT NULL, + PRIMARY KEY (`id`) +) ENGINE=InnoDB AUTO_INCREMENT=9 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Table structure for table `medicalReview` +-- + +DROP TABLE IF EXISTS `medicalReview`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `medicalReview` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `workerFk` int(11) NOT NULL, + `centerFk` int(11) NOT NULL, + `date` date DEFAULT NULL, + `time` varchar(5) COLLATE utf8_unicode_ci DEFAULT NULL, + `fit` binary(1) DEFAULT NULL, + `amount` double DEFAULT NULL, + `invoice` varchar(10) COLLATE utf8_unicode_ci DEFAULT NULL, + `remark` longtext COLLATE utf8_unicode_ci, + PRIMARY KEY (`id`), + KEY `frgcenter_idx` (`centerFk`), + KEY `frgnkWorker_idx` (`workerFk`), + CONSTRAINT `frgcenter` FOREIGN KEY (`centerFk`) REFERENCES `medicalCenter` (`id`) ON DELETE NO ACTION ON UPDATE NO ACTION, + CONSTRAINT `frgnkWorker` FOREIGN KEY (`workerFk`) REFERENCES `vn2008`.`Trabajadores` (`Id_Trabajador`) ON DELETE NO ACTION ON UPDATE NO ACTION +) ENGINE=InnoDB AUTO_INCREMENT=59 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +/*!40101 SET character_set_client = @saved_cs_client */; + -- -- Table structure for table `message` -- @@ -45813,7 +42185,7 @@ CREATE TABLE `message` ( KEY `sender` (`sender`), KEY `recipient` (`recipient`), KEY `uuid` (`uuid`(8)) -) ENGINE=InnoDB AUTO_INCREMENT=1539454 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=1576049 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -45835,7 +42207,7 @@ CREATE TABLE `messageInbox` ( PRIMARY KEY (`id`), KEY `uuid` (`uuid`(8)), KEY `finalRecipient` (`finalRecipient`) -) ENGINE=InnoDB AUTO_INCREMENT=1687659 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=1725458 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -45862,30 +42234,6 @@ SET character_set_client = utf8; 1 AS `lastUpdate`*/; SET character_set_client = @saved_cs_client; --- --- Temporary table structure for view `movementkk` --- - -DROP TABLE IF EXISTS `movementkk`; -/*!50001 DROP VIEW IF EXISTS `movementkk`*/; -SET @saved_cs_client = @@character_set_client; -SET character_set_client = utf8; -/*!50001 CREATE VIEW `movementkk` AS SELECT - 1 AS `id`, - 1 AS `item`, - 1 AS `ticket`, - 1 AS `concept`, - 1 AS `amount`, - 1 AS `quantity`, - 1 AS `price`, - 1 AS `discount`, - 1 AS `cost`, - 1 AS `reservado`, - 1 AS `od`, - 1 AS `priceFixed`, - 1 AS `lastUpdate`*/; -SET character_set_client = @saved_cs_client; - -- -- Table structure for table `noticeCategory` -- @@ -46079,15 +42427,57 @@ DROP TABLE IF EXISTS `parking`; /*!40101 SET character_set_client = utf8 */; CREATE TABLE `parking` ( `id` int(11) NOT NULL AUTO_INCREMENT, - `column` varchar(5) COLLATE utf8_unicode_ci NOT NULL, - `row` varchar(5) COLLATE utf8_unicode_ci NOT NULL, + `column` varchar(5) CHARACTER SET utf8 NOT NULL DEFAULT '--', + `row` varchar(5) CHARACTER SET utf8 NOT NULL DEFAULT '--', `sectorFk` int(11) NOT NULL DEFAULT '2', + `code` varchar(8) CHARACTER SET utf8 DEFAULT NULL, PRIMARY KEY (`id`), UNIQUE KEY `column_UNIQUE` (`column`,`row`), + UNIQUE KEY `code_UNIQUE` (`code`), KEY `parking_fk1_idx` (`sectorFk`), CONSTRAINT `parking_fk1` FOREIGN KEY (`sectorFk`) REFERENCES `sector` (`id`) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=617 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=20706 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8 */ ; +/*!50003 SET character_set_results = utf8 */ ; +/*!50003 SET collation_connection = utf8_general_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `vn`.`parking_BEFORE_INSERT` BEFORE INSERT ON `parking` FOR EACH ROW +BEGIN + + -- SET new.`code` = CONCAT(new.`column`,' - ',new.`row`) ; + +END */;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8 */ ; +/*!50003 SET character_set_results = utf8 */ ; +/*!50003 SET collation_connection = utf8_general_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +/*!50003 CREATE*/ /*!50017 DEFINER=`z-developer`@`%`*/ /*!50003 TRIGGER `vn`.`parking_BEFORE_UPDATE` BEFORE UPDATE ON `parking` FOR EACH ROW +BEGIN + + -- SET new.`code` = CONCAT(new.`column`,' - ',new.`row`) ; + +END */;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; -- -- Temporary table structure for view `payDem` @@ -46182,6 +42572,21 @@ SET character_set_client = utf8; 1 AS `companyCode`*/; SET character_set_client = @saved_cs_client; +-- +-- Table structure for table `pedidosInternos` +-- + +DROP TABLE IF EXISTS `pedidosInternos`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `pedidosInternos` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `idArticle` int(11) DEFAULT NULL, + `quantity` int(11) DEFAULT NULL, + PRIMARY KEY (`id`) +) ENGINE=InnoDB AUTO_INCREMENT=54 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +/*!40101 SET character_set_client = @saved_cs_client */; + -- -- Table structure for table `person` -- @@ -46756,7 +43161,7 @@ CREATE TABLE `routeLog` ( `creationDate` timestamp NULL DEFAULT CURRENT_TIMESTAMP, `description` text COLLATE utf8_unicode_ci NOT NULL, PRIMARY KEY (`id`) -) ENGINE=InnoDB AUTO_INCREMENT=538450 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=575681 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -46835,12 +43240,13 @@ DROP TABLE IF EXISTS `saleItemShelving`; CREATE TABLE `saleItemShelving` ( `id` int(11) NOT NULL AUTO_INCREMENT, `saleFk` int(11) NOT NULL, - `itemShelvingFk` int(11) NOT NULL, + `itemShelvingFk` int(10) unsigned NOT NULL, `quantity` int(11) NOT NULL DEFAULT '0', `isPicked` tinyint(4) NOT NULL DEFAULT '0', `ubication` varchar(45) COLLATE utf8_unicode_ci DEFAULT NULL, - PRIMARY KEY (`id`) -) ENGINE=InnoDB AUTO_INCREMENT=219 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; + PRIMARY KEY (`id`), + KEY `saleItemShelving_fk1_idx` (`itemShelvingFk`) +) ENGINE=InnoDB AUTO_INCREMENT=8106 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -46874,7 +43280,8 @@ SET character_set_client = utf8; 1 AS `id`, 1 AS `code`, 1 AS `description`, - 1 AS `isVisible`*/; + 1 AS `isVisible`, + 1 AS `hasCompany`*/; SET character_set_client = @saved_cs_client; -- @@ -46902,8 +43309,9 @@ DROP TABLE IF EXISTS `shelving`; /*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET character_set_client = utf8 */; CREATE TABLE `shelving` ( - `code` varchar(5) COLLATE utf8_unicode_ci NOT NULL, + `code` varchar(10) CHARACTER SET utf8 NOT NULL, `parkingFk` int(11) DEFAULT NULL, + `isPrinted` tinyint(4) NOT NULL DEFAULT '0', PRIMARY KEY (`code`), KEY `shelving_fk1_idx` (`parkingFk`), CONSTRAINT `shelving_fk1` FOREIGN KEY (`parkingFk`) REFERENCES `parking` (`id`) ON DELETE SET NULL ON UPDATE CASCADE @@ -46928,7 +43336,7 @@ CREATE TABLE `sms` ( `status` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL, `created` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, PRIMARY KEY (`id`) -) ENGINE=InnoDB AUTO_INCREMENT=100525 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=104442 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -47070,7 +43478,8 @@ SET character_set_client = utf8; 1 AS `name`, 1 AS `order`, 1 AS `alertLevel`, - 1 AS `code`*/; + 1 AS `code`, + 1 AS `sectorProdPriority`*/; SET character_set_client = @saved_cs_client; -- @@ -47092,7 +43501,7 @@ CREATE TABLE `stockBuyed` ( UNIQUE KEY `date_UNIQUE` (`date`,`user`), KEY `stockBuyed_user_idx` (`user`), CONSTRAINT `stockBuyedUserFk` FOREIGN KEY (`user`) REFERENCES `account`.`user` (`id`) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=360603 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=382393 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -47169,7 +43578,7 @@ CREATE TABLE `tag` ( `sourceTable` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL, `unit` varchar(45) COLLATE utf8_unicode_ci DEFAULT NULL, PRIMARY KEY (`id`) -) ENGINE=InnoDB AUTO_INCREMENT=80 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Categorias para etiquetar los productos'; +) ENGINE=InnoDB AUTO_INCREMENT=84 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Categorias para etiquetar los productos'; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -47330,7 +43739,7 @@ CREATE TABLE `ticketLog` ( KEY `logTicketuserFk` (`userFk`), CONSTRAINT `ticketLog_ibfk_1` FOREIGN KEY (`originFk`) REFERENCES `vn2008`.`Tickets` (`Id_Ticket`) ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT `ticketLog_ibfk_2` FOREIGN KEY (`userFk`) REFERENCES `account`.`user` (`id`) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=1110706 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=1750481 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; /*!50003 SET @saved_cs_client = @@character_set_client */ ; /*!50003 SET @saved_cs_results = @@character_set_results */ ; @@ -47430,7 +43839,7 @@ CREATE TABLE `ticketPackaging` ( KEY `ticketPackaging_fk2_idx` (`packagingFk`), CONSTRAINT `ticketPackaging_fk1` FOREIGN KEY (`ticketFk`) REFERENCES `vn2008`.`Tickets` (`Id_Ticket`) ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT `ticketPackaging_fk2` FOREIGN KEY (`packagingFk`) REFERENCES `vn2008`.`Cubos` (`Id_Cubo`) ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=35320 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=38534 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -47624,6 +44033,20 @@ CREATE TABLE `town` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; +-- +-- Table structure for table `trainingCenter` +-- + +DROP TABLE IF EXISTS `trainingCenter`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `trainingCenter` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `name` varchar(45) COLLATE utf8_unicode_ci NOT NULL, + PRIMARY KEY (`id`) +) ENGINE=InnoDB AUTO_INCREMENT=13 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +/*!40101 SET character_set_client = @saved_cs_client */; + -- -- Table structure for table `trainingCourse` -- @@ -47635,12 +44058,17 @@ CREATE TABLE `trainingCourse` ( `id` int(11) NOT NULL AUTO_INCREMENT, `workerFk` int(11) NOT NULL, `trainingCourseTypeFk` varchar(45) CHARACTER SET utf8 NOT NULL, + `centerFk` int(11) DEFAULT NULL, `started` datetime NOT NULL, `ended` datetime NOT NULL, + `invoice` int(11) DEFAULT NULL, + `amount` double DEFAULT NULL, PRIMARY KEY (`id`), KEY `frgnWorker_idx` (`workerFk`), + KEY `frgnCenter_idx` (`centerFk`), + CONSTRAINT `frgnCenter` FOREIGN KEY (`centerFk`) REFERENCES `trainingCenter` (`id`) ON DELETE NO ACTION ON UPDATE NO ACTION, CONSTRAINT `frgnWorker` FOREIGN KEY (`workerFk`) REFERENCES `vn2008`.`Trabajadores` (`Id_Trabajador`) ON DELETE NO ACTION ON UPDATE NO ACTION -) ENGINE=InnoDB AUTO_INCREMENT=77 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Lista de trabajadores que han realizado una formación'; +) ENGINE=InnoDB AUTO_INCREMENT=113 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Lista de trabajadores que han realizado una formación'; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -47874,6 +44302,26 @@ SET character_set_client = utf8; 1 AS `fiDueDate`*/; SET character_set_client = @saved_cs_client; +-- +-- Table structure for table `workerBosses` +-- + +DROP TABLE IF EXISTS `workerBosses`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `workerBosses` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `workerFk` int(11) NOT NULL, + `bossFk` int(11) NOT NULL, + PRIMARY KEY (`id`), + UNIQUE KEY `workerFk_UNIQUE` (`workerFk`,`bossFk`), + KEY `fg_worker_worker_idx` (`workerFk`), + KEY `fg_bossFk_worker_idx` (`bossFk`), + CONSTRAINT `fg_bossFk_worker` FOREIGN KEY (`bossFk`) REFERENCES `vn2008`.`Trabajadores` (`Id_Trabajador`) ON DELETE NO ACTION ON UPDATE NO ACTION, + CONSTRAINT `fg_workerFk_worker` FOREIGN KEY (`workerFk`) REFERENCES `vn2008`.`Trabajadores` (`Id_Trabajador`) ON DELETE NO ACTION ON UPDATE NO ACTION +) ENGINE=InnoDB AUTO_INCREMENT=2491 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +/*!40101 SET character_set_client = @saved_cs_client */; + -- -- Table structure for table `workerClockLog` -- @@ -47910,7 +44358,7 @@ CREATE TABLE `workerDocument` ( KEY `workerDocument_ibfk_2` (`document`), CONSTRAINT `workerDocument_ibfk_1` FOREIGN KEY (`worker`) REFERENCES `vn2008`.`Trabajadores` (`user_id`) ON UPDATE CASCADE, CONSTRAINT `workerDocument_ibfk_2` FOREIGN KEY (`document`) REFERENCES `vn2008`.`gestdoc` (`id`) ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=6345 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=6880 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -47960,7 +44408,7 @@ CREATE TABLE `workerJourney` ( UNIQUE KEY `userFk_UNIQUE` (`userFk`,`dated`), KEY `fk_workerJourney_user_idx` (`userFk`), CONSTRAINT `fk_workerJourney_user` FOREIGN KEY (`userFk`) REFERENCES `account`.`user` (`id`) ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=4166878 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=5431262 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -47982,7 +44430,7 @@ CREATE TABLE `workerLog` ( KEY `userFk_idx` (`userFk`), CONSTRAINT `userFk` FOREIGN KEY (`userFk`) REFERENCES `account`.`user` (`id`) ON DELETE NO ACTION ON UPDATE NO ACTION, CONSTRAINT `workerFk` FOREIGN KEY (`originFk`) REFERENCES `vn2008`.`Trabajadores` (`Id_Trabajador`) ON DELETE NO ACTION ON UPDATE NO ACTION -) ENGINE=InnoDB AUTO_INCREMENT=4990 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=5425 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -48019,7 +44467,7 @@ CREATE TABLE `workerTimeControl` ( KEY `warehouseFkfk1_idx` (`warehouseFk`), CONSTRAINT `warehouseFk_1` FOREIGN KEY (`warehouseFk`) REFERENCES `vn2008`.`warehouse` (`id`) ON UPDATE CASCADE, CONSTRAINT `workerTimeControl_fk1` FOREIGN KEY (`userFk`) REFERENCES `account`.`user` (`id`) ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=1352638 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Fichadas'; +) ENGINE=InnoDB AUTO_INCREMENT=1409012 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Fichadas'; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -48231,38 +44679,38 @@ DELIMITER ;; /*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;; /*!50003 SET @saved_time_zone = @@time_zone */ ;; /*!50003 SET time_zone = 'SYSTEM' */ ;; -/*!50106 CREATE*/ /*!50117 DEFINER=`z-developer`@`%`*/ /*!50106 EVENT `printingQueueChecker` ON SCHEDULE EVERY 10 MINUTE STARTS '2018-05-01 00:00:00' ON COMPLETION NOT PRESERVE ENABLE DO BEGIN - - DECLARE vCurrentCount INT; - DECLARE vCheckSum INT; - DECLARE vIsAlreadyNotified BOOLEAN; - - SELECT COUNT(*), SUM(id) INTO vCurrentCount, vCheckSum - FROM printingQueue WHERE state = 1; - - SELECT isAlreadyNotified INTO vIsAlreadyNotified - FROM printingQueueCheck; - - IF (SELECT lastCount FROM printingQueueCheck) = vCurrentCount AND - (SELECT lastCheckSum FROM printingQueueCheck) = vCheckSum AND - vIsAlreadyNotified = FALSE - THEN - INSERT INTO vn2008.mail (`to`, subject, text) - VALUES ('cau@verdnatura.es', - 'servidor de impresion parado', - CONCAT('Hay ', vCurrentCount, ' lineas bloqueadas')); - UPDATE printingQueueCheck SET isAlreadyNotified = TRUE; - END IF; - - IF (SELECT lastCount FROM printingQueueCheck) > vCurrentCount AND - vIsAlreadyNotified = TRUE - THEN - UPDATE printingQueueCheck SET isAlreadyNotified = FALSE; - END IF; - - UPDATE printingQueueCheck - SET lastCount = vCurrentCount, - lastCheckSum = vCheckSum; +/*!50106 CREATE*/ /*!50117 DEFINER=`z-developer`@`%`*/ /*!50106 EVENT `printingQueueChecker` ON SCHEDULE EVERY 10 MINUTE STARTS '2018-05-01 00:00:00' ON COMPLETION NOT PRESERVE ENABLE DO BEGIN + + DECLARE vCurrentCount INT; + DECLARE vCheckSum INT; + DECLARE vIsAlreadyNotified BOOLEAN; + + SELECT COUNT(*), SUM(id) INTO vCurrentCount, vCheckSum + FROM printingQueue WHERE state = 1; + + SELECT isAlreadyNotified INTO vIsAlreadyNotified + FROM printingQueueCheck; + + IF (SELECT lastCount FROM printingQueueCheck) = vCurrentCount AND + (SELECT lastCheckSum FROM printingQueueCheck) = vCheckSum AND + vIsAlreadyNotified = FALSE + THEN + INSERT INTO vn2008.mail (`to`, subject, text) + VALUES ('cau@verdnatura.es', + 'servidor de impresion parado', + CONCAT('Hay ', vCurrentCount, ' lineas bloqueadas')); + UPDATE printingQueueCheck SET isAlreadyNotified = TRUE; + END IF; + + IF (SELECT lastCount FROM printingQueueCheck) > vCurrentCount AND + vIsAlreadyNotified = TRUE + THEN + UPDATE printingQueueCheck SET isAlreadyNotified = FALSE; + END IF; + + UPDATE printingQueueCheck + SET lastCount = vCurrentCount, + lastCheckSum = vCheckSum; END */ ;; /*!50003 SET time_zone = @saved_time_zone */ ;; /*!50003 SET sql_mode = @saved_sql_mode */ ;; @@ -48871,32 +45319,6 @@ DELIMITER ; /*!50003 SET character_set_client = @saved_cs_client */ ; /*!50003 SET character_set_results = @saved_cs_results */ ; /*!50003 SET collation_connection = @saved_col_connection */ ; -/*!50003 DROP FUNCTION IF EXISTS `getDueDatekk` */; -/*!50003 SET @saved_cs_client = @@character_set_client */ ; -/*!50003 SET @saved_cs_results = @@character_set_results */ ; -/*!50003 SET @saved_col_connection = @@collation_connection */ ; -/*!50003 SET character_set_client = utf8 */ ; -/*!50003 SET character_set_results = utf8 */ ; -/*!50003 SET collation_connection = utf8_general_ci */ ; -/*!50003 SET @saved_sql_mode = @@sql_mode */ ; -/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; -DELIMITER ;; -CREATE DEFINER=`root`@`%` FUNCTION `getDueDatekk`(vDated DATE, vDayToPay INT) RETURNS date -BEGIN - - DECLARE vDued DATE; - -- JGF 2018-03-14 para vencimiento correcto ejemplo 438 - SET vDued = IF (/*vDayToPay > 30 or */ vDayToPay < 1 - ,TIMESTAMPADD(DAY, vDayToPay, vDated) - ,TIMESTAMPADD(DAY, vDayToPay, LAST_DAY(vDated))); - - RETURN vDued; -END ;; -DELIMITER ; -/*!50003 SET sql_mode = @saved_sql_mode */ ; -/*!50003 SET character_set_client = @saved_cs_client */ ; -/*!50003 SET character_set_results = @saved_cs_results */ ; -/*!50003 SET collation_connection = @saved_col_connection */ ; /*!50003 DROP FUNCTION IF EXISTS `getInventoryDate` */; ALTER DATABASE `vn` CHARACTER SET utf8 COLLATE utf8_general_ci ; /*!50003 SET @saved_cs_client = @@character_set_client */ ; @@ -49121,7 +45543,7 @@ BEGIN SELECT ticket INTO vTicket FROM tmp.production_buffer - ORDER BY (code = 'PICKER_DESIGNED') DESC , Hora, Minuto, loadingOrder + ORDER BY (code = 'PICKER_DESIGNED') DESC, Hora, Minuto, (code = 'PRINTED_BACK') DESC , loadingOrder LIMIT 1; RETURN vTicket; @@ -49241,6 +45663,31 @@ DELIMITER ; /*!50003 SET character_set_client = @saved_cs_client */ ; /*!50003 SET character_set_results = @saved_cs_results */ ; /*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 DROP FUNCTION IF EXISTS `getWorkerCode` */; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8 */ ; +/*!50003 SET character_set_results = utf8 */ ; +/*!50003 SET collation_connection = utf8_general_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +CREATE DEFINER=`root`@`%` FUNCTION `getWorkerCode`() RETURNS varchar(3) CHARSET utf8 COLLATE utf8_unicode_ci +BEGIN + DECLARE vUserCode VARCHAR(3); + + SELECT workerCode INTO vUserCode + FROM worker + WHERE userFk = account.userGetId(); + + RETURN vUserCode; +END ;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; /*!50003 DROP FUNCTION IF EXISTS `hasAnyNegativeBase` */; /*!50003 SET @saved_cs_client = @@character_set_client */ ; /*!50003 SET @saved_cs_results = @@character_set_results */ ; @@ -49477,6 +45924,44 @@ DELIMITER ; /*!50003 SET character_set_client = @saved_cs_client */ ; /*!50003 SET character_set_results = @saved_cs_results */ ; /*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 DROP FUNCTION IF EXISTS `itemPacking` */; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8 */ ; +/*!50003 SET character_set_results = utf8 */ ; +/*!50003 SET collation_connection = utf8_general_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +CREATE DEFINER=`root`@`%` FUNCTION `itemPacking`(vItemFk INT, vWarehouseFk INT) RETURNS int(11) +BEGIN + + DECLARE vPacking INTEGER; + + SELECT IFNULL(b.packing, 0) INTO vPacking + FROM vn.buy b + JOIN cache.last_buy lb ON lb.buy_id = b.id + WHERE lb.warehouse_id = vWarehouseFk + AND lb.item_id = vItemFk; + + IF vPacking = 0 THEN + + SELECT IFNULL(MAX(b.packing), 0) INTO vPacking + FROM vn.buy b + JOIN cache.last_buy lb ON lb.buy_id = b.id + WHERE lb.item_id = vItemFk; + + END IF; + + RETURN vPacking; + +END ;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; /*!50003 DROP FUNCTION IF EXISTS `itemPlacementGet` */; /*!50003 SET @saved_cs_client = @@character_set_client */ ; /*!50003 SET @saved_cs_results = @@character_set_results */ ; @@ -50160,6 +46645,55 @@ DELIMITER ; /*!50003 SET character_set_client = @saved_cs_client */ ; /*!50003 SET character_set_results = @saved_cs_results */ ; /*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 DROP PROCEDURE IF EXISTS `agencyHourGetLanded` */; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8 */ ; +/*!50003 SET character_set_results = utf8 */ ; +/*!50003 SET collation_connection = utf8_general_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +CREATE DEFINER=`root`@`%` PROCEDURE `agencyHourGetLanded`(vDated DATE, vAddress INT, vAgency INT, vWarehouse INT) +BEGIN +/** + * Devuelve una tabla temporal con el dia de recepcion para vDated. + * + * @param vDated Fecha de preparacion de mercancia + * @param vAddress Id de consignatario, %NULL para recogida + * @param vAgency Id agencia + * @table tmp.agencyHourGetLanded Datos de recepción + */ + DROP TEMPORARY TABLE IF EXISTS tmp.agencyHourGetLanded; + CREATE TEMPORARY TABLE tmp.agencyHourGetLanded + ENGINE = MEMORY + SELECT vWarehouse warehouseFk, landed FROM ( + SELECT * FROM ( + SELECT vWarehouse, TIMESTAMPADD(DAY, ah.substractDay, vDated) landed, ah.substractDay, ah.maxHour + FROM agencyHour ah + LEFT JOIN address a ON a.id = vAddress + WHERE (ah.weekDay = WEEKDAY(TIMESTAMPADD(DAY, ah.substractDay, vDated)) OR ah.weekDay IS NULL) + AND (ah.agencyFk = vAgency OR ah.agencyFk IS NULL) + AND ah.warehouseFk = vWarehouse + AND (ah.provinceFk = a.provinceFk OR ah.provinceFk IS NULL OR vAddress IS NULL) + ORDER BY ( + (ah.weekDay IS NOT NULL) + + (ah.agencyFk IS NOT NULL) + + (- ah.substractDay) + + ((ah.provinceFk IS NOT NULL)*3) + ) DESC + ) t + LIMIT 1 + ) t + WHERE IF(vDated = CURDATE(), t.maxHour > HOUR(NOW()), TRUE) AND t.substractDay < 225; + +END ;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; /*!50003 DROP PROCEDURE IF EXISTS `agencyHourGetShipped` */; /*!50003 SET @saved_cs_client = @@character_set_client */ ; /*!50003 SET @saved_cs_results = @@character_set_results */ ; @@ -50523,7 +47057,8 @@ BEGIN DELETE FROM vn.messageInbox WHERE sendDate < vDateShort; DELETE FROM vn.messageInbox WHERE sendDate < vDateShort; DELETE FROM vn.workerTimeControl WHERE timed < twoYearsAgo; - + DELETE FROM vn.itemShelving WHERE created < CURDATE() AND visible = 0; + INSERT INTO vn.dailyTaskLog(state) VALUES('clean END'); END ;; DELIMITER ; @@ -50638,6 +47173,280 @@ BEGIN END IF; +END ;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 DROP PROCEDURE IF EXISTS `clientGetDebt` */; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8 */ ; +/*!50003 SET character_set_results = utf8 */ ; +/*!50003 SET collation_connection = utf8_general_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +CREATE DEFINER=`root`@`%` PROCEDURE `clientGetDebt`(vDate DATE) +BEGIN +/** + * Calcula el riesgo para los clientes activos + * + * @table tmp.clientGetDebt(clientFk) + * @param vDate Fecha maxima de los registros + * @return tmp.risk + */ + DECLARE vStarted DATETIME DEFAULT TIMESTAMPADD(DAY, - DAYOFMONTH(CURDATE()) - 5, CURDATE()); + DECLARE vEnded DATETIME; + + SET vEnded = TIMESTAMP(IFNULL(vDate, CURDATE()), '23:59:59'); + + DROP TEMPORARY TABLE IF EXISTS tmp.ticket; + CREATE TEMPORARY TABLE tmp.ticket + (INDEX (ticketFk)) + ENGINE = MEMORY + SELECT id ticketFk, c.clientFk + FROM ticket t + JOIN tmp.clientGetDebt c ON c.clientFk = t.clientFk + WHERE refFk IS NULL + AND shipped BETWEEN vStarted AND vEnded; + + CALL ticketGetTotal(); + + DROP TEMPORARY TABLE IF EXISTS tClientRisk; + CREATE TEMPORARY TABLE tClientRisk + ENGINE = MEMORY + SELECT cr.customer_id clientFk, SUM(cr.amount) amount + FROM bi.customer_risk cr + JOIN tmp.clientGetDebt c ON c.clientFk = cr.customer_id + GROUP BY cr.customer_id; + + INSERT INTO tClientRisk + SELECT c.clientFk, SUM(r.amountPaid) + FROM receipt r + JOIN tmp.clientGetDebt c ON c.clientFk = r.clientFk + WHERE r.payed > vStarted + GROUP BY c.clientFk; + + INSERT INTO tClientRisk + SELECT t.clientFk, CAST(-SUM(t.amount) / 100 AS DECIMAL(10,2)) + FROM hedera.tpvTransaction t + JOIN tmp.clientGetDebt c ON c.clientFk = t.clientFk + WHERE t.receiptFk IS NULL + AND t.status = 'ok' + GROUP BY t.clientFk; + + INSERT INTO tClientRisk + SELECT t.clientFk, total + FROM tmp.ticketTotal tt + JOIN tmp.ticket t ON t.ticketFk = tt.ticketFk; + + DROP TEMPORARY TABLE IF EXISTS tmp.risk; + CREATE TEMPORARY TABLE tmp.risk + (PRIMARY KEY (clientFk)) + ENGINE = MEMORY + SELECT clientFk, SUM(amount) risk + FROM client c + JOIN tClientRisk cr ON cr.clientFk = c.id + WHERE c.isActive + GROUP BY c.id; +END ;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 DROP PROCEDURE IF EXISTS `clientGetDebtDiary` */; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8 */ ; +/*!50003 SET character_set_results = utf8 */ ; +/*!50003 SET collation_connection = utf8_general_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +CREATE DEFINER=`root`@`%` PROCEDURE `clientGetDebtDiary`(vClientFK INT, vCompanyFk INT) +BEGIN +/** + * Devuelve el registro de deuda + * + * @param vClientFK Id del cliente + * @param vCompanyFk Id de la empresa + */ + DECLARE vDone BOOL; + DECLARE vDate DATETIME; + DECLARE vTotalBalance DOUBLE DEFAULT 0.00; + DECLARE vCreated DATETIME; + DECLARE vIssued DATETIME; + DECLARE vBalance DOUBLE DEFAULT 0.00; + DECLARE cur CURSOR FOR + SELECT + created, + issued, + ROUND(amount, 2) AS balance + FROM invoiceOut + WHERE clientFk = vClientFk AND companyFk = vCompanyFk + UNION ALL + SELECT + created, + payed, + ROUND(-1 * amountPaid, 2) AS balance + FROM receipt + WHERE clientFk = vClientFk AND companyFk = vCompanyFk + ORDER BY issued, created; + DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE; + + OPEN cur; + + proc: LOOP + SET vDone = FALSE; + + FETCH cur INTO vCreated, vIssued, vBalance; + + IF vDone THEN + LEAVE proc; + END IF; + + SET vTotalBalance = vTotalBalance + vBalance; + + IF CAST(ABS(vTotalBalance) AS UNSIGNED) = 0 THEN + SET vDate = vIssued; + SET vDone = TRUE; + END IF; + END LOOP; + + CLOSE cur; + + SELECT + issued, + CAST(debtOut AS DECIMAL(10,2)) debtOut, + CAST(debtIn AS DECIMAL(10,2)) debtIn, + ref, + companyFk, + priority + FROM + (SELECT + NULL AS issued, + SUM(amountUnpaid) AS debtOut, + NULL AS debtIn, + 'Saldo Anterior' AS ref, + companyFk, + 0 as priority + FROM + (SELECT SUM(amount) AS amountUnpaid, companyFk, 0 + FROM invoiceOut + WHERE clientFk = vClientFK + AND issued < vDate + GROUP BY companyFk + + UNION ALL + + SELECT SUM(-1 * amountPaid), companyFk, 0 + FROM receipt + WHERE clientFk = vClientFK + AND payed < vDate + GROUP BY companyFk) AS transactions + GROUP BY companyFk + + UNION ALL + + SELECT + issued, + amount as debtOut, + NULL AS debtIn, + ref, + companyFk, + 1 + FROM invoiceOut + WHERE clientFk = vClientFK + AND issued >= vDate + UNION ALL + + SELECT + r.payed, + NULL as debtOut, + r.amountPaid, + r.id, + r.companyFk, + 0 + FROM receipt r + WHERE r.clientFk = vClientFK + AND r.payed >= vDate) t + INNER JOIN `client` c ON c.id = vClientFK + HAVING debtOut <> 0 OR debtIn <> 0 + ORDER BY issued, priority DESC, debtIn; +END ;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 DROP PROCEDURE IF EXISTS `clientRemoveWorker` */; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8 */ ; +/*!50003 SET character_set_results = utf8 */ ; +/*!50003 SET collation_connection = utf8_general_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +CREATE DEFINER=`root`@`%` PROCEDURE `clientRemoveWorker`() +BEGIN + + + DECLARE done BOOL DEFAULT FALSE; + DECLARE vClientFk INT; + + DECLARE rs CURSOR FOR + SELECT c.clientFk + FROM tmp.clientGetDebt c + LEFT JOIN tmp.risk r ON r.clientFk = c.clientFk + WHERE IFNULL(r.risk,0) = 0; + + DECLARE CONTINUE HANDLER FOR NOT FOUND SET done = TRUE; + + DROP TEMPORARY TABLE IF EXISTS tmp.clientGetDebt; + CREATE TEMPORARY TABLE tmp.clientGetDebt + SELECT cd.id as clientFk + FROM bs.clientDied cd + LEFT JOIN vn.clientProtected cp ON cp.clientFk = cd.id + JOIN vn.client c ON c.id = cd.id + JOIN vn.province p ON p.id = c.provinceFk + JOIN vn.country co ON co.id = p.countryFk + + WHERE cd.Aviso = 'TERCER AVISO' + AND cp.clientFk IS NULL + AND co.country NOT IN ('Portugal','Francia','España exento') + LIMIT 10; + + CALL vn.clientGetDebt(curdate()); + + OPEN rs; + + FETCH rs INTO vClientFk; + + WHILE NOT done DO + + SELECT vClientFk; + + CALL vn.greugeSpray(vClientFk, TRUE, '',TRUE); + + UPDATE vn.client SET salesPersonFk = NULL WHERE id = vClientFk; + + FETCH rs INTO vClientFk; + + END WHILE; + + + CLOSE rs; + + + + END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -50878,7 +47687,7 @@ DELIMITER ; /*!50003 SET character_set_client = @saved_cs_client */ ; /*!50003 SET character_set_results = @saved_cs_results */ ; /*!50003 SET collation_connection = @saved_col_connection */ ; -/*!50003 DROP PROCEDURE IF EXISTS `createExternalWorkerkk` */; +/*!50003 DROP PROCEDURE IF EXISTS `createPedidoInterno` */; /*!50003 SET @saved_cs_client = @@character_set_client */ ; /*!50003 SET @saved_cs_results = @@character_set_results */ ; /*!50003 SET @saved_col_connection = @@collation_connection */ ; @@ -50888,37 +47697,12 @@ DELIMITER ; /*!50003 SET @saved_sql_mode = @@sql_mode */ ; /*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; DELIMITER ;; -CREATE DEFINER=`root`@`%` PROCEDURE `createExternalWorkerkk`( - vFirstName VARCHAR(50), - vSurname1 VARCHAR(50), - vSurname2 VARCHAR(50), - vUser VARCHAR(20), - vPassword VARCHAR(50), - vWorkerCode VARCHAR(3) - ) +CREATE DEFINER=`root`@`%` PROCEDURE `createPedidoInterno`(vItemFk INT,vQuantity INT) BEGIN - DECLARE vUserId INT; - DECLARE vWorkerPako INT DEFAULT 2; - DECLARE vSurnames VARCHAR(100); - - INSERT INTO account.user(name,password,role) - SELECT vUser,MD5(vPassword),1; - - SET vUserId = LAST_INSERT_ID(); - /* - INSERT INTO vn.worker(firstName,name,bossFk,workerCode,user_id) - SELECT vFirstName,CONCAT(vSurname1,' ',vSurname2),2,vWorkerCode,vUser; - */ - - IF vSurname2 IS NULL THEN - SET vSurnames = vSurname1; - ELSE - SET vSurnames = CONCAT(vSurname1, ' ', vSurname2); - END IF; - INSERT INTO vn2008.Trabajadores(Nombre, Apellidos, boss, CodigoTrabajador, user_id) - SELECT vFirstName, vSurnames, vWorkerPako, vWorkerCode, vUserId; + UPDATE vn.item SET upToDown = vQuantity WHERE id = vItemFk; + END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -51705,7 +48489,7 @@ DELIMITER ; /*!50003 SET character_set_client = @saved_cs_client */ ; /*!50003 SET character_set_results = @saved_cs_results */ ; /*!50003 SET collation_connection = @saved_col_connection */ ; -/*!50003 DROP PROCEDURE IF EXISTS `getDebt` */; +/*!50003 DROP PROCEDURE IF EXISTS `getItemUbication` */; /*!50003 SET @saved_cs_client = @@character_set_client */ ; /*!50003 SET @saved_cs_results = @@character_set_results */ ; /*!50003 SET @saved_col_connection = @@collation_connection */ ; @@ -51715,83 +48499,18 @@ DELIMITER ; /*!50003 SET @saved_sql_mode = @@sql_mode */ ; /*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; DELIMITER ;; -CREATE DEFINER=`root`@`%` PROCEDURE `getDebt`(vDate DATE) +CREATE DEFINER=`root`@`%` PROCEDURE `getItemUbication`(vItemFk INT) BEGIN -/** - * Calcula el riesgo para los clientes activos de la tabla temporal tmp.client_list - * - * @table tmp.client_list - * @param vDate Fecha maxima de los registros - * @treturn tmp.risk - */ - DECLARE vDateIni DATETIME DEFAULT TIMESTAMPADD(DAY, - DAYOFMONTH(CURDATE()) - 5, CURDATE()); - DECLARE vDateEnd DATETIME; - DECLARE MAX_RISK_ALLOWED INT DEFAULT 200; - SET vDateEnd = TIMESTAMP(IFNULL(vDate, CURDATE()), '23:59:59'); + SELECT pk.code as Parking, + sh.code as Matricula, + ish.visible as visible, + ish.available as Disponible + FROM vn.itemShelving ish + JOIN vn.shelving sh ON sh.`code` = ish.shelvingFk + JOIN vn.parking pk ON pk.id = sh.parkingFk + WHERE ish.itemFk = vItemFk; - DROP TEMPORARY TABLE IF EXISTS tmp.clientList2; - CREATE TEMPORARY TABLE tmp.clientList2 - (PRIMARY KEY (Id_Cliente)) - ENGINE = MEMORY - SELECT * - FROM tmp.client_list; - - DROP TEMPORARY TABLE IF EXISTS tmp.clientList3; - CREATE TEMPORARY TABLE tmp.clientList3 - (PRIMARY KEY (Id_Cliente)) - ENGINE = MEMORY - SELECT * - FROM tmp.client_list; - - DROP TEMPORARY TABLE IF EXISTS tmp.ticket; - CREATE TEMPORARY TABLE tmp.ticket - (INDEX (ticketFk)) - ENGINE = MEMORY - SELECT id ticketFk, cl.Id_Cliente - FROM ticket t - JOIN tmp.clientList2 cl ON t.clientFk = cl.Id_Cliente - WHERE refFk IS NULL - AND shipped BETWEEN vDateIni AND vDateEnd; - - CALL vn.ticketGetTotal(); - - DROP TEMPORARY TABLE IF EXISTS tmp.risk; - CREATE TEMPORARY TABLE tmp.risk - (PRIMARY KEY (Id_Cliente)) - ENGINE = MEMORY - SELECT Id_Cliente, SUM(amount) risk - FROM vn2008.Clientes c - JOIN ( - SELECT customer_id, SUM(amount) amount - FROM bi.customer_risk cr - JOIN tmp.client_list on tmp.client_list.Id_Cliente = cr.customer_id - GROUP BY customer_id - UNION ALL - SELECT Id_Cliente, SUM(Entregado) - FROM vn2008.Recibos - JOIN tmp.clientList2 using(Id_Cliente) - WHERE Fechacobro > vDateIni - GROUP BY Id_Cliente - UNION ALL - SELECT t.Id_Cliente, total - FROM tmp.ticketTotal tt - JOIN tmp.ticket t ON t.ticketFk = tt.ticketFk - UNION ALL - SELECT t.clientFk customer_id, CAST(-SUM(t.amount) / 100 AS DECIMAL(10,2)) - FROM hedera.tpvTransaction t - JOIN tmp.clientList3 l ON l.Id_Cliente = t.clientFk - WHERE t.receiptFk IS NULL - AND t.status = 'ok' - GROUP BY t.clientFk - ) t ON c.Id_Cliente = t.customer_id - WHERE c.activo != FALSE - GROUP BY c.Id_Cliente; - - DROP TEMPORARY TABLE - tmp.ticket, - tmp.clientList2, - tmp.clientList3; END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -51843,6 +48562,27 @@ DELIMITER ; /*!50003 SET character_set_client = @saved_cs_client */ ; /*!50003 SET character_set_results = @saved_cs_results */ ; /*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 DROP PROCEDURE IF EXISTS `getPedidosInternos` */; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8 */ ; +/*!50003 SET character_set_results = utf8 */ ; +/*!50003 SET collation_connection = utf8_general_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +CREATE DEFINER=`root`@`%` PROCEDURE `getPedidosInternos`() +BEGIN + + SELECT id,name as description,upToDown as quantity FROM vn.item WHERE upToDown; + +END ;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; /*!50003 DROP PROCEDURE IF EXISTS `greugeSpray` */; /*!50003 SET @saved_cs_client = @@character_set_client */ ; /*!50003 SET @saved_cs_results = @@character_set_results */ ; @@ -51853,53 +48593,76 @@ DELIMITER ; /*!50003 SET @saved_sql_mode = @@sql_mode */ ; /*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; DELIMITER ;; -CREATE DEFINER=`root`@`%` PROCEDURE `greugeSpray`(IN vClientFk INT, IN onlyForHisOwner BOOL, IN vWorkerCode VARCHAR(3)) +CREATE DEFINER=`root`@`%` PROCEDURE `greugeSpray`(IN vClientFk INT, IN onlyForHisOwner BOOL, IN vWorkerCode VARCHAR(3), IN vWithMana BOOLEAN) BEGIN DECLARE vGreuge DECIMAL(10,2); DECLARE vOwner INT; DECLARE vTotalSale INT; DECLARE vGreugeTypeFk INT DEFAULT 5; -- HERENCIA + DECLARE vGreugeTypeMana INT DEFAULT 3;-- Maná + DECLARE vMana DECIMAL(10,2); + + SELECT vn.clientGetMana(vClientFk) INTO vMana; + + IF vWithMana AND vMana THEN + + INSERT INTO vn.greuge( clientFk, + description, + amount, + shipped, + greugeTypeFk) + VALUES( vClientFk, + 'Desasignación', + -1 * vMana, + CURDATE(), + vGreugeTypeMana); + + END IF; SELECT sum(amount) INTO vGreuge FROM vn.greuge WHERE clientFk = vClientFk; - IF LENGTH(vWorkerCode) = 0 THEN + IF vGreuge != 0 THEN - SELECT salesPersonFk INTO vOwner - FROM vn.client - WHERE id = vClientFk; + IF LENGTH(vWorkerCode) = 0 THEN - ELSE - - SELECT id INTO vOwner - FROM vn.worker - WHERE workerCode = vWorkerCode COLLATE utf8_general_ci; + SELECT salesPersonFk INTO vOwner + FROM vn.client + WHERE id = vClientFk; + ELSE + + SELECT id INTO vOwner + FROM vn.worker + WHERE workerCode = vWorkerCode COLLATE utf8_general_ci; + + END IF; + + DROP TEMPORARY TABLE IF EXISTS tmp.clientList; + CREATE TEMPORARY TABLE tmp.clientList + SELECT DISTINCT t.clientFk, floor(cr.yearSale / 12) AS monthSale + FROM vn.ticket t + JOIN vn.client c ON c.id = t.clientFk + JOIN vn.manaSpellers ms ON ms.worker = c.salesPersonFk + JOIN vn.claimRatio cr ON cr.clientFk = c.id + WHERE ms.worker = IF(onlyForHisOwner, vOwner, ms.worker) + AND t.shipped >= TIMESTAMPADD(MONTH,-1,CURDATE()) + AND c.id != vClientFk + HAVING monthSale > 100; + + SELECT SUM(monthSale) INTO vTotalSale + FROM tmp.clientList; + + INSERT INTO vn.greuge(clientFk, description, amount, shipped, greugeTypeFk) + SELECT clientFk, CONCAT('Cliente: ',vClientFk), vGreuge * monthSale / vTotalSale, CURDATE(), vGreugeTypeFk + FROM tmp.clientList + UNION ALL + SELECT vClientFk, 'Reparto greuge', -vGreuge, CURDATE(), vGreugeTypeFk; + END IF; - DROP TEMPORARY TABLE IF EXISTS tmp.clientList; - CREATE TEMPORARY TABLE tmp.clientList - SELECT DISTINCT t.clientFk, floor(cr.yearSale / 12) AS monthSale - FROM vn.ticket t - JOIN vn.client c ON c.id = t.clientFk - JOIN vn.manaSpellers ms ON ms.worker = c.salesPersonFk - JOIN vn.claimRatio cr ON cr.clientFk = c.id - WHERE ms.worker = IF(onlyForHisOwner, vOwner, ms.worker) - AND t.shipped >= TIMESTAMPADD(MONTH,-1,CURDATE()) - AND c.id != vClientFk - HAVING monthSale > 100; - - SELECT SUM(monthSale) INTO vTotalSale - FROM tmp.clientList; - - INSERT INTO vn.greuge(clientFk, description, amount, shipped, greugeTypeFk) - SELECT clientFk, CONCAT('Cliente: ',vClientFk), vGreuge * monthSale / vTotalSale, CURDATE(), vGreugeTypeFk - FROM tmp.clientList - UNION ALL - SELECT vClientFk, 'Reparto greuge', -vGreuge, CURDATE(), vGreugeTypeFk; - END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -52099,322 +48862,6 @@ BEGIN AND i.companyFk = n.companyFk GROUP BY i.companyFk; -END ;; -DELIMITER ; -/*!50003 SET sql_mode = @saved_sql_mode */ ; -/*!50003 SET character_set_client = @saved_cs_client */ ; -/*!50003 SET character_set_results = @saved_cs_results */ ; -/*!50003 SET collation_connection = @saved_col_connection */ ; -/*!50003 DROP PROCEDURE IF EXISTS `invoiceInBookingExtra_kk` */; -/*!50003 SET @saved_cs_client = @@character_set_client */ ; -/*!50003 SET @saved_cs_results = @@character_set_results */ ; -/*!50003 SET @saved_col_connection = @@collation_connection */ ; -/*!50003 SET character_set_client = utf8 */ ; -/*!50003 SET character_set_results = utf8 */ ; -/*!50003 SET collation_connection = utf8_general_ci */ ; -/*!50003 SET @saved_sql_mode = @@sql_mode */ ; -/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; -DELIMITER ;; -CREATE DEFINER=`root`@`%` PROCEDURE `invoiceInBookingExtra_kk`(vInvoiceInId INT) -BEGIN - - DECLARE totalBI DECIMAL(10,2); - DECLARE totalDATE DATE; - DECLARE done BOOL DEFAULT FALSE; - DECLARE vBookNumber,vSerialNumber INT; - DECLARE vInvoiceFk INT; - DECLARE rs CURSOR FOR - SELECT invoiceInFk - FROM invoiceInEntry iie - JOIN invoiceIn ii ON ii.id = iie.invoiceInFk - WHERE iie.invoiceInAwbFk = vInvoiceInId - AND ii.isBooked = FALSE; - - DECLARE CONTINUE HANDLER FOR NOT FOUND SET done = TRUE; - - OPEN rs; - - -- Actualizacion de la fecha de contabilizado y de operacion de las importaciones - - CALL invoiceInBookingCommon(vInvoiceInId,vSerialNumber); - - UPDATE invoiceInEntry iie - JOIN invoiceIn ii ON ii.id = iie.invoiceInFk - JOIN invoiceInAwb iia ON iia.invoiceInFk = iie.invoiceInAwbFk - JOIN awb a ON a.id = iia.awbFk - SET ii.isBooked = TRUE, - ii.booked = IFNULL(ii.booked,a.booked), - ii.operated = IFNULL(ii.operated,a.operated), - ii.issued = IFNULL(ii.issued,a.issued), - ii.bookEntried = IFNULL(ii.bookEntried,a.bookEntried) - WHERE iie.invoiceInAwbFk = vInvoiceInId; - FETCH rs INTO vInvoiceFk; - - -- Contabilización individual de las facturas - WHILE NOT done DO - - CALL invoiceInBookingMain(vInvoiceFk); - - SELECT MAX(ASIEN) - FROM vn2008.XDiario INTO vBookNumber; - - -- Elimina las lineas de IVA, para no duplicar con la declaración del DUA - DELETE FROM vn2008.XDiario - WHERE ASIEN = vBookNumber - AND IFNULL(EURODEBE,0) = 0 - AND IFNULL(EUROHABER,0) = 0; - - FETCH rs INTO vInvoiceFk; - - END WHILE; - - CLOSE rs; - - - /* - -- Extracomunitarias gasto contra proveedor/acreedor - INSERT INTO vn2008.XDiario ( - ASIEN, - FECHA, - SUBCTA, - CONTRA, - EURODEBE, - EUROHABER, - CONCEPTO, - CAMBIO, - DEBEME, - HABERME, - NFACTICK, - empresa_id - ) - SELECT - vBookNumber ASIEN, - IFNULL(a.bookEntried, n.bookEntried) FECHA, - iit.expenceFk SUBCTA, - s.account CONTRA, - /* - GREATEST(ROUND(SUM(iit.taxableBase) * (iie.percentage / 100),2) , 0) EURODEBE, - GREATEST(- ROUND(SUM(iit.taxableBase) * (iie.percentage / 100),2) , 0) EUROHABER, - */ - /* GREATEST(SUM(iit.taxableBase) , 0) EURODEBE, - GREATEST(- SUM(iit.taxableBase) , 0) EUROHABER, - CONCAT('COMPRA s/fra ',i.supplierRef,':',LEFT(s.name, 10)) CONCEPTO, - SUM(iit.taxableBase) / SUM(iit.foreignValue) CAMBIO, - -- ROUND(SUM(iit.foreignValue) * (iie.percentage / 100),2) DEBEME, - GREATEST(SUM(iit.foreignValue) ,0) DEBEME, - GREATEST(- SUM(iit.foreignValue) ,0) HABERME, - n.invoicesCount NFACTICK, - n.companyFk empresa_id - FROM newInvoiceIn n - JOIN invoiceInEntry iie ON iie.invoiceInAwbFk = n.id - JOIN invoiceInTax iit ON iit.invoiceInFk = iie.invoiceInFk - JOIN invoiceIn i ON i.id = iit.invoiceInFk - JOIN supplier s ON s.id = i.supplierFk - LEFT JOIN invoiceInAwb iia ON iia.invoiceInFk = n.id - LEFT JOIN awb a ON a.id = iia.awbFk - -- WHERE iie.percentage - WHERE i.isBooked = FALSE - GROUP BY i.id; - - -- Extracomunitarias proveedor contra gasto - INSERT INTO vn2008.XDiario ( - ASIEN, - FECHA, - SUBCTA, - CONTRA, - EUROHABER, - EURODEBE, - CONCEPTO, - CAMBIO, - HABERME, - DEBEME, - NFACTICK, - empresa_id - ) - SELECT - vBookNumber ASIEN, - IFNULL(a.bookEntried, n.bookEntried) FECHA, - s.account SUBCTA, - iit.expenceFk CONTRA, - /* - GREATEST( ROUND(SUM(iit.taxableBase) * (iie.percentage / 100),2) , 0) EUROHABER, - GREATEST(-ROUND(SUM(iit.taxableBase) * (iie.percentage / 100),2) , 0) EURODEBE, - */ - /* GREATEST(SUM(iit.taxableBase) , 0) EUROHABER, - GREATEST(- SUM(iit.taxableBase) , 0) EURODEBE, - CONCAT('COMPRA s/fra ',i.supplierRef,':',LEFT(s.name, 10)) CONCEPTO, - SUM(iit.taxableBase) / SUM(iit.foreignValue) CAMBIO, - -- SUM(iit.foreignValue) HABERME, - GREATEST(SUM(iit.foreignValue) ,0) HABERME, - GREATEST(- SUM(iit.foreignValue) ,0) DEBEME, - n.invoicesCount NFACTICK, - n.companyFk empresa_id - FROM newInvoiceIn n - JOIN invoiceInEntry iie ON iie.invoiceInAwbFk = n.id - JOIN invoiceInTax iit ON iit.invoiceInFk = iie.invoiceInFk - JOIN invoiceIn i ON i.id = iit.invoiceInFk - JOIN supplier s ON s.id = i.supplierFk - LEFT JOIN invoiceInAwb iia ON iia.invoiceInFk = n.id - LEFT JOIN awb a ON a.id = iia.awbFk - -- WHERE iie.percentage - WHERE i.isBooked = FALSE - GROUP BY i.id; - */ - SELECT MAX(ASIEN) + 1 - INTO vBookNumber - FROM vn2008.XDiario; - - - - -- Linea iva importacion extracomunitaria - - SET @cont:=1; - SET @total:=0; - - INSERT INTO vn2008.XDiario( - ASIEN, - FECHA, - SUBCTA, - CONTRA, - EURODEBE, - BASEEURO, - CONCEPTO, - FACTURA, - IVA, - AUXILIAR, - SERIE, - FECHA_EX, - FECHA_OP, - FACTURAEX, - NFACTICK, - L340, - LDIFADUAN, - TIPOCLAVE, - TIPOEXENCI, - TIPONOSUJE, - TIPOFACT, - TIPORECTIF, - TERIDNIF, - TERNIF, - TERNOM, - empresa_id, - FECREGCON - ) - - SELECT - vBookNumber ASIEN, - x.FECHA, - x.SUBCTA, - x.CONTRA, - IF (n.isSameCountry OR NOT s.isUeeMember, - x.EURODEBE, - NULL - ) EURODEBE, - x.BASEEURO, - x.CONCEPTO, - vSerialNumber FACTURA, - x.IVA, - '*' AUXILIAR, - x.SERIE, - x.FECHA_EX, - x.FECHA_OP, - x.dua FACTURAEX, - n.invoicesCount NFACTICK, - IF(@total:=@total + x.EURODEBE AND @cont:=@cont + 1 ,1,1) L340, - TRUE LDIFADUAN, - x.TIPOCLAVE, - n.cplusTaxBreakFk TIPOEXENCI, - n.cplusSubjectOpFk TIPONOSUJE, - 5 TIPOFACT, - n.cplusRectificationTypeFk TIPORECTIF, - x.TERIDNIF, - x.TERNIF, - x.TERNOM, - n.companyFk, - IFNULL(x.FECREGCON,n.booked) FECREGCON - - FROM newInvoiceIn n - JOIN newSupplier s - JOIN ( - SELECT - CONCAT('COMPRA s/fra ',ii.supplierRef,':',LEFT(s.name, 10)) CONCEPTO, - tc.code SUBCTA, - s.account CONTRA, - tc.rate IVA, - ROUND(sum(b.buyingValue * b.quantity / intraSub.intrastatSum * taxSub.amount)*(tc.rate/100),2) EURODEBE, - ROUND(sum(b.buyingValue * b.quantity / intraSub.intrastatSum * taxSub.amount),2) BASEEURO, - ii.serial SERIE, - e.supplierFk, - iia.dua, - iis.cplusTerIdNifFk TERIDNIF, - s.nif AS TERNIF, - s.name AS TERNOM, - ii.booked FECREGCON, - ii.cplusTrascendency472Fk TIPOCLAVE, - a.issued FECHA_EX, - a.operated FECHA_OP, - a.bookEntried FECHA - FROM invoiceInAwb iia - JOIN invoiceInEntry iie ON iie.invoiceInAwbFk = iia.invoiceInFk - JOIN awb a ON a.id = iia.awbFk - JOIN invoiceIn ii ON ii.id = iie.invoiceInFk - JOIN invoiceInSerial iis ON iis.code = ii.serial - JOIN buy b ON b.entryFk = iie.entryFk - JOIN item i ON i.id = b.itemFk - JOIN ( - SELECT - i.intrastatFk, - sum(b.buyingValue * b.quantity) as intrastatSum - FROM buy b - JOIN item i ON i.id = b.itemFk - JOIN invoiceInEntry iie ON iie.entryFk = b.entryFk - JOIN invoiceInAwb iia ON iia.invoiceInFk = iie.invoiceInAwbFk - JOIN awb aw ON aw.id =iia.awbFk - WHERE iie.percentage AND iia.invoiceInFk = vInvoiceInId - GROUP BY i.intrastatFk - ) intraSub ON intraSub.intrastatFk = i.intrastatFk - JOIN ( - SELECT - iii.intrastatFk, - iii.amount, - intr.taxCodeFk - FROM invoiceInIntrastat iii - JOIN intrastat intr ON intr.id = iii.intrastatFk - WHERE iii.invoiceInFk = vInvoiceInId - ) taxSub ON taxSub.intrastatFk = i.intrastatFk - JOIN taxCode tc ON tc.id = taxSub.taxCodeFk - JOIN entry e ON e.id = iie.entryFk - JOIN supplier s ON s.id = e.supplierFk - WHERE iie.invoiceInAwbFk = vInvoiceInId AND iie.percentage - GROUP BY e.supplierFk, taxSub.taxCodeFk - ) x - GROUP BY x.supplierFk, x.IVA; - -SELECT SUM(EURODEBE),FECHA INTO totalBI, totalDATE -FROM vn2008.XDiario -WHERE ASIEN = vBookNumber; - - -- Iva Importacion pendiente - - INSERT INTO vn2008.XDiario( - ASIEN, - FECHA, - SUBCTA, - CONCEPTO, - EUROHABER, - SERIE, - empresa_id) - - SELECT - vBookNumber, - totalDATE, - '4700000999', - n.conceptWithSupplier, - totalBI EUROHABER, - n.serial, - n.companyFk - FROM newInvoiceIn n; - END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -53688,6 +50135,80 @@ BEGIN DROP TEMPORARY TABLE tmp.ticket; DROP TEMPORARY TABLE tmp.ticketTax; DROP TEMPORARY TABLE tmp.ticketAmount; +END ;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 DROP PROCEDURE IF EXISTS `itemCard` */; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8 */ ; +/*!50003 SET character_set_results = utf8 */ ; +/*!50003 SET collation_connection = utf8_general_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +CREATE DEFINER=`root`@`%` PROCEDURE `itemCard`(vBarcode VARCHAR(22), vWarehouseFk INT) +BEGIN + + DECLARE vCacheVisibleFk INT; + DECLARE vCacheAvailableFk INT; + DECLARE vVisibleAltillo INT; + DECLARE vItemFk INT; + + SELECT vn.barcodeToItem(vBarcode) INTO vItemFk; + + SELECT max(id) INTO vCacheVisibleFk + FROM cache.cache_calc + WHERE cacheName = 'visible' + AND params = vWarehouseFk; + + SELECT max(id) INTO vCacheAvailableFk + FROM cache.cache_calc + WHERE cacheName = 'available' + AND params = CONCAT(vWarehouseFk,'/',date(CURDATE())); + + SELECT sum(visible) INTO vVisibleAltillo + FROM vn.itemShelving ish + JOIN vn.shelving sh ON sh.`code` = ish.shelvingFk + LEFT JOIN vn.parking p ON p.id = sh.parkingFk + LEFT JOIN vn.sector s ON s.id = p.sectorFk + WHERE ish.itemFk = vItemFk; + + + SELECT i.longName, + i.value5, + i.value6, + i.value7, + i.image, + i.size, + i.stems, + i.category, + p.name as producer, + o.code as origin, + ip.code as nicho, + ip.reserve as reserva, + v.visible - IFNULL(vVisibleAltillo,0) as enNicho, + a.available, + vVisibleAltillo as enAltillo, + v.visible as total, + i.upToDown as repo + + FROM vn.item i + LEFT JOIN vn.producer p ON p.id = i.producerFk + LEFT JOIN vn.origin o ON o.id = i.originFk + LEFT JOIN vn.itemPlacement ip ON ip.itemFk = i.id + LEFT JOIN cache.visible v ON v.calc_id = vCacheVisibleFk AND v.item_id = i.id + LEFT JOIN cache.available a ON a.calc_id = vCacheAvailableFk AND a.item_id = i.id + + + WHERE i.id = vItemFk + AND ip.warehouseFk = vWarehouseFk; + + END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -53717,10 +50238,13 @@ BEGIN stateName, origin, reference, + clientFk, name, `in`, `out`, - @a := @a + IFNULL(`in`,0) - IFNULL(`out`,0) as balance + @a := @a + IFNULL(`in`,0) - IFNULL(`out`,0) as balance, + isPicked, + isTicket FROM ( SELECT tr.landed as date, b.quantity as `in`, @@ -53730,7 +50254,9 @@ BEGIN s.name as name, e.ref as reference, e.id as origin, - TRUE isPicked + s.id as clientFk, + TRUE isPicked, + FALSE AS isTicket FROM vn.buy b JOIN vn.entry e ON e.id = b.entryFk JOIN vn.travel tr ON tr.id = e.travelFk @@ -53757,7 +50283,9 @@ BEGIN s.name as name, e.ref as reference, e.id as origin, - TRUE isPicked + s.id as clientFk, + TRUE isPicked, + FALSE AS isTicket FROM vn.buy b JOIN vn.entry e ON e.id = b.entryFk JOIN vn.travel tr ON tr.id = e.travelFk @@ -53787,7 +50315,9 @@ BEGIN t.nickname as name, t.refFk as reference, t.id as origin, - TRUE as isPicked -- stk.id as isPicked + t.clientFk, + TRUE as isPicked, -- stk.id as isPicked + TRUE as isTicket FROM vn.sale s JOIN vn.ticket t ON t.id = s.ticketFk LEFT JOIN vn.ticketState ts ON ts.ticket = t.id @@ -53811,118 +50341,6 @@ DELIMITER ; /*!50003 SET character_set_client = @saved_cs_client */ ; /*!50003 SET character_set_results = @saved_cs_results */ ; /*!50003 SET collation_connection = @saved_col_connection */ ; -/*!50003 DROP PROCEDURE IF EXISTS `itemDiaryKk` */; -/*!50003 SET @saved_cs_client = @@character_set_client */ ; -/*!50003 SET @saved_cs_results = @@character_set_results */ ; -/*!50003 SET @saved_col_connection = @@collation_connection */ ; -/*!50003 SET character_set_client = utf8 */ ; -/*!50003 SET character_set_results = utf8 */ ; -/*!50003 SET collation_connection = utf8_general_ci */ ; -/*!50003 SET @saved_sql_mode = @@sql_mode */ ; -/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; -DELIMITER ;; -CREATE DEFINER=`root`@`%` PROCEDURE `itemDiaryKk`(IN vItemId INT, IN vWarehouse INT) -BEGIN - DECLARE vDateInventory DATETIME; - DECLARE vCurdate DATE DEFAULT CURDATE(); - -- traduccion: date, alertLevel, origin, reference, name, In, Out, Balance - SELECT Fechainventario INTO vDateInventory FROM vn2008.tblContadores; - SET @a = 0; - SELECT DATE(date) AS date, - alertLevel, - stateName, - origin, - reference, - name, - `in`, - `out`, - @a := @a + IFNULL(`in`,0) - IFNULL(`out`,0) as balance - FROM - ( SELECT tr.landed as date, - b.quantity as `in`, - NULL as `out`, - IF(tr.isReceived != FALSE,3, IF(tr.isDelivered,1,0)) as alertLevel, - st.name AS stateName, - s.name as name, - e.ref as reference, - e.id as origin - FROM vn.buy b - JOIN vn.entry e ON e.id = b.entryFk - JOIN vn.travel tr ON tr.id = e.travelFk - JOIN vn.supplier s ON s.id = e.supplierFk - JOIN vn.alertLevel al ON al.alertLevel = - CASE - WHEN tr.isReceived != FALSE THEN 3 - WHEN tr.isDelivered THEN 1 - ELSE 0 - END - JOIN vn.state st ON st.code = al.code - WHERE tr.landed >= vDateInventory - AND vWarehouse = tr.warehouseInFk - AND b.itemFk = vItemId - AND e.isInventory = 0 - - UNION ALL - - SELECT tr.shipped as date, - NULL as `in`, - b.quantity as `out`, - IF(tr.isReceived != FALSE,3, IF(tr.isDelivered,1,0)) as alertLevel, - st.name AS stateName, - s.name as name, - e.ref as reference, - e.id as origin - FROM vn.buy b - JOIN vn.entry e ON e.id = b.entryFk - JOIN vn.travel tr ON tr.id = e.travelFk - JOIN vn.warehouse w ON w.id = tr.warehouseOutFk - JOIN vn.supplier s ON s.id = e.supplierFk - JOIN vn.alertLevel al ON al.alertLevel = - CASE - WHEN tr.isReceived != FALSE THEN 3 - WHEN tr.isDelivered THEN 1 - ELSE 0 - END - JOIN vn.state st ON st.code = al.code - WHERE tr.shipped >= vDateInventory - AND vWarehouse =tr.warehouseOutFk - AND s.id <> 4 - AND b.itemFk = vItemId - AND e.isInventory = 0 - AND w.isFeedStock = 0 - - UNION ALL - - SELECT t.shipped as date, - NULL as `in`, - s.quantity as `out`, - IF(DATE(t.shipped) < vCurdate,3,IF(DATE(t.shipped) > vCurdate, 0, IFNULL(ts.alertLevel,0))) as alertLevel, - st.name AS stateName, - t.nickname as name, - t.refFk as reference, - t.id as origin - FROM vn.sale s - JOIN vn.ticket t ON t.id = s.ticketFk - LEFT JOIN vn.ticketState ts ON ts.ticket = t.id - JOIN vn.client c ON c.id = t.clientFk - JOIN vn.alertLevel al ON al.alertLevel = - CASE - WHEN DATE(t.shipped) < vCurdate THEN 3 - WHEN DATE(t.shipped) > vCurdate THEN 0 - ELSE IFNULL(ts.alertLevel, 0) - END - JOIN vn.state st ON st.code = al.code - WHERE t.shipped >= vDateInventory - AND s.itemFk = vItemId - AND vWarehouse =t.warehouseFk - ) AS itemDiary - ORDER BY date, alertLevel DESC, `in` DESC; -END ;; -DELIMITER ; -/*!50003 SET sql_mode = @saved_sql_mode */ ; -/*!50003 SET character_set_client = @saved_cs_client */ ; -/*!50003 SET character_set_results = @saved_cs_results */ ; -/*!50003 SET collation_connection = @saved_col_connection */ ; /*!50003 DROP PROCEDURE IF EXISTS `itemGetVisibleAvailable` */; /*!50003 SET @saved_cs_client = @@character_set_client */ ; /*!50003 SET @saved_cs_results = @@character_set_results */ ; @@ -54068,7 +50486,7 @@ BEGIN UPDATE item i JOIN itemTag it ON it.itemFk = i.id - SET i.name = GROUP_CONCAT(it.value, ' ') + SET i.longName = GROUP_CONCAT(it.value, ' ') WHERE it.priority IN (1, 2, 3) AND (vItem IS NULL OR vItem = i.id); @@ -54105,6 +50523,87 @@ BEGIN SET tag8 = t.name, value8 = t.name WHERE it.priority = 8 AND (vItem IS NULL OR vItem = it.itemFk); + + UPDATE item i + JOIN itemTag it ON it.itemFk = i.id + JOIN tag t ON t.id = it.tagFk + SET tag9 = t.name, value9 = t.name + WHERE it.priority = 9 + AND (vItem IS NULL OR vItem = it.itemFk); + UPDATE item i + JOIN itemTag it ON it.itemFk = i.id + JOIN tag t ON t.id = it.tagFk + SET tag10 = t.name, value10 = t.name + WHERE it.priority = 10 + AND (vItem IS NULL OR vItem = it.itemFk); +END ;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 DROP PROCEDURE IF EXISTS `itemSearchShelving` */; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8 */ ; +/*!50003 SET character_set_results = utf8 */ ; +/*!50003 SET collation_connection = utf8_general_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +CREATE DEFINER=`root`@`%` PROCEDURE `itemSearchShelving`(vShelvingFk VARCHAR(3)) +BEGIN + + SELECT p.column as col , p.row + FROM vn.shelving s + INNER JOIN parking p + ON s.parkingFk = p.id + WHERE s.code = vShelvingFk; + + +END ;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 DROP PROCEDURE IF EXISTS `itemShelvingDelete` */; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8 */ ; +/*!50003 SET character_set_results = utf8 */ ; +/*!50003 SET collation_connection = utf8_general_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +CREATE DEFINER=`root`@`%` PROCEDURE `itemShelvingDelete`(vId INT) +BEGIN + + DELETE FROM vn.itemShelving WHERE id = vId; + +END ;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 DROP PROCEDURE IF EXISTS `itemShelvingEdit` */; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8 */ ; +/*!50003 SET character_set_results = utf8 */ ; +/*!50003 SET collation_connection = utf8_general_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +CREATE DEFINER=`root`@`%` PROCEDURE `itemShelvingEdit`(vVisible INT,vPacking INT,vId INT) +BEGIN + + UPDATE vn.itemShelving SET visible = vVisible,packing = vPacking WHERE id = vId; + END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -54121,15 +50620,23 @@ DELIMITER ; /*!50003 SET @saved_sql_mode = @@sql_mode */ ; /*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; DELIMITER ;; -CREATE DEFINER=`root`@`%` PROCEDURE `itemShelvingList`(vShelvingFk VARCHAR(3)) +CREATE DEFINER=`root`@`%` PROCEDURE `itemShelvingList`(vShelvingFk VARCHAR(8)) BEGIN + /*MODIFICADA POR QUIQUE: OBTENEMOS DEEP Y PARKING*/ SELECT ish.itemFk as item, IFNULL(i.subName, CONCAT(i.name, ' ',i.size)) as description, - ish.visible as quantity + ish.visible as visible, + ceil(ish.visible/ish.packing) as stickers, + ish.packing as packing, + p.`column` as col, + p.row as row, + ish.id FROM vn.itemShelving ish JOIN vn.item i ON i.id = ish.itemFk - WHERE ish.shelvingFk =vShelvingFk; + INNER JOIN vn.shelving s ON vShelvingFk = s.code COLLATE utf8_unicode_ci + LEFT JOIN vn.parking p ON s.parkingFk = p.id + WHERE ish.shelvingFk COLLATE utf8_unicode_ci =vShelvingFk COLLATE utf8_unicode_ci; END ;; DELIMITER ; @@ -54147,7 +50654,7 @@ DELIMITER ; /*!50003 SET @saved_sql_mode = @@sql_mode */ ; /*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; DELIMITER ;; -CREATE DEFINER=`root`@`%` PROCEDURE `itemShelvingMake`(vShelvingFk VARCHAR(5), +CREATE DEFINER=`root`@`%` PROCEDURE `itemShelvingMake`(vShelvingFk VARCHAR(8), vItemFk INT, vShelve VARCHAR(2), vDeep INT, @@ -54158,6 +50665,20 @@ CREATE DEFINER=`root`@`%` PROCEDURE `itemShelvingMake`(vShelvingFk VARCHAR(5), vWarehouseFk INT) BEGIN + + SELECT itemFk INTO vItemFk + FROM vn.buy b + WHERE b.id = vItemFk; + + IF (SELECT COUNT(*) FROM vn.shelving WHERE code = vShelvingFk COLLATE utf8_unicode_ci) = 0 THEN + + INSERT IGNORE INTO vn.parking(`code`) VALUES(vShelvingFk); + INSERT INTO vn.shelving(`code`, parkingFk) + SELECT vShelvingFk, id + FROM vn.parking + WHERE `code` = vShelvingFk COLLATE utf8_unicode_ci; + + END IF; INSERT INTO itemShelving( itemFk, shelvingFk, @@ -54177,18 +50698,178 @@ BEGIN vQuantity, vQuantity, vQuantity, - IF(vGrouping = 0, b.grouping, vGrouping) as grouping, + IF(vGrouping = 0, IFNULL(b.packing, vPacking), vGrouping) as grouping, IF(vPacking = 0, b.packing, vPacking) as packing, IF(vPackagingFk = '', b.packageFk, vPackagingFk) as packaging - FROM bi.Last_buy_id lb - JOIN vn.buy b ON b.id = lb.Id_Compra - WHERE lb.warehouse_id = vWarehouseFk - AND lb.Id_Article = vItemFk; + FROM vn.item i + LEFT JOIN bi.Last_buy_id lb ON i.id = lb.Id_Article AND lb.warehouse_id = vWarehouseFk + LEFT JOIN vn.buy b ON b.id = lb.Id_Compra + WHERE i.id = vItemFk; +END ;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 DROP PROCEDURE IF EXISTS `itemShelvingRadar` */; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8 */ ; +/*!50003 SET character_set_results = utf8 */ ; +/*!50003 SET collation_connection = utf8_general_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +CREATE DEFINER=`root`@`%` PROCEDURE `itemShelvingRadar`() +BEGIN + + DECLARE vWarehouseFk INT DEFAULT 1; + + CALL vn.ticketDepartureMake; + + DROP TEMPORARY TABLE IF EXISTS tmp.ticketStateToday; + CREATE TEMPORARY TABLE tmp.ticketStateToday + SELECT * FROM vn.ticketStateToday; + + DROP TEMPORARY TABLE IF EXISTS tmp.itemShelvingRadar; + CREATE TEMPORARY TABLE tmp.itemShelvingRadar + SELECT *, + @saldo:= IF(itemFk != @item, visibleTotal - Altillo, @saldo) - quantity as saldo, + @item:= itemFk as item + FROM + ( + SELECT IF(tst.updated AND st.`order` BETWEEN 4 AND 5 , HOUR(tst.updated), pb.Hora) as Hora, + IF(tst.updated AND st.`order` BETWEEN 4 AND 5, MINUTE(tst.updated),pb.Minuto) as Minuto, + s.itemFk, + i.longName as concept, + s.quantity, + iss.visible as Altillo, + v.visible as visibleTotal, + i.minimum * IFNULL(b.packing,999) as minimum, + i.size, + ip.code as nicho, + i.upToDown + FROM tmp.production_buffer pb + LEFT JOIN tmp.ticketStateToday tst ON tst.ticket = pb.ticket AND tst.updated >= CURDATE() + LEFT JOIN vn.state st ON st.id = tst.state + JOIN vn.sale s ON s.ticketFk = pb.ticket + JOIN vn.item i ON i.id = s.itemFk + LEFT JOIN vn.itemPlacement ip ON ip.itemFk = i.id AND ip.warehouseFk = vWarehouseFk + LEFT JOIN bi.Last_buy_id lb ON lb.Id_Article = i.id AND lb.warehouse_id = vWarehouseFk + LEFT JOIN vn.buy b ON b.id = lb.Id_Compra + JOIN (SELECT max(id) as cacheFk, @saldo := 0, @item := 0 + FROM cache.cache_calc + where cacheName = 'visible' and params = vWarehouseFk) cache + JOIN cache.visible v ON v.calc_id = cache.cacheFk AND v.item_id = s.itemFk + JOIN vn.itemShelvingStock iss ON iss.itemFk = s.itemFk + WHERE s.isPicked = FALSE + ORDER BY itemFk , + IF(tst.updated AND st.`order` BETWEEN 4 AND 5, HOUR(tst.updated), pb.Hora), + IF(tst.updated AND st.`order` BETWEEN 4 AND 5, MINUTE(tst.updated),pb.Minuto) + ) sub; + + + + DROP TEMPORARY TABLE IF EXISTS tmp.itemShelvingRadarMin; + CREATE TEMPORARY TABLE tmp.itemShelvingRadarMin + SELECT *, min(saldo) as minSaldo, min(saldo) as minSaldo2 + FROM tmp.itemShelvingRadar + GROUP BY itemFk; + + + + SELECT Hora, + Minuto, + itemFk, + concept, + quantity, + Altillo, + visibleTotal, + minimum, + size, + nicho, + saldo, + saldoFinal, + upToDown, + IF(saldoFinal = 1, minSaldo, saldo) as primerNegativo, + visibleTotal - Altillo as visibleEnNicho, + min(maxSaldo) as FinalDia + FROM + ( + SELECT * FROM + ( + SELECT *, 0 as minSaldo, 1000000 as maxSaldo, FALSE as saldoFinal + FROM tmp.itemShelvingRadar + WHERE saldo <= 0 + + UNION ALL + + SELECT *, TRUE as saldoFinal + FROM tmp.itemShelvingRadarMin + GROUP BY itemFk + ) sub + ORDER BY itemFk, saldoFinal, Hora, Minuto + ) sub2 + GROUP BY itemFk + HAVING saldo <= 0 OR saldoFinal ; + + +END ;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 DROP PROCEDURE IF EXISTS `itemStockUpdate` */; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8 */ ; +/*!50003 SET character_set_results = utf8 */ ; +/*!50003 SET collation_connection = utf8_general_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +CREATE DEFINER=`root`@`%` PROCEDURE `itemStockUpdate`(vItemFk INT, vWarehouseFk INT, vNewVisible INT, vTrash BOOLEAN) +BEGIN + + + DECLARE vTicketFk INT; + DECLARE vClientFk INT; + DECLARE vCompanyFk INT DEFAULT 442; -- VNL + DECLARE vVisible INT; + + SELECT IFNULL(v.visible,0) INTO vVisible + FROM cache.visible v + JOIN (SELECT max(id) as cacheFk + FROM cache.cache_calc + WHERE cacheName = 'visible' + AND params = vWarehouseFk) c ON v.calc_id = c.cacheFk AND v.item_id = vItemFk; + + SELECT IF(vTrash,200,400) INTO vClientFk; + + SELECT max(id) INTO vTicketFk + FROM vn.ticket + WHERE warehouseFk = vWarehouseFk + AND clientFk = vClientFk + AND date(shipped) = CURDATE(); + + IF vTicketFk IS NULL THEN + + CALL vn.ticketCreate(vClientFk, CURDATE(), vWarehouseFk, vCompanyFk, NULL, NULL, NULL, CURDATE(), vTicketFk); + + END IF; + + INSERT INTO sale(ticketFk, itemFk, concept, quantity, price, discount) + SELECT vTicketFk, vItemFk, CONCAT(vn.getWorkerCode(), ": " , longName), vVisible - vNewVisible,0,0 + FROM vn.item + WHERE id = vItemFk; END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -54313,73 +50994,59 @@ DELIMITER ; /*!50003 SET @saved_sql_mode = @@sql_mode */ ; /*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; DELIMITER ;; -CREATE DEFINER=`root`@`%` PROCEDURE `itemTagMake`() +CREATE DEFINER=`root`@`%` PROCEDURE `itemTagMake`(vItemFk INT) BEGIN -/* Crea los tags para articulos que no los tengan. - * Quitar los triggers de las tablas itemTag insert - * y Articles update +/* * Crea los tags usando la tabla plantilla itemTag + * y si no existe a partir de la ficha del artículo. + * @param vItemFk El item al que se le añaden los tags */ - - DROP TEMPORARY TABLE IF EXISTS upda; - create temporary table upda - SELECT i.id - FROM vn.item i - LEFT JOIN itemTag it ON it.itemFk = i.id - JOIN itemType ity ON ity.id = i.typeFk - WHERE it.itemFk IS NULL AND ity.workerFk = 740; - - INSERT IGNORE INTO itemTag(itemFk, tagFk, value, priority) - SELECT i.id, 8, i.size, 1 - FROM item i - JOIN upda u ON i.id = u.id; - - INSERT IGNORE INTO itemTag(itemFk, tagFk, value, priority) - SELECT i.id, 1, ik.name, 2 - FROM item i - JOIN upda u ON i.id = u.id - JOIN ink ik ON ik.id = i.inkFk; - - INSERT IGNORE INTO itemTag(itemFk, tagFk, value, priority) - SELECT i.id, 12, i.category, 3 - FROM item i - JOIN upda u ON i.id = u.id; - - -- Parte dos en la que se actualiza el articulo + DECLARE vInk VARCHAR(50); + DECLARE vSize INTEGER; + DECLARE vCategory VARCHAR(3); + DECLARE vProducer VARCHAR(50); + DECLARE vOrigin VARCHAR(20); + DECLARE vTypeFk INTEGER; - UPDATE item i - JOIN upda u ON i.id = u.id - JOIN producer p ON p.id = i.producerFk - SET i.subName = p.name - WHERE p.isVisible; + DELETE FROM itemTag + WHERE itemFk = vItemFk; + + SELECT typeFk INTO vTypeFk + FROM item + WHERE id = vItemFk; + + INSERT INTO itemTag(itemFk, tagFk, value, priority) + SELECT vItemFk, itt.tagFk, NULL, itt.priority + FROM itemTag it + LEFT JOIN itemTypeTag itt ON itt.itemTypeFk = vTypeFk + WHERE it.itemFk = vItemFk; + + IF (SELECT COUNT(*) FROM itemTag WHERE itemFk = vItemFk LIMIT 1) = 0 THEN - UPDATE item i - JOIN upda u ON i.id = u.id - JOIN itemTag it ON it.itemFk = i.id - JOIN tag t ON t.id = it.tagFk - SET tag5 = t.name, value5 = it.value - WHERE it.priority = 1; + SELECT ik.name, i.size, i.category, p.name, o.name + INTO vInk, vSize, vCategory, vProducer, vOrigin + FROM item i + LEFT JOIN ink ik ON ik.id = i.inkFk + LEFT JOIN producer p ON p.id = i.producerFk AND p.isVisible + LEFT JOIN origin o ON o.id = i.originFk + WHERE i.id = vItemFk; + + INSERT IGNORE INTO itemTag(itemFk, tagFk, value, priority) + VALUES(vItemFk, 1, vInk, 1); + + INSERT IGNORE INTO itemTag(itemFk, tagFk, value, priority) + VALUES (vItemFk, 8, vSize, 2); - UPDATE item i - JOIN upda u ON i.id = u.id - JOIN itemTag it ON it.itemFk = i.id - JOIN tag t ON t.id = it.tagFk - SET tag6 = t.name, value6 = it.value - WHERE it.priority = 2; + INSERT IGNORE INTO itemTag(itemFk, tagFk, value, priority) + VALUES(vItemFk, 47, vCategory, 3); - UPDATE item i - JOIN upda u ON i.id = u.id - JOIN itemTag it ON it.itemFk = i.id - JOIN tag t ON t.id = it.tagFk - SET tag7 = t.name, value7 = it.value - WHERE it.priority = 3; - - UPDATE item i - JOIN upda u ON i.id = u.id - JOIN itemTag it ON it.itemFk = i.id - JOIN tag t ON t.id = it.tagFk - SET tag8 = t.name, value8 = it.value - WHERE it.priority = 4; + INSERT IGNORE INTO itemTag(itemFk, tagFk, value, priority) + VALUES(vItemFk, 37, vProducer, 4); + + INSERT IGNORE INTO itemTag(itemFk, tagFk, value, priority) + VALUES(vItemFk, 35, vOrigin, 5); + END IF; + END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -54408,73 +51075,6 @@ BEGIN FROM itemTag WHERE itemFk = fromItemFk; -END ;; -DELIMITER ; -/*!50003 SET sql_mode = @saved_sql_mode */ ; -/*!50003 SET character_set_client = @saved_cs_client */ ; -/*!50003 SET character_set_results = @saved_cs_results */ ; -/*!50003 SET collation_connection = @saved_col_connection */ ; -/*!50003 DROP PROCEDURE IF EXISTS `itemTagUpdatePriorityKk` */; -/*!50003 SET @saved_cs_client = @@character_set_client */ ; -/*!50003 SET @saved_cs_results = @@character_set_results */ ; -/*!50003 SET @saved_col_connection = @@collation_connection */ ; -/*!50003 SET character_set_client = utf8 */ ; -/*!50003 SET character_set_results = utf8 */ ; -/*!50003 SET collation_connection = utf8_general_ci */ ; -/*!50003 SET @saved_sql_mode = @@sql_mode */ ; -/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; -DELIMITER ;; -CREATE DEFINER=`root`@`%` PROCEDURE `itemTagUpdatePriorityKk`(IN vItem INT) -BEGIN - --- OBSOLETO, CON EL NUEVO SISTEMA NO SE PUEDE ORDENAR --- JGF 12/07/18 -/* -* Recalcula las prioridades de articleTag -* -* @param vItem Id_Article. Si es 0, lo recalcula todo -*/ - - /* - SET vItem = IFNULL(vItem,0); - - SET @p := 0; - SET @a := 0; - - UPDATE itemTag a - JOIN ( - SELECT - id, - @p := IF(itemFk = @a, @p, 0) + 1 as NewPriority, - @a := itemFk - FROM itemTag - WHERE vItem IS NULL - OR vItem = itemFk - ORDER BY itemFk, priority - ) sub ON sub.id = a.id - SET a.priority = NewPriority; -*/ -END ;; -DELIMITER ; -/*!50003 SET sql_mode = @saved_sql_mode */ ; -/*!50003 SET character_set_client = @saved_cs_client */ ; -/*!50003 SET character_set_results = @saved_cs_results */ ; -/*!50003 SET collation_connection = @saved_col_connection */ ; -/*!50003 DROP PROCEDURE IF EXISTS `itemTagUpdatePriority_launcherKk` */; -/*!50003 SET @saved_cs_client = @@character_set_client */ ; -/*!50003 SET @saved_cs_results = @@character_set_results */ ; -/*!50003 SET @saved_col_connection = @@collation_connection */ ; -/*!50003 SET character_set_client = utf8 */ ; -/*!50003 SET character_set_results = utf8 */ ; -/*!50003 SET collation_connection = utf8_general_ci */ ; -/*!50003 SET @saved_sql_mode = @@sql_mode */ ; -/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; -DELIMITER ;; -CREATE DEFINER=`root`@`%` PROCEDURE `itemTagUpdatePriority_launcherKk`() -BEGIN - - -- CALL vn.itemTagUpdatePriority(0); - END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -54529,6 +51129,112 @@ SET tag8 = t.name, value8 = it.value WHERE it.priority = 4 AND (vItem IS NULL OR vItem = it.itemFk); +END ;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 DROP PROCEDURE IF EXISTS `kk` */; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8 */ ; +/*!50003 SET character_set_results = utf8 */ ; +/*!50003 SET collation_connection = utf8_general_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +CREATE DEFINER=`z-developer`@`%` PROCEDURE `kk`() +BEGIN +DECLARE vWarehouseFk INT DEFAULT 1; + + CALL vn.ticketDepartureMake; + + DROP TEMPORARY TABLE IF EXISTS tmp.ticketStateToday; + CREATE TEMPORARY TABLE tmp.ticketStateToday + SELECT * FROM vn.ticketStateToday; + + DROP TEMPORARY TABLE IF EXISTS tmp.itemShelvingRadar; + CREATE TEMPORARY TABLE tmp.itemShelvingRadar + SELECT *, + @saldo:= IF(itemFk != @item, visibleTotal - Altillo, @saldo) - quantity as saldo, + @item:= itemFk as item + FROM + ( + SELECT IF(tst.updated AND st.`order` BETWEEN 4 AND 5 , HOUR(tst.updated), pb.Hora) as Hora, + IF(tst.updated AND st.`order` BETWEEN 4 AND 5, MINUTE(tst.updated),pb.Minuto) as Minuto, + s.itemFk, + s.concept, + s.quantity, + iss.visible as Altillo, + v.visible as visibleTotal, + i.minimum * IFNULL(b.packing,999) as minimum, + i.size, + ip.code as nicho + FROM tmp.production_buffer pb + LEFT JOIN tmp.ticketStateToday tst ON tst.ticket = pb.ticket AND tst.updated >= CURDATE() + LEFT JOIN vn.state st ON st.id = tst.state + JOIN vn.sale s ON s.ticketFk = pb.ticket + JOIN vn.item i ON i.id = s.itemFk + LEFT JOIN vn.itemPlacement ip ON ip.itemFk = i.id AND ip.warehouseFk = vWarehouseFk + LEFT JOIN bi.Last_buy_id lb ON lb.Id_Article = i.id AND lb.warehouse_id = vWarehouseFk + LEFT JOIN vn.buy b ON b.id = lb.Id_Compra + JOIN (SELECT max(id) as cacheFk, @saldo := 0, @item := 0 + FROM cache.cache_calc + where cacheName = 'visible' and params = vWarehouseFk) cache + JOIN cache.visible v ON v.calc_id = cache.cacheFk AND v.item_id = s.itemFk + JOIN vn.itemShelvingStock iss ON iss.itemFk = s.itemFk + WHERE s.isPicked = FALSE + ORDER BY itemFk , + IF(tst.updated AND st.`order` BETWEEN 4 AND 5, HOUR(tst.updated), pb.Hora), + IF(tst.updated AND st.`order` BETWEEN 4 AND 5, MINUTE(tst.updated),pb.Minuto) + ) sub; + + + + DROP TEMPORARY TABLE IF EXISTS tmp.itemShelvingRadarMin; + CREATE TEMPORARY TABLE tmp.itemShelvingRadarMin + SELECT *, min(saldo) as minSaldo, min(saldo) as minSaldo2 + FROM tmp.itemShelvingRadar + GROUP BY itemFk; + + + + SELECT Hora, + Minuto, + itemFk, + concept, + quantity, + Altillo, + visibleTotal, + minimum, + size, + nicho, + saldo, + saldoFinal, + IF(saldoFinal = 1, minSaldo, saldo) as primerNegativo, + visibleTotal - Altillo as visibleEnNicho, + min(maxSaldo) as FinalDia + FROM + ( + SELECT * FROM + ( + SELECT *, 0 as minSaldo, 1000000 as maxSaldo, FALSE as saldoFinal + FROM tmp.itemShelvingRadar + WHERE saldo <= 0 + + UNION ALL + + SELECT *, TRUE as saldoFinal + FROM tmp.itemShelvingRadarMin + GROUP BY itemFk + ) sub + ORDER BY itemFk, saldoFinal, Hora, Minuto + ) sub2 + GROUP BY itemFk + HAVING saldo <= 0 OR saldoFinal ; + END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -55089,7 +51795,8 @@ BEGIN DECLARE vCode VARCHAR(3); SELECT MAX(code) INTO vCode - FROM vn.shelving; + FROM vn.shelving + WHERE isPrinted = FALSE; SET @a1 := ASCII(MID(vCode,1,1)); SET @a2 := ASCII(MID(vCode,2,1)); @@ -55530,6 +52237,33 @@ DELIMITER ; /*!50003 SET character_set_results = @saved_cs_results */ ; /*!50003 SET collation_connection = @saved_col_connection */ ; ALTER DATABASE `vn` CHARACTER SET utf8 COLLATE utf8_unicode_ci ; +/*!50003 DROP PROCEDURE IF EXISTS `productionSectorList` */; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8 */ ; +/*!50003 SET character_set_results = utf8 */ ; +/*!50003 SET collation_connection = utf8_general_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +CREATE DEFINER=`root`@`%` PROCEDURE `productionSectorList`() +BEGIN + + CALL vn.ticketDepartureMake; + + SELECT isa.*, sum(isa.available) as totalAvailable, pb.Hora, pb.Minuto + FROM vn.itemShelvingAvailable isa + LEFT JOIN tmp.production_buffer pb ON pb.ticket = isa.ticketFk + GROUP BY saleFk + HAVING isa.quantity <= totalAvailable; + +END ;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; /*!50003 DROP PROCEDURE IF EXISTS `refund` */; /*!50003 SET @saved_cs_client = @@character_set_client */ ; /*!50003 SET @saved_cs_results = @@character_set_results */ ; @@ -55640,6 +52374,32 @@ BEGIN rg.ready = IF(rg.freeTickets, FALSE, rg.ready); +END ;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 DROP PROCEDURE IF EXISTS `saleItemShelvingDelete` */; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8 */ ; +/*!50003 SET character_set_results = utf8 */ ; +/*!50003 SET collation_connection = utf8_general_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +CREATE DEFINER=`root`@`%` PROCEDURE `saleItemShelvingDelete`(vSaleFk INT) +BEGIN + + UPDATE vn.itemShelving ish + JOIN vn.saleItemShelving sis ON sis.itemShelvingFk = ish.id + SET ish.available = LEAST(ish.available + sis.quantity, ish.visible); + + DELETE FROM vn.saleItemShelving + WHERE saleFk = vSaleFk; + END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -55656,14 +52416,36 @@ DELIMITER ; /*!50003 SET @saved_sql_mode = @@sql_mode */ ; /*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; DELIMITER ;; -CREATE DEFINER=`root`@`%` PROCEDURE `saleItemShelvingIsPicked`(vTicketFk INT, vIsPicked INT(1)) +CREATE DEFINER=`root`@`%` PROCEDURE `saleItemShelvingIsPicked`(vTicketFk INT, vIsPicked BOOL) +BEGIN + + UPDATE vn.sale s + JOIN vn.itemShelvingAvailable isa ON isa.saleFk = s.id + SET s.isPicked = vIsPicked + WHERE s.ticketFk = vTicketFk; +END ;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 DROP PROCEDURE IF EXISTS `saleItemShelvingIsPicked_kk` */; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8 */ ; +/*!50003 SET character_set_results = utf8 */ ; +/*!50003 SET collation_connection = utf8_general_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +CREATE DEFINER=`root`@`%` PROCEDURE `saleItemShelvingIsPicked_kk`(vTicketFk INT, vIsPicked BOOL) BEGIN UPDATE vn.sale s JOIN vn.itemShelvingAvailable isa ON isa.saleFk = s.id SET s.isPicked = vIsPicked WHERE s.ticketFk = vTicketFk; - END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -55717,7 +52499,7 @@ BEGIN ish.available, s.quantity, ish.grouping, - CONCAT(p.`column`, '-',p.row,': ', sh.code ,' ', ish.shelve, ish.deep) as ubication + CONCAT(p.`column`, '-',p.row,': ', sh.code ) as ubication FROM vn.sale s JOIN vn.ticket t ON t.id = s.ticketFk JOIN vn.sector sc ON sc.warehouseFk = t.warehouseFk @@ -55733,7 +52515,7 @@ BEGIN ) sub ) sub2 WHERE Reserved > 0; - + /* DELETE sis.* FROM vn.saleItemShelving sis JOIN ( @@ -55743,13 +52525,22 @@ BEGIN WHERE s.ticketFk = vTicketFk GROUP BY sis.saleFk ) sub ON sis.saleFk = sub.saleFk - WHERE sub.quantity > sub.reserved; - + WHERE sub.quantity < sub.reserved; + */ UPDATE vn.itemShelving ish JOIN vn.saleItemShelving sis ON sis.itemShelvingFk = ish.id JOIN vn.sale s ON s.id = sis.saleFk - SET ish.available = ish.available - sis.quantity - WHERE s.ticketFk = vTicketFk; + SET ish.available = ish.visible - sis.quantity, + ish.visible = ish.visible - sis.quantity + WHERE s.ticketFk = vTicketFk + AND s.isPicked = FALSE; + + UPDATE vn.sale s + JOIN vn.saleItemShelving sis ON sis.saleFk = s.id + SET s.isPicked = TRUE + WHERE s.ticketFk = vTicketFk; + + END ;; DELIMITER ; @@ -56045,20 +52836,41 @@ DELIMITER ; /*!50003 SET @saved_sql_mode = @@sql_mode */ ; /*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; DELIMITER ;; -CREATE DEFINER=`root`@`%` PROCEDURE `shelvingPark`(vShelvingFk VARCHAR(3), vParkingCode VARCHAR(8)) +CREATE DEFINER=`root`@`%` PROCEDURE `shelvingPark`(vShelvingFk VARCHAR(8), vParkingCode VARCHAR(8)) BEGIN - DECLARE vParkingFk INT; - - SELECT id INTO vParkingFk - FROM vn.parking - WHERE `column` = LEFT(vParkingCode,3) - AND `row` = RIGHT(vParkingCode,2); + DECLARE vParkingFk INT DEFAULT 0; + + IF vShelvingFk = "OK" THEN + + IF (SELECT `code` FROM vn.ticketStateToday WHERE ticket = vParkingCode) != 'ON_PREPARATION' THEN + + CALL vn.ticketStateUpdate(vParkingCode,'PRINTED_BACK'); - UPDATE vn.shelving - SET parkingFk = vParkingFk - WHERE `code` = vShelvingFk; + END IF; + + SELECT TRUE FROM vn2008.tblContadores; + + ELSE + + SELECT id INTO vParkingFk + FROM vn.parking + WHERE `code` = vParkingCode COLLATE utf8_unicode_ci; + + UPDATE vn.shelving + SET parkingFk = vParkingFk + WHERE `code` = vShelvingFk COLLATE utf8_unicode_ci; + + SELECT (COUNT(*) > 0) AS IsUpdated + FROM vn.shelving + WHERE parkingFk = vParkingFk + AND `code` = vShelvingFk COLLATE utf8_unicode_ci; + + + END IF; + + END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -56261,63 +53073,6 @@ BEGIN CALL vn2008.item_last_buy_(vWarehouse,vDate); -END ;; -DELIMITER ; -/*!50003 SET sql_mode = @saved_sql_mode */ ; -/*!50003 SET character_set_client = @saved_cs_client */ ; -/*!50003 SET character_set_results = @saved_cs_results */ ; -/*!50003 SET collation_connection = @saved_col_connection */ ; -/*!50003 DROP PROCEDURE IF EXISTS `stockTraslationkk` */; -/*!50003 SET @saved_cs_client = @@character_set_client */ ; -/*!50003 SET @saved_cs_results = @@character_set_results */ ; -/*!50003 SET @saved_col_connection = @@collation_connection */ ; -/*!50003 SET character_set_client = utf8 */ ; -/*!50003 SET character_set_results = utf8 */ ; -/*!50003 SET collation_connection = utf8_general_ci */ ; -/*!50003 SET @saved_sql_mode = @@sql_mode */ ; -/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; -DELIMITER ;; -CREATE DEFINER=`root`@`%` PROCEDURE `stockTraslationkk`(vDate DATE) -BEGIN - /** - * Calcula el stock del vWarehouse desde FechaInventario hasta v_date - sin tener en cuenta las salidas del mismo dia vDate - para ver el transporte a reservar - **/ - - DECLARE vWarehouse INT DEFAULT 7; - - DELETE FROM stockBuyed WHERE `date` = vDate; - DROP TEMPORARY TABLE IF EXISTS tmp.item; - - CREATE TEMPORARY TABLE tmp.item ( - `item_id` INT, - `amount` DECIMAL(10, 2) DEFAULT 0.00, - PRIMARY KEY(item_id) - ) ENGINE = MEMORY; - - - IF vDate >= CURDATE() THEN - INSERT INTO tmp.item - SELECT item_id, SUM(amount) amount - FROM vn2008.item_entry_in - WHERE dat = vDate - AND warehouse_id = vWarehouse - GROUP BY item_id HAVING amount != 0; - END IF; - - CALL `cache`.stock_refresh (FALSE); - - INSERT INTO tmp.item (item_id,amount) - SELECT item_id,s.amount FROM `cache`.stock s - WHERE warehouse_id = vWarehouse - ON DUPLICATE KEY UPDATE - amount = tmp.item.amount + VALUES(amount); - - CALL vn2008.item_last_buy_(vWarehouse,vDate); - - select * FROM tmp.item; - END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -56581,6 +53336,130 @@ BEGIN GROUP BY s.itemFk; +END ;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 DROP PROCEDURE IF EXISTS `ticketCalculate` */; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8 */ ; +/*!50003 SET character_set_results = utf8 */ ; +/*!50003 SET collation_connection = utf8_general_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +CREATE DEFINER=`root`@`%` PROCEDURE `ticketCalculate`( + vDate DATE, + vAddress INT, + vAgencyMode INT) +proc: BEGIN +/** + * Calcula los articulos disponibles y sus precios + * + * @param vDate Fecha de recepcion de mercancia + * @param vAddress Id del consignatario + * @param vAgencyMode Id de la agencia + * @return tmp.ticketCalculateItem, tmp.ticketComponentPrice + **/ + + DECLARE vAvailableCalc INT; + DECLARE vShipment DATE; + DECLARE vAgencyId INT; + DECLARE vClient INT; + DECLARE vWarehouseFk SMALLINT; + DECLARE vDone BOOL; + DECLARE cTravelTree CURSOR FOR + SELECT warehouseFk, shipped FROM tmp.agencyHourGetShipped; + + DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE; + + -- Establece los almacenes y las fechas que van a entrar al disponible + + SELECT agencyFk INTO vAgencyId + FROM agencyMode WHERE id = vAgencyMode; + + SELECT clientFk INTO vClient + FROM address WHERE id = vAddress; + + CALL vn.agencyHourGetShipped(vDate, vAddress, vAgencyId); + + DROP TEMPORARY TABLE IF EXISTS tmp.ticketLot; + CREATE TEMPORARY TABLE tmp.ticketLot( + `warehouseFk` smallint(5) unsigned NOT NULL, + `itemFk` int(11) NOT NULL, + `available` double DEFAULT NULL, + `buyFk` int(11) DEFAULT NULL, + `fix` tinyint(3) unsigned DEFAULT '0', + KEY `itemFk` (`itemFk`), + KEY `item_warehouse` (`itemFk`,`warehouseFk`) USING HASH + ) ENGINE=MEMORY DEFAULT CHARSET=utf8; + + OPEN cTravelTree; + + l: LOOP + SET vDone = FALSE; + FETCH cTravelTree INTO vWarehouseFk, vShipment; + + IF vDone THEN + LEAVE l; + END IF; + + CALL `cache`.available_refresh (vAvailableCalc, FALSE, vWarehouseFk, vShipment); + CALL buyUltimate (vWarehouseFk, vShipment); + + INSERT INTO tmp.ticketLot (warehouseFk, itemFk, available, buyFk) + SELECT + vWarehouseFk, + i.item_id, + IFNULL(i.available, 0), + bu.buyFk + FROM `cache`.available i + JOIN tmp.item br ON br.itemFk = i.item_id + LEFT JOIN item it ON it.id = i.item_id + LEFT JOIN tmp.buyUltimate bu ON bu.itemFk = i.item_id + WHERE i.calc_id = vAvailableCalc + AND it.id != 100 + AND i.available > 0; + + DROP TEMPORARY TABLE tmp.buyUltimate; + END LOOP; + + CLOSE cTravelTree; + + CALL vn.ticketComponentCalculate(vAddress, vAgencyMode); + + DROP TEMPORARY TABLE IF EXISTS tmp.ticketCalculateItem; + CREATE TEMPORARY TABLE tmp.ticketCalculateItem + ENGINE = MEMORY + SELECT + b.itemFk, + SUM(b.available) available, + p.name producer, + i.name item, + i.size size, + i.stems, + i.category, + i.inkFk, + i.image, + o.code origin, bl.price + FROM tmp.ticketLot b + JOIN item i ON b.itemFk = i.id + LEFT JOIN producer p ON p.id = i.producerFk AND p.isVisible + JOIN origin o ON o.id = i.originFk + JOIN ( + SELECT MIN(price) price, itemFk + FROM tmp.ticketComponentPrice + GROUP BY itemFk + ) bl ON bl.itemFk = b.itemFk + GROUP BY b.itemFk; + + DROP TEMPORARY TABLE + tmp.ticketComponent, + tmp.ticketLot; END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -57758,7 +54637,7 @@ BEGIN SET vCompanyFk = vCompanyOrn; END IF; - IF NOT vAddressFk THEN + IF NOT vAddressFk OR vAddressFk IS NULL THEN SELECT id INTO vAddressFk FROM address WHERE clientFk = vClientId AND isDefaultAddress; @@ -57900,6 +54779,86 @@ DELIMITER ; /*!50003 SET character_set_client = @saved_cs_client */ ; /*!50003 SET character_set_results = @saved_cs_results */ ; /*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 DROP PROCEDURE IF EXISTS `ticketDepartureMake` */; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8 */ ; +/*!50003 SET character_set_results = utf8 */ ; +/*!50003 SET collation_connection = utf8_general_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +CREATE DEFINER=`root`@`%` PROCEDURE `ticketDepartureMake`() +BEGIN + + DECLARE vToday DATETIME DEFAULT CURDATE(); + DECLARE vYesterday DATETIME; + DECLARE vTodayvMidnight DATETIME DEFAULT midnight(vToday); + + SET vYesterday = TIMESTAMPADD(DAY,-1,vToday); + + DROP TEMPORARY TABLE IF EXISTS tmp.production_buffer; + CREATE TEMPORARY TABLE tmp.production_buffer + ENGINE = MEMORY + SELECT t.id as ticket + , am.agencyFk as agency_id + , t.warehouseFk as warehouse_id + , a.provinceFk as province_id + , Hour(t.shipped) as Hora + , Hour(t.shipped) as Departure + , Minute(t.shipped) as Minuto + FROM ticket t + JOIN agencyMode am on am.id = t.agencyModeFk + JOIN address a on a.id = t.addressFk + WHERE t.shipped BETWEEN vYesterday AND vTodayvMidnight; + + CALL vn2008.production_buffer_set_priority; +END ;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 DROP PROCEDURE IF EXISTS `ticketFilter` */; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8 */ ; +/*!50003 SET character_set_results = utf8 */ ; +/*!50003 SET collation_connection = utf8_general_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +CREATE DEFINER=`root`@`%` PROCEDURE `ticketFilter`() +BEGIN +/** + * Obtiene un listado de tickets + * junto con el precio total y los problemas + * + * @table tmp.ticket(ticketFk) Identificadores de los tickets a calcular + * @return Listado de tickets + */ + CALL ticketGetTotal(); + CALL ticketGetProblems(); + + DROP TEMPORARY TABLE IF EXISTS tmp.ticketFilter; + CREATE TEMPORARY TABLE tmp.ticketFilter ENGINE = MEMORY + SELECT t.*, tt.total, tp.problem + FROM tmp.ticket t + JOIN tmp.ticketTotal tt ON tt.ticketFk = t.ticketFk + LEFT JOIN tmp.ticketProblems tp ON tp.ticketFk = t.ticketFk; + + DROP TEMPORARY TABLE + tmp.ticket, + tmp.ticketTotal, + tmp.ticketProblems; +END ;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; /*!50003 DROP PROCEDURE IF EXISTS `ticketGetProblems` */; /*!50003 SET @saved_cs_client = @@character_set_client */ ; /*!50003 SET @saved_cs_results = @@character_set_results */ ; @@ -57913,8 +54872,10 @@ DELIMITER ;; CREATE DEFINER=`root`@`%` PROCEDURE `ticketGetProblems`() BEGIN /* - * Necesita la tabla tmp.ticket + * Obtiene los problemas de uno o varios tickets * + * @table tmp.ticketGetProblems(ticketFk, clientFk, warehouseFk, shipped) + * @return tmp.ticketProblems */ DECLARE vWarehouse INT; DECLARE vDate DATE; @@ -57923,10 +54884,9 @@ BEGIN DECLARE vDone INT DEFAULT 0; DECLARE vCursor CURSOR FOR - SELECT DISTINCT warehouseFk, date(t.shipped) - FROM tmp.ticket tt - JOIN vn.ticket t ON tt.ticketFk = t.id - AND DATE(t.shipped) BETWEEN CURDATE() + SELECT DISTINCT tt.warehouseFk, date(tt.shipped) + FROM tmp.ticketGetProblems tt + WHERE DATE(tt.shipped) BETWEEN CURDATE() AND TIMESTAMPADD(DAY, 1.9, CURDATE()); DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = 1; @@ -57941,8 +54901,8 @@ BEGIN -- CONGELADO INSERT INTO tmp.ticketProblems(ticketFk, problem) - SELECT DISTINCT tt.ticketFk, 'CONGELADO' - FROM tmp.ticket tt + SELECT DISTINCT tt.ticketFk, 'Freezed' + FROM tmp.ticketGetProblems tt JOIN vn.client c ON c.id = tt.clientFk WHERE c.isFreezed; @@ -57953,26 +54913,26 @@ BEGIN (PRIMARY KEY (ticketFk)) ENGINE = MEMORY SELECT tt.ticketFk, c.id - FROM tmp.ticket tt + FROM tmp.ticketGetProblems tt JOIN vn.client c ON c.id = tt.clientFk WHERE c.isFreezed = 0; - DROP TEMPORARY TABLE IF EXISTS tmp.client_list; - CREATE TEMPORARY TABLE tmp.client_list - (PRIMARY KEY (Id_Cliente)) + DROP TEMPORARY TABLE IF EXISTS tmp.clientGetDebt; + CREATE TEMPORARY TABLE tmp.clientGetDebt + (PRIMARY KEY (clientFk)) ENGINE = MEMORY - SELECT DISTINCT tt.clientFk AS Id_Cliente - FROM tmp.ticket tt; + SELECT DISTINCT tt.clientFk + FROM tmp.ticketGetProblems tt; -- RIESGO - CALL vn2008.risk_vs_client_list(CURDATE()); + CALL clientGetDebt(CURDATE()); INSERT INTO tmp.ticketProblems(ticketFk, problem) - SELECT DISTINCT tt.ticketFk, 'RIESGO' + SELECT DISTINCT tt.ticketFk, 'Risk' FROM tmp.ticketListFiltered tt JOIN vn.ticket t ON t.id = tt.ticketFk JOIN vn.agencyMode a ON t.agencyModeFk = a.id - JOIN tmp.risk r ON r.Id_Cliente = t.clientFk + JOIN tmp.risk r ON r.clientFk = t.clientFk JOIN vn.client c ON c.id = t.clientFk WHERE r.risk > c.credit + 10 AND a.deliveryMethodFk != 3; -- para que las recogidas se preparen @@ -57983,8 +54943,8 @@ BEGIN -- CODIGO 100 INSERT INTO tmp.ticketProblems(ticketFk, problem) - SELECT DISTINCT tt.ticketFk, 'COD 100' - FROM tmp.ticket tt + SELECT DISTINCT tt.ticketFk, 'Code 100' + FROM tmp.ticketGetProblems tt JOIN sale s ON s.ticketFk = tt.ticketFk WHERE s.itemFk = 100; @@ -58004,7 +54964,7 @@ BEGIN -- El disponible es menor que 0 INSERT INTO tmp.ticketProblems(ticketFk, problem) SELECT tt.ticketFk, i.name - FROM tmp.ticket tt + FROM tmp.ticketGetProblems tt JOIN vn.ticket t ON t.id = tt.ticketFk LEFT JOIN vn.sale s ON s.ticketFk = t.id JOIN vn.item i ON i.id = s.itemFk @@ -58027,8 +54987,8 @@ BEGIN -- Amarillo: El disponible es mayor que cero y la cantidad supera el visible, estando aun sin preparar INSERT INTO tmp.ticketProblems(ticketFk, problem) - SELECT tt.ticketFk, CONCAT('RETRASO ', i.name) - FROM tmp.ticket tt + SELECT tt.ticketFk, CONCAT('Delay', i.name) + FROM tmp.ticketGetProblems tt JOIN vn.ticket t ON t.id = tt.ticketFk LEFT JOIN vn.sale s ON s.ticketFk = t.id JOIN vn.item i ON i.id = s.itemFk @@ -58048,7 +55008,9 @@ BEGIN CLOSE vCursor; - DROP TEMPORARY TABLE tmp.ticketListFiltered; + DROP TEMPORARY TABLE + tmp.clientGetDebt, + tmp.ticketListFiltered; END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -58175,65 +55137,6 @@ DELIMITER ; /*!50003 SET character_set_client = @saved_cs_client */ ; /*!50003 SET character_set_results = @saved_cs_results */ ; /*!50003 SET collation_connection = @saved_col_connection */ ; -/*!50003 DROP PROCEDURE IF EXISTS `ticketGetTaxkk` */; -/*!50003 SET @saved_cs_client = @@character_set_client */ ; -/*!50003 SET @saved_cs_results = @@character_set_results */ ; -/*!50003 SET @saved_col_connection = @@collation_connection */ ; -/*!50003 SET character_set_client = utf8 */ ; -/*!50003 SET character_set_results = utf8 */ ; -/*!50003 SET collation_connection = utf8_general_ci */ ; -/*!50003 SET @saved_sql_mode = @@sql_mode */ ; -/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; -DELIMITER ;; -CREATE DEFINER=`root`@`%` PROCEDURE `ticketGetTaxkk`(vBillingDate DATE) - READS SQL DATA -BEGIN -/** - * Calcula la base imponible, el IVA y el recargo de equivalencia para - * un conjunto de tickets. - * - * @table tmp.ticket(ticketFk) Identificadores de los tickets a calcular - * @param vBillingDate Fecha de facturación - * @treturn tmp.ticketTax Impuesto desglosado para cada ticket - */ - CALL vn.taxGetRates (vBillingDate); - - -- Calcula el IVA y el recargo desglosado para cada ticket. - - DROP TEMPORARY TABLE IF EXISTS tmp.ticketTax; - CREATE TEMPORARY TABLE tmp.ticketTax - (INDEX (ticketFk)) - ENGINE = MEMORY - SELECT t.ticketFk, t.type, t.taxBase, - CAST(IF(t.hasTax, t.taxBase * x.rate, 0) AS DECIMAL(10,2)) tax, - CAST(IF(t.hasEqualizationTax, t.taxBase * x.equalizationTax, 0) AS DECIMAL(10,2)) equalizationTax - FROM ( - SELECT i.ticketFk, g.countryFk, g.type - ,SUM(CAST(m.quantity * m.price * (100 - m.discount) / 100 AS DECIMAL(10,2))) AS taxBase - ,NOT(c.isVies AND p.countryFk <> c.countryFk) hasTax - ,c.isEqualizated != FALSE AS hasEqualizationTax - FROM tmp.ticket i - JOIN vn.ticket t ON t.id = i.ticketFk - JOIN vn.sale m ON m.ticketFk = t.id - JOIN vn.item a ON a.id = m.itemFk - JOIN vn.client c ON c.id = t.clientFk - JOIN vn.supplier p ON p.id = t.companyFk - JOIN tmp.taxClass g - ON g.countryFk = p.countryFk AND g.taxClassFk = a.taxClassFk - GROUP BY i.ticketFk, g.type - ) t - JOIN tmp.taxType x - ON x.countryFk = t.countryFk AND x.type = t.type; - - DROP TEMPORARY TABLE - tmp.taxClass, - tmp.taxType; -END ;; -DELIMITER ; -/*!50003 SET sql_mode = @saved_sql_mode */ ; -/*!50003 SET character_set_client = @saved_cs_client */ ; -/*!50003 SET character_set_results = @saved_cs_results */ ; -/*!50003 SET collation_connection = @saved_col_connection */ ; /*!50003 DROP PROCEDURE IF EXISTS `ticketGetTax_new` */; /*!50003 SET @saved_cs_client = @@character_set_client */ ; /*!50003 SET @saved_cs_results = @@character_set_results */ ; @@ -58351,41 +55254,6 @@ DELIMITER ; /*!50003 SET character_set_client = @saved_cs_client */ ; /*!50003 SET character_set_results = @saved_cs_results */ ; /*!50003 SET collation_connection = @saved_col_connection */ ; -/*!50003 DROP PROCEDURE IF EXISTS `ticketGetTotalkk` */; -/*!50003 SET @saved_cs_client = @@character_set_client */ ; -/*!50003 SET @saved_cs_results = @@character_set_results */ ; -/*!50003 SET @saved_col_connection = @@collation_connection */ ; -/*!50003 SET character_set_client = utf8 */ ; -/*!50003 SET character_set_results = utf8 */ ; -/*!50003 SET collation_connection = utf8_general_ci */ ; -/*!50003 SET @saved_sql_mode = @@sql_mode */ ; -/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; -DELIMITER ;; -CREATE DEFINER=`root`@`%` PROCEDURE `ticketGetTotalkk`() - READS SQL DATA -BEGIN -/** - * Calcula el total con IVA para un conjunto de tickets. - * - * @table tmp.ticket(ticketFk) Identificadores de los tickets a calcular - * @treturn tmp.ticketTotal Total para cada ticket - */ - CALL ticketGetTax (NULL); - - DROP TEMPORARY TABLE IF EXISTS tmp.ticketTotal; - CREATE TEMPORARY TABLE tmp.ticketTotal - (INDEX (ticketFk)) - ENGINE = MEMORY - SELECT ticketFk, SUM(taxBase + tax + equalizationTax) AS total - FROM tmp.ticketTax GROUP BY ticketFk; - - DROP TEMPORARY TABLE tmp.ticketTax; -END ;; -DELIMITER ; -/*!50003 SET sql_mode = @saved_sql_mode */ ; -/*!50003 SET character_set_client = @saved_cs_client */ ; -/*!50003 SET character_set_results = @saved_cs_results */ ; -/*!50003 SET collation_connection = @saved_col_connection */ ; /*!50003 DROP PROCEDURE IF EXISTS `ticketGetVisibleAvailable` */; /*!50003 SET @saved_cs_client = @@character_set_client */ ; /*!50003 SET @saved_cs_results = @@character_set_results */ ; @@ -58530,6 +55398,30 @@ BEGIN JOIN ticket t ON t.id = tt.ticketFk JOIN client c ON c.id = t.ClientFk; +END ;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 DROP PROCEDURE IF EXISTS `ticketStateUpdate` */; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8 */ ; +/*!50003 SET character_set_results = utf8 */ ; +/*!50003 SET collation_connection = utf8_general_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +CREATE DEFINER=`root`@`%` PROCEDURE `ticketStateUpdate`(vTicketFk INT, vStateCode VARCHAR(45)) +BEGIN + + INSERT INTO vncontrol.inter(state_id, Id_Ticket, Id_Trabajador, Id_Supervisor) + SELECT id, vTicketFk, getWorker(), 20 + FROM vn.state + WHERE `code` = vStateCode collate utf8_unicode_ci; + END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -58730,42 +55622,6 @@ DELIMITER ; /*!50003 SET character_set_client = @saved_cs_client */ ; /*!50003 SET character_set_results = @saved_cs_results */ ; /*!50003 SET collation_connection = @saved_col_connection */ ; -/*!50003 DROP PROCEDURE IF EXISTS `ticketVolumekk` */; -/*!50003 SET @saved_cs_client = @@character_set_client */ ; -/*!50003 SET @saved_cs_results = @@character_set_results */ ; -/*!50003 SET @saved_col_connection = @@collation_connection */ ; -/*!50003 SET character_set_client = utf8 */ ; -/*!50003 SET character_set_results = utf8 */ ; -/*!50003 SET collation_connection = utf8_general_ci */ ; -/*!50003 SET @saved_sql_mode = @@sql_mode */ ; -/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; -DELIMITER ;; -CREATE DEFINER=`root`@`%` PROCEDURE `ticketVolumekk`(IN vTicketId INT) -BEGIN - DECLARE vWarehouseId INTEGER; - DECLARE vShippedDate DATE; - - DROP TEMPORARY TABLE IF EXISTS ticketVolume; - SELECT warehouseFk, shipped INTO vWarehouseId,vShippedDate FROM vn.ticket WHERE id = vTicketId; - - CREATE TEMPORARY TABLE IF NOT EXISTS ticketVolume ENGINE MEMORY - - SELECT itemFk, saleFk, quantity, concept, VolUd as m3_uni, volume as m3, volume * quantity as volumeTimesQuantity, @m3:= @m3 + ifnull(volume,0) as m3_total - FROM - ( - SELECT round(r.cm3 / 1000000,3) as VolUd ,s.quantity, round(r.cm3 * s.quantity / 1000000,3) as volume, - s.itemFk, s.id AS saleFk, s.concept, @m3:= 0, @vol:=0, t.agencyModeFk - FROM sale s - JOIN vn.ticket t on t.id = s.ticketFk - JOIN bi.rotacion r ON r.Id_Article = s.itemFk AND r.warehouse_id = t.warehouseFk - WHERE s.ticketFk = vTicketId - ) sub; -END ;; -DELIMITER ; -/*!50003 SET sql_mode = @saved_sql_mode */ ; -/*!50003 SET character_set_client = @saved_cs_client */ ; -/*!50003 SET character_set_results = @saved_cs_results */ ; -/*!50003 SET collation_connection = @saved_col_connection */ ; /*!50003 DROP PROCEDURE IF EXISTS `typeTagMake` */; /*!50003 SET @saved_cs_client = @@character_set_client */ ; /*!50003 SET @saved_cs_results = @@character_set_results */ ; @@ -58825,6 +55681,69 @@ BEGIN */ -- CALL itemTagArrangedUpdate(NULL); +END ;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 DROP PROCEDURE IF EXISTS `updatePedidosInternos` */; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8 */ ; +/*!50003 SET character_set_results = utf8 */ ; +/*!50003 SET collation_connection = utf8_general_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +CREATE DEFINER=`root`@`%` PROCEDURE `updatePedidosInternos`(vItemFk INT) +BEGIN + + UPDATE vn.item SET upToDown = 0 WHERE item.id = vItemFk; + + +END ;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 DROP PROCEDURE IF EXISTS `workerCalculateBoss` */; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8 */ ; +/*!50003 SET character_set_results = utf8 */ ; +/*!50003 SET collation_connection = utf8_general_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +CREATE DEFINER=`root`@`%` PROCEDURE `workerCalculateBoss`(vWorker INT) +BEGIN +/** +* Actualiza la tabla workerBosses +* vWorker: id del trabajador +* +*/ +DECLARE vBoss INT; +DECLARE vWorkerCompare INT DEFAULT vWorker; + +l: LOOP +SELECT bossFk INTO vBoss +FROM vn.worker +WHERE id=vWorkerCompare; + +IF vBoss=0 OR vWorkerCompare=vBoss THEN +LEAVE l; +END IF; + +REPLACE INTO vn.workerBosses(workerFk,bossFk) +VALUES(vWorker,vBoss); + +SET vWorkerCompare = vBoss; + +END LOOP; END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -58934,7 +55853,7 @@ BEGIN UPDATE `client` c JOIN payMethod p ON p.name = 'CONTADO' SET c.credit = 0, c.payMethodFk = p.id, hasCoreVnl = FALSE - WHERE c.id = 206; + WHERE c.id = vUserId; END ;; DELIMITER ; @@ -58986,6 +55905,52 @@ BEGIN CLOSE rs; +END ;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 DROP PROCEDURE IF EXISTS `workerForAllCalculateBoss` */; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8 */ ; +/*!50003 SET character_set_results = utf8 */ ; +/*!50003 SET collation_connection = utf8_general_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +CREATE DEFINER=`root`@`%` PROCEDURE `workerForAllCalculateBoss`() +BEGIN +/** +* Actualiza la tabla workerBosses utilizando el procedimiento +* vn.workerCalculateBoss(), actualiza todos los trabajadores en esa tabla +* +*/ +DECLARE vWorker INT; +DECLARE vDone BOOL; + +DECLARE cur CURSOR FOR +SELECT id FROM worker; + +DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE; + +OPEN cur; + +l: LOOP +SET vDone = FALSE; +FETCH cur INTO vWorker; + +IF vDone THEN +LEAVE l; +END IF; + +CALL workerCalculateBoss(vWorker); +END LOOP; + +CLOSE cur; + END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -59241,7 +56206,7 @@ DELIMITER ; /*!50003 SET @saved_sql_mode = @@sql_mode */ ; /*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; DELIMITER ;; -CREATE DEFINER=`z-developer`@`%` PROCEDURE `workerJourneyReplaceLauncher`() +CREATE DEFINER=`root`@`%` PROCEDURE `workerJourneyReplaceLauncher`() BEGIN DECLARE vDateStart DATE; @@ -59438,6 +56403,39 @@ DELIMITER ; /*!50003 SET character_set_results = @saved_cs_results */ ; /*!50003 SET collation_connection = @saved_col_connection */ ; ALTER DATABASE `vn` CHARACTER SET utf8 COLLATE utf8_unicode_ci ; +/*!50003 DROP PROCEDURE IF EXISTS `wrongEqualizatedClient` */; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8 */ ; +/*!50003 SET character_set_results = utf8 */ ; +/*!50003 SET collation_connection = utf8_general_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; +DELIMITER ;; +CREATE DEFINER=`root`@`%` PROCEDURE `wrongEqualizatedClient`() +BEGIN + SELECT clientFk, c.name, count(ie) as num + FROM vn.client c + JOIN + ( + SELECT DISTINCT + `a`.`clientFk` , + a.isEqualizated = 0 as ie + + FROM + `vn`.`address` `a` + JOIN `vn`.`client` `c` ON `c`.`id` = `a`.`clientFk` + ) sub ON sub.clientFk = c.id + WHERE c.hasToInvoiceByAddress = FALSE + GROUP BY clientFk + HAVING num > 1; +END ;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; /*!50003 DROP PROCEDURE IF EXISTS `zoneNestCountry` */; /*!50003 SET @saved_cs_client = @@character_set_client */ ; /*!50003 SET @saved_cs_results = @@character_set_results */ ; @@ -59721,7 +56719,7 @@ CREATE TABLE `batch` ( KEY `buy_edi_id` (`buy_edi_id`), CONSTRAINT `batch_ibfk_1` FOREIGN KEY (`message_id`) REFERENCES `message` (`id`) ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT `batch_ibfk_2` FOREIGN KEY (`buy_edi_id`) REFERENCES `vn2008`.`buy_edi` (`id`) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=347133 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=361878 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -60108,7 +57106,7 @@ CREATE TABLE `message` ( UNIQUE KEY `mail_id` (`mail_id`), KEY `sender_id` (`sender_id`), CONSTRAINT `message_ibfk_2` FOREIGN KEY (`sender_id`) REFERENCES `mail` (`id`) ON DELETE NO ACTION ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=368847 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=383629 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -61131,7 +58129,7 @@ CREATE TABLE `nightTask` ( `schema` varchar(45) COLLATE utf8_unicode_ci NOT NULL, `procedure` varchar(100) COLLATE utf8_unicode_ci NOT NULL, PRIMARY KEY (`id`) -) ENGINE=InnoDB AUTO_INCREMENT=45 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=46 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; /*!50003 SET @saved_cs_client = @@character_set_client */ ; /*!50003 SET @saved_cs_results = @@character_set_results */ ; @@ -61728,7 +58726,7 @@ DELIMITER ;; CREATE DEFINER=`root`@`%` PROCEDURE `clientDied`() BEGIN -IF DAY(CURDATE()) = 2 THEN +IF DAY(CURDATE()) = 4 THEN SET @primerAviso := TIMESTAMPADD(MONTH,-1,CURDATE()); SET @segundoAviso := TIMESTAMPADD(MONTH,-2,CURDATE()); @@ -61777,12 +58775,7 @@ DELIMITER ;; CREATE DEFINER=`root`@`%` PROCEDURE `comercialesCompleto`(IN vWorker INT) BEGIN -create TEMPORARY TABLE workerAndBelow ENGINE=MEMORY - -SELECT w.id - FROM vn.worker w - WHERE w.bossFk=vWorker OR w.id=vWorker; - +CALL vn.subordinateGetList(vWorker); SELECT c.Id_Cliente id_cliente, @@ -61826,7 +58819,7 @@ FROM (SELECT v.Id_Cliente, SUM(importe) c365 -- optimizat de 6s /5.3s/ 4.7s a 0.3/0.4/0.3 FROM bs.ventas v JOIN vn2008.Clientes c USING (Id_Cliente) - JOIN workerAndBelow w ON w.id = c.Id_Trabajador + WHERE v.fecha BETWEEN TIMESTAMPADD(YEAR, - 1, CURDATE()) AND CURDATE() GROUP BY v.Id_Cliente) c365 ON c365.Id_Cliente = c.Id_Cliente LEFT JOIN @@ -61883,13 +58876,14 @@ FROM FROM vn2008.Facturas f JOIN vn2008.Clientes c ON c.Id_cliente = f.Id_Cliente + LEFT JOIN vn2008.Trabajadores tr ON c.Id_Trabajador = tr.Id_Trabajador WHERE (c.Id_Trabajador = vWorker OR tr.boss = vWorker) GROUP BY Id_Cliente) dead ON dead.Id_Cliente = c.Id_Cliente -WHERE - (c.Id_Trabajador = vWorker OR tr.boss = vWorker); -DROP TEMPORARY TABLE workerAndBelow; + JOIN tmp.subordinate s ON s.workerFk = c.Id_Trabajador; + +DROP TEMPORARY TABLE tmp.subordinate; END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -64650,6 +61644,15 @@ UPDATE bi.claims_ratio SET recobro = GREATEST(0.08, recobro) WHERE Id_Cliente = -- CLIENTE 5523, VERDECORA UPDATE bi.claims_ratio SET recobro = GREATEST(0.12, recobro) WHERE Id_Cliente = 5523; +-- CLIENTE 5189 i 8942, son de CSR i son el mateix client +UPDATE bi.claims_ratio cr + JOIN (SELECT sum(Consumo * recobro)/sum(Consumo) as recobro + FROM bi.claims_ratio + WHERE Id_Cliente IN ( 5189,8942) + ) sub + SET cr.recobro = sub.recobro + WHERE Id_Cliente IN ( 5189,8942); + -- control INSERT INTO vn2008.daily_task_log(consulta) VALUES('bi.claim_ratio_routine END'); @@ -65921,16 +62924,18 @@ DECLARE intLAPSO INT DEFAULT DATEDIFF(datEND,datSTART ); GROUP BY Id_Article, warehouse_id; - - - CALL vn2008.item_last_buy_(NULL,datSTART); + CALL vn2008.item_last_buy_(NULL,datSTART); -- Añadimos el volumen por unidad de venta - update bi.rotacion r + UPDATE bi.rotacion r JOIN vn2008.t_item_last_buy b ON r.Id_Article = b.item_id AND r.warehouse_id = b.warehouse_id join vn2008.Compres ON Id_Compra = b.buy_id - set cm3 = vn2008.cm3_2(Id_Cubo, r.Id_Article) / Packing - where r.Id_Article between intART_DESDE and intART_HASTA; + join vn2008.Articles a ON a.Id_Article = Compres.Id_Article + JOIN vn2008.Tipos tp ON tp.tipo_id = a.tipo_id + JOIN vn2008.reinos re ON re.id = tp.reino_id + SET cm3 = vn2008.cm3_2(Id_Cubo, r.Id_Article) / Packing + WHERE re.mercancia = TRUE + AND r.Id_Article BETWEEN intART_DESDE AND intART_HASTA; -- Añadimos el coste de almacenamiento y manipulacion UPDATE bi.rotacion @@ -65971,17 +62976,19 @@ SET auxiliar = if(rotacion < 0,0,round(rotacion *cm3 * Coste_Auxiliar / Operacio -- Añadimos todos los productos de los que no tenemos histórico, con la media de su familia como valor por defecto INSERT INTO bi.rotacion(Id_Article, warehouse_id, rotacion, cm3, almacenaje, manipulacion, auxiliar, mermas) -SELECT a.Id_Article, warehouse_id, rotacion_m, cm3_m, alm_m, man_m, aux_m, merm_m -FROM vn2008.Articles a -JOIN (SELECT tipo_id, warehouse_id, Id_Tipo, avg(rotacion) rotacion_m, avg(cm3) cm3_m, avg(almacenaje) alm_m, avg(manipulacion) man_m - , avg(auxiliar) aux_m, avg(mermas) merm_m - from bi.rotacion - join vn2008.Articles a using(Id_Article) - join vn2008.Tipos tp using(tipo_id) - group by tipo_id, warehouse_id) sub using(tipo_id) - -WHERE a.Id_Article between intART_DESDE and intART_HASTA -ON DUPLICATE KEY UPDATE rotacion = rotacion; + SELECT a.Id_Article, warehouse_id, rotacion_m, cm3_m, alm_m, man_m, aux_m, merm_m + FROM vn2008.Articles a + JOIN (SELECT tipo_id, warehouse_id, Id_Tipo, avg(rotacion) rotacion_m, avg(cm3) cm3_m, avg(almacenaje) alm_m, avg(manipulacion) man_m + , avg(auxiliar) aux_m, avg(mermas) merm_m + from bi.rotacion + join vn2008.Articles a using(Id_Article) + join vn2008.Tipos tp using(tipo_id) + join vn2008.reinos r ON r.id = tp.reino_id + where r.mercancia = TRUE + group by tipo_id, warehouse_id) sub using(tipo_id) + + WHERE a.Id_Article between intART_DESDE and intART_HASTA + ON DUPLICATE KEY UPDATE rotacion = rotacion; END ;; DELIMITER ; @@ -66121,7 +63128,7 @@ DELIMITER ; /*!50003 SET @saved_sql_mode = @@sql_mode */ ; /*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; DELIMITER ;; -CREATE DEFINER=`z-developer`@`%` PROCEDURE `rotacion_volumen_update`() +CREATE DEFINER=`root`@`%` PROCEDURE `rotacion_volumen_update`() BEGIN CALL vn2008.item_last_buy_(NULL,curdate()); @@ -66129,8 +63136,12 @@ BEGIN -- Añadimos el volumen por unidad de venta update bi.rotacion r JOIN vn2008.t_item_last_buy b ON r.Id_Article = b.item_id AND r.warehouse_id = b.warehouse_id - join vn2008.Compres ON Id_Compra = b.buy_id - set cm3 = vn2008.cm3_2(Id_Cubo, r.Id_Article) / Packing; + join vn2008.Compres c ON c.Id_Compra = b.buy_id + join vn.item i ON i.id = c.Id_Article + join vn.itemType tp ON tp.id = i.typeFk + join vn.kingdom k ON k.id = tp.kingdomFk + set cm3 = vn2008.cm3_2(Id_Cubo, r.Id_Article) / Packing + where k.merchandise = TRUE; END ;; DELIMITER ; @@ -66395,7 +63406,7 @@ CREATE TABLE `cdr` ( KEY `dstchannel` (`dst_channel`), KEY `disposition` (`disposition`), KEY `src` (`src`) -) ENGINE=MyISAM AUTO_INCREMENT=210001 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=MyISAM AUTO_INCREMENT=216136 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -66750,7 +63761,10 @@ CREATE TABLE `schedule` ( `weekDay` tinyint(3) unsigned NOT NULL COMMENT '0 = Monday, 6 = Sunday', `timeStart` time NOT NULL, `timeEnd` time NOT NULL, - PRIMARY KEY (`id`) + `queue` varchar(128) CHARACTER SET utf8 NOT NULL, + PRIMARY KEY (`id`), + KEY `queue` (`queue`), + CONSTRAINT `schedule_ibfk_1` FOREIGN KEY (`queue`) REFERENCES `queue` (`name`) ) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; @@ -67187,7 +64201,7 @@ CREATE TABLE `cache_calc` ( KEY `cache_id` (`cache_id`), KEY `cacheName` (`cacheName`), KEY `expires` (`expires`) -) ENGINE=InnoDB AUTO_INCREMENT=150148 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=173253 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -68956,7 +65970,7 @@ CREATE TABLE `inter` ( CONSTRAINT `inter_ibfk_1` FOREIGN KEY (`Id_Ticket`) REFERENCES `vn2008`.`Tickets` (`Id_Ticket`) ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT `inter_state` FOREIGN KEY (`state_id`) REFERENCES `vn2008`.`state` (`id`) ON UPDATE CASCADE, CONSTRAINT `responsable` FOREIGN KEY (`Id_Supervisor`) REFERENCES `vn2008`.`Trabajadores` (`Id_Trabajador`) ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=11754074 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=12344024 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; /*!50003 SET @saved_cs_client = @@character_set_client */ ; /*!50003 SET @saved_cs_results = @@character_set_results */ ; @@ -68972,6 +65986,7 @@ BEFORE INSERT ON `inter` FOR EACH ROW BEGIN /* PAK 08/05/18 Los sacadores no deben de poner los tickets en revisión */ + /* DECLARE vIsSacador BOOLEAN; IF NEW.state_id = 6 THEN -- Revisión @@ -68989,7 +66004,7 @@ BEGIN END IF; END IF; - + */ /* PAK 08/05/18 Los tickets no se pueden marcar como servidos en el futuro */ IF NEW.state_id = 16 AND (SELECT date(landed) FROM vn.ticket WHERE id = NEW.Id_Ticket) > CURDATE() THEN -- Entregado @@ -69299,7 +66314,7 @@ CREATE TABLE `imageCollectionSize` ( PRIMARY KEY (`id`), KEY `image_schema_id` (`collectionFk`), CONSTRAINT `imageCollectionSize_ibfk_1` FOREIGN KEY (`collectionFk`) REFERENCES `imageCollection` (`id`) ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=10 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=11 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -69327,12 +66342,12 @@ DROP TABLE IF EXISTS `imageFile`; /*!40101 SET character_set_client = utf8 */; CREATE TABLE `imageFile` ( `id` int(10) unsigned NOT NULL AUTO_INCREMENT, - `schemaFk` int(10) unsigned NOT NULL, + `collectionFk` int(10) unsigned NOT NULL, `file` varchar(255) COLLATE utf8_unicode_ci NOT NULL, `stamp` int(11) DEFAULT NULL, PRIMARY KEY (`id`), - UNIQUE KEY `schema_id_file` (`schemaFk`,`file`), - CONSTRAINT `imageFile_ibfk_1` FOREIGN KEY (`schemaFk`) REFERENCES `imageCollection` (`id`) ON UPDATE CASCADE + UNIQUE KEY `schema_id_file` (`collectionFk`,`file`), + CONSTRAINT `imageFile_ibfk_1` FOREIGN KEY (`collectionFk`) REFERENCES `imageCollection` (`id`) ON UPDATE CASCADE ) ENGINE=InnoDB AUTO_INCREMENT=32793 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; @@ -69693,7 +66708,7 @@ CREATE TABLE `news` ( KEY `tag` (`tag`), CONSTRAINT `news_ibfk_1` FOREIGN KEY (`userFk`) REFERENCES `account`.`account` (`id`) ON UPDATE CASCADE, CONSTRAINT `news_ibfk_2` FOREIGN KEY (`tag`) REFERENCES `newsTag` (`name`) ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=13018 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=13023 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -69744,7 +66759,7 @@ CREATE TABLE `order` ( CONSTRAINT `order_ibfk_5` FOREIGN KEY (`address_id`) REFERENCES `vn2008`.`Consignatarios` (`id_consigna`) ON UPDATE CASCADE, CONSTRAINT `order_ibfk_8` FOREIGN KEY (`delivery_method_id`) REFERENCES `vn2008`.`Vistas` (`vista_id`) ON UPDATE CASCADE, CONSTRAINT `order_ibfk_9` FOREIGN KEY (`agency_id`) REFERENCES `vn2008`.`Agencias` (`Id_Agencia`) ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=1483201 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=1534097 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -69843,7 +66858,7 @@ CREATE TABLE `orderRow` ( KEY `warehouse_shipment` (`warehouseFk`,`shipment`), CONSTRAINT `orderRow_ibfk_2` FOREIGN KEY (`itemFk`) REFERENCES `vn2008`.`Articles` (`Id_Article`) ON UPDATE CASCADE, CONSTRAINT `orderRow_ibfk_3` FOREIGN KEY (`orderFk`) REFERENCES `order` (`id`) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=9114478 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=9417186 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; /*!50003 SET @saved_cs_client = @@character_set_client */ ; /*!50003 SET @saved_cs_results = @@character_set_results */ ; @@ -70190,7 +67205,7 @@ CREATE TABLE `tpvTransaction` ( CONSTRAINT `receipt_id` FOREIGN KEY (`receiptFk`) REFERENCES `vn2008`.`Recibos` (`Id`) ON DELETE SET NULL ON UPDATE CASCADE, CONSTRAINT `tpvTransaction_ibfk_1` FOREIGN KEY (`clientFk`) REFERENCES `vn2008`.`Clientes` (`id_cliente`) ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT `tpvTransaction_ibfk_2` FOREIGN KEY (`merchantFk`) REFERENCES `tpvMerchant` (`id`) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=233383 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Transactions realized through the virtual TPV'; +) ENGINE=InnoDB AUTO_INCREMENT=242874 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Transactions realized through the virtual TPV'; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -70225,7 +67240,7 @@ CREATE TABLE `visit` ( PRIMARY KEY (`id`), KEY `firstAgent` (`firstAgent`), CONSTRAINT `visit_ibfk_1` FOREIGN KEY (`firstAgent`) REFERENCES `visitAgent` (`id`) ON DELETE SET NULL ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=1327505 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=1370172 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -70245,7 +67260,7 @@ CREATE TABLE `visitAccess` ( KEY `visit_access_idx_agent` (`agent`), KEY `stamp` (`stamp`), CONSTRAINT `visitAccess_ibfk_1` FOREIGN KEY (`agent`) REFERENCES `visitAgent` (`id`) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=2912494 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=3011426 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -70270,7 +67285,7 @@ CREATE TABLE `visitAgent` ( KEY `firstAccess` (`firstAccess`), CONSTRAINT `visitAgent_ibfk_1` FOREIGN KEY (`visit`) REFERENCES `visit` (`id`) ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT `visitAgent_ibfk_2` FOREIGN KEY (`firstAccess`) REFERENCES `visitAccess` (`id`) ON DELETE SET NULL ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=1875701 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=1923308 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -70290,7 +67305,7 @@ CREATE TABLE `visitUser` ( KEY `date_time` (`stamp`), KEY `user_id` (`user`), CONSTRAINT `visitUser_ibfk_1` FOREIGN KEY (`access`) REFERENCES `visitAccess` (`id`) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=2761177 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=2836351 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -71335,15 +68350,15 @@ DELIMITER ; /*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ; DELIMITER ;; CREATE DEFINER=`root`@`%` PROCEDURE `myTicketGetRows`(`vTicket` INT) -BEGIN - - SELECT r.itemFk, r.quantity, r.concept, r.price, r.discount, - i.image, i.category, i.size, i.stems, i.inkFk, - i.tag5, i.value5, i.tag6, i.value6, i.tag7, i.value7 - FROM myTicketRow r - JOIN vn.item i ON i.id = r.itemFk - WHERE r.ticketFk = vTicket - ORDER BY r.concept; +BEGIN + + SELECT r.itemFk, r.quantity, r.concept, r.price, r.discount, + i.image, i.category, i.size, i.stems, i.inkFk, + i.tag5, i.value5, i.tag6, i.value6, i.tag7, i.value7 + FROM myTicketRow r + JOIN vn.item i ON i.id = r.itemFk + WHERE r.ticketFk = vTicket + ORDER BY r.concept; END ;; DELIMITER ; /*!50003 SET sql_mode = @saved_sql_mode */ ; @@ -75032,7 +72047,7 @@ USE `vn`; /*!50001 SET collation_connection = utf8_general_ci */; /*!50001 CREATE ALGORITHM=UNDEFINED */ /*!50013 DEFINER=`root`@`%` SQL SECURITY DEFINER */ -/*!50001 VIEW `agencyProvince` AS select `a`.`province_id` AS `provinceFk`,`a`.`agency_id` AS `agencyFk`,`a`.`zona` AS `zone`,`a`.`warehouse_id` AS `warehouseFk`,`a`.`route` AS `route` from `vn2008`.`Agencias_province` `a` */; +/*!50001 VIEW `agencyProvince` AS select `a`.`province_id` AS `provinceFk`,`a`.`agency_id` AS `agencyFk`,`a`.`zona` AS `zone`,`a`.`warehouse_id` AS `warehouseFk` from `vn2008`.`Agencias_province` `a` */; /*!50001 SET character_set_client = @saved_cs_client */; /*!50001 SET character_set_results = @saved_cs_results */; /*!50001 SET collation_connection = @saved_col_connection */; @@ -75230,7 +72245,7 @@ USE `vn`; /*!50001 SET collation_connection = utf8_general_ci */; /*!50001 CREATE ALGORITHM=UNDEFINED */ /*!50013 DEFINER=`root`@`%` SQL SECURITY DEFINER */ -/*!50001 VIEW `claim` AS select `c`.`id` AS `id`,`c`.`Fecha` AS `ticketCreated`,`c`.`cl_est_id` AS `claimStateFk`,`c`.`notas` AS `observation`,`c`.`Id_Cliente` AS `clientFk`,`c`.`Id_Trabajador` AS `workerFk`,`c`.`sensib` AS `responsibility`,`c`.`mana` AS `isChargedToMana`,`c`.`odbc_date` AS `created` from `vn2008`.`cl_main` `c` */; +/*!50001 VIEW `claim` AS select `c`.`id` AS `id`,`c`.`Fecha` AS `ticketCreated`,`c`.`cl_est_id` AS `claimStateFk`,`c`.`notas` AS `observation`,`c`.`Id_Cliente` AS `clientFk`,`c`.`Id_Trabajador` AS `workerFk`,`c`.`sensib` AS `responsibility`,`c`.`mana` AS `isChargedToMana`,`c`.`ticketFk` AS `ticketFk`,`c`.`odbc_date` AS `created` from `vn2008`.`cl_main` `c` */; /*!50001 SET character_set_client = @saved_cs_client */; /*!50001 SET character_set_results = @saved_cs_results */; /*!50001 SET collation_connection = @saved_col_connection */; @@ -75248,7 +72263,7 @@ USE `vn`; /*!50001 SET collation_connection = utf8_general_ci */; /*!50001 CREATE ALGORITHM=UNDEFINED */ /*!50013 DEFINER=`root`@`%` SQL SECURITY DEFINER */ -/*!50001 VIEW `claimBeginning` AS select `c`.`id` AS `id`,`c`.`cl_main_id` AS `claimFk`,`c`.`Id_Movimiento` AS `saleFk`,`c`.`numero` AS `claimed` from `vn2008`.`cl_det` `c` */; +/*!50001 VIEW `claimBeginning` AS select `c`.`id` AS `id`,`c`.`cl_main_id` AS `claimFk`,`c`.`Id_Movimiento` AS `saleFk`,`c`.`numero` AS `quantity` from `vn2008`.`cl_det` `c` */; /*!50001 SET character_set_client = @saved_cs_client */; /*!50001 SET character_set_results = @saved_cs_results */; /*!50001 SET collation_connection = @saved_col_connection */; @@ -75487,42 +72502,6 @@ USE `vn`; /*!50001 SET character_set_results = @saved_cs_results */; /*!50001 SET collation_connection = @saved_col_connection */; --- --- Final view structure for view `clientNotificationTypekk` --- - -/*!50001 DROP VIEW IF EXISTS `clientNotificationTypekk`*/; -/*!50001 SET @saved_cs_client = @@character_set_client */; -/*!50001 SET @saved_cs_results = @@character_set_results */; -/*!50001 SET @saved_col_connection = @@collation_connection */; -/*!50001 SET character_set_client = utf8 */; -/*!50001 SET character_set_results = utf8 */; -/*!50001 SET collation_connection = utf8_general_ci */; -/*!50001 CREATE ALGORITHM=UNDEFINED */ -/*!50013 DEFINER=`root`@`%` SQL SECURITY DEFINER */ -/*!50001 VIEW `clientNotificationTypekk` AS select `e`.`id` AS `id`,`e`.`abrev` AS `code`,`e`.`descripcion` AS `description`,`e`.`visible` AS `isVisible` from `vn2008`.`escritos` `e` */; -/*!50001 SET character_set_client = @saved_cs_client */; -/*!50001 SET character_set_results = @saved_cs_results */; -/*!50001 SET collation_connection = @saved_col_connection */; - --- --- Final view structure for view `clientNotificationkk` --- - -/*!50001 DROP VIEW IF EXISTS `clientNotificationkk`*/; -/*!50001 SET @saved_cs_client = @@character_set_client */; -/*!50001 SET @saved_cs_results = @@character_set_results */; -/*!50001 SET @saved_col_connection = @@collation_connection */; -/*!50001 SET character_set_client = utf8 */; -/*!50001 SET character_set_results = utf8 */; -/*!50001 SET collation_connection = utf8_general_ci */; -/*!50001 CREATE ALGORITHM=UNDEFINED */ -/*!50013 DEFINER=`root`@`%` SQL SECURITY DEFINER */ -/*!50001 VIEW `clientNotificationkk` AS select `e`.`id` AS `id`,`e`.`Id_Cliente` AS `clientFk`,`e`.`escritos_id` AS `clientNotificationTypeFk`,`e`.`fecha` AS `created`,`e`.`Id_Trabajador` AS `workerFk`,`e`.`userFk` AS `userFk` from `vn2008`.`escritos_det` `e` */; -/*!50001 SET character_set_client = @saved_cs_client */; -/*!50001 SET character_set_results = @saved_cs_results */; -/*!50001 SET collation_connection = @saved_col_connection */; - -- -- Final view structure for view `clientObservation` -- @@ -76436,7 +73415,7 @@ USE `vn`; /*!50001 SET collation_connection = utf8_general_ci */; /*!50001 CREATE ALGORITHM=UNDEFINED */ /*!50013 DEFINER=`root`@`%` SQL SECURITY DEFINER */ -/*!50001 VIEW `item` AS select `t`.`Id_Article` AS `id`,`t`.`Article` AS `name`,`t`.`tipo_id` AS `typeFk`,`t`.`Medida` AS `size`,`t`.`Color` AS `inkFk`,`t`.`Categoria` AS `category`,`t`.`Tallos` AS `stems`,`t`.`id_origen` AS `originFk`,`t`.`description` AS `description`,`t`.`producer_id` AS `producerFk`,`t`.`Codintrastat` AS `intrastatFk`,`t`.`offer` AS `isOnOffer`,`t`.`caja` AS `box`,`t`.`expenceFk` AS `expenceFk`,`t`.`bargain` AS `isBargain`,`t`.`comments` AS `comment`,`t`.`relevancy` AS `relevancy`,`t`.`Foto` AS `image`,`t`.`generic` AS `generic`,`t`.`density` AS `density`,`t`.`iva_group_id` AS `taxClassFk`,`t`.`PVP` AS `minPrice`,`t`.`Min` AS `hasMinPrice`,`t`.`isActive` AS `isActive`,`t`.`longName` AS `longName`,`t`.`subName` AS `subName`,`t`.`tag5` AS `tag5`,`t`.`value5` AS `value5`,`t`.`tag6` AS `tag6`,`t`.`value6` AS `value6`,`t`.`tag7` AS `tag7`,`t`.`value7` AS `value7`,`t`.`tag8` AS `tag8`,`t`.`value8` AS `value8` from `vn2008`.`Articles` `t` */; +/*!50001 VIEW `item` AS select `t`.`Id_Article` AS `id`,`t`.`Article` AS `name`,`t`.`tipo_id` AS `typeFk`,`t`.`Medida` AS `size`,`t`.`Color` AS `inkFk`,`t`.`Categoria` AS `category`,`t`.`Tallos` AS `stems`,`t`.`id_origen` AS `originFk`,`t`.`description` AS `description`,`t`.`producer_id` AS `producerFk`,`t`.`Codintrastat` AS `intrastatFk`,`t`.`offer` AS `isOnOffer`,`t`.`caja` AS `box`,`t`.`expenceFk` AS `expenceFk`,`t`.`bargain` AS `isBargain`,`t`.`comments` AS `comment`,`t`.`relevancy` AS `relevancy`,`t`.`Foto` AS `image`,`t`.`generic` AS `generic`,`t`.`density` AS `density`,`t`.`iva_group_id` AS `taxClassFk`,`t`.`PVP` AS `minPrice`,`t`.`Min` AS `hasMinPrice`,`t`.`isActive` AS `isActive`,`t`.`longName` AS `longName`,`t`.`subName` AS `subName`,`t`.`tag5` AS `tag5`,`t`.`value5` AS `value5`,`t`.`tag6` AS `tag6`,`t`.`value6` AS `value6`,`t`.`tag7` AS `tag7`,`t`.`value7` AS `value7`,`t`.`tag8` AS `tag8`,`t`.`value8` AS `value8`,`t`.`tag9` AS `tag9`,`t`.`value9` AS `value9`,`t`.`tag10` AS `tag10`,`t`.`value10` AS `value10`,`t`.`minimum` AS `minimum`,`t`.`upToDown` AS `upToDown` from `vn2008`.`Articles` `t` */; /*!50001 SET character_set_client = @saved_cs_client */; /*!50001 SET character_set_results = @saved_cs_results */; /*!50001 SET collation_connection = @saved_col_connection */; @@ -76508,7 +73487,7 @@ USE `vn`; /*!50001 SET collation_connection = utf8_general_ci */; /*!50001 CREATE ALGORITHM=UNDEFINED */ /*!50013 DEFINER=`root`@`%` SQL SECURITY DEFINER */ -/*!50001 VIEW `itemCategory` AS select `r`.`id` AS `id`,`r`.`reino` AS `name`,`r`.`display` AS `display`,`r`.`color` AS `color` from `vn2008`.`reinos` `r` */; +/*!50001 VIEW `itemCategory` AS select `r`.`id` AS `id`,`r`.`reino` AS `name`,`r`.`display` AS `display`,`r`.`color` AS `color`,`r`.`icon` AS `icon` from `vn2008`.`reinos` `r` */; /*!50001 SET character_set_client = @saved_cs_client */; /*!50001 SET character_set_results = @saved_cs_results */; /*!50001 SET collation_connection = @saved_col_connection */; @@ -76562,7 +73541,25 @@ USE `vn`; /*!50001 SET collation_connection = utf8_general_ci */; /*!50001 CREATE ALGORITHM=UNDEFINED */ /*!50013 DEFINER=`root`@`%` SQL SECURITY DEFINER */ -/*!50001 VIEW `itemShelvingAvailable` AS select `s`.`id` AS `saleFk`,`tst`.`updated` AS `Modificado`,`s`.`ticketFk` AS `ticketFk`,`s`.`isPicked` AS `isPicked`,`s`.`itemFk` AS `itemFk`,`s`.`quantity` AS `quantity`,`s`.`concept` AS `concept`,`i`.`size` AS `size`,`st`.`name` AS `Estado`,`st`.`order` AS `orden`,`its`.`available` AS `available`,`pk`.`sectorFk` AS `sectorFk`,`sh`.`code` AS `matricula`,`pk`.`id` AS `parking`,`its`.`id` AS `itemShelving` from (((((((`vn`.`sale` `s` join `vn`.`ticket` `t` on((`t`.`id` = `s`.`ticketFk`))) join `vn`.`ticketStateToday` `tst` on((`tst`.`ticket` = `t`.`id`))) join `vn`.`state` `st` on((`st`.`id` = `tst`.`state`))) join `vn`.`item` `i` on((`i`.`id` = `s`.`itemFk`))) join `vn`.`itemShelving` `its` on((`its`.`itemFk` = `s`.`itemFk`))) join `vn`.`shelving` `sh` on((`sh`.`code` = `its`.`shelvingFk`))) join `vn`.`parking` `pk` on((`pk`.`id` = `sh`.`parkingFk`))) where ((`t`.`shipped` between `util`.`yesterday`() and `util`.`dayend`(curdate())) and (`its`.`available` > 0) and (`st`.`order` between 3 and 6)) order by `st`.`order` desc,`tst`.`updated` */; +/*!50001 VIEW `itemShelvingAvailable` AS select `s`.`id` AS `saleFk`,`tst`.`updated` AS `Modificado`,`s`.`ticketFk` AS `ticketFk`,`s`.`isPicked` AS `isPicked`,`s`.`itemFk` AS `itemFk`,`s`.`quantity` AS `quantity`,`s`.`concept` AS `concept`,`i`.`size` AS `size`,`st`.`name` AS `Estado`,`st`.`sectorProdPriority` AS `sectorProdPriority`,`its`.`available` AS `available`,`pk`.`sectorFk` AS `sectorFk`,`sh`.`code` AS `matricula`,`pk`.`id` AS `parking`,`its`.`id` AS `itemShelving`,`am`.`name` AS `Agency`,`t`.`shipped` AS `shipped`,`its`.`grouping` AS `grouping` from (((((((((`vn`.`sale` `s` join `vn`.`ticket` `t` on((`t`.`id` = `s`.`ticketFk`))) join `vn`.`agencyMode` `am` on((`am`.`id` = `t`.`agencyModeFk`))) join `vn`.`ticketStateToday` `tst` on((`tst`.`ticket` = `t`.`id`))) join `vn`.`state` `st` on((`st`.`id` = `tst`.`state`))) join `vn`.`item` `i` on((`i`.`id` = `s`.`itemFk`))) join `vn`.`itemShelving` `its` on((`its`.`itemFk` = `s`.`itemFk`))) join `vn`.`shelving` `sh` on((`sh`.`code` = `its`.`shelvingFk`))) join `vn`.`parking` `pk` on((`pk`.`id` = `sh`.`parkingFk`))) join `vn`.`sector` `sc` on(((`sc`.`id` = `pk`.`sectorFk`) and (`sc`.`warehouseFk` = `t`.`warehouseFk`)))) where ((`t`.`shipped` between `util`.`yesterday`() and `util`.`dayend`(curdate())) and (`its`.`available` > 0) and (`its`.`packing` <= `s`.`quantity`) and `st`.`sectorProdPriority`) */; +/*!50001 SET character_set_client = @saved_cs_client */; +/*!50001 SET character_set_results = @saved_cs_results */; +/*!50001 SET collation_connection = @saved_col_connection */; + +-- +-- Final view structure for view `itemShelvingStock` +-- + +/*!50001 DROP VIEW IF EXISTS `itemShelvingStock`*/; +/*!50001 SET @saved_cs_client = @@character_set_client */; +/*!50001 SET @saved_cs_results = @@character_set_results */; +/*!50001 SET @saved_col_connection = @@collation_connection */; +/*!50001 SET character_set_client = utf8 */; +/*!50001 SET character_set_results = utf8 */; +/*!50001 SET collation_connection = utf8_general_ci */; +/*!50001 CREATE ALGORITHM=UNDEFINED */ +/*!50013 DEFINER=`root`@`%` SQL SECURITY DEFINER */ +/*!50001 VIEW `itemShelvingStock` AS select `itemShelving`.`itemFk` AS `itemFk`,sum(`itemShelving`.`visible`) AS `visible`,`itemShelving`.`packing` AS `packing` from `itemShelving` group by `itemShelving`.`itemFk` */; /*!50001 SET character_set_client = @saved_cs_client */; /*!50001 SET character_set_results = @saved_cs_results */; /*!50001 SET collation_connection = @saved_col_connection */; @@ -76616,7 +73613,7 @@ USE `vn`; /*!50001 SET collation_connection = utf8_general_ci */; /*!50001 CREATE ALGORITHM=UNDEFINED */ /*!50013 DEFINER=`root`@`%` SQL SECURITY DEFINER */ -/*!50001 VIEW `itemType` AS select `t`.`tipo_id` AS `id`,`t`.`Id_Tipo` AS `code`,`t`.`Tipo` AS `name`,`t`.`reino_id` AS `categoryFk`,`t`.`life` AS `life`,`t`.`Id_Trabajador` AS `workerFk`,`t`.`warehouseFk` AS `warehouseFk`,`t`.`isPackaging` AS `isPackaging` from `vn2008`.`Tipos` `t` */; +/*!50001 VIEW `itemType` AS select `t`.`tipo_id` AS `id`,`t`.`Id_Tipo` AS `code`,`t`.`Tipo` AS `name`,`t`.`reino_id` AS `categoryFk`,`t`.`reino_id` AS `kingdomFk`,`t`.`life` AS `life`,`t`.`Id_Trabajador` AS `workerFk`,`t`.`warehouseFk` AS `warehouseFk`,`t`.`isPackaging` AS `isPackaging` from `vn2008`.`Tipos` `t` */; /*!50001 SET character_set_client = @saved_cs_client */; /*!50001 SET character_set_results = @saved_cs_results */; /*!50001 SET collation_connection = @saved_col_connection */; @@ -76639,6 +73636,24 @@ USE `vn`; /*!50001 SET character_set_results = @saved_cs_results */; /*!50001 SET collation_connection = @saved_col_connection */; +-- +-- Final view structure for view `kingdom` +-- + +/*!50001 DROP VIEW IF EXISTS `kingdom`*/; +/*!50001 SET @saved_cs_client = @@character_set_client */; +/*!50001 SET @saved_cs_results = @@character_set_results */; +/*!50001 SET @saved_col_connection = @@collation_connection */; +/*!50001 SET character_set_client = utf8 */; +/*!50001 SET character_set_results = utf8 */; +/*!50001 SET collation_connection = utf8_general_ci */; +/*!50001 CREATE ALGORITHM=UNDEFINED */ +/*!50013 DEFINER=`z-developer`@`%` SQL SECURITY DEFINER */ +/*!50001 VIEW `kingdom` AS select `vn2008`.`reinos`.`id` AS `id`,`vn2008`.`reinos`.`reino` AS `kingdom`,`vn2008`.`reinos`.`orden` AS `order`,`vn2008`.`reinos`.`display` AS `display`,`vn2008`.`reinos`.`color` AS `color`,`vn2008`.`reinos`.`efimero` AS `shortLife`,`vn2008`.`reinos`.`mercancia` AS `merchandise`,`vn2008`.`reinos`.`icon` AS `icon` from `vn2008`.`reinos` */; +/*!50001 SET character_set_client = @saved_cs_client */; +/*!50001 SET character_set_results = @saved_cs_results */; +/*!50001 SET collation_connection = @saved_col_connection */; + -- -- Final view structure for view `mail` -- @@ -76729,24 +73744,6 @@ USE `vn`; /*!50001 SET character_set_results = @saved_cs_results */; /*!50001 SET collation_connection = @saved_col_connection */; --- --- Final view structure for view `movementkk` --- - -/*!50001 DROP VIEW IF EXISTS `movementkk`*/; -/*!50001 SET @saved_cs_client = @@character_set_client */; -/*!50001 SET @saved_cs_results = @@character_set_results */; -/*!50001 SET @saved_col_connection = @@collation_connection */; -/*!50001 SET character_set_client = utf8 */; -/*!50001 SET character_set_results = utf8 */; -/*!50001 SET collation_connection = utf8_general_ci */; -/*!50001 CREATE ALGORITHM=UNDEFINED */ -/*!50013 DEFINER=`root`@`%` SQL SECURITY DEFINER */ -/*!50001 VIEW `movementkk` AS select `m`.`Id_Movimiento` AS `id`,`m`.`Id_Article` AS `item`,`m`.`Id_Ticket` AS `ticket`,`m`.`Concepte` AS `concept`,`m`.`Cantidad` AS `amount`,`m`.`quantity` AS `quantity`,`m`.`Preu` AS `price`,`m`.`Descuento` AS `discount`,`m`.`CostFixat` AS `cost`,`m`.`Reservado` AS `reservado`,`m`.`OK` AS `od`,`m`.`PrecioFijado` AS `priceFixed`,`m`.`odbc_date` AS `lastUpdate` from `vn2008`.`Movimientos` `m` */; -/*!50001 SET character_set_client = @saved_cs_client */; -/*!50001 SET character_set_results = @saved_cs_results */; -/*!50001 SET collation_connection = @saved_col_connection */; - -- -- Final view structure for view `observationType` -- @@ -77354,7 +74351,7 @@ USE `vn`; /*!50001 SET collation_connection = utf8_general_ci */; /*!50001 CREATE ALGORITHM=UNDEFINED */ /*!50013 DEFINER=`root`@`%` SQL SECURITY DEFINER */ -/*!50001 VIEW `sample` AS select `e`.`id` AS `id`,`e`.`abrev` AS `code`,`e`.`descripcion` AS `description`,`e`.`visible` AS `isVisible` from `vn2008`.`escritos` `e` */; +/*!50001 VIEW `sample` AS select `e`.`id` AS `id`,`e`.`abrev` AS `code`,`e`.`descripcion` AS `description`,`e`.`visible` AS `isVisible`,`e`.`hasCompany` AS `hasCompany` from `vn2008`.`escritos` `e` */; /*!50001 SET character_set_client = @saved_cs_client */; /*!50001 SET character_set_results = @saved_cs_results */; /*!50001 SET collation_connection = @saved_col_connection */; @@ -77390,7 +74387,7 @@ USE `vn`; /*!50001 SET collation_connection = utf8_general_ci */; /*!50001 CREATE ALGORITHM=UNDEFINED */ /*!50013 DEFINER=`root`@`%` SQL SECURITY DEFINER */ -/*!50001 VIEW `state` AS select `s`.`id` AS `id`,`s`.`name` AS `name`,`s`.`order` AS `order`,`s`.`alert_level` AS `alertLevel`,`s`.`code` AS `code` from `vn2008`.`state` `s` */; +/*!50001 VIEW `state` AS select `s`.`id` AS `id`,`s`.`name` AS `name`,`s`.`order` AS `order`,`s`.`alert_level` AS `alertLevel`,`s`.`code` AS `code`,`s`.`sectorProdPriority` AS `sectorProdPriority` from `vn2008`.`state` `s` */; /*!50001 SET character_set_client = @saved_cs_client */; /*!50001 SET character_set_results = @saved_cs_results */; /*!50001 SET collation_connection = @saved_col_connection */; @@ -78705,4 +75702,4 @@ USE `stock`; /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; --- Dump completed on 2018-07-27 11:53:09 +-- Dump completed on 2018-09-05 12:55:00 diff --git a/services/db/install/dump/03-dumpedFixtures.sql b/services/db/install/dump/03-dumpedFixtures.sql index 08eb266d3..9513353a0 100644 --- a/services/db/install/dump/03-dumpedFixtures.sql +++ b/services/db/install/dump/03-dumpedFixtures.sql @@ -55,7 +55,7 @@ UNLOCK TABLES; /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; --- Dump completed on 2018-08-01 19:38:28 +-- Dump completed on 2018-09-05 11:59:54 USE `salix`; -- MySQL dump 10.13 Distrib 5.7.21, for osx10.13 (x86_64) -- @@ -93,7 +93,7 @@ UNLOCK TABLES; /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; --- Dump completed on 2018-08-01 19:38:28 +-- Dump completed on 2018-09-05 11:59:54 USE `vn`; -- MySQL dump 10.13 Distrib 5.7.21, for osx10.13 (x86_64) -- @@ -168,7 +168,7 @@ UNLOCK TABLES; LOCK TABLES `tag` WRITE; /*!40000 ALTER TABLE `tag` DISABLE KEYS */; -INSERT INTO `tag` VALUES (1,'Color',0,1,'ink',NULL),(2,'Forma',1,1,NULL,NULL),(3,'Material',1,1,NULL,NULL),(4,'Longitud',1,0,NULL,NULL),(5,'Diámetro',1,0,NULL,'mm'),(6,'Perímetro',1,0,NULL,'mm'),(7,'Ancho de la base',1,0,NULL,'mm'),(8,'Altura',1,0,NULL,'mm'),(9,'Volumen',1,0,NULL,'ml'),(10,'Densidad',1,0,NULL,NULL),(11,'Calidad',1,1,NULL,NULL),(12,'Textura',1,1,NULL,NULL),(13,'Material del mango',1,1,NULL,NULL),(14,'Compra mínima',1,1,NULL,NULL),(15,'Nº pétalos',1,0,NULL,NULL),(16,'Ancho',1,0,NULL,'mm'),(17,'Alto',1,0,NULL,'mm'),(18,'Profundidad',1,0,NULL,'mm'),(19,'Largo',1,0,NULL,'mm'),(20,'Ancho superior',1,0,NULL,'mm'),(21,'Ancho inferior',1,0,NULL,'mm'),(22,'Gramaje',1,0,NULL,'g'),(23,'Tallos',1,0,NULL,NULL),(24,'Estado',0,1,NULL,NULL),(25,'Color principal',0,1,NULL,NULL),(26,'Color secundario',0,1,NULL,NULL),(27,'Longitud(cm)',1,0,NULL,'cm'),(28,'Diámetro base',1,0,NULL,NULL),(29,'Colección',1,1,NULL,NULL),(30,'Uds / caja',1,0,NULL,NULL),(31,'Contenido',1,1,NULL,NULL),(32,'Peso',1,0,NULL,'g'),(33,'Grosor',1,0,NULL,'mm'),(34,'Marca',1,1,NULL,NULL),(35,'Origen',0,1,'origin',NULL),(36,'Proveedor',1,1,NULL,NULL),(37,'Productor',1,1,'producer',NULL),(38,'Duración',1,0,NULL,'s'),(39,'Flor',1,1,NULL,NULL),(40,'Soporte',1,1,NULL,NULL),(41,'Tamaño flor',1,1,NULL,NULL),(42,'Apertura',1,1,NULL,NULL),(43,'Tallo',0,1,NULL,NULL),(44,'Numero hojas',1,1,NULL,NULL),(45,'Dimensiones',1,1,NULL,NULL),(46,'Diámetro boca',1,1,NULL,NULL),(47,'Nº flores',1,0,NULL,NULL),(48,'Uds / paquete',1,0,NULL,NULL),(49,'Maceta',1,1,NULL,NULL),(50,'Textura flor',1,1,NULL,NULL),(51,'Textura hoja',1,1,NULL,NULL),(52,'Tipo de iva',1,1,NULL,NULL),(53,'Tronco',1,1,NULL,NULL),(54,'Hoja',1,1,NULL,NULL),(55,'Formato',1,1,NULL,NULL),(56,'Genero',1,1,NULL,NULL),(57,'Especie',1,1,NULL,NULL),(58,'Variedad',1,1,NULL,NULL),(59,'Medida grande',1,0,NULL,NULL),(60,'Medida mediano',1,0,NULL,NULL),(61,'Medida pequeño',1,0,NULL,NULL),(62,'Medida pequeño',1,0,NULL,NULL),(63,'Recipiente interior',1,1,NULL,NULL),(64,'Material secundario',1,1,NULL,NULL),(65,'Colores',1,1,NULL,NULL),(66,'Referencia',1,1,NULL,NULL),(67,'Categoria',1,0,NULL,NULL),(68,'Amb',0,1,NULL,NULL),(69,'Anchura',1,1,NULL,'cm'),(70,'Hueco interior',-1,1,NULL,NULL),(71,'Tamaño',1,1,NULL,NULL),(72,'Color botón',1,1,NULL,NULL),(73,'Tamaño minimo del botón',1,1,NULL,NULL),(74,'Obtentor',1,1,NULL,NULL),(75,'Loguitud del brote',1,1,NULL,NULL),(76,'Tallos / u.v.',1,1,NULL,NULL),(77,'Madera de',1,1,NULL,NULL),(78,'Unidad de venta',1,1,NULL,NULL),(79,'temporal',1,1,NULL,NULL); +INSERT INTO `tag` VALUES (1,'Color',0,1,'ink',NULL),(2,'Forma',1,1,NULL,NULL),(3,'Material',1,1,NULL,NULL),(4,'Longitud',1,0,NULL,NULL),(5,'Diámetro',1,0,NULL,'mm'),(6,'Perímetro',1,0,NULL,'mm'),(7,'Ancho de la base',1,0,NULL,'mm'),(8,'Altura',1,0,NULL,'mm'),(9,'Volumen',1,0,NULL,'ml'),(10,'Densidad',1,0,NULL,NULL),(11,'Calidad',1,1,NULL,NULL),(12,'Textura',1,1,NULL,NULL),(13,'Material del mango',1,1,NULL,NULL),(14,'Compra mínima',1,1,NULL,NULL),(15,'Nº pétalos',1,0,NULL,NULL),(16,'Ancho',1,0,NULL,'mm'),(17,'Alto',1,0,NULL,'mm'),(18,'Profundidad',1,0,NULL,'mm'),(19,'Largo',1,0,NULL,'mm'),(20,'Ancho superior',1,0,NULL,'mm'),(21,'Ancho inferior',1,0,NULL,'mm'),(22,'Gramaje',1,0,NULL,'g'),(23,'Tallos',1,0,NULL,NULL),(24,'Estado',0,1,NULL,NULL),(25,'Color principal',0,1,NULL,NULL),(26,'Color secundario',0,1,NULL,NULL),(27,'Longitud(cm)',1,0,NULL,'cm'),(28,'Diámetro base',1,0,NULL,NULL),(29,'Colección',1,1,NULL,NULL),(30,'Uds / caja',1,0,NULL,NULL),(31,'Contenido',1,1,NULL,NULL),(32,'Peso',1,0,NULL,'g'),(33,'Grosor',1,0,NULL,'mm'),(34,'Marca',1,1,NULL,NULL),(35,'Origen',0,1,'origin',NULL),(36,'Proveedor',1,1,NULL,NULL),(37,'Productor',1,1,'producer',NULL),(38,'Duración',1,0,NULL,'s'),(39,'Flor',1,1,NULL,NULL),(40,'Soporte',1,1,NULL,NULL),(41,'Tamaño flor',1,1,NULL,NULL),(42,'Apertura',1,1,NULL,NULL),(43,'Tallo',0,1,NULL,NULL),(44,'Numero hojas',1,1,NULL,NULL),(45,'Dimensiones',1,1,NULL,NULL),(46,'Diámetro boca',1,1,NULL,NULL),(47,'Nº flores',1,0,NULL,NULL),(48,'Uds / paquete',1,0,NULL,NULL),(49,'Maceta',1,1,NULL,NULL),(50,'Textura flor',1,1,NULL,NULL),(51,'Textura hoja',1,1,NULL,NULL),(52,'Tipo de iva',1,1,NULL,NULL),(53,'Tronco',1,1,NULL,NULL),(54,'Hoja',1,1,NULL,NULL),(55,'Formato',1,1,NULL,NULL),(56,'Genero',1,1,NULL,NULL),(57,'Especie',1,1,NULL,NULL),(58,'Variedad',1,1,NULL,NULL),(59,'Medida grande',1,0,NULL,NULL),(60,'Medida mediano',1,0,NULL,NULL),(61,'Medida pequeño',1,0,NULL,NULL),(62,'Medida pequeño',1,0,NULL,NULL),(63,'Recipiente interior',1,1,NULL,NULL),(64,'Material secundario',1,1,NULL,NULL),(65,'Colores',1,1,NULL,NULL),(66,'Referencia',1,1,NULL,NULL),(67,'Categoria',1,0,NULL,NULL),(68,'Amb',0,1,NULL,NULL),(69,'Anchura',1,1,NULL,'cm'),(70,'Hueco interior',-1,1,NULL,NULL),(71,'Tamaño',1,1,NULL,NULL),(72,'Color botón',1,1,NULL,NULL),(73,'Tamaño minimo del botón',1,1,NULL,NULL),(74,'Obtentor',1,1,NULL,NULL),(75,'Logitud del brote',1,1,NULL,NULL),(76,'Tallos / u.v.',1,1,NULL,NULL),(77,'Madera de',1,1,NULL,NULL),(78,'Unidad de venta',1,1,NULL,NULL),(79,'Temporal',1,1,NULL,NULL),(80,'Gramaje/tallo',1,1,NULL,NULL),(81,'Gramaje/paquete',1,1,NULL,NULL),(82,'Flexibilidad del tallo',1,1,NULL,NULL),(83,'Nº planchas',1,1,NULL,NULL); /*!40000 ALTER TABLE `tag` ENABLE KEYS */; UNLOCK TABLES; /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */; @@ -181,7 +181,7 @@ UNLOCK TABLES; /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; --- Dump completed on 2018-08-01 19:38:28 +-- Dump completed on 2018-09-05 11:59:54 USE `vn2008`; -- MySQL dump 10.13 Distrib 5.7.21, for osx10.13 (x86_64) -- @@ -216,7 +216,7 @@ UNLOCK TABLES; LOCK TABLES `Gastos` WRITE; /*!40000 ALTER TABLE `Gastos` DISABLE KEYS */; -INSERT INTO `Gastos` VALUES ('2000000000',1,'Inmovilizado pendiente',1,0,0),('2000000000',3,'Compra de bienes de inmovilizado',1,0,0),('2600000000',1,'Fianzas',0,0,0),('4600000000',1,'Anticipos de remuneraciones',1,0,0),('4600000001',1,'Anticpos de remuneración',1,0,0),('4751000000',0,'Retenciones',0,1,0),('4751000000',1,'Retenciones',0,1,0),('4751000000',6,'Retencion',0,0,0),('5200000006',1,'Deudas a c/p CRA',1,0,0),('5200000008',0,'Prestamo CP Transolver IVECO 269',1,0,0),('5200000008',1,'Prestamo Transolver 201600269',1,0,0),('5200000009',0,'Prestamo CP Transolver IVECO 270',1,0,0),('5200000009',1,'Prestamo Transolver 201600270',1,0,0),('5200000010',0,'Prestamo CP Transolver IVECO 271',1,0,0),('5200000010',1,'Prestamo Transolver 201600271',1,0,0),('5200000011',1,'Prestamo Transolver 339',0,0,0),('5200000012',1,'Prestamo Transolver 340',1,0,0),('5200000013',1,'Prestamo Transolver 341',1,0,0),('5200000014',1,'Prestamo a c/p BBVA 600.000€',1,0,0),('5200000022',1,'Linea comercio exterior',1,0,0),('5240000001',1,'Leasing BBVA',1,0,0),('5240002032',1,'Leasing Iveco',1,0,0),('5240002066',1,'Leasing c/p Man',1,0,0),('5240002104',1,'Leasing c/p La caixa 3 vehículos',1,0,0),('5325000003',6,'Prestamo a partes vinculadas',0,0,0),('5420000001',1,'Prestamo concedido',1,0,0),('5660000001',1,'Suplidos',0,0,0),('5660000001',20,'Suplidos',1,0,0),('5660000002',0,'Suplidos',0,0,0),('5660000002',1,'Suplidos Transitarios nacionales',1,0,0),('5660000003',1,'Deposito c/p Ebury',1,0,0),('5660000003',4,'Deposito Ebury',0,0,0),('5660000004',4,'Deposito Global Reach',0,0,0),('6001000000',1,'Compras a terceros nacional',1,0,0),('6001000000',18,'Compras a terceros nacional',1,0,0),('6001000000',19,'Compras a terceros nacional',1,0,0),('6001000001',1,'Adquisiones en Europa',0,0,0),('6001000001',3,'Adquisición en Europa',1,0,0),('6002000000',1,'Transportes de compras',1,0,0),('6002000001',1,'Tranportes de compra Europa',1,0,0),('6002000001',4,'Transportes de compras Europa',1,0,0),('6002000567',0,'Transporte de compras VNH',1,0,0),('6003000000',1,'Adquisición mercancia Extracomunitaria',1,0,0),('6003000000',5,'Adquisición mercancia Extracomunitaria',1,0,0),('6003000000',6,'Adquisición mercancia Extracomunitaria',1,0,0),('6003000567',0,'Compra de mercancia extracomunitaria VNH',1,0,0),('6004000000',1,'Transporte compras Sudamérica',1,0,0),('6004000000',4,'Transporte compras Sudamérica',1,0,0),('6004000000',6,'Transporte compras Sudamérica',1,0,0),('6010000000',1,'Materias primas',1,0,0),('6020000000',1,'Otros aprovisionamientos',1,0,0),('6020000001',1,'Embalajes',1,0,0),('6020000002',1,'Otros aprov. Taller artíficial',1,0,0),('6070000000',1,'Trabajos de produccion encargados a terceros',1,0,0),('6090000000',6,'Rappels por compras',1,0,0),('6100000000',0,'Variacion existencias',1,0,0),('6210000000',1,'Arrendamientos',1,0,0),('6210000001',1,'Arrendamiento vehículo',1,0,0),('6210000001',4,'Gastos de arrendamiento vehículos',1,0,0),('6210000002',1,'Arrendamiento nave',1,0,0),('6210000003',1,'Arrendamiento espacio virtual-informatic',1,0,0),('6210000004',1,'Arrendamiento elementos para el proceso de informa',1,0,0),('6210000005',1,'Arrendamiento CC y banddejas',1,0,0),('6210000567',0,'Alquiler VNH',1,0,0),('6220000000',1,'Reparaciones y conservacion',1,0,0),('6220000001',1,'Reparación-Informatica',1,0,0),('6220000001',4,'Reparacion y mantenimiento informatica',1,0,0),('6220000003',1,'Reparación-Vehiculos',1,0,0),('6220000004',1,'Reparación-Instalaciones',1,0,0),('6220000005',1,'Reparación y mantenimineto CCs',1,0,0),('6220000006',1,'Repracion y conser maquinaria',1,0,0),('6230000000',1,'Servicios de profesionales independientes',1,0,0),('6230000000',4,'Servicio de profesionales',0,0,0),('6230000000',6,'Servicios de profesionales',1,0,0),('6230000001',1,'Servicios por gestión de ventas',1,0,0),('6230000001',4,'Servicios por gestión de ventas',1,0,0),('6240000000',1,'Transportes',1,0,0),('6240000000',4,'Transportes de ventas',1,0,0),('6240000001',1,'Transporte ventas troncal',1,0,0),('6240000567',0,'Transporte ventas VNH',1,0,0),('6250000000',1,'Primas de seguros',1,0,0),('6250000000',4,'Prima de Seguros',1,0,0),('6250000001',1,'Primas de seguros-Personales',1,0,0),('6250000002',1,'Primas de seguros-Colectivos',1,0,0),('6250000003',1,'Primas de seguros-Vehiculos',1,0,0),('6250000004',1,'Primas de seguros-Inmuebles',1,0,0),('6250000567',0,'Seguros VNH',1,0,0),('6260000000',1,'Gastos bancarios',1,0,0),('6260000000',4,'Gastos bancarios',0,0,0),('6260000000',6,'Gastos bancarios',1,0,0),('6260000001',1,'Gastos bancarios datafono',1,0,0),('6260000002',1,'Gastos bancarios transferencia nacional',1,0,0),('6260000003',1,'Gastos bancarios transferencia Europa',1,0,0),('6260000004',1,'Gastos bancarios transferencia divisas',1,0,0),('6260000567',0,'Gastos bancarios VNH',1,0,0),('6270000000',1,'Publicidad y RRPP',1,0,0),('6270000000',3,'Publicidad, propaganda y RR PP',1,0,0),('6270000000',6,'Publicidad',1,0,0),('6270000000',14,'Publicidad, propaganda RRPP',1,0,0),('6270000001',1,'Patrocinio',0,0,0),('6280000000',1,'Suministros',1,0,0),('6280000001',1,'Telefonos',1,0,0),('6280000002',1,'Gasoil',1,0,0),('6280000003',1,'Suministros-Electricidad',1,0,0),('6280000004',1,'Internet',1,0,0),('6280000567',0,'Suministros VNH',1,0,0),('6280001567',0,'Suministros telefono VNH',1,0,0),('6280003567',0,'Suministro luz VNH',1,0,0),('6290000000',1,'Otros servicios',1,0,0),('6290000001',1,'Material de oficina',1,0,0),('6290000002',1,'Gastos en formacion',1,0,0),('6290000003',1,'Asesoria juridica',1,0,0),('6290000004',4,'Otros servicios UE',1,0,0),('6290000005',1,'Gastos varios-Correos',1,0,0),('6290000006',6,'Otros servicios extranjero',1,0,0),('6290000007',1,'Gastos pequeño material',1,0,0),('6290000007',3,'Compras pequeño material',1,0,0),('6290000007',6,'Pequeño material',1,0,0),('6290000008',1,'Gastos varios-uniformes personal',1,0,0),('6290000008',3,'Compra uniformes',1,0,0),('6290000009',1,'Gastos-CC Container',1,0,0),('6290000010',1,'Gastos formación clientes',1,0,0),('6290000012',1,'Gastos gestión contra-reembolsos',1,0,0),('6290000013',1,'Arrendamiento Vilassar',1,0,0),('6290000014',1,'Gasto laboral espresas ETT',1,0,0),('6290000015',1,'Gasto compra terminales moviles y similares',1,0,0),('6290000015',3,'Gasto compra terminales moviles y similares',1,0,0),('6290000015',6,'Gasto compra terminales moviles y similares',1,0,0),('6290000016',1,'Gasto gestión cobro ventas',1,0,0),('6290000553',1,'Gastos viaje administrador',1,0,0),('6290000553',4,'Gastos viaje administrador-gerente',1,0,0),('6290000553',6,'Gastos viaje administrador',1,0,0),('6290001000',1,'Gastos de viaje',1,0,0),('6290001000',4,'Gastos viajes otros departamentos',1,0,0),('6290001000',6,'Gastos viaje personal otros departamentos',1,0,0),('6290001001',1,'Gastos R.R.P.P. Gerente',1,0,0),('6290001002',1,'Gastos R.R.P.P. Comerciales',1,0,0),('6290001567',0,'Gastos material oficina',1,0,0),('6300000000',1,'Impuesto de sociedades',1,0,0),('6310000000',1,'Otros tributos',1,0,0),('6380000000',1,'Ajustes positivos s/b Bº',1,0,0),('6400000000',0,'Sueldos y salarios',1,0,0),('6400000000',1,'Salarios',0,0,0),('6400000001',0,'Productividad',1,0,0),('6400000567',0,'Salarios VNH',1,0,0),('6410000001',1,'Indemnizaciones',1,0,0),('6420000000',0,'Seguridad Social a cargo de la empresa',1,0,0),('6420000000',1,'Seguridad Social',0,0,0),('6490000000',1,'Otros gastos sociales',1,0,0),('6500000000',1,'Impagados definitivos',1,0,0),('6620000000',0,'Intereses Bancarios',1,0,0),('6620000001',1,'Intereses Leasing BBVA Dic 2017',1,0,0),('6620000006',1,'Intereses deuda prestamo CRA',1,0,0),('6620000007',1,'Intereses La Caixa linea comercio exterior',1,0,0),('6620000007',16,'Intereses La Caixa Linea Comercio Exterior',0,0,0),('6620000008',1,'Intereses Prestamos Transolver 2016',1,0,0),('6620000011',1,'Intereses BBVA linea comercio exterior',1,0,0),('6620000014',1,'Intereses Prestamo BBVA',1,0,0),('6620000015',1,'Interés Póliza Deutsche Bank Comercio Exterior',0,0,0),('6620000023',1,'Intereses Bankinter Póliza Comercio Exterior',0,0,0),('6620002032',1,'Intereses Leaing Iveco',1,0,0),('6620002066',1,'Leasing Intereses Man',1,0,0),('6620002104',1,'Intereses Leasing La caixa 3 vehículos',1,0,0),('6681000000',1,'Diferencia negativa tipo de cambio',1,0,0),('6681000000',4,'Diferencia negativa tipo de cambio',0,0,0),('6681000000',6,'Diferencia negativa tipo de cambio',1,0,0),('6681000567',0,'Diferencias de cambio VNH',1,0,0),('6690000000',1,'Otros gastos financieros',1,0,0),('6690000000',6,'Gastos financieros',1,0,0),('6720000000',16,'Perdidas procedentes de inversiones',0,0,0),('6780000000',1,'Gastos extraordinarios',1,0,0),('6780000001',1,'Gastos no deducibles',1,0,0),('6780000001',16,'Gasto no deducible',0,0,0),('6800000000',1,'Amortización inmovilizado intangible',1,0,0),('6800000001',0,'Amortizacion inmovilizado material',1,0,0),('6810000000',0,'Amortizaciones inmovilizado',1,0,0),('6810000000',1,'Amortizacion inmovilizado material',1,0,0),('7000000000',0,'Ventas',1,0,0),('7000000001',1,'Venta entre empresas',1,0,0),('7000010000',0,'Terceros Flor',1,0,0),('7000020000',0,'Terceros Planta',1,0,0),('7000030000',0,'Terceros Complementos',1,0,0),('7000040000',0,'Terceros Artificial',1,0,0),('7000050000',0,'Terceros Verdes',1,0,0),('7000060000',0,'Terceros Otros',1,0,0),('7000070000',0,'Terceros Confección',1,0,0),('7000080000',1,'Terceros Logística',1,0,0),('7001000000',1,'Mercaderia',1,0,1),('7001010000',0,'Grupo Flor',1,0,0),('7001020000',0,'Grupo Planta',1,0,0),('7001030000',0,'Grupo Complementos',1,0,0),('7001040000',0,'Grupo Artificial',1,0,0),('7001050000',0,'Grupo Verdes',1,0,0),('7001060000',0,'Grupo Otros',1,0,0),('7001070000',0,'Grupo Confección',1,0,0),('7001080000',1,'Grupo Logística',1,0,0),('7002010000',0,'Asociados Flor',1,0,0),('7002020000',0,'Asociados Planta',1,0,0),('7002030000',0,'Asociados Complementos',1,0,0),('7002040000',0,'Asociados Artificial',1,0,0),('7002050000',0,'Asociados Verdes',1,0,0),('7002060000',0,'Asociados Otros',1,0,0),('7002070000',0,'Asociados Confección',1,0,0),('7002080000',1,'Asociados Logística',1,0,0),('7040000000',1,'Embalajes',1,0,1),('7050000000',1,'Prestacion de servicios',1,0,1),('7400000000',1,'Subvenciones, donaciones a la explotacion',1,0,0),('7550000000',0,'Ingresos por serivicios al personal',1,0,0),('7680000000',0,'Diferencias positivas de cambio',1,0,0),('7680000000',1,'Diferenica positiva tipo de cambio',1,0,0),('7690000000',1,'Otros ingresos financieros',1,0,0),('7780000000',1,'Ingresos excepcionales',1,0,0),('7780000000',16,'Ingreso extraordinario',0,0,0),('7780000001',1,'Indemnizaciones transporte',1,0,0),('7780000001',4,'Indemnizaciones agencias transporte',1,0,0),('7780000001',5,'Indemnizaciones agencias transporte',1,0,0),('7780000001',6,'Indemnizaciones transporte',1,0,0),('7940000000',16,'Reversión impagos',0,0,0); +INSERT INTO `Gastos` VALUES ('2000000000',1,'Inmovilizado pendiente',1,0,0),('2000000000',3,'Compra de bienes de inmovilizado',1,0,0),('2600000000',1,'Fianzas',0,0,0),('4600000000',1,'Anticipos de remuneraciones',1,0,0),('4600000001',1,'Anticpos de remuneración',1,0,0),('4751000000',0,'Retenciones',0,1,0),('4751000000',1,'Retenciones',0,1,0),('4751000000',6,'Retencion',0,0,0),('5200000006',1,'Deudas a c/p CRA',1,0,0),('5200000008',0,'Prestamo CP Transolver IVECO 269',1,0,0),('5200000008',1,'Prestamo Transolver 201600269',1,0,0),('5200000009',0,'Prestamo CP Transolver IVECO 270',1,0,0),('5200000009',1,'Prestamo Transolver 201600270',1,0,0),('5200000010',0,'Prestamo CP Transolver IVECO 271',1,0,0),('5200000010',1,'Prestamo Transolver 201600271',1,0,0),('5200000011',1,'Prestamo Transolver 339',0,0,0),('5200000012',1,'Prestamo Transolver 340',1,0,0),('5200000013',1,'Prestamo Transolver 341',1,0,0),('5200000014',1,'Prestamo a c/p BBVA 600.000€',1,0,0),('5200000022',1,'Linea comercio exterior',1,0,0),('5240000001',1,'Leasing BBVA',1,0,0),('5240002032',1,'Leasing Iveco',1,0,0),('5240002066',1,'Leasing c/p Man',1,0,0),('5240002104',1,'Leasing c/p La caixa 3 vehículos',1,0,0),('5325000003',6,'Prestamo a partes vinculadas',0,0,0),('5420000001',1,'Prestamo concedido',1,0,0),('5650000001',1,'Fianza c/p vehiculo',0,0,0),('5660000001',1,'Suplidos',0,0,0),('5660000001',20,'Suplidos',1,0,0),('5660000002',0,'Suplidos',0,0,0),('5660000002',1,'Suplidos Transitarios nacionales',1,0,0),('5660000003',1,'Deposito c/p Ebury',1,0,0),('5660000003',4,'Deposito Ebury',0,0,0),('5660000004',4,'Deposito Global Reach',0,0,0),('6001000000',1,'Compras a terceros nacional',1,0,0),('6001000000',18,'Compras a terceros nacional',1,0,0),('6001000000',19,'Compras a terceros nacional',1,0,0),('6001000001',1,'Adquisiones en Europa',0,0,0),('6001000001',3,'Adquisición en Europa',1,0,0),('6002000000',1,'Transportes de compras',1,0,0),('6002000001',1,'Tranportes de compra Europa',1,0,0),('6002000001',4,'Transportes de compras Europa',1,0,0),('6002000567',0,'Transporte de compras VNH',1,0,0),('6003000000',1,'Adquisición mercancia Extracomunitaria',1,0,0),('6003000000',5,'Adquisición mercancia Extracomunitaria',1,0,0),('6003000000',6,'Adquisición mercancia Extracomunitaria',1,0,0),('6003000567',0,'Compra de mercancia extracomunitaria VNH',1,0,0),('6004000000',1,'Transporte compras Sudamérica',1,0,0),('6004000000',4,'Transporte compras Sudamérica',1,0,0),('6004000000',6,'Transporte compras Sudamérica',1,0,0),('6010000000',1,'Materias primas',1,0,0),('6020000000',1,'Otros aprovisionamientos',1,0,0),('6020000001',1,'Embalajes',1,0,0),('6020000002',1,'Otros aprov. Taller artíficial',1,0,0),('6070000000',1,'Trabajos de produccion encargados a terceros',1,0,0),('6090000000',6,'Rappels por compras',1,0,0),('6100000000',0,'Variacion existencias',1,0,0),('6210000000',1,'Arrendamientos',1,0,0),('6210000001',1,'Arrendamiento vehículo',1,0,0),('6210000001',4,'Gastos de arrendamiento vehículos',1,0,0),('6210000002',1,'Arrendamiento nave',1,0,0),('6210000003',1,'Arrendamiento espacio virtual-informatic',1,0,0),('6210000004',1,'Arrendamiento elementos para el proceso de informa',1,0,0),('6210000005',1,'Arrendamiento CC y banddejas',1,0,0),('6210000567',0,'Alquiler VNH',1,0,0),('6220000000',1,'Reparaciones y conservacion',1,0,0),('6220000001',1,'Reparación-Informatica',1,0,0),('6220000001',4,'Reparacion y mantenimiento informatica',1,0,0),('6220000003',1,'Reparación-Vehiculos',1,0,0),('6220000004',1,'Reparación-Instalaciones',1,0,0),('6220000005',1,'Reparación y mantenimineto CCs',1,0,0),('6220000006',1,'Repracion y conser maquinaria',1,0,0),('6230000000',1,'Servicios de profesionales independientes',1,0,0),('6230000000',4,'Servicio de profesionales',0,0,0),('6230000000',6,'Servicios de profesionales',1,0,0),('6230000001',1,'Servicios por gestión de ventas',1,0,0),('6230000001',4,'Servicios por gestión de ventas',1,0,0),('6240000000',1,'Transportes',1,0,0),('6240000000',4,'Transportes de ventas',1,0,0),('6240000001',1,'Transporte ventas troncal',1,0,0),('6240000567',0,'Transporte ventas VNH',1,0,0),('6250000000',1,'Primas de seguros',1,0,0),('6250000000',4,'Prima de Seguros',1,0,0),('6250000001',1,'Primas de seguros-Personales',1,0,0),('6250000002',1,'Primas de seguros-Colectivos',1,0,0),('6250000003',1,'Primas de seguros-Vehiculos',1,0,0),('6250000004',1,'Primas de seguros-Inmuebles',1,0,0),('6250000567',0,'Seguros VNH',1,0,0),('6260000000',1,'Gastos bancarios',1,0,0),('6260000000',4,'Gastos bancarios',0,0,0),('6260000000',6,'Gastos bancarios',1,0,0),('6260000001',1,'Gastos bancarios datafono',1,0,0),('6260000002',1,'Gastos bancarios transferencia nacional',1,0,0),('6260000003',1,'Gastos bancarios transferencia Europa',1,0,0),('6260000004',1,'Gastos bancarios transferencia divisas',1,0,0),('6260000567',0,'Gastos bancarios VNH',1,0,0),('6270000000',1,'Publicidad y RRPP',1,0,0),('6270000000',3,'Publicidad, propaganda y RR PP',1,0,0),('6270000000',6,'Publicidad',1,0,0),('6270000000',14,'Publicidad, propaganda RRPP',1,0,0),('6270000001',1,'Patrocinio',0,0,0),('6280000000',1,'Suministros',1,0,0),('6280000001',1,'Telefonos',1,0,0),('6280000002',1,'Gasoil',1,0,0),('6280000003',1,'Suministros-Electricidad',1,0,0),('6280000004',1,'Internet',1,0,0),('6280000567',0,'Suministros VNH',1,0,0),('6280001567',0,'Suministros telefono VNH',1,0,0),('6280003567',0,'Suministro luz VNH',1,0,0),('6290000000',1,'Otros servicios',1,0,0),('6290000001',1,'Material de oficina',1,0,0),('6290000002',1,'Gastos en formacion',1,0,0),('6290000003',1,'Asesoria juridica',1,0,0),('6290000004',4,'Otros servicios UE',1,0,0),('6290000005',1,'Gastos varios-Correos',1,0,0),('6290000006',6,'Otros servicios extranjero',1,0,0),('6290000007',1,'Gastos pequeño material',1,0,0),('6290000007',3,'Compras pequeño material',1,0,0),('6290000007',6,'Pequeño material',1,0,0),('6290000008',1,'Gastos varios-uniformes personal',1,0,0),('6290000008',3,'Compra uniformes',1,0,0),('6290000009',1,'Gastos-CC Container',1,0,0),('6290000010',1,'Gastos formación clientes',1,0,0),('6290000012',1,'Gastos gestión contra-reembolsos',1,0,0),('6290000013',1,'Arrendamiento Vilassar',1,0,0),('6290000014',1,'Gasto laboral espresas ETT',1,0,0),('6290000015',1,'Gasto compra terminales moviles y similares',1,0,0),('6290000015',3,'Gasto compra terminales moviles y similares',1,0,0),('6290000015',6,'Gasto compra terminales moviles y similares',1,0,0),('6290000016',1,'Gasto gestión cobro ventas',1,0,0),('6290000553',1,'Gastos viaje administrador',1,0,0),('6290000553',4,'Gastos viaje administrador-gerente',1,0,0),('6290000553',6,'Gastos viaje administrador',1,0,0),('6290001000',1,'Gastos de viaje',1,0,0),('6290001000',4,'Gastos viajes otros departamentos',1,0,0),('6290001000',6,'Gastos viaje personal otros departamentos',1,0,0),('6290001001',1,'Gastos R.R.P.P. Gerente',1,0,0),('6290001002',1,'Gastos R.R.P.P. Comerciales',1,0,0),('6290001567',0,'Gastos material oficina',1,0,0),('6300000000',1,'Impuesto de sociedades',1,0,0),('6310000000',1,'Otros tributos',1,0,0),('6380000000',1,'Ajustes positivos s/b Bº',1,0,0),('6400000000',0,'Sueldos y salarios',1,0,0),('6400000000',1,'Salarios',0,0,0),('6400000001',0,'Productividad',1,0,0),('6400000567',0,'Salarios VNH',1,0,0),('6410000001',1,'Indemnizaciones',1,0,0),('6420000000',0,'Seguridad Social a cargo de la empresa',1,0,0),('6420000000',1,'Seguridad Social',0,0,0),('6490000000',1,'Otros gastos sociales',1,0,0),('6500000000',1,'Impagados definitivos',1,0,0),('6620000000',0,'Intereses Bancarios',1,0,0),('6620000001',1,'Intereses deudas a l/p',1,0,0),('6620000006',1,'Intereses deuda prestamo CRA',1,0,0),('6620000007',1,'Intereses La Caixa linea comercio exterior',1,0,0),('6620000007',16,'Intereses La Caixa Linea Comercio Exterior',0,0,0),('6620000008',1,'Intereses Prestamos Transolver 2016',1,0,0),('6620000011',1,'Intereses BBVA linea comercio exterior',1,0,0),('6620000014',1,'Intereses Prestamo BBVA',1,0,0),('6620000015',1,'Interés Póliza Deutsche Bank Comercio Exterior',0,0,0),('6620000023',1,'Intereses Bankinter Póliza Comercio Exterior',0,0,0),('6620002032',1,'Intereses Leaing Iveco',1,0,0),('6620002066',1,'Leasing Intereses Man',1,0,0),('6620002104',1,'Intereses Leasing La caixa 3 vehículos',1,0,0),('6681000000',1,'Diferencia negativa tipo de cambio',1,0,0),('6681000000',4,'Diferencia negativa tipo de cambio',0,0,0),('6681000000',6,'Diferencia negativa tipo de cambio',1,0,0),('6681000567',0,'Diferencias de cambio VNH',1,0,0),('6690000000',1,'Otros gastos financieros',1,0,0),('6690000000',6,'Gastos financieros',1,0,0),('6720000000',16,'Perdidas procedentes de inversiones',0,0,0),('6780000000',1,'Gastos extraordinarios',1,0,0),('6780000001',1,'Gastos no deducibles',1,0,0),('6780000001',16,'Gasto no deducible',0,0,0),('6800000000',1,'Amortización inmovilizado intangible',1,0,0),('6800000001',0,'Amortizacion inmovilizado material',1,0,0),('6810000000',0,'Amortizaciones inmovilizado',1,0,0),('6810000000',1,'Amortizacion inmovilizado material',1,0,0),('7000000000',0,'Ventas',1,0,0),('7000000001',1,'Venta entre empresas',1,0,0),('7000010000',0,'Terceros Flor',1,0,0),('7000020000',0,'Terceros Planta',1,0,0),('7000030000',0,'Terceros Complementos',1,0,0),('7000040000',0,'Terceros Artificial',1,0,0),('7000050000',0,'Terceros Verdes',1,0,0),('7000060000',0,'Terceros Otros',1,0,0),('7000070000',0,'Terceros Confección',1,0,0),('7000080000',1,'Terceros Logística',1,0,0),('7001000000',1,'Mercaderia',1,0,1),('7001010000',0,'Grupo Flor',1,0,0),('7001020000',0,'Grupo Planta',1,0,0),('7001030000',0,'Grupo Complementos',1,0,0),('7001040000',0,'Grupo Artificial',1,0,0),('7001050000',0,'Grupo Verdes',1,0,0),('7001060000',0,'Grupo Otros',1,0,0),('7001070000',0,'Grupo Confección',1,0,0),('7001080000',1,'Grupo Logística',1,0,0),('7002010000',0,'Asociados Flor',1,0,0),('7002020000',0,'Asociados Planta',1,0,0),('7002030000',0,'Asociados Complementos',1,0,0),('7002040000',0,'Asociados Artificial',1,0,0),('7002050000',0,'Asociados Verdes',1,0,0),('7002060000',0,'Asociados Otros',1,0,0),('7002070000',0,'Asociados Confección',1,0,0),('7002080000',1,'Asociados Logística',1,0,0),('7040000000',1,'Embalajes',1,0,1),('7050000000',1,'Prestacion de servicios',1,0,1),('7400000000',1,'Subvenciones, donaciones a la explotacion',1,0,0),('7550000000',0,'Ingresos por serivicios al personal',1,0,0),('7680000000',0,'Diferencias positivas de cambio',1,0,0),('7680000000',1,'Diferenica positiva tipo de cambio',1,0,0),('7690000000',1,'Otros ingresos financieros',1,0,0),('7780000000',1,'Ingresos excepcionales',1,0,0),('7780000000',16,'Ingreso extraordinario',0,0,0),('7780000001',1,'Indemnizaciones transporte',1,0,0),('7780000001',4,'Indemnizaciones agencias transporte',1,0,0),('7780000001',5,'Indemnizaciones agencias transporte',1,0,0),('7780000001',6,'Indemnizaciones transporte',1,0,0),('7940000000',16,'Reversión impagos',0,0,0); /*!40000 ALTER TABLE `Gastos` ENABLE KEYS */; UNLOCK TABLES; @@ -236,7 +236,7 @@ UNLOCK TABLES; LOCK TABLES `state` WRITE; /*!40000 ALTER TABLE `state` DISABLE KEYS */; -INSERT INTO `state` VALUES (1,'Arreglar',2,0,'FIXING'),(2,'Libre',1,0,'FREE'),(3,'OK',3,0,'OK'),(4,'Impreso',4,1,'PRINTED'),(5,'Preparación',5,1,'ON_PREPARATION'),(6,'En Revisión',7,1,'ON_CHECKING'),(7,'Sin Acabar',2,0,'NOT_READY'),(8,'Revisado',8,1,'CHECKED'),(9,'Encajando',9,1,'PACKING'),(10,'Encajado',10,2,'PACKED'),(11,'Facturado',0,0,'INVOICED'),(12,'Bloqueado',0,0,'BLOCKED'),(13,'En Reparto',11,3,'ON_DELIVERY'),(14,'Preparado',6,1,'PREPARED'),(15,'Pte Recogida',12,3,'WAITING_FOR_PICKUP'),(16,'Entregado',13,3,'DELIVERED'),(17,'Eliminado',14,3,'ERASED'),(20,'Asignado',4,1,'PICKER_DESIGNED'),(21,'Retornado',4,1,'PRINTED_BACK'),(22,'¿Fecha?',2,0,'WRONG_DATE'),(23,'URGENTE',2,0,'LAST_CALL'),(24,'Encadenado',3,0,'CHAINED'),(25,'Embarcando',3,0,'BOARDING'); +INSERT INTO `state` VALUES (1,'Arreglar',2,0,'FIXING',NULL),(2,'Libre',1,0,'FREE',NULL),(3,'OK',3,0,'OK',3),(4,'Impreso',4,1,'PRINTED',2),(5,'Preparación',5,1,'ON_PREPARATION',7),(6,'En Revisión',7,1,'ON_CHECKING',NULL),(7,'Sin Acabar',2,0,'NOT_READY',NULL),(8,'Revisado',8,1,'CHECKED',NULL),(9,'Encajando',9,1,'PACKING',NULL),(10,'Encajado',10,2,'PACKED',NULL),(11,'Facturado',0,0,'INVOICED',NULL),(12,'Bloqueado',0,0,'BLOCKED',NULL),(13,'En Reparto',11,3,'ON_DELIVERY',NULL),(14,'Preparado',6,1,'PREPARED',NULL),(15,'Pte Recogida',12,3,'WAITING_FOR_PICKUP',NULL),(16,'Entregado',13,3,'DELIVERED',NULL),(17,'Eliminado',14,3,'ERASED',NULL),(20,'Asignado',4,1,'PICKER_DESIGNED',NULL),(21,'Retornado',4,1,'PRINTED_BACK',6),(22,'¿Fecha?',2,0,'WRONG_DATE',NULL),(23,'URGENTE',2,0,'LAST_CALL',NULL),(24,'Encadenado',3,0,'CHAINED',4),(25,'Embarcando',3,0,'BOARDING',5),(26,'Prep Previa',5,1,'PREVIOUS_PREPARATION',1); /*!40000 ALTER TABLE `state` ENABLE KEYS */; UNLOCK TABLES; @@ -296,7 +296,7 @@ UNLOCK TABLES; LOCK TABLES `escritos` WRITE; /*!40000 ALTER TABLE `escritos` DISABLE KEYS */; -INSERT INTO `escritos` VALUES (1,'Carta_1','Aviso inicial por saldo deudor',0,'0'),(2,'Carta_2','Reiteracion de aviso por saldo deudor',0,'0'),(3,'Cred_Up','Notificación de aumento de crédito',0,'0'),(4,'Cred_down','Notificación de reducción de crédito',0,'0'),(5,'Pet_CC','Petición de datos bancarios B2B',0,'0'),(6,'SolCredito','Solicitud de crédito',0,'0'),(7,'LeyPago','Ley de pagos',0,'0'),(8,'Pet_CC_Core','Petición de datos bancarios CORE',0,'0'),(9,'nueva_alta','Documento de nueva alta de cliente',0,'0'),(10,'client_welcome','Email de bienvenida para nuevo cliente',0,'0'),(11,'setup_printer','Email de instalación de impresora',0,'0'),(12,'client-welcome','Email de bienvenida como nuevo cliente.',1,'0'),(13,'printer-setup','Email de instalación y configuración de impresora de coronas.',1,'0'),(14,'sepa-core','Email de solicitud de datos bancarios core.',1,'1'),(15,'letter-debtor-st','Email de aviso inicial por saldo deudor',0,'1'),(16,'letter-debtor-nd','Email de aviso reiterado por saldo deudor',0,'1'); +INSERT INTO `escritos` VALUES (1,'Carta_1','Aviso inicial por saldo deudor',0,'0'),(2,'Carta_2','Reiteracion de aviso por saldo deudor',0,'0'),(3,'Cred_Up','Notificación de aumento de crédito',0,'0'),(4,'Cred_down','Notificación de reducción de crédito',0,'0'),(5,'Pet_CC','Petición de datos bancarios B2B',0,'0'),(6,'SolCredito','Solicitud de crédito',0,'0'),(7,'LeyPago','Ley de pagos',0,'0'),(8,'Pet_CC_Core','Petición de datos bancarios CORE',0,'0'),(9,'nueva_alta','Documento de nueva alta de cliente',0,'0'),(10,'client_welcome','Email de bienvenida para nuevo cliente',0,'0'),(11,'setup_printer','Email de instalación de impresora',0,'0'),(12,'client-welcome','Email de bienvenida como nuevo cliente.',1,'0'),(13,'printer-setup','Email de instalación y configuración de impresora de coronas.',1,'0'),(14,'sepa-core','Email de solicitud de datos bancarios core.',1,'1'),(15,'letter-debtor-st','Email de aviso inicial por saldo deudor',1,'1'),(16,'letter-debtor-nd','Email de aviso reiterado por saldo deudor',1,'1'); /*!40000 ALTER TABLE `escritos` ENABLE KEYS */; UNLOCK TABLES; @@ -316,7 +316,7 @@ UNLOCK TABLES; LOCK TABLES `cl_con` WRITE; /*!40000 ALTER TABLE `cl_con` DISABLE KEYS */; -INSERT INTO `cl_con` VALUES (1,'Otros daños'),(2,'Roces'),(3,'Humedad'),(4,'Deshidratacion'),(5,'Error identidad'),(6,'Incompleto (Faltas)'),(7,'Error packing'),(8,'Error color'),(9,'Error medida'),(10,'Error origen'),(11,'Envejecido'),(12,'Venta Perdida'),(13,'Duplicacion'),(14,'Rechazado'),(15,'Rotura'),(16,'Deterioro/Estrepeado'),(17,'Podrido'),(18,'Baboso'),(19,'Cocido'),(20,'Congelado'),(21,'Machacado'),(22,'Error precio'),(23,'Manchado'),(24,'No entregado'),(25,'Cobro indebido'),(26,'Decepcion/Esperaba mas'),(27,'Otros'); +INSERT INTO `cl_con` VALUES (1,'Otros daños'),(2,'Roces'),(3,'Humedad'),(4,'Deshidratacion'),(5,'Error identidad'),(6,'Incompleto (Faltas)'),(7,'Error packing'),(8,'Error color'),(9,'Error medida'),(10,'Error origen'),(11,'Envejecido'),(12,'Venta Perdida'),(13,'Duplicacion'),(14,'Rechazado'),(15,'Rotura'),(16,'Deterioro/Estropeado'),(17,'Podrido'),(18,'Baboso'),(19,'Cocido'),(20,'Congelado'),(21,'Machacado'),(22,'Error precio'),(23,'Manchado'),(24,'No entregado'),(25,'Cobro indebido'),(26,'Decepcion/Esperaba mas'),(27,'Otros'); /*!40000 ALTER TABLE `cl_con` ENABLE KEYS */; UNLOCK TABLES; @@ -369,7 +369,7 @@ UNLOCK TABLES; /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; --- Dump completed on 2018-08-01 19:38:29 +-- Dump completed on 2018-09-05 11:59:55 USE `bi`; -- MySQL dump 10.13 Distrib 5.7.21, for osx10.13 (x86_64) -- @@ -417,7 +417,7 @@ UNLOCK TABLES; /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; --- Dump completed on 2018-08-01 19:38:29 +-- Dump completed on 2018-09-05 11:59:55 USE `cache`; -- MySQL dump 10.13 Distrib 5.7.21, for osx10.13 (x86_64) -- @@ -455,4 +455,4 @@ UNLOCK TABLES; /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; --- Dump completed on 2018-08-01 19:38:29 +-- Dump completed on 2018-09-05 11:59:55 diff --git a/services/db/install/dump/fixtures.sql b/services/db/install/dump/fixtures.sql index abc46115c..a53f7b82c 100644 --- a/services/db/install/dump/fixtures.sql +++ b/services/db/install/dump/fixtures.sql @@ -1,3 +1,6 @@ +ALTER TABLE `vn`.`itemTaxCountry` AUTO_INCREMENT = 1; +ALTER TABLE `vn2008`.`Consignatarios` AUTO_INCREMENT = 1; + INSERT INTO `util`.`config` ( `dbVersion`, `hasTriggersDisabled`, `environment`) VALUES ('1.0.0', '0', 'development'); @@ -343,7 +346,7 @@ INSERT INTO `vn`.`invoiceOut`(`id`, `ref`, `serial`, `amount`, `issued`,`clientF (13, 2, 2, 2, DATE_ADD(CURDATE(), INTERVAL +2 MONTH), DATE_ADD(CURDATE(), INTERVAL +2 MONTH), 101, 'address 21', 121, NULL, 0), (14, 2, 2, 2, DATE_ADD(CURDATE(), INTERVAL +3 MONTH), DATE_ADD(CURDATE(), INTERVAL +3 MONTH), 101, 'address 21', 121, NULL, 0), (15, 3, 3, 3, DATE_ADD(CURDATE(), INTERVAL +4 MONTH), DATE_ADD(CURDATE(), INTERVAL +4 MONTH), 101, 'address 21', 121, NULL, 0), - (16, 3, 3, 4, CURDATE() , CURDATE() , 101, 'address 21', 121, NULL, 0), + (16, 1, 1, 1, CURDATE() , CURDATE() , 101, 'address 21', 121, NULL, 0), (17, 4, 4, 4, CURDATE() , CURDATE() , 106, 'address 26', 126, NULL, 0), (18, 4, 4, 4, CURDATE() , CURDATE() , 107, 'address 27', 127, NULL, 0), (19, 5, 5, 4, CURDATE() , CURDATE() , 108, 'address 28', 128, NULL, 0), @@ -426,11 +429,15 @@ INSERT INTO `vn`.`mandate`(`id`, `clientFk`, `companyFk`, `code`, `created`, `ma VALUES (1, 102, 442, '1-1', CURDATE(), 2); -INSERT INTO `vn`.`itemCategory`(`id`, `name`, `display`, `color`) +INSERT INTO `vn`.`itemCategory`(`id`, `name`, `display`, `color`, `icon`) VALUES - (1, 'Plant' , 1, 'B92A26'), - (2, 'Flower' , 2, 'dcf711'), - (3, 'Logistic', 0, 'b9f711'); + (1, 'Plant' , 1, 'B92A26', 'icon-plant'), + (2, 'Flower' , 2, 'dcf711', 'icon-flower'), + (3, 'Logistic' , 0, 'b9f711', NULL), + (4, 'Handmade' , 1, NULL, 'icon-handmade'), + (5, 'Artificial' , 1, NULL, 'icon-artificial'), + (6, 'Green' , 1, NULL, 'icon-greenery'), + (7, 'Accessories', 1, NULL, 'icon-accessory'); INSERT INTO `vn`.`itemType`(`id`, `code`, `name`, `categoryFk`, `life`,`workerFk`, `isPackaging`) VALUES @@ -510,14 +517,18 @@ INSERT INTO `vn`.`ticketPackaging`(`id`, `ticketFk`, `packagingFk`, `quantity`, INSERT INTO `vn`.`sale`(`id`, `itemFk`, `ticketFk`, `concept`, `quantity`, `price`, `discount`, `reserved`, `isPicked`, `created`) VALUES - ( 1, 1, 1 , 'Gem of Time', 5 , 23.5, 0, 0, 0, CURDATE()), - ( 2, 2, 1 , 'Gem of Mind', 10 , 4.5 , 0, 0, 0, CURDATE()), - ( 3, 1, 1 , 'Gem of Time', 2 , 23.5, 0, 0, 0, CURDATE()), - ( 4, 4, 1 , 'Mark I' , 20 , 9 , 0, 0, 0, CURDATE()), - ( 5, 1, 2 , 'Gem of Time', 10 , 23.5, 0, 0, 0, CURDATE()), - ( 6, 1, 3 , 'Gem of Time', 15 , 23.5, 0, 0, 0, CURDATE()), - ( 7, 2, 11, 'Gem of Mind', 15 , 4.5 , 0, 0, 0, CURDATE()), - ( 8, 4, 11, 'Mark I' , 10 , 9 , 0, 0, 0, CURDATE()); + ( 1, 1, 1 , 'Gem of Time', 5 , 9.60, 0, 0, 0, CURDATE()), + ( 2, 2, 1 , 'Gem of Mind', 10 , 4.21, 0, 0, 0, CURDATE()), + ( 3, 1, 1 , 'Gem of Time', 2 , 9.60, 0, 0, 0, CURDATE()), + ( 4, 4, 1 , 'Mark I' , 20 , 7.06, 0, 0, 0, CURDATE()), + ( 5, 1, 2 , 'Gem of Time', 10 , 9.60, 0, 0, 0, CURDATE()), + ( 6, 1, 3 , 'Gem of Time', 15 , 9.60, 0, 0, 0, CURDATE()), + ( 7, 2, 11, 'Gem of Mind', 15 , 4.21, 0, 0, 0, CURDATE()), + ( 8, 4, 11, 'Mark I' , 10 , 7.06, 0, 0, 0, CURDATE()), + ( 9, 1, 16, 'Gem of Time', 5 , 9.60, 0, 0, 0, CURDATE()), + ( 10, 2, 16, 'Gem of Mind', 10 , 4.21, 0, 0, 0, CURDATE()), + ( 11, 1, 16, 'Gem of Time', 2 , 9.60, 0, 0, 0, CURDATE()), + ( 12, 4, 16, 'Mark I' , 20 , 7.06, 0, 0, 0, CURDATE()); INSERT INTO `vn`.`saleChecked`(`saleFk`, `isChecked`) VALUES @@ -567,12 +578,32 @@ INSERT INTO `vn`.`saleComponent`(`saleFk`, `componentFk`, `value`) ( 8, 10, 1), ( 8, 39, 5), ( 8, 15, 5), - ( 8, 37, 2); + ( 8, 37, 2), + ( 9, 10, 1), + ( 9, 14, 2.5), + ( 9, 15, 3), + ( 9, 17, 4.5), + ( 9, 21, 5), + ( 9, 23, 6.5), + ( 9, 28, 1), + ( 10, 28, 1), + ( 11, 10, 1), + ( 11, 14, 2.5), + ( 11, 15, 3), + ( 11, 17, 4.5), + ( 11, 21, 5), + ( 11, 23, 6.5), + ( 11, 28, 1), + ( 12, 28, 1), + ( 12, 10, 1), + ( 10, 17, 3.5), + ( 12, 39, 5), + ( 12, 37, 2); INSERT INTO `vn`.`saleTracking`(`saleFk`, `isChecked`, `created`, `originalQuantity`, `workerFk`, `actionFk`, `id`, `stateFk`) VALUES ( 1, 0, CURDATE(), 5, 40, 3, 1, 14), - ( 1, 1, CURDATE(), 5, 40, 3, 2, 14), + ( 1, 1, CURDATE(), 5, 40, 3, 2, 8), ( 2, 1, CURDATE(), 10, 40, 4, 3, 8), ( 3, 1, CURDATE(), 2, 40, 4, 4, 8); diff --git a/services/loopback/common/locale/en.json b/services/loopback/common/locale/en.json index 9bfbace75..909aecb09 100644 --- a/services/loopback/common/locale/en.json +++ b/services/loopback/common/locale/en.json @@ -29,7 +29,8 @@ "The credit must be an integer greater than or equal to zero": "The credit must be an integer greater than or equal to zero", "The grade must be an integer greater than or equal to zero": "The grade must be an integer greater than or equal to zero", "Sample type cannot be blank": "Sample type cannot be blank", - "The new quantity should be smaller than the old one": "La nueva cantidad debe ser menor que la anterior", "The package cannot be blank": "The package cannot be blank", - "The warehouse can't be repeated": "The warehouse can't be repeated" + "The warehouse can't be repeated": "The warehouse can't be repeated", + "The sales of that ticket can't be modified": "The sales of that ticket can't be modified", + "The new quantity should be smaller than the old one": "The new quantity should be smaller than the old one" } \ No newline at end of file diff --git a/services/loopback/common/methods/client/specs/getDebt.spec.js b/services/loopback/common/methods/client/specs/getDebt.spec.js index dff62a9ff..66e026e3d 100644 --- a/services/loopback/common/methods/client/specs/getDebt.spec.js +++ b/services/loopback/common/methods/client/specs/getDebt.spec.js @@ -4,7 +4,7 @@ describe('client getDebt()', () => { it('should return the client debt', async() => { let result = await app.models.Client.getDebt(101); - expect(result.debt).toEqual(1389.9); + expect(result.debt).toEqual(1342.66); }); }); diff --git a/services/loopback/common/methods/client/specs/getMana.spec.js b/services/loopback/common/methods/client/specs/getMana.spec.js index 4a7d2b594..8a3b6ff2d 100644 --- a/services/loopback/common/methods/client/specs/getMana.spec.js +++ b/services/loopback/common/methods/client/specs/getMana.spec.js @@ -4,7 +4,7 @@ describe('client getMana()', () => { it('should call the getMana method', async() => { let result = await app.models.Client.getMana(101); - expect(result.mana).toEqual(260); + expect(result.mana).toEqual(400); }); }); diff --git a/services/loopback/common/methods/client/specs/summary.spec.js b/services/loopback/common/methods/client/specs/summary.spec.js index c70d56642..fcdb6fa38 100644 --- a/services/loopback/common/methods/client/specs/summary.spec.js +++ b/services/loopback/common/methods/client/specs/summary.spec.js @@ -11,13 +11,13 @@ describe('client summary()', () => { it('should return a summary object containing mana', async() => { let result = await app.models.Client.summary(101); - expect(result.mana.mana).toEqual(260); + expect(result.mana.mana).toEqual(400); }); it('should return a summary object containing debt', async() => { let result = await app.models.Client.summary(101); - expect(result.debt.debt).toEqual(1389.9); + expect(result.debt.debt).toEqual(1342.66); }); it('should return a summary object containing averageInvoiced', async() => { diff --git a/services/loopback/common/methods/item/specs/updateTaxes.spec.js b/services/loopback/common/methods/item/specs/updateTaxes.spec.js index aa30ed8cd..aeb96c6cc 100644 --- a/services/loopback/common/methods/item/specs/updateTaxes.spec.js +++ b/services/loopback/common/methods/item/specs/updateTaxes.spec.js @@ -2,14 +2,14 @@ const app = require(`${servicesDir}/item/server/server`); describe('item updateTaxes()', () => { afterAll(async() => { - let taxesInFixtures = [{id: 509368, taxClassFk: 1}]; + let taxesInFixtures = [{id: 3, taxClassFk: 1}]; await app.models.Item.updateTaxes(taxesInFixtures); }); it('should throw an error if the taxClassFk is blank', async() => { let error; - let taxes = [{id: 509368, taxClassFk: undefined}]; + let taxes = [{id: 3, taxClassFk: undefined}]; await app.models.Item.updateTaxes(taxes) .catch(err => { @@ -21,11 +21,11 @@ describe('item updateTaxes()', () => { }); it('should update the tax of a given country of an item', async() => { - let taxCountry = await app.models.ItemTaxCountry.findById(509368); + let taxCountry = await app.models.ItemTaxCountry.findById(3); expect(taxCountry.taxClassFk).toEqual(1); - let taxes = [{id: 509368, taxClassFk: 2}]; + let taxes = [{id: 3, taxClassFk: 2}]; let result = await app.models.Item.updateTaxes(taxes); @@ -33,7 +33,7 @@ describe('item updateTaxes()', () => { }); it('should confirm the tax class was updated', async() => { - let taxCountry = await app.models.ItemTaxCountry.findById(509368); + let taxCountry = await app.models.ItemTaxCountry.findById(3); expect(taxCountry.taxClassFk).toEqual(2); }); diff --git a/services/loopback/common/methods/sale/specs/priceDifference.spec.js b/services/loopback/common/methods/sale/specs/priceDifference.spec.js index fc304cceb..0205cf098 100644 --- a/services/loopback/common/methods/sale/specs/priceDifference.spec.js +++ b/services/loopback/common/methods/sale/specs/priceDifference.spec.js @@ -10,8 +10,8 @@ describe('sale priceDifference()', () => { }; let result = await app.models.Sale.priceDifference(1, data); - expect(result.totalUnitPrice).toEqual(60.5); + expect(result.totalUnitPrice).toEqual(30.469999999999995); expect(result.totalNewPrice).toEqual(26.12); - expect(result.totalDifference).toEqual(202.80); + expect(result.totalDifference).toEqual(63.8); }); }); diff --git a/services/loopback/common/methods/ticket/specs/getSalespersonMana.spec.js b/services/loopback/common/methods/ticket/specs/getSalespersonMana.spec.js index c804ec592..f0b695528 100644 --- a/services/loopback/common/methods/ticket/specs/getSalespersonMana.spec.js +++ b/services/loopback/common/methods/ticket/specs/getSalespersonMana.spec.js @@ -4,7 +4,7 @@ describe('ticket getSalesPersonMana()', () => { it('should get the mana of a salesperson of a given ticket', async() => { let mana = await app.models.Ticket.getSalesPersonMana(1); - expect(mana).toEqual(330); + expect(mana).toEqual(470); }); it('should return 0 if the given ticket does not exists', async() => { diff --git a/services/loopback/common/methods/ticket/specs/getTaxes.spec.js b/services/loopback/common/methods/ticket/specs/getTaxes.spec.js index 5bb6ecf46..d9637ab85 100644 --- a/services/loopback/common/methods/ticket/specs/getTaxes.spec.js +++ b/services/loopback/common/methods/ticket/specs/getTaxes.spec.js @@ -4,6 +4,6 @@ describe('ticket getTaxes()', () => { it('should return the tax of a given ticket', async() => { let result = await app.models.Ticket.getTaxes(1); - expect(result[0].tax).toEqual(20.95); + expect(result[0].tax).toEqual(10.93); }); }); diff --git a/services/loopback/common/methods/ticket/specs/getTotal.spec.js b/services/loopback/common/methods/ticket/specs/getTotal.spec.js index 062256df1..1d211fbba 100644 --- a/services/loopback/common/methods/ticket/specs/getTotal.spec.js +++ b/services/loopback/common/methods/ticket/specs/getTotal.spec.js @@ -4,7 +4,7 @@ describe('ticket getTotal()', () => { it('should return the total of a ticket', async() => { let result = await app.models.Ticket.getTotal(1); - expect(result).toEqual(448.25); + expect(result).toEqual(291.08); }); it(`should return zero if the ticket doesn't have lines`, async() => { diff --git a/services/loopback/common/methods/ticket/specs/getVAT.spec.js b/services/loopback/common/methods/ticket/specs/getVAT.spec.js index 13b6473c2..300744502 100644 --- a/services/loopback/common/methods/ticket/specs/getVAT.spec.js +++ b/services/loopback/common/methods/ticket/specs/getVAT.spec.js @@ -4,7 +4,7 @@ describe('ticket getVAT()', () => { it('should call the getVAT method and return the response', async() => { await app.models.Ticket.getVAT(1) .then(response => { - expect(response).toEqual(58.75); + expect(response).toEqual(40.58); }); }); diff --git a/services/loopback/common/methods/ticket/specs/new.spec.js b/services/loopback/common/methods/ticket/specs/new.spec.js index 1f4639403..897271e9b 100644 --- a/services/loopback/common/methods/ticket/specs/new.spec.js +++ b/services/loopback/common/methods/ticket/specs/new.spec.js @@ -19,7 +19,7 @@ describe('ticket new()', () => { warehouseFk: 1, clientFk: 101, companyFk: 442, - addressFk: 25516, + addressFk: 1, agencyModeFk: 1, userId: 9 }; diff --git a/services/loopback/common/methods/ticket/specs/summary.spec.js b/services/loopback/common/methods/ticket/specs/summary.spec.js index e1f2f18fb..96e0153be 100644 --- a/services/loopback/common/methods/ticket/specs/summary.spec.js +++ b/services/loopback/common/methods/ticket/specs/summary.spec.js @@ -17,13 +17,13 @@ describe('ticket summary()', () => { it('should return a summary object containing subTotal for 1 ticket', async() => { let result = await app.models.Ticket.summary(1); - expect(result.subTotal).toEqual(389.5); + expect(result.subTotal).toEqual(250.5); }); it('should return a summary object containing VAT for 1 ticket', async() => { let result = await app.models.Ticket.summary(1); - expect(result.VAT).toEqual(58.75); + expect(result.VAT).toEqual(40.58); }); it('should return a summary object containing total for 1 ticket', async() => { diff --git a/services/loopback/common/methods/workerMana/specs/getCurrentWorkerMana.spec.js b/services/loopback/common/methods/workerMana/specs/getCurrentWorkerMana.spec.js index 0eb28a8bd..73d51c6a0 100644 --- a/services/loopback/common/methods/workerMana/specs/getCurrentWorkerMana.spec.js +++ b/services/loopback/common/methods/workerMana/specs/getCurrentWorkerMana.spec.js @@ -4,7 +4,7 @@ describe('workerMana getCurrentWorkerMana()', () => { it('should get the mana of the logged worker', async() => { let mana = await app.models.WorkerMana.getCurrentWorkerMana({req: {accessToken: {userId: 18}}}); - expect(mana).toEqual(330); + expect(mana).toEqual(470); }); it('should return 0 if the user doesnt uses mana', async() => { diff --git a/services/loopback/common/models/specs/address.spec.js b/services/loopback/common/models/specs/address.spec.js index b8692fc63..c010a9531 100644 --- a/services/loopback/common/models/specs/address.spec.js +++ b/services/loopback/common/models/specs/address.spec.js @@ -2,8 +2,9 @@ const app = require(`${servicesDir}/client/server/server`); describe('loopback model address', () => { let createdAddressId; + afterAll(async() => { - let address = await app.models.Address.findById(25516); + let address = await app.models.Address.findById(1); let client = await app.models.Client.findById(101); await address.updateAttribute('isDefaultAddress', true); @@ -13,9 +14,9 @@ describe('loopback model address', () => { }); describe('observe()', () => { - it('should throw an error if the default consignee is unchecked', async() => { + it('should throw an error when deactivating a consignee if its the default address', async() => { let error; - let address = await app.models.Address.findById(25516); + let address = await app.models.Address.findById(1); await address.updateAttribute('isActive', false) .catch(e => { @@ -28,7 +29,7 @@ describe('loopback model address', () => { }); it('should set isDefaultAddress to false of all the addresses for a given client', async() => { - let previousDefaultAddress = await app.models.Address.findById(25516); + let previousDefaultAddress = await app.models.Address.findById(1); expect(previousDefaultAddress.isDefaultAddress).toBeTruthy(); @@ -40,7 +41,7 @@ describe('loopback model address', () => { expect(defaultAddress.isDefaultAddress).toBeTruthy(); - let noLongerDefaultAddress = await app.models.Address.findById(25516); + let noLongerDefaultAddress = await app.models.Address.findById(1); expect(noLongerDefaultAddress.isDefaultAddress).toBeFalsy(); }); diff --git a/services/loopback/server/connectors/vn-mysql.js b/services/loopback/server/connectors/vn-mysql.js index 0f63211c6..ead44653c 100644 --- a/services/loopback/server/connectors/vn-mysql.js +++ b/services/loopback/server/connectors/vn-mysql.js @@ -45,12 +45,14 @@ VnMySQL.prototype.toColumnValue = function(prop, val) { if (val == null || !prop || prop.type !== Date) return MySQL.prototype.toColumnValue.call(this, prop, val); + val = new Date(val); + return val.getFullYear() + '-' + - fillZeros(val.getMonth() + 1) + '-' + - fillZeros(val.getDate()) + ' ' + - fillZeros(val.getHours()) + ':' + - fillZeros(val.getMinutes()) + ':' + - fillZeros(val.getSeconds()); + fillZeros(val.getMonth() + 1) + '-' + + fillZeros(val.getDate()) + ' ' + + fillZeros(val.getHours()) + ':' + + fillZeros(val.getMinutes()) + ':' + + fillZeros(val.getSeconds()); function fillZeros(v) { return v < 10 ? '0' + v : v; @@ -96,7 +98,7 @@ VnMySQL.prototype._makeWhere = function(model, where) { } stmt.merge({ sql: branches.join(' ' + key.toUpperCase() + ' '), - params: branchParams, + params: branchParams }); whereStmts.push(stmt); continue; @@ -154,15 +156,13 @@ VnMySQL.prototype._makeWhere = function(model, where) { columnValue = self.toColumnValue(p, expression); if (columnValue === null) { stmt.merge(columnName + ' IS NULL'); + } else if (columnValue instanceof ParameterizedSQL) { + stmt.merge(columnName + '=').merge(columnValue); } else { - if (columnValue instanceof ParameterizedSQL) { - stmt.merge(columnName + '=').merge(columnValue); - } else { - stmt.merge({ - sql: columnName + '=?', - params: [columnValue], - }); - } + stmt.merge({ + sql: columnName + '=?', + params: [columnValue] + }); } } whereStmts.push(stmt); @@ -175,7 +175,7 @@ VnMySQL.prototype._makeWhere = function(model, where) { } var whereStmt = new ParameterizedSQL({ sql: sqls.join(' AND '), - params: params, + params: params }); return whereStmt; }; diff --git a/services/order/common/methods/order/specs/getTaxes.spec.js b/services/order/common/methods/order/specs/getTaxes.spec.js index 4d8b30c27..867714774 100644 --- a/services/order/common/methods/order/specs/getTaxes.spec.js +++ b/services/order/common/methods/order/specs/getTaxes.spec.js @@ -1,6 +1,6 @@ const app = require(`${servicesDir}/order/server/server`); -describe('order getTaxes()', () => { +xdescribe('order getTaxes()', () => { it('should call the getTaxes method and return undefined if its called with a string', async() => { let result = await app.models.Order.getTaxes('pepinillos'); diff --git a/services/order/common/methods/order/specs/getTotal.spec.js b/services/order/common/methods/order/specs/getTotal.spec.js index 52681a0b1..083ee6d50 100644 --- a/services/order/common/methods/order/specs/getTotal.spec.js +++ b/services/order/common/methods/order/specs/getTotal.spec.js @@ -1,6 +1,6 @@ const app = require(`${servicesDir}/order/server/server`); -describe('order getTotal()', () => { +xdescribe('order getTotal()', () => { it('should return the total', async() => { let result = await app.models.Order.getTotal(1); diff --git a/services/order/common/methods/order/specs/new.spec.js b/services/order/common/methods/order/specs/new.spec.js index 7150b86cc..646411f3a 100644 --- a/services/order/common/methods/order/specs/new.spec.js +++ b/services/order/common/methods/order/specs/new.spec.js @@ -16,7 +16,7 @@ describe('order new()', () => { it('should throw an error if the client isnt frozen and isnt active', async() => { let error; - let params = {addressFk: 25521}; + let params = {addressFk: 6}; await app.models.Order.new(params) .catch(e => { @@ -28,7 +28,7 @@ describe('order new()', () => { it('should throw an error if the client isnt frozen and is active but doesnt have data checked', async() => { let error; - let params = {addressFk: 25522}; + let params = {addressFk: 7}; await app.models.Order.new(params) .catch(e => {