Merge remote-tracking branch 'origin/master'

common/src/main/ets/utils/HttpUtil.ets

@@ -35,6 +35,7 @@ export async function httpPost(url: string, extraData) {
     connectTimeout: CommonConstant.CONNECT_TIMEOUT
   } as http.HttpRequestOptions;
   try {
+    console.error('--------DDD--------:' + CommonConstant.SERVER + url, options)
     let result = await request.request(CommonConstant.SERVER + url, options);
     if (result && result.responseCode === CommonConstant.SUCCESS_CODE) {
       return result;

entry/src/main/ets/entryability/EntryAbility.ets

@@ -10,7 +10,7 @@ export default class EntryAbility extends UIAbility {
   onCreate(want, launchParam) {
     hilog.info(0x0000, 'testTag', '%{public}s', 'Ability onCreate');
     // 初始化数据库
-    database.initDB(this.context)
+    // database.initDB(this.context)
   }
 
   onDestroy() {

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/ets/pages/sub_systemMaintenance/DataSynchronism/DataSynchronism.ets

@@ -3,6 +3,7 @@ import { TitleBar } from '../../../view/title/TitleBar'
 import { TipDialog } from '../../../view/TipDialog/TipDialog'
 import { ListDialog } from './ListDialog'
 import { listData } from './sync.data'
+import  { httpPost } from "@ohos/common/src/main/ets/utils/HttpUtil"
 
 @Extend(Button) function CommonButtonStyle() {
   .borderWidth(2)
@@ -59,8 +60,14 @@ export struct DataSynchronism {
     console.log("onSubmit")
   }
 
-  handleClick(item) {
+ async handleClick(item) {
     switch (item.title) {
+
+      case "基础信息":
+       const res =  await httpPost("/template/billOfDocument",{})
+        console.log("基础信息参数：", JSON.stringify(res))
+        break;
+
       case "删除表结构":
         if (this.dialogController != undefined) {
           this.content = '是否确定清除数据并删除表结构'
@@ -70,7 +77,7 @@ export struct DataSynchronism {
 
       case "新建表结构":
         if (this.dialogController != undefined) {
-          this.content = '请先确认新建前是否删除表结构。'
+          this.content = '请先确认新建前是否删除表结构'
           this.dialogController.open()
         }
         break;

entry/src/main/ets/view/demo/demo.ets

@@ -5,7 +5,6 @@ export struct Demo {
   itemClick: () => void
 
   build() {
-
       Column() {
         Flex({ justifyContent: FlexAlign.Start, alignItems: ItemAlign.Center }) {
           CheckboxGroup({ group: 'checkboxGroup' })

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"
   ]
 }