Merge pull request 'BlueMonkey' (!2133) from 6358-boxPicking_BlueMonkey into dev
gitea/salix/pipeline/head This commit looks good Details

Reviewed-on: #2133
Reviewed-by: Pablo Natek <pablone@verdnatura.es>
This commit is contained in:
Pako Natek 2024-03-05 13:36:51 +00:00
commit 9eb3b32564
2 changed files with 3 additions and 3 deletions

View File

@ -27,7 +27,7 @@ BEGIN
s.quantity, s.quantity,
MAKETIME(pb.HH,pb.mm,0) etd, MAKETIME(pb.HH,pb.mm,0) etd,
pb.routeFk, pb.routeFk,
FLOOR(s.quantity / ish.packing) stickers, FLOOR(s.quantity / IF(i.isBoxPickingMode, ish.packing, i.packingOut)) stickers,
IF(i.isBoxPickingMode, ish.packing, i.packingOut) packing, IF(i.isBoxPickingMode, ish.packing, i.packingOut) packing,
b.packagingFk b.packagingFk
FROM sale s FROM sale s
@ -71,5 +71,3 @@ BEGIN
DROP TEMPORARY TABLE tmp.sale; DROP TEMPORARY TABLE tmp.sale;
END$$ END$$
DELIMITER ; DELIMITER ;
CALL `vn`.`sale_getBoxPickingList`(1, curdate());

View File

@ -0,0 +1,2 @@
-- Place your SQL code here
ALTER TABLE dipole.expedition_PrintOut MODIFY COLUMN street varchar(42) CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci DEFAULT ' ' NOT NULL;