From 239e4412abbc7747744a433746864904848525a0 Mon Sep 17 00:00:00 2001
From: zhaohe <h_zhaohe@163.com>
Date: Sat, 5 Oct 2024 18:02:47 +0800
Subject: [PATCH] update

---
 scanresult.json                                    | 231 +++++++++++++++++++++
 .../ScanResultState.java                           |   8 +-
 2 files changed, 235 insertions(+), 4 deletions(-)
 create mode 100644 scanresult.json

diff --git a/scanresult.json b/scanresult.json
new file mode 100644
index 0000000..3114bf4
--- /dev/null
+++ b/scanresult.json
@@ -0,0 +1,231 @@
+{
+    "consumableState": {
+      "scanDate": "2024-10-05T09:53:00.511+00:00",
+      "tipGroup": [
+        {
+          "tipNum": 120
+        },
+        {
+          "tipNum": 120
+        },
+        {
+          "tipNum": 120
+        }
+      ],
+      "reactionPlateGroup": [
+        {
+          "projIndex": null,
+          "projName": null,
+          "lotId": "",
+          "color": "",
+          "editable": false,
+          "num": 0
+        },
+        {
+          "projIndex": null,
+          "projName": null,
+          "lotId": "",
+          "color": "",
+          "editable": false,
+          "num": 0
+        },
+        {
+          "projIndex": null,
+          "projName": null,
+          "lotId": "",
+          "color": "",
+          "editable": false,
+          "num": 0
+        },
+        {
+          "projIndex": null,
+          "projName": null,
+          "lotId": "",
+          "color": "",
+          "editable": false,
+          "num": 0
+        },
+        {
+          "projIndex": null,
+          "projName": null,
+          "lotId": "",
+          "color": "",
+          "editable": false,
+          "num": 0
+        },
+        {
+          "projIndex": null,
+          "projName": null,
+          "lotId": "",
+          "color": "",
+          "editable": false,
+          "num": 0
+        }
+      ],
+      "littBSGroup": [
+        {
+          "projIndex": null,
+          "projName": null,
+          "lotId": "",
+          "color": "",
+          "editable": false,
+          "num": 0
+        },
+        {
+          "projIndex": null,
+          "projName": null,
+          "lotId": "",
+          "color": "",
+          "editable": false,
+          "num": 0
+        },
+        {
+          "projIndex": null,
+          "projName": null,
+          "lotId": "",
+          "color": "",
+          "editable": false,
+          "num": 0
+        },
+        {
+          "projIndex": null,
+          "projName": null,
+          "lotId": "",
+          "color": "",
+          "editable": false,
+          "num": 0
+        },
+        {
+          "projIndex": null,
+          "projName": null,
+          "lotId": "",
+          "color": "",
+          "editable": false,
+          "num": 0
+        },
+        {
+          "projIndex": null,
+          "projName": null,
+          "lotId": "",
+          "color": "",
+          "editable": false,
+          "num": 0
+        }
+      ],
+      "larBSGroup": [
+        {
+          "projIndex": null,
+          "projName": null,
+          "lotId": "",
+          "color": "",
+          "num": 0,
+          "editable": false
+        },
+        {
+          "projIndex": null,
+          "projName": null,
+          "lotId": "",
+          "color": "",
+          "num": 0,
+          "editable": false
+        },
+        {
+          "projIndex": null,
+          "projName": null,
+          "lotId": "",
+          "color": "",
+          "num": 0,
+          "editable": false
+        },
+        {
+          "projIndex": null,
+          "projName": null,
+          "lotId": "",
+          "color": "",
+          "num": 0,
+          "editable": false
+        },
+        {
+          "projIndex": null,
+          "projName": null,
+          "lotId": "",
+          "color": "",
+          "num": 0,
+          "editable": false
+        },
+        {
+          "projIndex": null,
+          "projName": null,
+          "lotId": "",
+          "color": "",
+          "num": 0,
+          "editable": false
+        }
+      ]
+    },
+    "scanRawResult": {
+      "PBScanResult": [
+        null,
+        null,
+        null,
+        null,
+        null,
+        null
+      ],
+      "littBSScanResult": [
+        null,
+        null,
+        null,
+        null,
+        null,
+        null
+      ],
+      "larBSScanResult": [
+        null,
+        null,
+        null,
+        null,
+        null,
+        null
+      ]
+    },
+    "scanResult": [
+      {
+        "chNum": 0,
+        "state": "Empty",
+        "projIndex": null,
+        "lotId": null
+      },
+      {
+        "chNum": 1,
+        "state": "Empty",
+        "projIndex": null,
+        "lotId": null
+      },
+      {
+        "chNum": 2,
+        "state": "Empty",
+        "projIndex": null,
+        "lotId": null
+      },
+      {
+        "chNum": 3,
+        "state": "Empty",
+        "projIndex": null,
+        "lotId": null
+      },
+      {
+        "chNum": 4,
+        "state": "Empty",
+        "projIndex": null,
+        "lotId": null
+      },
+      {
+        "chNum": 5,
+        "state": "Empty",
+        "projIndex": null,
+        "lotId": null
+      }
+    ],
+    "$dataType": "HashMap"
+  }
\ No newline at end of file
diff --git a/src/main/java/a8k/service/appdevicectrl/type/app_consumables_mgr_service/ScanResultState.java b/src/main/java/a8k/service/appdevicectrl/type/app_consumables_mgr_service/ScanResultState.java
index 044af65..2873a3a 100644
--- a/src/main/java/a8k/service/appdevicectrl/type/app_consumables_mgr_service/ScanResultState.java
+++ b/src/main/java/a8k/service/appdevicectrl/type/app_consumables_mgr_service/ScanResultState.java
@@ -7,10 +7,10 @@ public enum ScanResultState {
 	LostReactionPlate, //丢弃反应板
 	ConsumableExpired, //耗材过期
 
-	LostLittSB, //丢失小缓冲液
-	LittSBLotIdIsMatch,//小缓冲液批号匹配
-	LostLarBS, //丢失大缓冲液
-	LarBSLotIdIsMatch,//大缓冲液批号匹配
+	LostLittSB, //缺少小缓冲液
+	LittSBLotIdIsNotMatch,//小缓冲液批号不匹配
+	LostLarBS, //缺少大缓冲液
+	LarBSLotIdIsNotMatch,//大缓冲液批号不匹配
 
 	NoMatchingProjIDCardFound,//未找到匹配的项目ID卡
 	ProjInfoIsInComplete,//项目信息不全