Merge remote-tracking branch 'origin/master'

# Conflicts:
#	common/index.ets

common/index.ets

@@ -30,4 +30,6 @@ export {Wzhxdm} from './src/main/ets/entity/Wzhxdm';
 export {DrInfo} from './src/main/ets/entity/DrInfo';
 export {Wzcrk} from './src/main/ets/entity/Wzcrk';
 export {Wzcrkmx} from './src/main/ets/entity/Wzcrkmx';
-export {pzlx_dict,szlx_dict, zmlx_dict} from './src/main/ets/utils/dict';
\ No newline at end of file
+export {DsRfid} from './src/main/ets/entity/DsRfid';
+export {DsRfidDao} from './src/main/ets/db/dao/DsRfidDao';
+export {pzlx_dict} from './src/main/ets/utils/dict';
\ No newline at end of file

entry/src/main/ets/model/DsRfidModel.ets

+import { uuid } from '@ohos/common/src/main/ets/utils/util'
+import { DsRfid,SQLiteContext, DsRfidDao,Logger } from '@ohos/common'
+class DsRfidModel {
+  // 添加识别的物资RFID点数数据服务
+  async set(data: DsRfid) {
+    data.guid=uuid()
+    await SQLiteContext.with(DsRfidDao).insert(data)
+  }
+}
\ No newline at end of file

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

 import { TitleBar } from '../../view/title/TitleBar'
 import { BasicTable } from '../../view/BasicTable/BasicTable'
 import {analysisQrCode}  from '../../identify/analysis/analysis_QR_code'
+import wzcrkModel from '../../model/WzcrkModel';
 import {
-  Logger
+  DsRfid,Logger
 } from '@ohos/common';
+import IdentifyService from '../../identify/IdentifySerivce'
+import emitter from '@ohos.events.emitter';
 @Extend(Button) function CommonButtonStyle() {
   .borderWidth(2)
   .borderColor('#0fa983')
@@ -19,8 +22,10 @@ struct  UHFScanPage{
   @State fontColor: string = '#0FA983'
   @State selectedFontColor: string = '#fff'
   @State currentIndex: number = 0
+  @State hjRfidList:DsRfid[]=[]
   private controller: TabsController = new TabsController()
   private  searchcontroller: SearchController = new SearchController()
+  @State doneEpcsList: string[] = []
   @Builder TabBuilder(index: number, name: string) {
     Column() {
       Text(name)
@@ -33,6 +38,24 @@ struct  UHFScanPage{
     .borderRadius(3)
     .backgroundColor(this.currentIndex === index ? this.fontColor : '#00000000')
   }
+  @Builder wzListView(item?:DsRfid){
+    Flex({ direction: FlexDirection.Column}) {
+      Flex({ justifyContent: FlexAlign.SpaceBetween, alignItems: ItemAlign.Center }) {
+        Checkbox({ name: 'checkbox1', group: 'checkboxGroup' })
+          .selectedColor('#007DFF')
+          .onChange((value: boolean) => {
+            console.info('Checkbox1 change is' + value)
+          }).margin({ right: 10,left: 10 })
+        Column(){
+          Text("07常服").fontColor($r("app.color.item_color_black")).textAlign(TextAlign.Start).width("100%")
+          Text("无号配号").fontColor($r("app.color.item_color_black")).textAlign(TextAlign.Start).width("100%").padding({top:10})
+        }.width("50%")
+        Text("8").fontColor($r("app.color.item_color_black")).textAlign(TextAlign.Center).width("15%")
+        Text("5").fontColor($r("app.color.item_color_black")).textAlign(TextAlign.Center).width("15%")
+        Text("暂无").fontColor($r("app.color.item_color_black")).textAlign(TextAlign.Center).width("20%")
+      }.height("65").backgroundColor('#fff').padding({left:5,right:10,top:5,bottom:5})
+    }.margin({left:10,right:10})
+  }
   @Builder WzStatisticsView(){
     Flex({ direction: FlexDirection.Column}) {
       Flex({ justifyContent: FlexAlign.SpaceBetween, alignItems: ItemAlign.Center }) {
@@ -52,12 +75,17 @@ struct  UHFScanPage{
   @Builder ListHeadView(){
     Flex({ direction: FlexDirection.Column}) {
       Flex({ justifyContent: FlexAlign.SpaceBetween, alignItems: ItemAlign.Center }) {
+        CheckboxGroup({ group: 'checkboxGroup' })
+          .selectedColor('#007DFF')
+          .onChange((itemName: CheckboxGroupResult) => {
+            console.info("checkbox group content" + JSON.stringify(itemName))
+          })
         Text("品名/号型").fontColor($r("app.color.white")).textAlign(TextAlign.Start).width("50%")
         Text("箱号").fontColor($r("app.color.white")).textAlign(TextAlign.Center).width("15%")
         Text("数量").fontColor($r("app.color.white")).textAlign(TextAlign.Center).width("15%")
         Text("货位号").fontColor($r("app.color.white")).textAlign(TextAlign.Center).width("20%")
       }.width("100%").backgroundColor('#0fa983').padding({left:10,right:10,top:5,bottom:5})
-    }.height("40").margin({left:10,right:10})
+    }.height("50").margin({left:10,right:10,top:10})
   }
   build(){
     Column() {
@@ -78,20 +106,28 @@ struct  UHFScanPage{
             Text("RFID扫描：").fontColor($r("app.color.item_color_black")).textAlign(TextAlign.Start).width("100%")
             Row(){
               Text("停止").margin({left:5,right:5})
-              Toggle({ type: ToggleType.Switch, isOn: true })
+              Toggle({ type: ToggleType.Switch, isOn: false })
                 .selectedColor('#007DFF')
                 .switchPointColor('#FFFFFF')
                 .onChange((isOn: boolean) => {
-                  console.info('Component status:' + isOn)
+                  if(isOn){
+                    IdentifyService.openRFIDInv()
+                  }else {
+                    IdentifyService.stopRfidInv()
+                  }
+                  Logger.info('RFID开启状态:' + isOn)
                 })
               Text("开启").margin({left:5,right:5})
             }.width("100%")
           }.width("40%").margin({left:20,right:20})
         }.width("100%").height("10%").margin({top:10,left:10})
         this.ListHeadView()
-        Column(){
-          BasicTable({dataSource:[]})
-        }.flexGrow(1)
+        List(){
+          ForEach(this.doneEpcsList,(item,index)=>{
+            this.wzListView(item)
+          })
+        }.height("70%")
+
         Row() {
           Flex({ justifyContent: FlexAlign.SpaceEvenly, alignItems: ItemAlign.Center}) {
             Button("选择货位").CommonButtonStyle().width("45%")
@@ -99,18 +135,45 @@ struct  UHFScanPage{
           }
         }.margin({left:10,right:10}).height(80)
       }.width("100%")
-    }.linearGradient({
+    }.height('100%').linearGradient({
       direction: GradientDirection.Right, // 渐变方向
       repeating: true, // 渐变颜色是否重复
       colors: [['#36a3c0', 0.0], ['#97c6a6', 1.5], ['#c7d799', 2.0]] // 数组末尾元素占比小于1时满足重复着色效果
     })
   }
-  /*界面展示*/
-  onPageShow(){
-
+  rfidInvListen() {
+    var innerEvent = {eventId: 1 }
+    emitter.on(innerEvent, (eventData) => {
+      if(innerEvent.eventId==1){
+        let result = eventData.data.epc
+        console.log("射频扫码","收到EPC:" + result)
+        if(result!=undefined&&!this.doneEpcsList.includes(result)&&result.substring(0, 2)=='05'){
+          this.showList(result)
+        }
+      }
+    })
+  }
+  showList(epc?:string){
+    this.doneEpcsList.push(epc)
+  }
+  /*
+   * RFDID解析*/
+  async handleanalysisQrCode(rfid:string){
+    const res = await analysisQrCode(rfid, true)
+    console.log('RFDID解析返回数据', res)
+    if (res.data && res.data.length == 0) {
+      console.log('RFDID解析返回数据', res)
+      return
+    }
+  }
+  onPageShow() {
+    console.error("========onPageShow=========")
+    this.rfidInvListen()
+    IdentifyService.openRfidPort()
   }
-  /*界面关闭*/
   onPageHide(){
-
+    IdentifyService.closeRFIDInv()
+    /*取消盘点EPC订阅*/
+    emitter.off(1);
   }
 }
\ No newline at end of file

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

@@ -127,6 +127,7 @@ export struct Pmhx {
             return {
               ...row,
               sjlx:"导入",
+              wzct:"未完成",
             };
           });
           wzcrkModel.set(mappedRows)