db/routines/vn/procedures/item_getBalance.sql

@@ -41,6 +41,7 @@ BEGIN
 	);
 
 	INSERT INTO tItemDiary
+		WITH entries AS (
 			SELECT tr.landed shipped,
 					b.quantity `in`,
 					NULL `out`,
@@ -70,24 +71,25 @@ BEGIN
 					AND vWarehouseFk = tr.warehouseInFk
 					AND (s.id <> ec.inventorySupplierFk OR vDate IS NULL) 
 					AND b.itemFk = vItemFk
-				AND e.isExcludedFromAvailable = FALSE
-				AND e.isRaid = FALSE
-		UNION ALL
+					AND NOT e.isExcludedFromAvailable
+					AND NOT e.isRaid
+			),
+			deliveried AS (
 				SELECT tr.shipped,
 						NULL,
 						b.quantity,
 						st.alertLevel,
-				st.name,
-				s.name,
+						st.name stateName,
+						s.name ,
 						e.invoiceNumber,
-				e.id,
-				s.id,
+						e.id entryFk,
+						s.id supplierFk,
 						IF(st.`code` = 'DELIVERED' , TRUE, FALSE),
-				FALSE,
+						FALSE isTicket,
 						b.id,
-				NULL,
-				NULL,
-				NULL,
+						NULL `order`,
+						NULL clientType,
+						NULL claimFk,
 						ec.inventorySupplierFk
 					FROM buy b
 						JOIN entry e ON e.id = b.entryFk
@@ -103,26 +105,23 @@ BEGIN
 						AND vWarehouseFk = tr.warehouseOutFk
 						AND (s.id <> ec.inventorySupplierFk OR vDate IS NULL) 
 							AND b.itemFk = vItemFk
-				AND e.isExcludedFromAvailable = FALSE
-				AND w.isFeedStock = FALSE
-				AND e.isRaid = FALSE
-		UNION ALL
-		SELECT DATE(t.shipped),
-			NULL,
+							AND NOT e.isExcludedFromAvailable
+							AND NOT w.isFeedStock
+							AND NOT e.isRaid
+			),
+			sales AS (
+				SELECT DATE(t.shipped) shipped,
 						s.quantity,
 						st2.alertLevel,
 						st2.name,
 						t.nickname,
 						t.refFk,
-			t.id,
+						t.id ticketFk,
 						t.clientFk,
-			stk.id,
-			TRUE,
-			s.id,
+						s.id saleFk,
 						st.`order`,
 						c.typeFk,
-			cb.claimFk,
-			NULL
+						cb.claimFk
 					FROM sale s
 						JOIN ticket t ON t.id = s.ticketFk
 						LEFT JOIN ticketState ts ON ts.ticketFk = t.id
@@ -133,13 +132,53 @@ BEGIN
 							IF (t.shipped > util.dayEnd(util.VN_CURDATE()),
 								'FREE',
 								IFNULL(ts.code, 'FREE')))
-			LEFT JOIN state stPrep ON stPrep.`code` = 'PREPARED'
-			LEFT JOIN saleTracking stk ON stk.saleFk = s.id 
-				AND stk.stateFk = stPrep.id
 						LEFT JOIN claimBeginning cb ON s.id = cb.saleFk
 					WHERE t.shipped >= vDateInventory
 						AND s.itemFk = vItemFk
-			AND vWarehouseFk =t.warehouseFk
+						AND vWarehouseFk = t.warehouseFk
+			),sale AS (
+				SELECT s.shipped,
+					NULL `in`,
+					s.quantity,
+					s.alertLevel,
+					s.name,
+					s.nickname,
+					s.refFk,
+					s.ticketFk,
+					s.clientFk,
+					IF(stk.saleFk, TRUE, NULL),
+					TRUE,
+					s.saleFk,
+					s.`order`,
+					s.typeFk,
+					s.claimFk,
+					NULL
+					FROM sales s
+						LEFT JOIN state stPrep ON stPrep.`code` = 'PREPARED'
+						LEFT JOIN saleTracking stk ON stk.saleFk = s.saleFk 
+							AND stk.stateFk = stPrep.id
+					GROUP BY s.saleFk
+			)	SELECT shipped,
+					`in`,
+					`out`,
+					alertLevel,
+					stateName,
+					`name`,
+					reference,
+					origin,
+					clientFk,
+					isPicked,
+					isTicket,
+					lineFk,
+					`order`,
+					clientType,
+					claimFk,
+					inventorySupplierFk
+					FROM entries
+				UNION ALL
+				SELECT * FROM deliveried
+				UNION ALL
+				SELECT * FROM sale
 				ORDER BY shipped,
 					(inventorySupplierFk = clientFk) DESC,
 					alertLevel DESC,