Merge remote-tracking branch 'origin/master'

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

@@ -131,7 +131,7 @@ export class ScanAnalysis {
     let p = new Promise(function (resolve, reject) {
       setTimeout(function () {
         resolve(1)
-      }, 200)
+      }, 300)
     }).then(undefined, (error) => {
     })
     return p;

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

@@ -52,7 +52,7 @@ async function analysisQrCode(bqData:string, isData:boolean = false) {
   var result = {}as any
   // TODO 标签解析
   // 07A00120轻便作战靴A002889000004A006290A010202303A005军委机关
-  var str = bqData
+  var str = bqData.replace(/[\x04\x1D\x1E\x1F]/g, '')
   console.log("str=======>"+str)
   // 移除特定字符
   // str = replaceAll(str, "", "");
@@ -256,6 +256,7 @@ async function analysisQrCode(bqData:string, isData:boolean = false) {
   // const allList1 = await createOrFindSQL("GY_M_PMV3", allsql1)\
   // bzhxModal.queryLsm(str)
   // console.log('sql查询语句'+ sql)
+  console.log('解析结果'+JSON.stringify(str))
   let wzdmList = await bzhxModal.queryHXlist(hx_map)
   console.log('sql查询结果'+JSON.stringify(wzdmList))
   if(!wzdmList){

entry/src/main/ets/pages/metailmange/WzInPage/WzinDetail/WzinDetail.ets

@@ -38,8 +38,9 @@ struct WzinDetail {
   @State isUpdate: boolean = false
   @State wzcrk: WzClass = null // 物资出入库单据信息
   @State wzmx: WzmxClass[] = [] // 物资出入库明细
-  wzcrkmxDao: WzcrkmxDao = SQLiteContext.with(WzcrkmxDao)
+
   private controller: TabsController = new TabsController()
+  wzcrkmxDao: WzcrkmxDao = SQLiteContext.with(WzcrkmxDao)
 
   onPageShow() {
     const params = router.getParams() as params
@@ -169,8 +170,11 @@ struct WzinDetail {
       }.width("100%")
     }.onKeyEvent((e: globalThis.KeyEvent) => {
       console.error('keycode====》:' + e.keyCode)
-      if (this.currentIndex == 1 && (e.keyCode == 2096 || e.keyCode == 2093)) {
-        if (e.type == 1) {
+      if ((e.keyCode == 2096 || e.keyCode == 2093)) {
+        if(e.type==1){
+          if(this.currentIndex==0){
+            this.currentIndex=1
+          }
           IdentifyService.openScan()
         }
       }