8144-devToTest_2448 #3216
|
@ -400,11 +400,11 @@ INSERT INTO `vn`.`client`(`id`,`name`,`fi`,`socialName`,`contact`,`street`,`city
|
||||||
(1108, 'Charles Xavier', '22641921P', 'PROFESSOR X', 'Beast', '3800 VICTORY PKWY, CINCINNATI, OH 45207, USA', 'Gotham', 46460, 1111111111, 222222222, 1, 'CharlesXavier@mydomain.com', NULL, 0, 1234567890, 0, 5, 1, 300, 13, 1, 10, 5, util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 1, NULL, 0, 0, 19, 0, 'florist','normal'),
|
(1108, 'Charles Xavier', '22641921P', 'PROFESSOR X', 'Beast', '3800 VICTORY PKWY, CINCINNATI, OH 45207, USA', 'Gotham', 46460, 1111111111, 222222222, 1, 'CharlesXavier@mydomain.com', NULL, 0, 1234567890, 0, 5, 1, 300, 13, 1, 10, 5, util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 1, NULL, 0, 0, 19, 0, 'florist','normal'),
|
||||||
(1109, 'Bruce Banner', '16104829E', 'HULK', 'Black widow', 'SOMEWHERE IN NEW YORK', 'Gotham', 46460, 1111111111, 222222222, 1, 'BruceBanner@mydomain.com', NULL, 0, 1234567890, 0, 1, 1, 300, 1, 1, 10, 5, util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 0, 0, NULL, 0, 0, 9, 0, 'florist','normal'),
|
(1109, 'Bruce Banner', '16104829E', 'HULK', 'Black widow', 'SOMEWHERE IN NEW YORK', 'Gotham', 46460, 1111111111, 222222222, 1, 'BruceBanner@mydomain.com', NULL, 0, 1234567890, 0, 1, 1, 300, 1, 1, 10, 5, util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 0, 0, NULL, 0, 0, 9, 0, 'florist','normal'),
|
||||||
(1110, 'Jessica Jones', '58282869H', 'JESSICA JONES', 'Luke Cage', 'NYCC 2015 POSTER', 'Gotham', 46460, 1111111111, 222222222, 1, 'JessicaJones@mydomain.com', NULL, 0, 1234567890, 0, 1, 1, 300, 1, 1, 10, 5, util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 0, NULL, 0, 0, NULL, 1, 'florist','normal'),
|
(1110, 'Jessica Jones', '58282869H', 'JESSICA JONES', 'Luke Cage', 'NYCC 2015 POSTER', 'Gotham', 46460, 1111111111, 222222222, 1, 'JessicaJones@mydomain.com', NULL, 0, 1234567890, 0, 1, 1, 300, 1, 1, 10, 5, util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 0, NULL, 0, 0, NULL, 1, 'florist','normal'),
|
||||||
(1111, 'Missing', NULL, 'MISSING MAN', 'Anton', 'THE SPACE, UNIVERSE FAR AWAY', 'Gotham', 46460, 1111111111, 222222222, 1, NULL, NULL, 0, 1234567890, 0, 1, 1, 300, 1, 1, 10, 5, util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 0, 1, 0, NULL, 1, 0, NULL, 0, 'others','loses'),
|
(1111, 'Missing', NULL, 'MISSING MAN', 'Anton', 'THE SPACE, UNIVERSE FAR AWAY', 'Gotham', 46460, 1111111111, 222222222, 0, NULL, NULL, 0, 1234567890, 0, 1, 1, 300, 1, 1, 10, 5, util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 0, 1, 0, NULL, 1, 0, NULL, 0, 'others','loses'),
|
||||||
(1112, 'Trash', NULL, 'GARBAGE MAN', 'Unknown name', 'NEW YORK CITY, UNDERGROUND', 'Gotham', 46460, 1111111111, 222222222, 1, NULL, NULL, 0, 1234567890, 0, 1, 1, 300, 1, 1, 10, 5, util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 0, 1, 0, NULL, 1, 0, NULL, 0, 'others','loses');
|
(1112, 'Trash', NULL, 'GARBAGE MAN', 'Unknown name', 'NEW YORK CITY, UNDERGROUND', 'Gotham', 46460, 1111111111, 222222222, 0, NULL, NULL, 0, 1234567890, 0, 1, 1, 300, 1, 1, 10, 5, util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 0, 1, 0, NULL, 1, 0, NULL, 0, 'others','loses');
|
||||||
|
|
||||||
INSERT INTO `vn`.`client`(`id`, `name`, `fi`, `socialName`, `contact`, `street`, `city`, `postcode`, `isRelevant`, `email`, `iban`,`dueDay`,`accountingAccount`, `isEqualizated`, `provinceFk`, `hasToInvoice`, `credit`, `countryFk`, `isActive`, `quality`, `payMethodFk`,`created`, `isTaxDataChecked`)
|
INSERT INTO `vn`.`client`(`id`, `name`, `fi`, `socialName`, `contact`, `street`, `city`, `postcode`, `isRelevant`, `email`, `iban`,`dueDay`,`accountingAccount`, `isEqualizated`, `provinceFk`, `hasToInvoice`, `credit`, `countryFk`, `isActive`, `quality`, `payMethodFk`,`created`, `isTaxDataChecked`)
|
||||||
SELECT id, name, CONCAT(RPAD(CONCAT(id,9),8,id),'A'), UPPER(CONCAT(name, 'Social')), CONCAT(name, 'Contact'), UPPER(CONCAT(name, 'Street')), 'GOTHAM', 46460, 1, CONCAT(name,'@mydomain.com'), NULL, 0, 1234567890, 0, 1, 1, 300, 1, 1, 10, 5, util.VN_CURDATE(), 1
|
SELECT id, name, CONCAT(RPAD(CONCAT(id,9),8,id),'A'), UPPER(CONCAT(name, 'Social')), CONCAT(name, 'Contact'), UPPER(CONCAT(name, 'Street')), 'GOTHAM', 46460, 0, CONCAT(name,'@mydomain.com'), NULL, 0, 1234567890, 0, 1, 1, 300, 1, 1, 10, 5, util.VN_CURDATE(), 1
|
||||||
FROM `account`.`role` `r`
|
FROM `account`.`role` `r`
|
||||||
WHERE `r`.`hasLogin` = 1;
|
WHERE `r`.`hasLogin` = 1;
|
||||||
|
|
||||||
|
@ -4008,6 +4008,19 @@ INSERT IGNORE INTO pbx.queueMember
|
||||||
UPDATE vn.department SET pbxQueue = '1000' WHERE name = "CAMARA";
|
UPDATE vn.department SET pbxQueue = '1000' WHERE name = "CAMARA";
|
||||||
UPDATE vn.department SET pbxQueue = '2000' WHERE name = "VENTAS";
|
UPDATE vn.department SET pbxQueue = '2000' WHERE name = "VENTAS";
|
||||||
|
|
||||||
|
INSERT INTO srt.buffer (id, x, y, `size`, `length`, stateFk, typeFk, isActive, code, stratus, hasWorkerWaiting, reserve, routeFk, dayMinute, lastUnloaded, hasStrapper, typeDefaultFk, motors, editorFk)
|
||||||
|
VALUES (0, 0, 0, 0, NULL, 3, 1, 0, 'ENT', 0, 0, NULL, NULL, NULL, NULL, 0, 1, 1, NULL),
|
||||||
|
(1, 0, 9900, 0, NULL, 1, 0, 0, 'NOK', 0, 0, NULL, NULL, NULL, NULL, 0, 1, 1, NULL),
|
||||||
|
(2, 0, 0, 450, 13000, 1, 0, 1, '01A', 1, 1, NULL, NULL, NULL, NULL, 0, 1, 1, NULL),
|
||||||
|
(3, 1400, 0, 450, 13000, 1, 0, 1, '01B', 1, 0, NULL, NULL, NULL, NULL, 0, 1, 1, NULL),
|
||||||
|
(4, 0, 500, 500, 13000, 1, 4, 1, '02A', 2, 1, NULL, NULL, NULL, NULL, 1, 4, 13, NULL),
|
||||||
|
(5, 1400, 500, 500, 13000, 1, 4, 1, '02B', 2, 1, NULL, NULL, NULL, NULL, 1, 4, 13, NULL),
|
||||||
|
(6, 0, 1000, 500, 13000, 1, 1, 1, '03A', 3, 0, NULL, NULL, NULL, NULL, 0, 1, 1, NULL),
|
||||||
|
(7, 1400, 1000, 500, 13000, 1, 1, 1, '03B', 3, 0, NULL, NULL, NULL, NULL, 0, 1, 1, NULL),
|
||||||
|
(8, 0, 1500, 500, 13000, 1, 0, 1, '04A', 4, 0, NULL, NULL, NULL, NULL, 0, 1, 1, NULL),
|
||||||
|
(9, 1400, 1500, 500, 13000, 1, 1, 1, '04B', 4, 0, NULL, NULL, NULL, NULL, 0, 1, 1, NULL),
|
||||||
|
(10, 0, 2000, 500, 13000, 1, 1, 1, '05A', 5, 0, NULL, NULL, NULL, NULL, 0, 1, 1, NULL);
|
||||||
|
|
||||||
|
|
||||||
INSERT IGNORE INTO vn.saySimpleCountry (countryFk, channel)
|
INSERT IGNORE INTO vn.saySimpleCountry (countryFk, channel)
|
||||||
VALUES (19, 1169),
|
VALUES (19, 1169),
|
||||||
|
|
|
@ -9,45 +9,54 @@ BEGIN
|
||||||
* @param vOrder El identificador del pedido
|
* @param vOrder El identificador del pedido
|
||||||
* @return tmp.orderTax Bases imponibles, IVA y recargo de equivalencia
|
* @return tmp.orderTax Bases imponibles, IVA y recargo de equivalencia
|
||||||
*/
|
*/
|
||||||
|
-- No poner create or replace, ya que da problemas
|
||||||
DROP TEMPORARY TABLE IF EXISTS tmp.addressCompany;
|
DROP TEMPORARY TABLE IF EXISTS tmp.addressCompany;
|
||||||
CREATE TEMPORARY TABLE tmp.addressCompany
|
CREATE TEMPORARY TABLE tmp.addressCompany
|
||||||
(INDEX (addressFk, companyFk))
|
(INDEX (addressFk, companyFk))
|
||||||
ENGINE = MEMORY
|
ENGINE = MEMORY
|
||||||
SELECT DISTINCT o.address_id addressFk, o.company_id companyFk
|
SELECT DISTINCT o.address_id addressFk, o.company_id companyFk
|
||||||
FROM tmp.`order` tmpOrder
|
FROM tmp.`order` tmpOrder
|
||||||
JOIN hedera.`order` o ON o.id = tmpOrder.orderFk;
|
JOIN `order` o ON o.id = tmpOrder.orderFk;
|
||||||
|
|
||||||
CALL vn.addressTaxArea;
|
CALL vn.addressTaxArea();
|
||||||
|
|
||||||
-- Calcula el IVA y el recargo desglosado.
|
-- Calcula el IVA y el recargo desglosado.
|
||||||
|
CREATE OR REPLACE TEMPORARY TABLE tmp.orderTax
|
||||||
DROP TEMPORARY TABLE IF EXISTS tmp.orderTax;
|
(PRIMARY KEY (orderFk, code, rate))
|
||||||
CREATE TEMPORARY TABLE tmp.orderTax
|
|
||||||
(INDEX (orderFk))
|
|
||||||
ENGINE = MEMORY
|
ENGINE = MEMORY
|
||||||
SELECT o.id orderFk,
|
WITH orders AS (
|
||||||
tc.code,
|
SELECT tor.orderFk,
|
||||||
SUM(m.amount * m.price) taxableBase,
|
oro.amount * oro.price total,
|
||||||
pgc.rate
|
s.countryFk,
|
||||||
FROM tmp.`order` tmpOrder
|
ata.areaFk,
|
||||||
JOIN `order` o ON o.id = tmpOrder.orderFk
|
itc.taxClassFk
|
||||||
JOIN orderRow m ON m.orderFk = o.id
|
FROM hedera.orderRow oro
|
||||||
JOIN vn.item i ON i.id = m.itemFk
|
JOIN tmp.order tor ON tor.orderFk = oro.orderFk
|
||||||
|
JOIN hedera.`order` o ON o.id = tor.orderFk
|
||||||
|
JOIN vn.item i ON i.id = oro.itemFk
|
||||||
JOIN vn.`client` c ON c.id = o.customer_id
|
JOIN vn.`client` c ON c.id = o.customer_id
|
||||||
JOIN vn.supplier s ON s.id = o.company_id
|
JOIN vn.supplier s ON s.id = o.company_id
|
||||||
JOIN tmp.addressTaxArea ata
|
JOIN tmp.addressTaxArea ata ON ata.addressFk = o.address_id
|
||||||
ON ata.addressFk = o.address_id AND ata.companyFk = o.company_id
|
AND ata.companyFk = o.company_id
|
||||||
JOIN vn.itemTaxCountry itc
|
JOIN vn.itemTaxCountry itc ON itc.itemFk = i.id
|
||||||
ON itc.itemFk = i.id AND itc.countryFk = s.countryFk
|
AND itc.countryFk = s.countryFk
|
||||||
JOIN vn.bookingPlanner bp
|
HAVING total
|
||||||
ON bp.countryFk = s.countryFk
|
)
|
||||||
AND bp.taxAreaFk = ata.areaFk
|
SELECT o.orderFk,
|
||||||
AND bp.taxClassFk = itc.taxClassFk
|
tc.code,
|
||||||
JOIN vn.pgc ON pgc.`code` = bp.pgcFk
|
SUM(o.total) taxableBase,
|
||||||
|
pgc.rate
|
||||||
|
FROM orders o
|
||||||
|
JOIN vn.bookingPlanner bp ON bp.countryFk = o.countryFk
|
||||||
|
AND bp.taxAreaFk = o.areaFk
|
||||||
|
AND bp.taxClassFk = o.taxClassFk
|
||||||
|
JOIN vn.pgc ON pgc.code = bp.pgcFk
|
||||||
JOIN vn.taxClass tc ON tc.id = bp.taxClassFk
|
JOIN vn.taxClass tc ON tc.id = bp.taxClassFk
|
||||||
GROUP BY tmpOrder.orderFk, pgc.`code`, pgc.rate
|
GROUP BY o.orderFk, pgc.code, pgc.rate
|
||||||
HAVING taxableBase != 0;
|
HAVING taxableBase
|
||||||
|
ORDER BY bp.priority;
|
||||||
|
|
||||||
|
-- No poner create or replace, ya que da problemas
|
||||||
DROP TEMPORARY TABLE IF EXISTS tmp.orderAmount;
|
DROP TEMPORARY TABLE IF EXISTS tmp.orderAmount;
|
||||||
CREATE TEMPORARY TABLE tmp.orderAmount
|
CREATE TEMPORARY TABLE tmp.orderAmount
|
||||||
(INDEX (orderFk))
|
(INDEX (orderFk))
|
||||||
|
|
|
@ -42,7 +42,6 @@ BEGIN
|
||||||
i.minimum `min`,
|
i.minimum `min`,
|
||||||
p.name producer,
|
p.name producer,
|
||||||
o.code origin,
|
o.code origin,
|
||||||
v.visible - IFNULL(vVisibleItemShelving, 0) unlocated,
|
|
||||||
a.available,
|
a.available,
|
||||||
vVisibleItemShelving,
|
vVisibleItemShelving,
|
||||||
v.visible,
|
v.visible,
|
||||||
|
|
|
@ -0,0 +1,74 @@
|
||||||
|
DELIMITER $$
|
||||||
|
CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`stockBuyedByWorker`(
|
||||||
|
vDated DATE,
|
||||||
|
vWorker INT
|
||||||
|
)
|
||||||
|
BEGIN
|
||||||
|
/**
|
||||||
|
* Inserta el volumen de compra de un comprador
|
||||||
|
* en stockBuyed de acuerdo con la fecha.
|
||||||
|
*
|
||||||
|
* @param vDated Fecha de compra
|
||||||
|
* @param vWorker Id de trabajador
|
||||||
|
*/
|
||||||
|
CREATE OR REPLACE TEMPORARY TABLE tStockBuyed
|
||||||
|
(INDEX (userFk))
|
||||||
|
ENGINE = MEMORY
|
||||||
|
SELECT requested, reserved, userFk
|
||||||
|
FROM stockBuyed
|
||||||
|
WHERE dated = vDated
|
||||||
|
AND userFk = vWorker;
|
||||||
|
|
||||||
|
DELETE FROM stockBuyed
|
||||||
|
WHERE dated = vDated
|
||||||
|
AND userFk = vWorker;
|
||||||
|
|
||||||
|
CALL item_calculateStock(vDated);
|
||||||
|
|
||||||
|
INSERT INTO stockBuyed(userFk, buyed, `dated`, reserved, requested, description)
|
||||||
|
SELECT it.workerFk,
|
||||||
|
SUM((ti.quantity / b.packing) * buy_getVolume(b.id)) / vc.palletM3 / 1000000,
|
||||||
|
vDated,
|
||||||
|
sb.reserved,
|
||||||
|
sb.requested,
|
||||||
|
u.name
|
||||||
|
FROM itemType it
|
||||||
|
JOIN item i ON i.typeFk = it.id
|
||||||
|
LEFT JOIN tmp.item ti ON ti.itemFk = i.id
|
||||||
|
JOIN itemCategory ic ON ic.id = it.categoryFk
|
||||||
|
JOIN warehouse wh ON wh.code = 'VNH'
|
||||||
|
JOIN tmp.buyUltimate bu ON bu.itemFk = i.id
|
||||||
|
AND bu.warehouseFk = wh.id
|
||||||
|
JOIN buy b ON b.id = bu.buyFk
|
||||||
|
JOIN volumeConfig vc
|
||||||
|
JOIN account.`user` u ON u.id = it.workerFk
|
||||||
|
LEFT JOIN tStockBuyed sb ON sb.userFk = it.workerFk
|
||||||
|
WHERE ic.display
|
||||||
|
AND it.workerFk = vWorker;
|
||||||
|
|
||||||
|
SELECT b.entryFk Id_Entrada,
|
||||||
|
i.id Id_Article,
|
||||||
|
i.name Article,
|
||||||
|
ti.quantity Cantidad,
|
||||||
|
(ac.conversionCoefficient * (ti.quantity / b.packing) * buy_getVolume(b.id))
|
||||||
|
/ (vc.trolleyM3 * 1000000) buyed,
|
||||||
|
b.packagingFk id_cubo,
|
||||||
|
b.packing
|
||||||
|
FROM tmp.item ti
|
||||||
|
JOIN item i ON i.id = ti.itemFk
|
||||||
|
JOIN itemType it ON i.typeFk = it.id
|
||||||
|
JOIN itemCategory ic ON ic.id = it.categoryFk
|
||||||
|
JOIN worker w ON w.id = it.workerFk
|
||||||
|
JOIN auctionConfig ac
|
||||||
|
JOIN tmp.buyUltimate bu ON bu.itemFk = i.id
|
||||||
|
AND bu.warehouseFk = ac.warehouseFk
|
||||||
|
JOIN buy b ON b.id = bu.buyFk
|
||||||
|
JOIN volumeConfig vc
|
||||||
|
WHERE ic.display
|
||||||
|
AND w.id = vWorker;
|
||||||
|
|
||||||
|
DROP TEMPORARY TABLE tmp.buyUltimate,
|
||||||
|
tmp.item,
|
||||||
|
tStockBuyed;
|
||||||
|
END$$
|
||||||
|
DELIMITER ;
|
|
@ -0,0 +1,70 @@
|
||||||
|
DELIMITER $$
|
||||||
|
CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`stockBuyed_add`(
|
||||||
|
vDated DATE
|
||||||
|
)
|
||||||
|
BEGIN
|
||||||
|
/**
|
||||||
|
* Inserta el volumen de compra por comprador
|
||||||
|
* en stockBuyed de acuerdo con la fecha.
|
||||||
|
*
|
||||||
|
* @param vDated Fecha de compra
|
||||||
|
*/
|
||||||
|
CREATE OR REPLACE TEMPORARY TABLE tStockBuyed
|
||||||
|
(INDEX (userFk))
|
||||||
|
ENGINE = MEMORY
|
||||||
|
SELECT requested, reserved, userFk
|
||||||
|
FROM stockBuyed
|
||||||
|
WHERE dated = vDated;
|
||||||
|
|
||||||
|
DELETE FROM stockBuyed WHERE dated = vDated;
|
||||||
|
|
||||||
|
CALL item_calculateStock(vDated);
|
||||||
|
|
||||||
|
INSERT INTO stockBuyed(userFk, buyed, `dated`, description)
|
||||||
|
SELECT it.workerFk,
|
||||||
|
SUM((ti.quantity / b.packing) * buy_getVolume(b.id)) / vc.palletM3 / 1000000,
|
||||||
|
vDated,
|
||||||
|
u.name
|
||||||
|
FROM itemType it
|
||||||
|
JOIN item i ON i.typeFk = it.id
|
||||||
|
LEFT JOIN tmp.item ti ON ti.itemFk = i.id
|
||||||
|
JOIN itemCategory ic ON ic.id = it.categoryFk
|
||||||
|
JOIN warehouse wh ON wh.code = 'VNH'
|
||||||
|
JOIN tmp.buyUltimate bu ON bu.itemFk = i.id AND bu.warehouseFk = wh.id
|
||||||
|
JOIN buy b ON b.id = bu.buyFk
|
||||||
|
JOIN volumeConfig vc
|
||||||
|
JOIN account.`user` u ON u.id = it.workerFk
|
||||||
|
JOIN workerDepartment wd ON wd.workerFk = u.id
|
||||||
|
JOIN department d ON d.id = wd.departmentFk
|
||||||
|
WHERE ic.display
|
||||||
|
AND d.code IN ('shopping', 'logistic', 'franceTeam')
|
||||||
|
GROUP BY it.workerFk;
|
||||||
|
|
||||||
|
INSERT INTO stockBuyed(buyed, dated, description)
|
||||||
|
SELECT SUM(ic.cm3 * ito.quantity / vc.palletM3 / 1000000),
|
||||||
|
vDated,
|
||||||
|
IF(c.code = 'ES', p.name, c.name) destiny
|
||||||
|
FROM itemTicketOut ito
|
||||||
|
JOIN ticket t ON t.id = ito.ticketFk
|
||||||
|
JOIN `address` a ON a.id = t.addressFk
|
||||||
|
JOIN province p ON p.id = a.provinceFk
|
||||||
|
JOIN country c ON c.id = p.countryFk
|
||||||
|
JOIN warehouse wh ON wh.id = t.warehouseFk
|
||||||
|
JOIN itemCost ic ON ic.itemFk = ito.itemFk
|
||||||
|
AND ic.warehouseFk = t.warehouseFk
|
||||||
|
JOIN volumeConfig vc
|
||||||
|
WHERE ito.shipped BETWEEN vDated AND util.dayend(vDated)
|
||||||
|
AND wh.code = 'VNH'
|
||||||
|
GROUP BY destiny;
|
||||||
|
|
||||||
|
UPDATE stockBuyed s
|
||||||
|
JOIN tStockBuyed ts ON ts.userFk = s.userFk
|
||||||
|
SET s.requested = ts.requested,
|
||||||
|
s.reserved = ts.reserved
|
||||||
|
WHERE s.dated = vDated;
|
||||||
|
|
||||||
|
DROP TEMPORARY TABLE tmp.buyUltimate,
|
||||||
|
tmp.item,
|
||||||
|
tStockBuyed;
|
||||||
|
END$$
|
||||||
|
DELIMITER ;
|
|
@ -0,0 +1 @@
|
||||||
|
ALTER TABLE vn.productionConfig DROP COLUMN hasNewLabelMrwMethod;
|
|
@ -0,0 +1,2 @@
|
||||||
|
-- Place your SQL code here
|
||||||
|
RENAME TABLE vn.stockBuyed__ TO vn.stockBuyed;
|
|
@ -0,0 +1 @@
|
||||||
|
ALTER TABLE vn.dua ADD comment TEXT DEFAULT NULL NULL;
|
|
@ -70,10 +70,18 @@ export default class App {
|
||||||
|
|
||||||
if (this.logger.$params.q) {
|
if (this.logger.$params.q) {
|
||||||
let tableValue = this.logger.$params.q;
|
let tableValue = this.logger.$params.q;
|
||||||
|
if (Array.isArray(tableValue)) {
|
||||||
|
const [key, param1, param2] = tableValue;
|
||||||
|
const payload = key === 'createForm'
|
||||||
|
? {[param1]: param2}
|
||||||
|
: {[key]: param1};
|
||||||
|
newRoute += `?${key}=${JSON.stringify(payload)}`;
|
||||||
|
} else {
|
||||||
const q = JSON.parse(tableValue);
|
const q = JSON.parse(tableValue);
|
||||||
if (typeof q === 'number')
|
if (typeof q === 'number')
|
||||||
tableValue = JSON.stringify({id: tableValue});
|
tableValue = JSON.stringify({id: tableValue});
|
||||||
newRoute = newRoute.concat(`?table=${tableValue}`);
|
newRoute = newRoute.concat(`?table=${tableValue}`);
|
||||||
|
}
|
||||||
} else if (!hasId && this.logger.$params.id && newRoute.indexOf(this.logger.$params.id) < 0)
|
} else if (!hasId && this.logger.$params.id && newRoute.indexOf(this.logger.$params.id) < 0)
|
||||||
newRoute = newRoute.concat(`${this.logger.$params.id}`);
|
newRoute = newRoute.concat(`${this.logger.$params.id}`);
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,3 @@
|
||||||
|
|
||||||
const ParameterizedSQL = require('loopback-connector').ParameterizedSQL;
|
const ParameterizedSQL = require('loopback-connector').ParameterizedSQL;
|
||||||
const buildFilter = require('vn-loopback/util/filter').buildFilter;
|
const buildFilter = require('vn-loopback/util/filter').buildFilter;
|
||||||
const mergeFilters = require('vn-loopback/util/filter').mergeFilters;
|
const mergeFilters = require('vn-loopback/util/filter').mergeFilters;
|
||||||
|
|
|
@ -99,7 +99,7 @@
|
||||||
<div ng-transclude="btnThree">
|
<div ng-transclude="btnThree">
|
||||||
<vn-quick-link
|
<vn-quick-link
|
||||||
tooltip="New order"
|
tooltip="New order"
|
||||||
state="['order.create', {clientFk: $ctrl.id}]"
|
state="['order.index', {q: ['createForm', 'clientFk', $ctrl.id]}]"
|
||||||
icon="icon-basketadd">
|
icon="icon-basketadd">
|
||||||
</vn-quick-link>
|
</vn-quick-link>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -76,6 +76,7 @@ module.exports = Self => {
|
||||||
});
|
});
|
||||||
|
|
||||||
Self.filter = async(ctx, filter, options) => {
|
Self.filter = async(ctx, filter, options) => {
|
||||||
|
const models = Self.app.models;
|
||||||
const conn = Self.dataSource.connector;
|
const conn = Self.dataSource.connector;
|
||||||
const myOptions = {};
|
const myOptions = {};
|
||||||
|
|
||||||
|
|
|
@ -13,7 +13,8 @@ module.exports = Self => {
|
||||||
{
|
{
|
||||||
arg: 'landed',
|
arg: 'landed',
|
||||||
type: 'date',
|
type: 'date',
|
||||||
description: `The landing date`
|
description: `The landing date`,
|
||||||
|
required: true
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
arg: 'warehouseId',
|
arg: 'warehouseId',
|
||||||
|
|
|
@ -117,7 +117,6 @@ module.exports = Self => {
|
||||||
case 'landedTo':
|
case 'landedTo':
|
||||||
return {'t.landed': {lte: value}};
|
return {'t.landed': {lte: value}};
|
||||||
case 'daysOnward':
|
case 'daysOnward':
|
||||||
|
|
||||||
today.setHours(0, 0, 0, 0);
|
today.setHours(0, 0, 0, 0);
|
||||||
future.setDate(today.getDate() + value);
|
future.setDate(today.getDate() + value);
|
||||||
future.setHours(23, 59, 59, 999);
|
future.setHours(23, 59, 59, 999);
|
||||||
|
|
Loading…
Reference in New Issue