node-red-trexmes-commands 1.5.1 → 1.5.3

package/package.json

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

package/trexcommands.html

@@ -419,7 +419,8 @@
                     { value: '100|Get Open Jobs', label: 'Get Open Jobs', hasValue: false },
                     { value: '101|Get StopCause List', label: 'Get StopCause List', hasValue: false },
                     { value: '102|Get PWorkstation List', label: 'Get PWorkstation List', hasValue: false },
-                    { value: '103|Get Station Status', label: 'Get Station Status', hasValue: false }                                                                                         
+                    { value: '103|Get Station Status', label: 'Get Station Status', hasValue: false },
+                    { value: '104|Get Employee List', label: 'Get Employee List', hasValue: false }                                                                                                                                                                                                      
                 ],
                 typeField: $('#node-input-modeOptType'),
                 default: 'Load Job Plan'
@@ -478,7 +479,10 @@
                 } 
                 else if(operationMode.startsWith('103|')) { //Get Station Status
 					data = '{ "WorkstationId": 10 }';									
-				}                   
+				} 
+                else if(operationMode.startsWith('104|')) { //Get Employee List
+                    data = '{}';
+                }                                   
 				node.editor.setValue(JSON.stringify(JSON.parse(data),null, 2));	
 
             });

package/trexcommands.js

@@ -34,7 +34,7 @@ module.exports = function (RED) {
     function checkPayload(payload) {
         let result = { "isOk" : false, "isGetFunc": false };
         if(!payload.WorkstationId){
-            if(payload.operationMode != "102" )
+            if(payload.operationMode != "102" && payload.operationMode != "104")
             {
                 return result;
             }
@@ -135,7 +135,12 @@ module.exports = function (RED) {
             result.command = JSON.stringify({ "WorkstationId" : payload.WorkstationId });
             result.isOk = true;
             result.isGetFunc = true;
-        }                                                
+        }  
+        else if(payload.operationMode == "104" ) { // Get Employee List
+            result.command = JSON.stringify({ });
+            result.isOk = true;
+            result.isGetFunc = true;
+        }                                                         
         return result;
     }
 
@@ -209,7 +214,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,
@@ -253,7 +260,7 @@ module.exports = function (RED) {
         }
 
         query += " ORDER BY A.STARTDATE, ISNULL(A.SORTID,A.PID)"; 
-
+        
         return query;
     }
 
@@ -470,6 +477,13 @@ module.exports = function (RED) {
         return query;
     }
 
+    function sqlGenerateEmployeeListQuery(record) {
+        let query = `select EMPLOYEEID,EMPLOYEENO,EMPLOYEENAME,
+                    QUALITYEMPLOYEE,MAINTEMPLOYEE,FORKLIFTEMPLOYEE,DEPARTMANID,PWORKCENTERID
+                    from EMPLOYEE where COMPANYID= ${record.companyId} and STATUS = 2`;
+        return query;
+    }
+
     function connection(config) {
         RED.nodes.createNode(this, config);
         const node = this;
@@ -776,7 +790,10 @@ module.exports = function (RED) {
                     }
                     else if (record.cmdId == "103") {
                         query = sqlGenerateStationStatusQuery(record);
-                    }                    
+                    } 
+                    else if (record.cmdId == "104") {
+                        query = sqlGenerateEmployeeListQuery(record);
+                    }                                       
                 }
                 else {
                     query = sqlNgpCommandQueInsert(record);