出库与入库顺序互换

common/src/main/ets/db/dao/DsRfidDao.ets

@@ -13,6 +13,7 @@ export class DsRfidDao extends BaseTable<DsRfid> {
       guid: cursor.getString(cursor.getColumnIndex('guid')),
       wzcrkguid: cursor.getString(cursor.getColumnIndex('wzcrkguid')),
       pmdmcode: cursor.getString(cursor.getColumnIndex('pmdmcode')),
+      lsm: cursor.getString(cursor.getColumnIndex('lsm')),
       pmmc: cursor.getString(cursor.getColumnIndex('pmmc')),
       pmdm: cursor.getString(cursor.getColumnIndex('pmdm')),
       hxmc: cursor.getString(cursor.getColumnIndex('hxmc')),
@@ -34,7 +35,7 @@ export class DsRfidDao extends BaseTable<DsRfid> {
   }
 
   getTableColumns(): string[] {
-    return ['guid', 'wzcrkguid', 'pmdmcode', 'pmmc', 'pmdm', 'hxmc', 'xh', 'sl', 'hwh', 'epc', 'subepc']
+    return ['guid', 'wzcrkguid', 'pmdmcode', 'lsm','pmmc', 'pmdm', 'hxmc', 'xh', 'sl', 'hwh', 'epc', 'subepc']
   }
 
   getCreateTableSql(): string {
@@ -42,6 +43,7 @@ export class DsRfidDao extends BaseTable<DsRfid> {
 							"GUID" TEXT NOT NULL PRIMARY KEY,
 							"WZCRKGUID" TEXT,
 							"PMDMCODE" TEXT,
+							"LSM" TEXT,
 							"PMMC" TEXT,
 							"PMDM" TEXT,
 							"HXMC" TEXT,

common/src/main/ets/db/dao/WzcrkmxDao.ets

@@ -21,7 +21,8 @@ export class WzcrkmxDao extends BaseTable<Wzcrkmx> {
       crksl: cursor.getLong(cursor.getColumnIndex('crksl')),
       wzcrkguid: cursor.getString(cursor.getColumnIndex('wzcrkguid')),
       hwh: cursor.getString(cursor.getColumnIndex('hwh')),
-      pzmxguid: cursor.getString(cursor.getColumnIndex('pzmxguid'))
+      pzmxguid: cursor.getString(cursor.getColumnIndex('pzmxguid')),
+      wzdm: cursor.getString(cursor.getColumnIndex('wzdm')),
     };
     return info;
   }
@@ -35,7 +36,7 @@ export class WzcrkmxDao extends BaseTable<Wzcrkmx> {
   }
 
   getTableColumns(): string[] {
-    return ['guid', 'gznd', 'pmdmcode', 'pzsl', 'crksl', 'wzcrkguid', 'hwh', 'pzmxguid']
+    return ['guid', 'gznd', 'pmdmcode', 'pzsl', 'crksl', 'wzcrkguid', 'hwh', 'pzmxguid','wzdm']
   }
 
   getCreateTableSql(): string {

common/src/main/ets/entity/DsRfid.ts

@@ -12,6 +12,10 @@ export interface DsRfid {
    */
   pmdmcode: string,
   /**
+   * LSM
+   */
+  lsm: string,
+  /**
    * 品名名称
    */
   pmmc: string,

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

@@ -99,7 +99,8 @@ struct GoodsSelectHwPage{
         pmdmcode: row.pmdmcode,
         hwh: this.hwh,
         wzcrkguid: row.wzcrkguid,
-        pzmxguid: ''
+        pzmxguid: '',
+        wzdm: '',
       }
       Logger.info("插入不存在数据===》"+JSON.stringify(wzcrxmx))
       wzcrkmxModel.setInsert(wzcrxmx)

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

@@ -214,10 +214,8 @@ struct  UHFScanPage{
     this.doneEpcsList.push(epc)
     try {
       // this.handleanalysisQrCode("050400000000000016033C62BF2A111F0000A10040E220419000");
-      const [filterData] = this.hjRfidList.filter(fItem => fItem.epc == epc)
-      if (!filterData) {
-        this.handleanalysisQrCode(epc);
-      }
+      this.handleanalysisQrCode(epc);
+
     }catch (err){
       Logger.info("解析失败1"+epc+JSON.stringify(err))
       console.error("Stack Trace1:", err.stack);
@@ -232,7 +230,11 @@ 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;
+    }
     const res = await bzhxModal.queryLsm(pro.getiWzLsm().toString())
     console.log('RFDID解析返回数据', res)
     if (res && res.length == 0) {
@@ -245,6 +247,7 @@ struct  UHFScanPage{
           guid: uuid(),
           wzcrkguid: this.wzcrk.guid,
           pmdmcode: item.pmdmTen,
+          lsm: pro.getiWzLsm().toString(),
           pmmc: item.wzpm,
           pmdm: item.wzpm,
           hxmc: item.hxmc,
@@ -260,6 +263,7 @@ struct  UHFScanPage{
           guid: params.guid,
           wzcrkguid: params.wzcrkguid,
           pmdmcode: params.pmdmcode,
+          lsm: params.lsm,
           pmmc: params.pmmc,
           pmdm: params.pmdm,
           hxmc: params.hxmc,