node-red-trexmes-commands 1.3.0 → 1.4.0

package/package.json

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

package/trexcommands.html

@@ -417,7 +417,8 @@
                     { value: '15|Finish Test Mode', label: 'Finish Test Mode', hasValue: false },
                     { value: '16|Create Deffect', label: 'Create Deffect', hasValue: false },
                     { value: '100|Get Open Jobs', label: 'Get Open Jobs', hasValue: false },
-                    { value: '101|Get StopCause List', label: 'Get StopCause List', hasValue: false }                                                
+                    { value: '101|Get StopCause List', label: 'Get StopCause List', hasValue: false },
+                    { value: '102|Get PWorkstation List', label: 'Get PWorkstation List', hasValue: false }                                                                     
                 ],
                 typeField: $('#node-input-modeOptType'),
                 default: 'Load Job Plan'
@@ -471,9 +472,9 @@
                 else if(operationMode.startsWith('101|')) { //Get StopCause List
 					data = '{ "WorkstationId": 10 }';									
 				} 
-                else if(operationMode.startsWith('102|')) { //Get Employee List
-					data = '{ "WorkstationId": 10 }';									
-				}                 
+                else if(operationMode.startsWith('102|')) { //Get PWorkstation List
+                    data = '{}';
+                } 
 				node.editor.setValue(JSON.stringify(JSON.parse(data),null, 2));	
 
             });

package/trexcommands.js

@@ -34,8 +34,12 @@ module.exports = function (RED) {
     function checkPayload(payload) {
         let result = { "isOk" : false, "isGetFunc": false };
         if(!payload.WorkstationId){
-            return result;
+            if(payload.operationMode != "102" )
+            {
+                return result;
+            }
         }
+
         result.wsId = payload.WorkstationId;
 
         if(payload.operationMode == "1" ) { // Load Job Plan
@@ -121,7 +125,12 @@ module.exports = function (RED) {
             result.command = JSON.stringify({ "WorkstationId" : payload.WorkstationId });
             result.isOk = true;
             result.isGetFunc = true;
-        }                                       
+        } 
+        else if(payload.operationMode == "102" ) { // Get PWorkstation List
+            result.command = JSON.stringify({ });
+            result.isOk = true;
+            result.isGetFunc = true;
+        }                                        
         return result;
     }
 
@@ -278,6 +287,14 @@ module.exports = function (RED) {
 
     }
 
+    function sqlGeneratePWorkstationListQuery(record) {
+        let query = `select PWS.PWORKSTATIONID, PWS.PWORKSTATIONNO, 
+                    PWS.PWORKSTATIONNAME from PLINEDET PL inner join PWORKSTATION PWS 
+                    on PL.COMPANYID = PWS.COMPANYID and PL.PWORKSTATIONID = PWS.PWORKSTATIONID
+                    where PWS.COMPANYID= ${record.companyId} and PWS.STATUS = 2`;
+        return query;
+    }
+
     function connection(config) {
         RED.nodes.createNode(this, config);
         const node = this;
@@ -580,6 +597,10 @@ module.exports = function (RED) {
                     {
                         query = sqlGenerateStopCauseListQuery(record);    
                     }
+                    else if(record.cmdId == "102") 
+                    {
+                        query = sqlGeneratePWorkstationListQuery(record);    
+                    }
                 }
                 else {
                     query = sqlNgpCommandQueInsert(record);