feat(salix): refs #6321 updates

db/routines/vn/procedures/item_getSimilar.sql

@@ -66,7 +66,14 @@ BEGIN
 				ELSE 1
 			END AS minQuantity,
 			iss.visible located,
-			b.price2
+			b.price,
+			b.price1,
+			b.price2,
+			b.price3,
+			a.price,
+			a.price1,
+			a.price2,
+			a.price3,
 		FROM vn.item i
 			JOIN cache.available a ON a.item_id = i.id
 				AND a.calc_id = vCalcFk

modules/item/back/methods/item/getSimilar.js

@@ -25,9 +25,9 @@ module.exports = Self => {
         if (typeof options == 'object')
             Object.assign(myOptions, options);
 
-        // const where = filter.where;
-        // const query = [where.itemFk, where.warehouseFk, where.date ?? Date.now(), where.showType ?? true] ;
-        // const [results] = await Self.rawSql('CALL vn.item_getSimilar(?, ?, ?, ?)',, myOptions);
+        const where = filter.where;
+        const query = [where.itemFk, where.warehouseFk, where.date ?? Date.now(), where.showType ?? true];
+        const [results] = await Self.rawSql('CALL vn.item_getSimilar(?, ?, ?, ?)', query, myOptions);
 
         return [
             {
@@ -51,7 +51,7 @@ module.exports = Self => {
                 'counter': 0,
                 'minQuantity': 1,
                 'visible': null,
-                'price2': null
+                'price2': 1
             }
 
         ];

modules/ticket/back/methods/ticket/itemLackDetail.js

@@ -45,6 +45,7 @@ module.exports = Self => {
                 st.name stateName,
                 st.id stateId,
                 s.itemFk itemFk,
+                s.price price,
                 al.code alertLevelCode,
                 z.name zoneName,
                 z.hour theoreticalhour,