Merge pull request 'BlueMonkey' (!2133 ) from 6358-boxPicking_BlueMonkey into dev

Reviewed-on: #2133 Reviewed-by: Pablo Natek <pablone@verdnatura.es>
BlueMonkey
2024-03-05 13:36:51 +00:00 · 2024-03-05 13:18:13 +01:00
2 changed files with 3 additions and 3 deletions
--- a/db/routines/vn/procedures/sale_getBoxPickingList.sql
+++ b/db/routines/vn/procedures/sale_getBoxPickingList.sql
@ -27,7 +27,7 @@ BEGIN
 		s.quantity,
 		MAKETIME(pb.HH,pb.mm,0) etd, 
 		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,
 		b.packagingFk
 		FROM sale s
@ -71,5 +71,3 @@ BEGIN
 	DROP TEMPORARY TABLE tmp.sale;
 	END$$
 DELIMITER ;
 CALL `vn`.`sale_getBoxPickingList`(1, curdate());
--- a/db/versions/10929-orangeAnthurium/00-firstScript.sql
+++ b/db/versions/10929-orangeAnthurium/00-firstScript.sql
@ -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;
Author	SHA1	Message	Date
Pako Natek	9eb3b32564	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>	2024-03-05 13:36:51 +00:00
Pako Natek	9c14836bc7	BlueMonkey gitea/salix/pipeline/pr-dev This commit looks good Details	2024-03-05 13:18:13 +01:00
		`@ -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;`