modules/ticket/back/methods/sale/getFromSectorCollection.js

@@ -1,5 +1,5 @@
 module.exports = Self => {
-    Self.remoteMethod('getFromSectorCollection', {
+    Self.remoteMethodCtx('getFromSectorCollection', {
         description: 'Get sales from sector collection',
         accessType: 'READ',
         accepts: [
@@ -24,12 +24,35 @@ module.exports = Self => {
         },
     });
 
-    Self.getFromSectorCollection = async(sectorCollectionFk, sectorFk, options) => {
+    Self.getFromSectorCollection = async(ctx, sectorCollectionFk, sectorFk, options) => {
         const myOptions = {};
+        const userId = ctx.req.accessToken.userId;
 
         if (typeof options == 'object') Object.assign(myOptions, options);
 
-        const [sales] = await Self.rawSql('CALL vn.sectorCollection_getSale(?)', [sectorCollectionFk]);
+        const sales = await Self.rawSql(
+            `SELECT s.ticketFk,
+                    s.itemFk,
+                    i.longName,
+                    itemPackingTypeFk,
+                    subName,
+                    s.quantity,
+                    w.code workerCode,
+                    sgd.saleFk,
+                    iss.quantity pickedQuantity,
+                    c.salesPersonFk
+                FROM vn.sale s
+                    JOIN item i ON i.id = s.itemFk
+                    JOIN saleGroupDetail sgd ON sgd.saleFk = s.id
+                    JOIN sectorCollectionSaleGroup scsg ON scsg.saleGroupFk = sgd.saleGroupFk
+                    JOIN saleTracking st ON st.saleFk = s.id
+                    JOIN state stt ON stt.id = st.stateFk AND stt.code = 'PREVIOUS_PREPARATION'
+                    JOIN worker w ON w.id = st.workerFk
+                    JOIN ticket t ON t.id= s.ticketFk
+                    JOIN client c ON c.id=t.clientFk
+                    LEFT JOIN itemShelvingSaleSum iss ON iss.saleFk = s.id
+                WHERE scsg.sectorCollectionFk = ?
+                    AND st.workerFk = ?;`, [sectorCollectionFk, userId]);
 
         const itemShelvings = [];
         for (let sale of sales) {