Merge branch 'master' of http://gitlab.sothing.top/Mmao/jump_hm_warehouse

common/src/main/ets/db/BaseTable.ets

@@ -57,12 +57,19 @@ export default abstract class BaseTable<T> implements ITable {
   }
 
   bindToValuesBucket(bucket: ValuesBucket, item: T) {
-    Logger.info(this, "表结构数据>>" + JSON.stringify(this.getTableColumns()))
     this.getTableColumns().forEach((col) => {
       bucket[col] = item[col]
     })
   }
 
+  toBucket(bucket: ValuesBucket, item: T): ValuesBucket {
+    this.getTableColumns().forEach((col) => {
+      bucket[col] = item[col]
+    })
+    return bucket;
+  }
+
+
   /**
    * 清空表
    */
@@ -92,6 +99,27 @@ export default abstract class BaseTable<T> implements ITable {
   }
 
   /**
+   * 插入数据
+   * @param item 插入对象
+   */
+  async batchInsert(item: T[]): Promise<number> {
+    Logger.info(this, '批量插入数据>>' + JSON.stringify(item))
+    let bucket = [];
+    if (item) {
+      item.forEach(it => {
+        let tmp = {};
+        bucket.push(this.toBucket(tmp, it));
+      })
+      Logger.info(this, '绑定到Bucket数据>>' + JSON.stringify(bucket))
+      let db = await this.futureDb;
+      return db.batchInsert(this.tableName, bucket);
+    } else {
+      throw new Error('插入数据为空');
+    }
+  }
+
+
+  /**
    * 删除数据
    */
   async delete(item: T): Promise<number> {

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

 import relationalStore from '@ohos.data.relationalStore';
 import { DwInfo } from '../../entity/DwInfo';
-import { Logger } from '../../utils/Logger';
 import BaseTable, { ValueType } from '../BaseTable';
 import { Table } from '../decorator/Decorators';
-import { BaseSql } from '../sql/BaseSql';
 
 /**
  * 单位的数据层

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

 import { TitleBar } from '../../view/title/TitleBar'
 import { BasicTable } from '../../view/BasicTable/BasicTable'
+import router from '@ohos.router'
+import url from '@ohos.url'
 
 @Extend(Button) function CommonButtonStyle() {
   .borderWidth(2)
@@ -301,7 +303,9 @@ export struct AddTemporaryInPage {
           this.currentIndex = index
         })
           Flex({ justifyContent: FlexAlign.SpaceEvenly, alignItems: ItemAlign.Center }) {
-            Button("射频扫码").CommonButtonStyle().width("45%")
+            Button("射频扫码").CommonButtonStyle().width("45%").onClick(()=>{
+              router.pushUrl({url:'pages/metailmange/UHFScanPage'})
+            })
             Button("保存").CommonButtonStyle().width("45%")
           }.height(80).width("100%")
       }

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

 import { TitleBar } from '../../view/title/TitleBar'
 import { BasicTable } from '../../view/BasicTable/BasicTable'
+import router from '@ohos.router'
+
 @Extend(Button) function CommonButtonStyle() {
   .borderWidth(2)
   .borderColor('#0fa983')
@@ -290,7 +292,9 @@ struct AddTemporaryOutPage{
         })
         Row() {
           Flex({ justifyContent: FlexAlign.SpaceEvenly, alignItems: ItemAlign.Center }) {
-            Button("射频扫码").CommonButtonStyle().width("50%")
+            Button("射频扫码").CommonButtonStyle().width("50%").onClick(()=>{
+              router.pushUrl({url:'pages/metailmange/UHFScanPage'})
+            })
             Button("保存").CommonButtonStyle().width("50%")
           }
         }.margin({left:20,right:20}).height(80)

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

+import { TitleBar } from '../../view/title/TitleBar'
+import { BasicTable } from '../../view/BasicTable/BasicTable'
+@Extend(Button) function CommonButtonStyle() {
+  .borderWidth(2)
+  .borderColor('#0fa983')
+  .backgroundColor('#97c6a6')
+  .fontColor('#fff')
+  .borderRadius(5)
+  .type(ButtonType.Normal)
+  .stateEffect(true)
+}
+@Entry
+@Component
+struct  UHFScanPage{
+  @State fontColor: string = '#0FA983'
+  @State selectedFontColor: string = '#fff'
+  @State currentIndex: number = 0
+  private controller: TabsController = new TabsController()
+  private  searchcontroller: SearchController = new SearchController()
+  @Builder TabBuilder(index: number, name: string) {
+    Column() {
+      Text(name)
+        .fontColor(this.currentIndex === index ? this.selectedFontColor : this.fontColor)
+        .fontSize(21)
+        .lineHeight(36)
+    } .width('100%')
+    .height(45)
+    .border({ width: 2, color: 'rgb(15, 169, 131)' })
+    .borderRadius(3)
+    .backgroundColor(this.currentIndex === index ? this.fontColor : '#00000000')
+  }
+  @Builder WzStatisticsView(){
+    Flex({ direction: FlexDirection.Column}) {
+      Flex({ justifyContent: FlexAlign.SpaceBetween, alignItems: ItemAlign.Center }) {
+        Text("品种/个").fontColor($r("app.color.white")).textAlign(TextAlign.Center).width("25%")
+        Text("号型/种").fontColor($r("app.color.white")).textAlign(TextAlign.Center).width("25%")
+        Text("箱号/个").fontColor($r("app.color.white")).textAlign(TextAlign.Center).width("25%")
+        Text("数量/个").fontColor($r("app.color.white")).textAlign(TextAlign.Center).width("25%")
+      }.borderRadius({ topLeft:6, topRight: 6 }).width("100%").backgroundColor('#0fa983').padding({left:10,right:10,top:5,bottom:5})
+      Flex({ justifyContent: FlexAlign.SpaceBetween, alignItems: ItemAlign.Center }) {
+        Text("0").fontColor('#0fa983').textAlign(TextAlign.Center).width("25%")
+        Text("0").fontColor('#0fa983').textAlign(TextAlign.Center).width("25%")
+        Text("0").fontColor('#0fa983').textAlign(TextAlign.Center).width("25%")
+        Text("0").fontColor('#0fa983').textAlign(TextAlign.Center).width("25%")
+      }.borderRadius({ bottomLeft:6, bottomRight: 6 }).width("100%").backgroundColor($r("app.color.white")).padding({left:10,right:10,top:5,bottom:5})
+    }.height(80).margin({left:10,right:10})
+  }
+  @Builder ListHeadView(){
+    Flex({ direction: FlexDirection.Column}) {
+      Flex({ justifyContent: FlexAlign.SpaceBetween, alignItems: ItemAlign.Center }) {
+        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})
+  }
+  build(){
+    Column() {
+      Flex({ direction: FlexDirection.Column }) {
+        TitleBar({ title: "射频扫码"})
+        this.WzStatisticsView()
+        Flex({ direction: FlexDirection.Row}) {
+          Tabs({ barPosition: BarPosition.Start, controller: this.controller }) {
+            TabContent() {
+            }.tabBar(this.TabBuilder(0, '待上架'))
+            TabContent() {
+            }.tabBar(this.TabBuilder(1, '已上架'))
+          }
+          .onChange((index: number) => {
+            this.currentIndex = index
+          }).width("60%")
+          Column(){
+            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 })
+                .selectedColor('#007DFF')
+                .switchPointColor('#FFFFFF')
+                .onChange((isOn: boolean) => {
+                  console.info('Component status:' + 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)
+        Row() {
+          Flex({ justifyContent: FlexAlign.SpaceEvenly, alignItems: ItemAlign.Center }) {
+            Button("选择货位").CommonButtonStyle().width("50%")
+            Button("扫货位码").CommonButtonStyle().width("50%")
+          }
+        }.margin({left:10,right:10}).height(80)
+      }.width("100%")
+    }.linearGradient({
+      direction: GradientDirection.Right, // 渐变方向
+      repeating: true, // 渐变颜色是否重复
+      colors: [[0x36a3c0, 0.0], [0x97c6a6, 1], [0xc7d799, 0.0]] // 数组末尾元素占比小于1时满足重复着色效果
+    })
+  }
+}
\ No newline at end of file

entry/src/main/ets/pages/order_detail/PzInOutDetailPage.ets

@@ -287,7 +287,9 @@ struct PzInOutDetailPage{
         })
         Row() {
           Flex({ justifyContent: FlexAlign.SpaceEvenly, alignItems: ItemAlign.Center }) {
-            Button("射频扫码").CommonButtonStyle().width("50%")
+            Button("射频扫码").CommonButtonStyle().width("50%").onClick(()=>{
+              router.pushUrl({url:'pages/metailmange/UHFScanPage'})
+            })
             Button("保存").CommonButtonStyle().width("50%")
           }
         }.margin({left:10,right:10}).height(80)

entry/src/main/resources/base/profile/main_pages.json

@@ -33,6 +33,7 @@
     "pages/order_detail/PzPourStoragePage",
     "pages/sub_systemMaintenance/Version",
     "pages/sub_systemMaintenance/Feedback",
-    "pages/metailmange/WzStatus"
+    "pages/metailmange/WzStatus",
+    "pages/metailmange/UHFScanPage"
   ]
 }