change new code
gitea/salix/pipeline/head This commit looks good Details

This commit is contained in:
Alex Moreno 2022-04-20 14:40:29 +02:00
parent e00d63d7af
commit 8b68fcf088
5 changed files with 9 additions and 9 deletions

View File

@ -40,7 +40,7 @@ BEGIN
INTO vFromDated
FROM bs.manaCustomer;
WHILE timestampadd(DAY,30,vFromDated) < CURDATE() DO
WHILE timestampadd(DAY,30,vFromDated) < vn.VN_CURDATE() DO
SELECT
timestampadd(DAY,30,vFromDated),

View File

@ -11,7 +11,7 @@ BEGIN
*/
DECLARE vWorkerIsExcluded BOOLEAN;
DECLARE vFromDated DATE;
DECLARE vToDated DATE DEFAULT TIMESTAMPADD(DAY,1,CURDATE());
DECLARE vToDated DATE DEFAULT TIMESTAMPADD(DAY,1,vn.VN_CURDATE());
DECLARE vMana INT;
DECLARE vAutoMana INT;
DECLARE vClaimMana INT;
@ -63,7 +63,7 @@ BEGIN
FROM greuge g
JOIN client c ON c.id = g.clientFk
WHERE c.salesPersonFk = vWorkerFk AND g.greugeTypeFk = vManaGreugeType
AND g.shipped > vFromDated and g.shipped < CURDATE()
AND g.shipped > vFromDated and g.shipped < vn.VN_CURDATE()
UNION ALL
SELECT cc.mana
FROM clientManaCache cc

View File

@ -51,13 +51,13 @@ BEGIN
)
SELECT
vCustomer,
CURDATE(),
vn.VN_CURDATE(),
vAddress,
vRefundAgencyMode,
a.nickname,
vWarehouse,
vCompany,
CURDATE(),
vn.VN_CURDATE(),
vZoneFk
FROM address a
WHERE a.id = vAddress;

View File

@ -58,13 +58,13 @@ BEGIN
)
SELECT
vCustomer,
CURDATE(),
vn.VN_CURDATE(),
vAddress,
vRefundAgencyMode,
a.nickname,
vWarehouse,
vCompany,
CURDATE(),
vn.VN_CURDATE(),
vZoneFk
FROM address a
WHERE a.id = vAddress;

View File

@ -14,7 +14,7 @@ describe('zone zone_getLanded()', () => {
warehouseFk: 1,
showExpiredZones: true};
stmt = new ParameterizedSQL('CALL zone_getLanded(DATE_ADD(CURDATE(), INTERVAL -1 DAY), ?, ?, ?, ?)', [
stmt = new ParameterizedSQL('CALL zone_getLanded(DATE_ADD(vn.VN_CURDATE(), INTERVAL -1 DAY), ?, ?, ?, ?)', [
params.addressFk,
params.agencyModeFk,
params.warehouseFk,
@ -47,7 +47,7 @@ describe('zone zone_getLanded()', () => {
warehouseFk: 1,
showExpiredZones: false};
stmt = new ParameterizedSQL('CALL zone_getLanded(DATE_ADD(CURDATE(), INTERVAL +2 DAY), ?, ?, ?, ?)', [
stmt = new ParameterizedSQL('CALL zone_getLanded(DATE_ADD(vn.VN_CURDATE(), INTERVAL +2 DAY), ?, ?, ?, ?)', [
params.addressFk,
params.agencyModeFk,
params.warehouseFk,