工序首页查询订单

entry/src/main/ets/common/component/OrderStatisticsComp.ets

@@ -1,6 +1,17 @@
 @Component
 export struct OrderStatisticsComp {
 
+  // 计划数量
+  @Link private planNum: number
+  // 完成数量
+  @Link private completeNum: number
+  // 报故数量
+  @Link private bugNum: number
+
+  aboutToAppear() {
+    console.log('testTag', '==p' + this.planNum + '==c' + this.completeNum + '==b' + this.bugNum )
+  }
+
   build(){
     //中间框
     Row(){
@@ -22,7 +33,7 @@ export struct OrderStatisticsComp {
           }.width('100%')
 
           .height('30%')
-          Text('100').width('80%')
+          Text(this.planNum.toString()).width('80%')
             .height('70%')
             .textAlign(TextAlign.Center)
             .fontSize('80px')
@@ -47,7 +58,7 @@ export struct OrderStatisticsComp {
             Blank()
           }.width('100%')
           .height('30%')
-          Text('100').width('80%')
+          Text(this.planNum.toString()).width('80%')
             .height('60%')
             .textAlign(TextAlign.Center)
             .fontSize('80px')
@@ -74,7 +85,7 @@ export struct OrderStatisticsComp {
           }.width('100%')
 
           .height('30%')
-          Text('10')
+          Text(this.completeNum.toString())
             .width('70%')
             .height('70%')
             .textAlign(TextAlign.Start)
@@ -101,7 +112,7 @@ export struct OrderStatisticsComp {
             .justifyContent(FlexAlign.Start)
             .width('100%')
             .height('30%')
-            Text('1')
+            Text(this.bugNum.toString())
               .width('60%')
               .height('60%')
               .textAlign(TextAlign.Start)

entry/src/main/ets/common/constants/CommonConstants.ets

@@ -56,43 +56,23 @@ import RobotInfo from '../../model/RobotInfo'
 
 export default class CommonConstants {
 
-    static readonly RDB_NAME : string = 'Presentation.db'
-    static readonly PRE_NAME : string = 'MyPreferences'
-    static AUTH_TOKEN : string = ''
-
-    static readonly STORAGE_TYPE: string[] =  ['电子元器件', '电路板', '结构件', '辅助材料']
-    static readonly PARK_TYPE: string[] =  ['出入库位置', '充电位置', '工作台', '其他']
-
-    static readonly ROBOTS: RobotInfo[] = [
-      {id:1, robotCode:'JGRR1135554213', storageId:1, robotType:2, robotToward: 2, x:3, y:2, lastSelfCheck: '2024/02/16 11:11:34'},
-      {id:2, robotCode:'JGRR1123554233', storageId:1, robotType:2, robotToward: 1, x:1, y:2, lastSelfCheck: '2024/02/16 10:56:34'},
-      {id:3, robotCode:'JGRR1147006978', storageId:1, robotType:2, robotToward: 3, x:6, y:2, lastSelfCheck: '2024/02/16 14:23:34'},
-    ]
-
-    static readonly STORAGES: StorageInfo[] = [
-      {id:1, storageName:'晶格智能仓储1', xSize:7, ySize: 5, defaultLayer:5},
-    ]
-  // 订单信息
-  static readonly ORDER_ARRAY: OrderInfo[] = [
-    {id:1,orderName:'ASFFSA-ASDFASD卫星天线', productModel: 'SDF-SDFS-SDFSD', planCode: '123123123123', orderCode:'DD16551666', kittingNum:50, orderNum: 50, orderState:1},
-    {id:2,orderName:'DSADfF11模组', productModel: 'SASDFG33323', planCode: 'JH516353332114466', orderCode:'DD16551622', kittingNum:200, orderNum: 6, orderState:2},
-    {id:3,orderName:'ASFFSA-ASDFASD成品组合', productModel: 'SDF-SDFS-SDFSD', planCode: '123123123123', orderCode:'DD16551634', kittingNum:50, orderNum: 50, orderState:3},
-    {id:4,orderName:'ASFFSA-ASDFASD成品组合', productModel: 'SDF-SDFS-SDFSD', planCode: '123123123123', orderCode:'DD16551654', kittingNum:50, orderNum: 50, orderState:3},
-    {id:5,orderName:'ASFFSA-ASDFASD成品组合', productModel: 'SDF-SDFS-SDFSD', planCode: '123123123123', orderCode:'DD16551645', kittingNum:50, orderNum: 50, orderState:3},
-    {id:6,orderName:'ASFFSA-ASDFASD成品组合', productModel: 'SDF-SDFS-SDFSD', planCode: '123123123123', orderCode:'DD16551646', kittingNum:50, orderNum: 50, orderState:3},
-    {id:7,orderName:'ASFFSA-ASDFASD成品组合', productModel: 'SDF-SDFS-SDFSD', planCode: '123123123123', orderCode:'DD16551647', kittingNum:50, orderNum: 50, orderState:3},
-    {id:8,orderName:'ASFFSA-ASDFASD成品组合', productModel: 'SDF-SDFS-SDFSD', planCode: '123123123123', orderCode:'DD16551648', kittingNum:50, orderNum: 50, orderState:3},
-    {id:9,orderName:'ASFFSA-ASDFASD成品组合', productModel: 'SDF-SDFS-SDFSD', planCode: '123123123123', orderCode:'DD16551649', kittingNum:50, orderNum: 50, orderState:3},
+  static readonly RDB_NAME : string = 'Presentation.db'
+  static readonly PRE_NAME : string = 'MyPreferences'
+  static AUTH_TOKEN : string = ''
+  // 附件地址前缀
+  static FILE_URL_PREFIX : string = 'http://192.168.101.4:9000/jgfile'
+
+  static readonly STORAGE_TYPE: string[] =  ['电子元器件', '电路板', '结构件', '辅助材料']
+  static readonly PARK_TYPE: string[] =  ['出入库位置', '充电位置', '工作台', '其他']
+
+  static readonly ROBOTS: RobotInfo[] = [
+    {id:1, robotCode:'JGRR1135554213', storageId:1, robotType:2, robotToward: 2, x:3, y:2, lastSelfCheck: '2024/02/16 11:11:34'},
+    {id:2, robotCode:'JGRR1123554233', storageId:1, robotType:2, robotToward: 1, x:1, y:2, lastSelfCheck: '2024/02/16 10:56:34'},
+    {id:3, robotCode:'JGRR1147006978', storageId:1, robotType:2, robotToward: 3, x:6, y:2, lastSelfCheck: '2024/02/16 14:23:34'},
   ]
 
-  // 工序操作
-  static readonly PROCESS_ARRAY: ProcessData[] = [
-    {id:1,sortNum:1, processName: '整机装配', orderId:1, completedQuantity:50},
-    {id:2,sortNum:2, processName: '固封', orderId:1, completedQuantity:50},
-    {id:3,sortNum:3, processName: '检验', orderId:1, completedQuantity:0},
-    {id:4,sortNum:4, processName: '多媒体记录', orderId:1, completedQuantity:0},
-    {id:5,sortNum:5, processName: '整机装配', orderId:1, completedQuantity:0},
-    {id:6,sortNum:6, processName: '检验', orderId:1, completedQuantity:0},
+  static readonly STORAGES: StorageInfo[] = [
+    {id:1, storageName:'晶格智能仓储1', xSize:7, ySize: 5, defaultLayer:5},
   ]
 
   // 工步数据

entry/src/main/ets/model/OrderInfo.ets

@@ -1,18 +1,52 @@
+import ProcessData from './ProcessData'
+
 export default class OrderInfo {
+  // todo delete 订单状态（1:未开始 2:生产中 3:已完成）
+  orderState?: number = 1
   // 订单id
-  id: number
+  id?: number
+  // 报故数量
+  bugNum?: number
+  // 完成数量
+  completeNum?: number
+  // 入库数量
+  inventoryNum?: number
+  // 物料编号
+  materialCode?: string
+  // 物料型号
+  materialModel?: string
+  // 物料名称
+  materialName?: string
+  // 订单编码
+  orderCode?: string
   // 订单名称
-  orderName: string
-  // 产品型号
-  productModel: string
-  // 计划编号
-  planCode: string
-  // 订单编号
-  orderCode: string
-  // 主料齐套
-  kittingNum: number
-  // 订单数量
-  orderNum: number
-  // 订单状态（1:未开始 2:生产中 3:已完成）
-  orderState: number = 1
-}
+  orderName?: string
+  // 计划数量
+  planNum?: number
+  // 计划结束时间
+  planStartEnd?: string
+  // 计划开始时间
+  planStartWhen?: string
+  // 工艺路线编码
+  processRouteCode?: string
+  // 工艺路线id
+  processRouteId?: number
+  // 工艺路线名称
+  processRouteName?: string
+  // 产线id
+  productLineId?: number
+  // 产线名称
+  productLineName?: string
+  // 报废数量
+  scrapNum?: number
+  // 工单编码
+  workOrderCode?: string
+  // 工单状态-字典 plan_work_order_state
+  workOrderState?: number
+  // 生产车间id
+  workshopId?: number
+  // 生产车间
+  workshopName?: string
+  // 工序列表
+  ops?: ProcessData[]
+}

entry/src/main/ets/model/ProcessData.ets

@@ -2,16 +2,15 @@
  * 工序数据类
  * */
 export default class ProcessData {
-  // 主键id
-  id: number;
-  // 序号
-  sortNum: number;
+
+  // 完成数量
+  completeNum?: string
+  // 工序码
+  operationCode?: string
   // 工序名称
-  processName: string;
-  // 订单id
-  orderId: number
-  // 已完成数
-  completedQuantity:number;
-  // 工序状态 (1:已完成 2:未完成)
-  processState?: number = 2;
+  operationName?: string
+  // 工序排序
+  operationSort?: number
+  // 工单编码
+  workOrderCod?: string
 }

entry/src/main/ets/pages/LoginPage.ets

@@ -219,13 +219,24 @@ struct LoginPage {
       .backgroundColor($r('app.color.login_background_color'))
       .borderRadius($r('app.float.general_border_radius'))
       .margin({right: '8.25%'})
+
+      Row() {
+        Image($r('app.media.shutdown'))
+          .width($r('app.float.login_image_size'))
+          .height($r('app.float.login_image_size'))
+      }
+      .height('19%')
+      .width('100%')
+      .alignItems(VerticalAlign.Bottom)
+      .justifyContent(FlexAlign.End)
+      .margin({bottom: '1%', right: '1%'})
     }
     .width('100%')
     .height('100%')
     .backgroundImage($r('app.media.login_background'))
     .backgroundImageSize({width: '100%', height: '100%'})
     .alignItems(HorizontalAlign.End)
-    .justifyContent(FlexAlign.Center)
+    .justifyContent(FlexAlign.End)
   }
 }
 

entry/src/main/ets/pages/process/ProcessHome.ets

@@ -1,11 +1,11 @@
 import { BottomOperateComp } from '../../common/component/BottomOperateComp'
 import { TitleStateComp } from '../../common/component/TitleStateComp'
-import CommonConstants from '../../common/constants/CommonConstants';
 import OrderInfo from '../../model/OrderInfo';
 import ProcessData from '../../model/ProcessData';
 import router from '@ohos.router';
 import { OrderStatisticsComp } from '../../common/component/OrderStatisticsComp';
 import JGRequest from '../../common/util/request/Request';
+import PageModel from '../../viewmodel/PageModel';
 
 /*
  * 工序操作首页
@@ -15,22 +15,49 @@ import JGRequest from '../../common/util/request/Request';
 struct ProcessHome {
 
   @State orderArray: OrderInfo[] = [];
-  @State selectOrderId: number = 0
-  @State processes: ProcessData[] = CommonConstants.PROCESS_ARRAY;
+  @State selectOrder: number = -1
+  @State processes: ProcessData[] = [];
   @State selectProcess: number = 0
+  // 扫描到的物料
   @State mainMaterial: string = ''
 
+  // 统计——当前订单
+  @State planNum: number = 0
+  @State completeNum: number = 0
+  @State bugNum: number = 0
+
+  private orderPageNo: number = 1
+  private orderPageSize: number = 10
+  @State orderTotalCount: number = 0
+  private orderTotalPages: number = 0
+
   async aboutToAppear() {
     // 查询订单数据
-    this.orderArray = await JGRequest.get("/api/v1/plan/workOrder/taskPage", {
-
-    }) as OrderInfo[]
+    let res = await this.queryOrderList()
+    this.orderTotalCount = res.totalCount
+    this.orderTotalPages = res.totalPages
+    this.orderArray = res.records
 
+    // 设置默认值
     if (this.orderArray && this.orderArray.length > 0) {
-      this.selectOrderId = this.orderArray[0].id
+      this.selectOrder = 0
+      this.planNum = this.orderArray[0].planNum ? (this.orderArray[0].planNum | 0) : 0
+      this.completeNum = this.orderArray[0].completeNum ? (this.orderArray[0].completeNum | 0) : 0
+      this.bugNum = this.orderArray[0].bugNum ? (this.orderArray[0].bugNum | 0) : 0
+      this.processes = this.orderArray[0].ops
+      if (this.processes && this.processes.length > 0) {
+        this.selectProcess = this.processes[0].operationSort
+      }
     }
   }
 
+  private async queryOrderList() {
+    return await JGRequest.post("/api/v1/plan/workOrder/taskPage", {
+      "pageNo": this.orderPageNo,
+      "pageSize": this.orderPageSize
+    }) as PageModel<OrderInfo>;
+  }
+
   build() {
     Column() {
       TitleStateComp()
@@ -45,15 +72,15 @@ struct ProcessHome {
           .height('9%')
           .justifyContent(FlexAlign.Start)
           List({space: '2%'}) {
-            ForEach(this.orderArray, (item: OrderInfo)=>{
+            ForEach(this.orderArray, (item: OrderInfo, index: number)=>{
               ListItem() {
                 Column() {
                   Row() {
                     Text(item.orderName)
                       .fontSize($r('app.float.process_card_middle_font_size'))
                       .fontWeight(FontWeight.Medium)
-                      .fontColor(this.selectOrderId === item.id ? $r('app.color.general_font_white_color') : $r('app.color.general_font_color'))
-                      .opacity(this.selectOrderId === item.id ? $r('app.float.card_font_select_opacity') : 1)
+                      .fontColor(this.selectOrder === index ? $r('app.color.general_font_white_color') : $r('app.color.general_font_color'))
+                      .opacity(this.selectOrder === index ? $r('app.float.card_font_select_opacity') : 1)
                   }
                   .width('90%')
                   .height('15%')
@@ -63,11 +90,11 @@ struct ProcessHome {
                   Row() {
                     Text('产品型号  ')
                       .fontSize($r('app.float.process_card_small_font_size'))
-                      .fontColor(this.selectOrderId === item.id ? $r('app.color.general_font_white_color') : $r('app.color.general_font_color'))
-                    Text(item.productModel)
+                      .fontColor(this.selectOrder === index ? $r('app.color.general_font_white_color') : $r('app.color.general_font_color'))
+                    Text(item.materialModel)
                       .fontSize($r('app.float.process_card_small_font_size'))
                       .fontWeight(FontWeight.Bold)
-                      .fontColor(this.selectOrderId === item.id ? $r('app.color.general_font_white_color') : $r('app.color.general_font_color'))
+                      .fontColor(this.selectOrder === index ? $r('app.color.general_font_white_color') : $r('app.color.general_font_color'))
                   }
                   .width('90%')
                   .height('12.5%')
@@ -76,11 +103,11 @@ struct ProcessHome {
                   Row() {
                     Text('计划编号  ')
                       .fontSize($r('app.float.process_card_small_font_size'))
-                      .fontColor(this.selectOrderId === item.id ? $r('app.color.general_font_white_color') : $r('app.color.general_font_color'))
-                    Text(item.productModel)
+                      .fontColor(this.selectOrder === index ? $r('app.color.general_font_white_color') : $r('app.color.general_font_color'))
+                    Text(item.workOrderCode)
                       .fontSize($r('app.float.process_card_small_font_size'))
                       .fontWeight(FontWeight.Bold)
-                      .fontColor(this.selectOrderId === item.id ? $r('app.color.general_font_white_color') : $r('app.color.general_font_color'))
+                      .fontColor(this.selectOrder === index ? $r('app.color.general_font_white_color') : $r('app.color.general_font_color'))
                   }
                   .width('90%')
                   .height('12.5%')
@@ -89,11 +116,11 @@ struct ProcessHome {
                   Row() {
                     Text('订单编号  ')
                       .fontSize($r('app.float.process_card_small_font_size'))
-                      .fontColor(this.selectOrderId === item.id ? $r('app.color.general_font_white_color') : $r('app.color.general_font_color'))
+                      .fontColor(this.selectOrder === index ? $r('app.color.general_font_white_color') : $r('app.color.general_font_color'))
                     Text(item.orderCode)
                       .fontSize($r('app.float.process_card_small_font_size'))
                       .fontWeight(FontWeight.Bold)
-                      .fontColor(this.selectOrderId === item.id ? $r('app.color.general_font_white_color') : $r('app.color.general_font_color'))
+                      .fontColor(this.selectOrder === index ? $r('app.color.general_font_white_color') : $r('app.color.general_font_color'))
                   }
                   .width('90%')
                   .height('12.5%')
@@ -103,46 +130,47 @@ struct ProcessHome {
                     Row() {}
                     .width('5%')
                     Column() {
-                      Text(item.orderNum.toString())
+                      Text(item.planNum ? (item.planNum | 0).toString()  : '')
                         .fontSize($r('app.float.process_card_large_font_size'))
                         .fontWeight(FontWeight.Bold)
-                        .fontColor(this.selectOrderId === item.id ? $r('app.color.general_font_white_color') : $r('app.color.general_font_color'))
+                        .fontColor(this.selectOrder === index ? $r('app.color.general_font_white_color') : $r('app.color.general_font_color'))
                         .padding({ bottom: '2%' })
-                      Text('订单数量')
+                      Text('产品数量')
                         .fontSize($r('app.float.process_card_small_font_size'))
-                        .fontColor(this.selectOrderId === item.id ? $r('app.color.general_font_white_color') : $r('app.color.general_font_color'))
+                        .fontColor(this.selectOrder === index ? $r('app.color.general_font_white_color') : $r('app.color.general_font_color'))
                     }
                     Row(){}
                     .width('8%')
                     Divider()
                       .vertical(true)
-                      .color(this.selectOrderId === item.id ? $r('app.color.general_font_white_color') : $r('app.color.general_font_color'))
+                      .color(this.selectOrder === index ? $r('app.color.general_font_white_color') : $r('app.color.general_font_color'))
                       .strokeWidth('1px')
-                      .opacity(this.selectOrderId === item.id ? 0.2 : 1)
+                      .opacity(this.selectOrder === index ? 0.2 : 1)
                       .height('60%')
                     Row(){}
                     .width('8%')
 
                     Column() {
-                      Text(item.kittingNum.toString())
+                      //  todo 修改为主料
+                      Text(item.planNum ? (item.planNum | 0).toString() : '0')
                         .fontSize($r('app.float.process_card_large_font_size'))
                         .fontWeight(FontWeight.Bold)
-                        .fontColor(this.selectOrderId === item.id ? $r('app.color.general_font_white_color') : $r('app.color.general_font_color'))
+                        .fontColor(this.selectOrder === index ? $r('app.color.general_font_white_color') : $r('app.color.general_font_color'))
                         .padding({ bottom: '2%' })
                       Text('主料齐套')
                         .fontSize($r('app.float.process_card_small_font_size'))
-                        .fontColor(this.selectOrderId === item.id ? $r('app.color.general_font_white_color') : $r('app.color.general_font_color'))
+                        .fontColor(this.selectOrder === index ? $r('app.color.general_font_white_color') : $r('app.color.general_font_color'))
                     }
                     Blank()
 
                     Row() {
-                      Text(item.orderState === 1 ? '未开始' : (item.orderState === 2 ? '生产中' : '已完成'))
+                      Text((item.workOrderState <= 3 || item.workOrderState === 5) ? '未开始' : (item.workOrderState === 4 ? '生产中' : '已完成'))
                         .fontWeight(FontWeight.Bold)
                         .textAlign(TextAlign.Center)
                         .fontSize($r('app.float.process_card_small_font_size'))
                         .fontColor($r('app.color.general_font_white_color'))
                         .borderRadius({topLeft: $r('app.float.general_border_radius'), bottomRight: $r('app.float.general_border_radius')})
-                        .backgroundColor(item.orderState === 1 ? $r('app.color.order_wait_state_background') : (item.orderState === 2 ? $r('app.color.order_producing_state_background') : $r('app.color.order_finished_state_background')))
+                        .backgroundColor((item.workOrderState <= 3 || item.workOrderState === 5) ? $r('app.color.order_wait_state_background') : (item.workOrderState === 4 ? $r('app.color.order_producing_state_background') : $r('app.color.order_finished_state_background')))
                         .width($r('app.float.order_state_width'))
                         .height($r('app.float.order_state_height'))
                     }
@@ -158,17 +186,29 @@ struct ProcessHome {
                 .justifyContent(FlexAlign.Center)
                 // .alignItems(HorizontalAlign.Center)
                 .onClick(() => {
-                  this.selectOrderId = item.id
+                  this.selectOrder = index
+                  this.planNum = this.orderArray[index].planNum ? (this.orderArray[index].planNum | 0) : 0
+                  this.completeNum = this.orderArray[index].completeNum ? (this.orderArray[index].completeNum | 0) : 0
+                  this.bugNum = this.orderArray[index].bugNum ? (this.orderArray[index].bugNum | 0) : 0
                   //   todo 查询当前工序
                 })
                 .width('90%')
                 .height('26.5%')
                 .borderRadius($r('app.float.general_border_radius'))
-                .backgroundColor(this.selectOrderId === item.id ? $r('app.color.order_select_background') : $r('app.color.general_card_background_color'))
+                .backgroundColor(this.selectOrder === index ? $r('app.color.order_select_background') : $r('app.color.general_card_background_color'))
               }
             })
           }
           .alignListItem(ListItemAlign.Center)
+          // 未完成订单大于10条，触底再去查询
+          .onReachEnd(() => {
+            if (this.orderPageNo >= this.orderTotalPages) {
+              return
+            }
+            this.orderPageNo++
+            let res = this.queryOrderList() as PageModel<OrderInfo>
+            this.orderArray = this.orderArray.concat(res.records)
+          })
         }
         .width('26%')
         .height('100%')
@@ -188,12 +228,12 @@ struct ProcessHome {
                 Column() {
                   Row({ space: 4 }) {
                     Stack() {
-                      Image(this.selectProcess === item.sortNum ? $r('app.media.step_blue') : $r('app.media.step_white'))
+                      Image(this.selectProcess === item.operationSort ? $r('app.media.step_blue') : $r('app.media.step_white'))
                         .objectFit(ImageFit.Contain)
                       Row() {
-                        Text(JSON.stringify(item.sortNum))
+                        Text(JSON.stringify(item.operationSort))
                           .fontSize($r('app.float.process_card_middle_font_size'))
-                          .fontColor(this.selectProcess === item.sortNum ? $r('app.color.general_font_white_color') : $r('app.color.general_font_color'))
+                          .fontColor(this.selectProcess === item.operationSort ? $r('app.color.general_font_white_color') : $r('app.color.general_font_color'))
                           .fontWeight(FontWeight.Bold)
                       }
                       .width('100%')
@@ -204,25 +244,26 @@ struct ProcessHome {
                     }
                     .width('25%')
                     .height('100%')
+                    .alignContent(Alignment.Start)
 
-                    Text(item.processName)
+                    Text(item.operationName)
                       .fontSize($r('app.float.process_card_middle_font_size'))
-                      .fontColor(this.selectProcess === item.sortNum ? $r('app.color.general_font_white_color') : $r('app.color.general_font_color'))
+                      .fontColor(this.selectProcess === item.operationSort ? $r('app.color.general_font_white_color') : $r('app.color.general_font_color'))
                       .fontWeight(FontWeight.Bold)
                     Blank()
-                    Text(item.completedQuantity.toString())
+                    Text(item.completeNum.toString())
                       .fontSize($r('app.float.process_card_middle_font_size'))
-                      .fontColor(this.selectProcess === item.sortNum ? $r('app.color.general_font_white_color') : $r('app.color.general_font_color'))
+                      .fontColor(this.selectProcess === item.operationSort ? $r('app.color.general_font_white_color') : $r('app.color.general_font_color'))
                       .fontWeight(FontWeight.Bold)
                   }
                   .width('100%')
                   .height('91%')
                   .justifyContent(FlexAlign.Start)
-                  .backgroundColor(this.selectProcess === item.sortNum ? $r('app.color.order_select_background') : $r('app.color.general_card_background_color'))
+                  .backgroundColor(this.selectProcess === item.operationSort ? $r('app.color.order_select_background') : $r('app.color.general_card_background_color'))
                   .borderRadius('187px')
                   .padding({ right: '5%' })
                   .onClick(() => {
-                    this.selectProcess = item.sortNum
+                    this.selectProcess = item.operationSort
                   })
 
                   if (index < this.processes.length - 1) {
@@ -274,7 +315,11 @@ struct ProcessHome {
               .width('85%')
               .height('22%')
               Row() {
-                OrderStatisticsComp()
+                OrderStatisticsComp({
+                  planNum: $planNum,
+                  completeNum: $completeNum,
+                  bugNum: $bugNum,
+                })
               }
               .width('90%')
               .justifyContent(FlexAlign.End)
@@ -359,31 +404,26 @@ struct ProcessHome {
               }
               .width('8%')
               .justifyContent(FlexAlign.End)
+              .onClick(()=>{
+                router.pushUrl({
+                  url: 'pages/process/ProcessStepPage',
+                  params: {
+                    mainMaterial: this.mainMaterial,
+                    processInfo: this.processes[this.selectProcess],
+                  }
+                })
+              })
 
-              TextInput({ placeholder: '请扫描物料编码' })
-                .placeholderColor($r('app.color.text_input_placeholder_font_color'))
-                .placeholderFont({size: $r('app.float.robot_set_font_size'), weight: FontWeight.Medium})
-                .fontSize($r('app.float.robot_set_font_size'))
+              Text(this.mainMaterial)
+                .fontSize($r('app.float.process_card_middle_font_size'))
                 .fontWeight(FontWeight.Medium)
                 .fontColor($r('app.color.general_font_color'))
+                .opacity($r('app.float.general_font_opacity'))
                 .textAlign(TextAlign.Start)
                 .height('100%')
                 .layoutWeight(1)
-                .maxLength(100)
                 .borderRadius($r('app.float.robot_set_radius'))
                 .backgroundColor($r('app.color.general_font_white_color'))
-                .onChange((value: string) => {
-                  this.mainMaterial = value
-                })
-                .onSubmit(() => {
-                  router.pushUrl({
-                    url: 'pages/process/ProcessStepPage',
-                    params: {
-                      mainMaterial: this.mainMaterial,
-                      processInfo: this.processes[this.selectProcess],
-                    }
-                  })
-                })
             }
             .borderRadius($r('app.float.robot_set_radius'))
             .backgroundColor($r('app.color.general_font_white_color'))
@@ -452,4 +492,4 @@ struct OperateCard {
     .justifyContent(FlexAlign.Center)
     .justifyContent(FlexAlign.Center)
   }
-}
+}

entry/src/main/ets/pages/process/ProcessStepPage.ets

@@ -21,16 +21,15 @@ import { pinyin } from 'pinyin-pro';
 import HashMap from '@ohos.util.HashMap';
 import { ProcessTitleComp } from '../../common/component/ProcessTitleComp';
 
-// const params = router.getParams(); // 获取传递过来的参数对象
-// const mainMaterial = params['mainMaterial']; // 获取主料号
-// const processInfo = params['processInfo']; // 获取当前工序信息
+const params = router.getParams(); // 获取传递过来的参数对象
+const mainMaterial = params['mainMaterial']; // 获取主料号
+const processInfo = params['processInfo']; // 获取当前工序信息
 
 @Entry
 @Component
 struct ProcessStepPage {
-  @State mainMaterial: string = '233'
-  @State process: ProcessData =
-    {id:2,sortNum:2, processName: '固封', orderId:1, completedQuantity:50}
+  @State mainMaterial: string = mainMaterial
+  @State process: ProcessData = processInfo
 
   @State product: ProductInfo = CommonConstants.PRODUCT_DATA
   @State productSteps: ProcessStep[] = CommonConstants.PROCESS_STEP_ARRAY
@@ -115,7 +114,7 @@ struct ProcessStepPage {
                 .fontColor($r('app.color.general_font_color'))
                 .opacity($r('app.float.card_font_default_opacity'))
               Row() {
-                Text(this.process.processName)
+                Text(this.process.operationName)
                   .fontSize($r('app.float.card_info_font_size'))
                   .fontColor($r('app.color.general_font_color'))
                   .fontWeight(FontWeight.Medium)

entry/src/main/ets/viewmodel/PageModel.ets

@@ -0,0 +1,17 @@
+/*
+ * 分页查询
+ * */
+export default class PageModel<T> {
+  // 当前页码
+  pageNo?: number;
+  // 每页显示数量
+  pageSize?: number;
+  // 返回数据
+  records?: T[];
+  // 游标位置
+  scrollId?: string;
+  // 总记录数
+  totalCount?: number;
+  // 总页数
+  totalPages?: number;
+}

entry/src/main/resources/base/element/float.json

@@ -143,6 +143,10 @@
     {
       "name": "card_subscript_new_size",
       "value": "21.6vp"
+    },
+    {
+      "name": "login_image_size",
+      "value": "52.4vp"
     }
   ]
 }