Index: ssts-web/src/main/webapp/disinfectsystem/packing/setPlugInRFID.js
===================================================================
diff -u -r34431 -r34447
--- ssts-web/src/main/webapp/disinfectsystem/packing/setPlugInRFID.js	(.../setPlugInRFID.js)	(revision 34431)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/setPlugInRFID.js	(.../setPlugInRFID.js)	(revision 34447)
@@ -150,7 +150,11 @@
                         if (usbVendorId == 6790 && usbProductId == 29987) {//桌面式 F5005-H
                             if (value.length > 20) {
                                 for (var i = 0; i < value.length; i++) {
-                                    dataString += value[i].toString(16)
+                                    if(value[i] > 9){
+                                        dataString += value[i].toString(16)
+                                    }else {
+                                        dataString += '0'+value[i].toString(16)
+                                    }
                                 }
                             } else {
                                 var isReturn;
@@ -188,15 +192,8 @@
                                 if (getAllData) {
                                     var newTid;
                                     if (dataString.indexOf('BB') >= 0) {
-                                        var tid;
-                                        dataString = dataString.substring(10, dataString.length);
-                                        var epc = dataString.substring(0, dataString.indexOf('CE2'));
-                                        if (dataString.indexOf('4D') > 0) {
-                                            tid = dataString.substring(dataString.indexOf('CE2') + 1, dataString.indexOf('4D') - 2);
-                                        } else {
-                                            tid = dataString.substring(dataString.indexOf('CE2') + 1, dataString.length - 2);
-                                        }
-                                        if (tid.length > 10 && dataString.indexOf('E') == 0) {
+                                        var tid = dataString.substring(36, 60);
+                                        if (tid.length == 24 && tid.indexOf('E') == 0) {
                                             newTid = tid || ''
                                         }
                                     }
@@ -406,11 +403,23 @@
     }
 }
 
-async function writeRFID(barcode) {
+async function writeRFID(barcode,uid) {
     if (!isStop) {
         showResult('请先停止读取标签!');
         return;
     }
+    if (uid.length !== 24) {
+        showResult('选择的标签有误!');
+        return;
+    }
+    var filterArr = [];
+    for(var i=0;i<uid.length/2;i++){
+        var start = i*2;
+        var end = start+1;
+        var hexValue = '0x'+uid[start]+uid[end];
+        var num = eval(hexValue).toString(10);
+        filterArr.push(parseInt(num));
+    }
     var { usbProductId, usbVendorId } = port.getInfo();
     if (usbVendorId == 6790 && usbProductId == 29987) {//桌面式 F5005-H
         var barcodeArr = stringtoArr(barcode);
@@ -421,9 +430,10 @@
             }
         }
         var arr = [187];
-        var arr1 = [26, 30, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0, 9];
+        var arr1 = [26, 42, 0, 0, 0, 0, 1, 0, 12];
+        var arr3 = [3, 0, 0, 0, 9];
 
-        var resultArr = arr1.concat(barcodeArr).concat(addArr);
+        var resultArr = arr1.concat(filterArr).concat(arr3).concat(barcodeArr).concat(addArr);
         var sum = eval(resultArr.join('+'));
         var str = sum.toString(16);
         var crc = str.substring(str.length - 2);