多标签处理

entry/src/main/ets/identify/analysis/label/ProductEpc196.ets

@@ -793,7 +793,6 @@ export default class ProductEpc196 {
    * @param strHexEpc
    */
   UnPackEpc(strHexEpc: string) {
-    console.log("196解析的EPC:"+strHexEpc)
     //获取EPC相同部分
     this.strSubEpc = strHexEpc.substring(0, 41) + strHexEpc.substring(43, 49);
     //将Epc转为2进制Epc编码

entry/src/main/ets/pages/metailmange/UHFScanPage.ets

@@ -52,6 +52,7 @@ struct  UHFScanPage{
   /*获取上架或待上架数据*/
   async getUPorDown(){
     this.rfidList=await dsRfidModel.queryDSJ(this.wzcrk.guid,this.currentIndex)
+    this.hjRfidList=await dsRfidModel.queryDSJ(this.wzcrk.guid)
     this.countToal()
   }
   @Builder TabBuilder(index: number, name: string) {
@@ -230,11 +231,7 @@ struct  UHFScanPage{
     pro.getInfoFormEpc();
     console.log("proEpc"+pro.strEpc)
     console.log("LSM"+pro.getiWzLsm())
-    const [filterData] = this.hjRfidList.filter(fItem => fItem.epc == epcstr||(fItem.lsm==pro.getiWzLsm().toString()&&fItem.xh===pro.getiXangNo().toString()))
-    if (filterData) {
-      Logger.info("标签过滤了====>"+`${pro.getiWzLsm().toString()}`+epcstr)
-      return;
-    }
+    console.log("箱号===》"+pro.getiXangNo().toString())
     const res = await bzhxModal.queryLsm(pro.getiWzLsm().toString())
     console.log('RFDID解析返回数据', res)
     if (res && res.length == 0) {
@@ -243,6 +240,23 @@ struct  UHFScanPage{
     }
     if (res && res.length > 0) {
       res.forEach((item) => {
+        Logger.info('添加wz数据1',pro.strEpc)
+        Logger.info('添加wz数据2',pro.strSubEpc)
+        const filterData = this.hjRfidList.filter(fItem => {
+          // 检查是否符合条件一或条件二
+          try {
+            Logger.info("执行结果2===》",fItem.subepc+'====>'+fItem.epc)
+            Logger.info("执行结果4===>",pro.strSubEpc+'====>'+pro.strEpc)
+          }catch (err){
+            Logger.info("ERR",JSON.stringify(err))
+            Logger.error("Stack Trace:", err.stack);
+          }
+          return fItem?.epc == pro.strEpc || fItem?.subepc == pro.strSubEpc;
+        });
+        if (filterData.length > 0) {
+          Logger.info("标签过滤了====>"+`${pro.getiWzLsm().toString()}`+epcstr)
+          return
+        }
         let params: DsRfid = {
           guid: uuid(),
           wzcrkguid: this.wzcrk.guid,
@@ -254,10 +268,10 @@ struct  UHFScanPage{
           xh: pro.getiXangNo().toString(),
           sl: pro.getiNum().toString(),
           hwh: "暂无",
-          epc: epcstr,
-          subepc: epcstr
+          epc: pro.strEpc,
+          subepc: pro.strSubEpc
         }
-        console.log('params', params)
+        console.log('存入params', JSON.stringify(params))
         dsRfidModel.set(params)
         const newParams: DsRfid = {
           guid: params.guid,
@@ -271,11 +285,23 @@ struct  UHFScanPage{
           sl: params.sl,
           hwh: "暂无",
           epc: params.epc,
-          subepc: params.subepc,
+          subepc: params.subepc
         }
-        this.hjRfidList.push(newParams)
-        this.rfidList.push(newParams)
-        this.countToal()
+        try {
+          if(this.hjRfidList==undefined){
+            this.hjRfidList=[]
+          }
+          this.hjRfidList.push(newParams)
+          console.log('params.epc', JSON.stringify(params.epc))
+          console.log('params.subepc', JSON.stringify(params.subepc))
+          console.log('new存入RFID统计', JSON.stringify(this.hjRfidList.length))
+          this.rfidList.push(newParams)
+          this.countToal()
+        }catch (err){
+          Logger.info("push报错===》"+JSON.stringify(err))
+          console.error("Stack Trace:", err.stack);
+        }
+
       })
     }
   }

entry/src/main/ets/pages/sub_systemMaintenance/DataSynchronism/DataSynchronism.ets

@@ -102,7 +102,6 @@ export struct Pmhx {
           await hwModel.clear();
           await hjModel.clear();
           await gldwModel.clear();
-          await dsRfidModel.clear();
           const res = await getPmList({ rows: 5000, page: 1 })
           // 获取品名
           const allData = JSON.parse(res).bzhxList as Bzhx[]
@@ -153,6 +152,7 @@ export struct Pmhx {
           this.showProgress = true
           await wzcrkModel.clear()
           await wzcrkmxModel.clear()
+          await dsRfidModel.clear()
           const { rows } = await getDjList({})
           // 使用map对rows进行操作
           const mappedRows = rows.map((row) => {