node-red-trexmes-commands 1.5.2 → 1.5.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-red-trexmes-commands",
-  "version": "1.5.2",
+  "version": "1.5.4",
   "description": "A node-red node to execute commands for Trex Mes Systems",
   "main": "trexcommands.js",
   "dependencies": {

package/trexcommands.html

@@ -464,7 +464,7 @@
 					data = '{ "WorkstationId": 10 }';									
 				} 
                 else if(operationMode.startsWith('16|')) { //Create Deffect
-					data = '{ "WorkstationId": 10, "DefectId": 11,"StockId": 12, "Quantity": 15.5 }';									
+					data = '{ "WorkstationId": 10, "JobOrderId": 123456, "DefectId": 11,"StockId": 12, "Quantity": 15.5 }';									
 				}  
                 else if(operationMode.startsWith('100|')) { //Get Open Jobs
 					data = '{ "WorkstationId": 10 }';		

package/trexcommands.js

@@ -107,13 +107,16 @@ module.exports = function (RED) {
             if(!payload.DefectId){
                 return result;
             }
+            if(!payload.JobOrderId){
+                return result;
+            }
             if(!payload.StockId){
                 return result;
             }
             if(!payload.Quantity){
                 return result;
             }
-            result.command = JSON.stringify({ "WorkstationId" : payload.WorkstationId, "DefectId": payload.DefectId, "StockId": payload.StockId, "Quantity": payload.Quantity, "ReferenceQuantityType": 0 });
+            result.command = JSON.stringify({ "WorkstationId" : payload.WorkstationId, "JobOrderId":payload.JobOrderId, "DefectId": payload.DefectId, "StockId": payload.StockId, "Quantity": payload.Quantity, "ReferenceQuantityType": 0 });
             result.isOk = true;
         } 
         else if(payload.operationMode == "100" ) { // Get Open Jobs
@@ -214,7 +217,9 @@ module.exports = function (RED) {
                     FROM PLINETOP WITH (NOLOCK) 
                     LEFT OUTER JOIN PLINEDET WITH (NOLOCK) ON PLINETOP.COMPANYID = PLINEDET.COMPANYID AND PLINEDET.PLINEID = PLINETOP.PLINEID 
                     WHERE PLINEDET.COMPANYID = ${record.companyId} AND PLINEDET.PWORKSTATIONID = ${record.wsId} 
-                    ORDER BY PLINETOP.PLINENO `;
+                    ORDER BY PLINETOP.PLINENO 
+                    SET @SqlPWorkStation = ISNULL(@SqlPWorkStation,${record.wsId})
+                    `;
 
         query = query + ` SELECT ${SqlIsYuklemeSirasi} A.PWORKSTATIONID, PW.PWORKSTATIONNO, A.SORTID, A.PID, A.DESCRIPTION, A.WORKSTARTDATE, A.PSTOPCAUSEID, A.SETUPDURATION, A.EMPDURATION,
             A.SPEED, A.PJOBORDERID, PJB.PROORDERSNO, PJB.TRANSCODE, A.PEQUIPMENTID, PE.PEQUIPMENTNO, A.DURATION, A.FPLANSTARTDATE, A.REQWORKEMPCOUNT, A.ITEMNO, A.PLANSHIFT, A.PLANWEEK, A.PLANDAY, A.PRIORITY,
@@ -258,7 +263,7 @@ module.exports = function (RED) {
         }
 
         query += " ORDER BY A.STARTDATE, ISNULL(A.SORTID,A.PID)"; 
-
+        
         return query;
     }