zhl-methods 1.1.11 → 1.1.12

package/VERSION.md

@@ -2,6 +2,10 @@
 
 版本更新日志
 
+### 1.1.12
+
+- ScanUDI 方法 增加检测 日期是否正确 错误返回 msg
+
 ### 1.1.11
 
 - numberToPrice 方法 增加支持 字符串

package/js/ScanUDI.js

@@ -20,16 +20,22 @@ export default class ScanUDI {
     if ((str && str.length < 8) || !str) {
       return `请输入正确的条形码${str}`;
     }
-    let upc = "",
-      sku_number = "",
-      manufacture_time = "",
-      expiry_time = "",
-      batch_no = "",
-      serial_no = "";
+    this.upc = "";
+    this.sku_number = "";
+    this.manufacture_time = "";
+    this.expiry_time = "";
+    this.batch_no = "";
+    this.serial_no = "";
+    this.msg = "";
     // 净里镜内部编码
     if (str.includes("/")) {
-      [upc, sku_number, manufacture_time, expiry_time, batch_no, serial_no] =
-        str.split("/");
+      let arr = str.split("/");
+      this.upc = arr[0];
+      this.sku_number = arr[1];
+      this.manufacture_time = arr[2];
+      this.expiry_time = arr[3];
+      this.batch_no = arr[4];
+      this.serial_no = arr[5];
     } else if (str.includes("(")) {
       const regex = /\((\d{2})\)([^($$)]+)/g;
       let match;
@@ -37,11 +43,11 @@ export default class ScanUDI {
       while ((match = regex.exec(str)) !== null) {
         obj[match[1]] = match[2];
       }
-      upc = obj["01"];
-      manufacture_time = obj["11"];
-      expiry_time = obj["17"];
-      batch_no = obj["10"];
-      serial_no = obj["21"];
+      this.upc = obj["01"];
+      this.manufacture_time = obj["11"];
+      this.expiry_time = obj["17"];
+      this.batch_no = obj["10"];
+      this.serial_no = obj["21"];
     } else {
       if (
         this.rules.every(
@@ -52,19 +58,25 @@ export default class ScanUDI {
       }
       this.rules.forEach((v) => {
         if (str.length == v.length && str.substring(0, 2) == v.start_value) {
-          upc = str.substr(v.upc_rule.start, v.upc_rule.length);
-          batch_no = str.substr(v.batch_no_rule.start, v.batch_no_rule.length);
+          this.upc = str.substr(v.upc_rule.start, v.upc_rule.length);
+          this.batch_no = str.substr(
+            v.batch_no_rule.start,
+            v.batch_no_rule.length
+          );
           if (v.manufacture_rule) {
-            manufacture_time = str.substr(
+            this.manufacture_time = str.substr(
               v.manufacture_rule.start,
               v.manufacture_rule.length
             );
           }
           if (v.expiry_rule) {
-            expiry_time = str.substr(v.expiry_rule.start, v.expiry_rule.length);
+            this.expiry_time = str.substr(
+              v.expiry_rule.start,
+              v.expiry_rule.length
+            );
           }
           if (v.serial_no_rule) {
-            serial_no = str.substr(
+            this.serial_no = str.substr(
               v.serial_no_rule.start,
               v.serial_no_rule.length
             );
@@ -73,17 +85,22 @@ export default class ScanUDI {
       });
     }
     let obj = {
-      upc: this.removeFrontZeros(upc),
-      sku_number,
+      upc: this.removeFrontZeros(this.upc),
+      sku_number: this.sku_number,
       manufacture_time: this.setDateFormat(
-        manufacture_time,
+        this.manufacture_time,
         "manufacture",
-        expiry_time
+        this.expiry_time
+      ),
+      expiry_time: this.setDateFormat(
+        this.expiry_time,
+        "expiry",
+        this.manufacture_time
       ),
-      expiry_time: this.setDateFormat(expiry_time, "expiry", manufacture_time),
-      batch_no: batch_no.toUpperCase(),
-      serial_no,
+      batch_no: this.batch_no.toUpperCase(),
+      serial_no: this.serial_no,
       udi: str.replace(/[^a-zA-Z0-9]/g, ""),
+      msg: this.msg,
     };
     return obj;
   }
@@ -112,13 +129,22 @@ export default class ScanUDI {
           }
           date = "20" + date + "01";
         }
+        if (
+          dayjs(date).format("YYYY-MM-DD") == "Invalid Date" ||
+          dayjs(expand).format("YYYY-MM-DD") == "Invalid Date"
+        ) {
+          this.batch_no = "";
+          this.msg = "警告：批次信息解析失败，请手动填写";
+          return "";
+        }
+
         return dayjs(date).format("YYYY-MM-DD");
       } else {
         return "";
       }
     } catch (error) {
       console.log(error, "setDateFormat error");
-      return date;
+      return "";
     }
   }
   removeFrontZeros(str) {
@@ -130,6 +156,3 @@ export default class ScanUDI {
     }
   }
 }
-const scanudi = new ScanUDI({ rules: [] });
-
-console.log(scanudi.parse("(01)00047144050546(17)261002(11)241003(10)GJ24117"));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zhl-methods",
-  "version": "1.1.11",
+  "version": "1.1.12",
   "license": "ISC",
   "dependencies": {
     "dayjs": "^1.11.15",