握把按钮事件捕捉

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

@@ -47,6 +47,8 @@ export class DsRfidDao extends BaseTable<DsRfid> {
     let wp = this.getPredicates();
     if (wzcrkguid) {
       wp.equalTo('WZCRKGUID', wzcrkguid);
+    }else {
+      wp.equalTo('WZCRKGUID', '');
     }
     if (sjType == 0) {
       wp.equalTo("HWH", "暂无")

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

@@ -46,16 +46,33 @@ export class WzhxdmDao extends BaseTable<Wzhxdm> {
     return NativeSql.getWzhxdmTable();
   }
 
-  async selectHXList(sql?: string): Promise<Wzhxdm[]> {
-    let db = await this.futureDb;
-    let rs = await db.querySql(sql, this.getTableColumns());
-    let items: Wzhxdm[];
-    if (rs.goToFirstRow()) {
-      do {
-        Logger.info(this, 'queryAll rowIndex=' + rs.rowIndex)
-        items.push(this.toBean(rs))
-      } while (rs.goToNextRow())
-    }
-    return items;
+  async selectHXList(hx_map?: any): Promise<Wzhxdm[]> {
+    let wp = this.getPredicates();
+    if (hx_map) {
+      wp.equalTo('lsm', hx_map['wzdm']);
+      wp.or()
+      wp.in('lsm',[`${hx_map['pmdm_hxmc']}`])
+      wp.or()
+      wp.equalTo('pmdmten',hx_map['wzdm']);
+      wp.or()
+      wp.beginWrap()
+      wp.equalTo('wzpm', hx_map['wzdm'])
+      wp.and()
+      wp.equalTo("hxdm","0000")
+      wp.or()
+      wp.in("hxdm",[`${hx_map['pmdm_hxmc']}`])
+      wp.endWrap()
+      wp.or()
+      wp.beginWrap()
+      wp.equalTo('wzpm', hx_map['wzdm'])
+      wp.and()
+      wp.beginWrap()
+      wp.equalTo('hxmc', "无号配号")
+      wp.or()
+      wp.in('hxmc', [`${hx_map['pmdm_hxmc']}`])
+      wp.endWrap()
+      wp.endWrap()
+    }
+    return this.query(wp, this.getTableColumns())
   }
 }
\ No newline at end of file

entry/src/main/ets/identify/analysis/analysis_QR_code.ets

@@ -254,9 +254,9 @@ async function analysisQrCode(bqData:string, isData:boolean = false) {
   // let sql = `SELECT HXMC,PMDMTEN from TAB_XTWH_JCSJ_BZHX where WZPM='${hx_map.wzdm}'`
   // const allList = await selectInformationType("GY_M_PMV3", allsql)
   // const allList1 = await createOrFindSQL("GY_M_PMV3", allsql1)\
-  bzhxModal.queryLsm(str)
-  console.log('sql查询语句'+ sql)
-  let wzdmList = await bzhxModal.queryHXlist(sql)
+  // bzhxModal.queryLsm(str)
+  // console.log('sql查询语句'+ sql)
+  let wzdmList = await bzhxModal.queryHXlist(hx_map)
   console.log('sql查询结果'+JSON.stringify(wzdmList))
   if(!wzdmList){
     wzdmList=[]

entry/src/main/ets/model/BzhxModel.ets

@@ -39,8 +39,8 @@ class BzhxModel {
     Logger.info("查询LSM结果"+JSON.stringify(res))
     return res;
   }
-  async queryHXlist(sql?: string):Promise<Wzhxdm[]> {
-    let res = await SQLiteContext.with(WzhxdmDao).selectHXList(sql);
+  async queryHXlist(hx_map?: any):Promise<Wzhxdm[]> {
+    let res = await SQLiteContext.with(WzhxdmDao).selectHXList(hx_map);
     return res;
   }
   // 清空表

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

@@ -28,6 +28,8 @@ struct GoodsSelectHwPage{
   @State checkedList: Array<DsRfid> = []
   @State hwh:string=""
   aboutToAppear(){
+    this.scanCodeListen()
+    IdentifyService.openScanPort()
     this.checkedList= router.getParams()["checkArray"];
     this.model=router.getParams()["checkType"]
     this.getHwList()
@@ -148,6 +150,7 @@ struct GoodsSelectHwPage{
             .backgroundColor('#fff')
             .type(ButtonType.Normal)
             .onClick(() => {
+              IdentifyService.openScan()
               this.model = ! this.model
             })
         }.padding({left: 20, right: 20})
@@ -180,7 +183,15 @@ struct GoodsSelectHwPage{
         }
         .height(70)
       }.width("100%")
-    }.linearGradient({
+    }.onKeyEvent((e: globalThis.KeyEvent) => {
+      console.error('keycode====》:' + e.keyCode)
+      if (! this.model&&(e.keyCode == 2096 || e.keyCode == 2093)) {
+        if(e.type==1){
+          IdentifyService.openScan()
+        }
+      }
+      console.error('keycode====》:' + e.keyCode)
+    }).linearGradient({
       direction: GradientDirection.Right, // 渐变方向
       repeating: true, // 渐变颜色是否重复
       colors: [['#36a3c0', 0.0], ['#97c6a6', 1.0], ['#c7d799', 2.0]]// 数组末尾元素占比小于1时满足重复着色效果
@@ -201,8 +212,6 @@ struct GoodsSelectHwPage{
   }
   onPageShow() {
     console.error("========onPageShow=========")
-    this.scanCodeListen()
-    IdentifyService.openScanPort()
   }
 
   onPageHide() {

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

@@ -38,9 +38,21 @@ struct  UHFScanPage{
   @State hxTotal:number=0;
   @State xhTotal:number=0;
   @State sumTotal:number=0;
+  @State  wzcrkGuid:string="";
   aboutToAppear(){
     // this.getUPorDown()
-    this.wzcrk=router.getParams()["wzcrkItem"]
+    // this.wzcrk=router.getParams()["wzcrkItem"]
+    if (router && typeof router.getParams === 'function') {
+      const params = router.getParams();
+      if (params && params.hasOwnProperty("wzcrkItem")) {
+        this.wzcrk = params["wzcrkItem"];
+        this.wzcrkGuid=this.wzcrk?.guid
+      } else {
+        console.error("在路由参数中未找到 'wzcrkItem' 属性。");
+      }
+    } else {
+      console.error("Router 或 getParams() 方法未定义。");
+    }
   }
   /*统计品种，号型，箱号，数量*/
   async  countToal(){
@@ -51,8 +63,8 @@ struct  UHFScanPage{
   }
   /*获取上架或待上架数据*/
   async getUPorDown(){
-    this.rfidList=await dsRfidModel.queryDSJ(this.wzcrk.guid,this.currentIndex)
-    this.hjRfidList=await dsRfidModel.queryDSJ(this.wzcrk.guid)
+    this.rfidList=await dsRfidModel.queryDSJ(this.wzcrkGuid,this.currentIndex)
+    this.hjRfidList=await dsRfidModel.queryDSJ(this.wzcrkGuid)
     this.countToal()
   }
   @Builder TabBuilder(index: number, name: string) {
@@ -215,7 +227,8 @@ struct  UHFScanPage{
     this.doneEpcsList.push(epc)
     try {
       // this.handleanalysisQrCode("050400000000000016033C62BF2A111F0000A10040E220419000");
-      this.handleanalysisQrCode(epc);
+      this.handleanalysisQrCode('0504000D2490C80C56033C44FC1A111100096300E0D220713000');
+      IdentifyService.stopRfidInv()
 
     }catch (err){
       Logger.info("解析失败1"+epc+JSON.stringify(err))
@@ -232,6 +245,8 @@ struct  UHFScanPage{
     console.log("proEpc"+pro.strEpc)
     console.log("LSM"+pro.getiWzLsm())
     console.log("箱号===》"+pro.getiXangNo().toString())
+    const scan = await analysisQrCode(pro.getiWzLsm().toString(), true)
+    console.log('扫描返回数据', JSON.stringify(scan))
     const res = await bzhxModal.queryLsm(pro.getiWzLsm().toString())
     console.log('RFDID解析返回数据', res)
     if (res && res.length == 0) {
@@ -259,7 +274,7 @@ struct  UHFScanPage{
         }
         let params: DsRfid = {
           guid: uuid(),
-          wzcrkguid: this.wzcrk.guid,
+          wzcrkguid: this.wzcrkGuid,
           pmdmcode: item.pmdmTen,
           lsm: pro.getiWzLsm().toString(),
           pmmc: item.wzpm,