对接扫码开工、物料图纸接口

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

@@ -1,4 +1,3 @@
-import ProcessData from '../../model/ProcessData'
 class Item{
   name:string
   id:string

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

@@ -1,4 +1,3 @@
-import ProcessData from '../../model/ProcessData';
 import StorageRequest from '../util/request/StorageRequest';
 import {SelectMaterialslist} from '../util/request/StorageRequestInstance'
 import detailsList from '../../model/DetailsList';

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

@@ -1,56 +1,11 @@
-// import OrderInfo from '../../model/OrderInfo'
-// import ProcessData from '../../model/ProcessData'
-
-
-//
-// export default class CommonConstants {
-//
-//   static readonly RDB_NAME : string = 'Presentation.db'
-//
-//   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 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},
-//   ]
-// }
- import StorageInfo from '../../model/StorageInfo'
+import StorageInfo from '../../model/StorageInfo'
 import MaterialInfo from '../../model/MaterialInfo'
 import OrderInfo from '../../model/OrderInfo'
 import ProcessAlarmData from '../../model/processmodel/ProcessAlarmData'
-import ProcessData from '../../model/ProcessData'
+import ProcessData from '../../viewmodel/ProcessData'
 import ProcessHandleData from '../../model/processmodel/ProcessHandleData'
 import ProcessStandardData from '../../model/processmodel/ProcessStandardData'
-import ProcessStep from '../../model/processmodel/ProcessStep'
+import ProcessStep from '../../viewmodel/ProcessStep'
 import ProductInfo from '../../model/processmodel/ProductInfo'
 import RobotInfo from '../../model/RobotInfo'
 import UniversalCard from  '../../model/UniversalCard'
@@ -80,19 +35,6 @@ export default class CommonConstants {
   ]
 
   // 工步数据
-  static readonly PROCESS_STEP_ARRAY: ProcessStep[] = [
-    {id:1,processId:1, stepType:1, stepName: '物流采集'},
-    {id:2,processId:1, stepType:2, stepName: '记录项'},
-    {id:3,processId:1, stepType:3, stepName: '多媒体采集'},
-    {id:4,processId:1, stepType:4, stepName: 'ESOP'},
-    {id:5,processId:1, stepType:5, stepName: '点检'},
-    {id:6,processId:1, stepType:6, stepName: '设备记录'},
-    {id:7,processId:1, stepType:7, stepName: '紧固'},
-    {id:8,processId:1, stepType:8, stepName: '调试配对'},
-    {id:9,processId:1, stepType:9, stepName: '铭牌绑定'},
-  ]
-
-  // 工步数据
   static readonly PRODUCT_DATA: ProductInfo = {
     id:1,productName:'SASD-FSDDS-大天线', productCode: 'SASD-FSDDS_ASDFSFDGHFS', productModel: ''
   }

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

@@ -1,4 +1,4 @@
-import ProcessData from './ProcessData'
+import ProcessData from '../viewmodel/ProcessData'
 
 export default class OrderInfo {
   // todo delete 订单状态（1:未开始 2:生产中 3:已完成）

entry/src/main/ets/model/processmodel/ProcessStep.ets

@@ -1,13 +0,0 @@
-/*
- * 工步数据类
- * */
-export default class ProcessStep {
-  // 主键id
-  id: number;
-  // 工序id
-  processId: number;
-  // 工序名称
-  stepName: string;
-  // 工序类型（1:物料采集 2:记录项 3:多媒体采集 4:ESOP 5:点检 6:设备记录 7:紧固 8:调试配对 9:铭牌绑定）
-  stepType: number;
-}

entry/src/main/ets/pages/Storage.ets

@@ -3,7 +3,6 @@ import { BottomOperateComp } from '../common/component/BottomOperateComp';
 import {IntelligentWarehousingOutbound}from '../view/IntelligentWarehousingOutbound'
 import  {Statistics}from '../view/Statistics'
 import {IntelligentStorageWarehousing }from '../view/IntelligentStorageWarehousing'
-import {testGet1,StorageStatus,testPost} from '../common/util/request/StorageRequestInstance'
 import {OtherStorageOutbound}from '../view/OtherStorageOutbound'
 import {OtherWarehousing}from '../view/OtherWarehousing'
 import { OtherStatistics } from '../view/OtherStatistics';

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

@@ -1,19 +1,23 @@
 import { BottomOperateComp } from '../../common/component/BottomOperateComp'
 import { ProcessTitleComp } from '../../common/component/ProcessTitleComp'
+import router from '@ohos.router';
+import JGRequest from '../../common/util/request/Request';
+
+const params = router.getParams(); // 获取传递过来的参数对象
+const mainMaterial = params['mainMaterial']; // 获取主料号
 
 @Entry
 @Component
 struct ProcessDrawingPage {
 
-  @State drawingArray: DrawingInfo[] = [
-    {drawingName: '结构图纸1', drawingSize: 25, sizeUnit: 'Mb', drawingRes: $r('app.media.drawing_demo1')},
-    {drawingName: '结构图纸2', drawingSize: 25, sizeUnit: 'Mb', drawingRes: $r('app.media.drawing_demo2')},
-    {drawingName: '结构图纸3', drawingSize: 25, sizeUnit: 'Mb', drawingRes: $r('app.media.drawing_demo3')},
-    {drawingName: '结构图纸4', drawingSize: 25, sizeUnit: 'Mb', drawingRes: $r('app.media.drawing_demo1')},
-    {drawingName: '结构图纸5', drawingSize: 25, sizeUnit: 'Mb', drawingRes: $r('app.media.drawing_demo1')},
-    {drawingName: '结构图纸6', drawingSize: 25, sizeUnit: 'Mb', drawingRes: $r('app.media.drawing_demo1')},
-    {drawingName: '结构图纸7', drawingSize: 25, sizeUnit: 'Mb', drawingRes: $r('app.media.drawing_demo1')},
-  ]
+  @State drawingArray: DrawingInfo[] = []
+  mainMaterial: string = mainMaterial
+
+  async aboutToAppear() {
+    this.drawingArray = await JGRequest.post("/api/v1/base/drawing/list", {
+      "materialCode": this.mainMaterial
+    })
+  }
 
   build() {
     Column() {
@@ -25,19 +29,19 @@ struct ProcessDrawingPage {
           ForEach(this.drawingArray, (item: DrawingInfo, index: number)=>{
             Column() {
               Row() {
-                Image(item.drawingRes)
+                Image(item.drawingPath)
                   .objectFit(ImageFit.Fill)
               }
               .height('77%')
               .width('100%')
 
               Column() {
-                Text(item.drawingName)
+                Text(item.drawingTitle)
                   .fontSize($r('app.float.process_card_small_font_size'))
                   .fontWeight(FontWeight.Medium)
                   .fontColor($r('app.color.general_font_color'))
                   .opacity($r('app.float.general_font_opacity'))
-                Text(item.drawingSize + item.sizeUnit)
+                Text(item.drawingCode)
                   .fontSize($r('app.float.process_card_small_font_size'))
                   .fontColor($r('app.color.general_font_color'))
                   .opacity($r('app.float.process_step_font_opacity'))
@@ -69,10 +73,15 @@ struct ProcessDrawingPage {
   }
 }
 
-class DrawingInfo{
-  drawingName?: string
-  drawingSize?: number
-  // 大小的单位
-  sizeUnit?: string
-  drawingRes?: Resource
+class DrawingInfo {
+  // 主键id
+  id?: number
+  // 图纸编码
+  drawingCode?: string
+  // 图纸路径
+  drawingPath?:	string
+  // 图纸标题
+  drawingTitle?: string
+  // 图纸版本号
+  drawingVersion?: number
 }

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

@@ -1,11 +1,12 @@
 import { BottomOperateComp } from '../../common/component/BottomOperateComp'
 import { TitleStateComp } from '../../common/component/TitleStateComp'
 import OrderInfo from '../../model/OrderInfo';
-import ProcessData from '../../model/ProcessData';
+import ProcessData from '../../viewmodel/ProcessData';
 import router from '@ohos.router';
 import { OrderStatisticsComp } from '../../common/component/OrderStatisticsComp';
 import JGRequest from '../../common/util/request/Request';
 import PageModel from '../../viewmodel/PageModel';
+import StartWorkInfo from '../../viewmodel/StartWorkInfo';
 
 /*
  * 工序操作首页
@@ -18,8 +19,8 @@ struct ProcessHome {
   @State selectOrder: number = -1
   @State processes: ProcessData[] = [];
   @State selectProcess: number = 0
-  // 扫描到的物料
-  @State mainMaterial: string = ''
+  // 扫描到的序列号
+  @State seqNo: string = ''
 
   // 统计——当前订单
   @State planNum: number = 0
@@ -404,17 +405,24 @@ struct ProcessHome {
               }
               .width('8%')
               .justifyContent(FlexAlign.End)
-              .onClick(()=>{
+              .onClick(async ()=>{
+                // todo 应该对接扫码枪，扫描到序列号，然后处理以下逻辑
+                let res: StartWorkInfo = await JGRequest.post("/api/v1/process/info/scan", {
+                  "operationId": this.processes[this.selectProcess].operationId,
+                  "qrCode": "20240402000054",
+                  "workOrderCode": this.orderArray[this.selectOrder].workOrderCode
+                })
+
                 router.pushUrl({
                   url: 'pages/process/ProcessStepPage',
                   params: {
-                    mainMaterial: this.mainMaterial,
+                    startWorkInfo: res,
                     processInfo: this.processes[this.selectProcess],
                   }
                 })
               })
 
-              Text(this.mainMaterial)
+              Text(this.seqNo)
                 .fontSize($r('app.float.process_card_middle_font_size'))
                 .fontWeight(FontWeight.Medium)
                 .fontColor($r('app.color.general_font_color'))

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

@@ -3,10 +3,9 @@
  * */
 import { BottomOperateComp } from '../../common/component/BottomOperateComp'
 import router from '@ohos.router';
-import ProcessData from '../../model/ProcessData';
+import ProcessData from '../../viewmodel/ProcessData';
 import CommonConstants from '../../common/constants/CommonConstants';
-import ProductInfo from '../../model/processmodel/ProductInfo';
-import ProcessStep from '../../model/processmodel/ProcessStep'
+import ProcessStep from '../../viewmodel/ProcessStep'
 import MaterialInfo from '../../model/MaterialInfo';
 import { MaterialCollectView } from '../../view/processview/MaterialCollectView';
 import { RecordItemView } from '../../view/processview/RecordItemView';
@@ -20,19 +19,22 @@ import { NameplateBindView } from '../../view/processview/NameplateBindView';
 import { pinyin } from 'pinyin-pro';
 import HashMap from '@ohos.util.HashMap';
 import { ProcessTitleComp } from '../../common/component/ProcessTitleComp';
+import JGRequest from '../../common/util/request/Request';
+import StartWorkInfo from '../../viewmodel/StartWorkInfo';
 
 // const params = router.getParams(); // 获取传递过来的参数对象
-// const mainMaterial = params['mainMaterial']; // 获取主料号
+// const startWorkInfo = params['startWorkInfo']; // 获取开工信息
 // const processInfo = params['processInfo']; // 获取当前工序信息
 
 @Entry
 @Component
 struct ProcessStepPage {
-  @State mainMaterial: string = '23'
-  @State process: ProcessData = {completeNum:'101',operationCode:'32434', operationSort:1, operationName: '物流采集'}
+  // todo 根据homePage传过来的值
+  startWorkInfo: StartWorkInfo = {materialCode: 'BL000001', materialName:'数据链处理机板硬件(国产化)', seqNo: '20240402000054'}
+  @State process: ProcessData = {operationId: 129, completeNum:'101',operationCode:'32434', operationSort:1, operationName: '物流采集'}
 
-  @State product: ProductInfo = CommonConstants.PRODUCT_DATA
-  @State productSteps: ProcessStep[] = CommonConstants.PROCESS_STEP_ARRAY
+  // @State product: ProductInfo = CommonConstants.PRODUCT_DATA
+  @State productSteps: ProcessStep[] = []
 
   private stepImages: Resource[] = CommonConstants.STEP_IMAGES
   private stepSelectImages: Resource[] = CommonConstants.STEP_SELECT_IMAGES
@@ -59,11 +61,11 @@ struct ProcessStepPage {
     customStyle: true,
   })
 
-  aboutToAppear() {
+  async aboutToAppear() {
+    this.productSteps = await JGRequest.get("/api/v1/process/opCompent/get/" + this.process.operationId, {})
     if (this.productSteps && this.productSteps.length > 0) {
-      this.selectStep = 1
+      this.selectStep = 0
     }
-    // todo 查询产品数据，查询当前工序的工步
   }
 
   build() {
@@ -75,13 +77,13 @@ struct ProcessStepPage {
           // 信息栏（产品、工序、主料）
           Column() {
             Column() {
-              Text(this.product.productName)
+              Text(this.startWorkInfo.materialName)
                 .fontSize($r('app.float.card_title_font_size'))
                 .fontWeight(FontWeight.Medium)
                 .fontColor($r('app.color.general_font_color'))
                 .opacity($r('app.float.general_font_opacity'))
                 .maxLines(1)
-              Text(this.product.productCode)
+              Text(this.startWorkInfo.materialCode)
                 .fontSize($r('app.float.card_info_font_size'))
                 .fontColor($r('app.color.general_font_color'))
                 .fontWeight(FontWeight.Regular)
@@ -97,7 +99,7 @@ struct ProcessStepPage {
                 .fontWeight(FontWeight.Regular)
                 .fontColor($r('app.color.general_font_color'))
                 .opacity($r('app.float.card_font_default_opacity'))
-              Text(this.mainMaterial)
+              Text(this.startWorkInfo.seqNo)
                 .fontSize($r('app.float.card_info_font_size'))
                 .fontColor($r('app.color.general_font_color'))
                 .fontWeight(FontWeight.Medium)
@@ -158,7 +160,9 @@ struct ProcessStepPage {
           OperateCard({operateName: '图纸', operateImage:$r('app.media.drawing'), clickEvent: ()=>{
             router.pushUrl({
               url: 'pages/process/ProcessDrawingPage',
-              // params: {}
+              params: {
+                mainMaterial: this.startWorkInfo.materialCode
+              }
             })
           }})
           OperateCard({operateName: '报故', operateImage:$r('app.media.report_fault'), clickEvent: ()=>{
@@ -180,10 +184,10 @@ struct ProcessStepPage {
             ForEach(this.productSteps, (item: ProcessStep, index: number)=> {
               ListItem() {
                 Column() {
-                  Image(this.selectStep === index ? this.stepSelectImages[item.stepType - 1] :  this.stepImages[item.stepType - 1])
+                  Image(this.selectStep === index ? this.stepSelectImages[item.compentType - 1] :  this.stepImages[item.compentType - 1])
                     .width($r('app.float.card_image_size'))
                     .height($r('app.float.card_image_size'))
-                  Text(item.stepName)
+                  Text(item.compentName)
                     .fontSize($r('app.float.card_info_font_size'))
                     .fontWeight(FontWeight.Medium)
                     .fontColor(this.selectStep === index ? $r('app.color.general_font_white_color') : $r('app.color.general_font_color'))
@@ -206,27 +210,27 @@ struct ProcessStepPage {
           .margin({left: '2%'})
 
           Column() {
-            if (this.productSteps[this.selectStep].stepType === 1) {
+            if (this.productSteps[this.selectStep].compentType === 1) {
               MaterialCollectView({
-                mainMaterial: this.mainMaterial,
+                mainMaterial: this.startWorkInfo.materialCode,
                 process: $process,
               })
-            } else if (this.productSteps[this.selectStep].stepType === 2) {
+            } else if (this.productSteps[this.selectStep].compentType === 2) {
               RecordItemView()
-            } else if (this.productSteps[this.selectStep].stepType === 3) {
+            } else if (this.productSteps[this.selectStep].compentType === 3) {
               MultimediaCollectView()
-            } else if (this.productSteps[this.selectStep].stepType === 4) {
+            } else if (this.productSteps[this.selectStep].compentType === 4) {
               EsopView()
-            } else if (this.productSteps[this.selectStep].stepType === 5) {
+            } else if (this.productSteps[this.selectStep].compentType === 5) {
               SpotCheckView()
-            } else if (this.productSteps[this.selectStep].stepType === 6) {
+            } else if (this.productSteps[this.selectStep].compentType === 6) {
               EquipRecordView()
-            } else if (this.productSteps[this.selectStep].stepType === 7) {
+            } else if (this.productSteps[this.selectStep].compentType === 7) {
               FixtureView()
-            } else if (this.productSteps[this.selectStep].stepType === 8) {
+            } else if (this.productSteps[this.selectStep].compentType === 8) {
               DebugPairView()
-            } else if (this.productSteps[this.selectStep].stepType === 9) {
-              NameplateBindView({mainMaterial: this.mainMaterial})
+            } else if (this.productSteps[this.selectStep].compentType === 9) {
+              NameplateBindView({mainMaterial: this.startWorkInfo.materialCode})
             }
           }
           .width('100%')

entry/src/main/ets/view/StorageSetView.ets

@@ -338,7 +338,18 @@ export struct StorageSetView {
                 Toggle({ type: ToggleType.Switch, isOn: this.selectSpace && this.selectSpace.enableState === 1 ? true : false })
                   .height('33%')
                   .width('60%')
-                  .onChange((isOn: boolean) => {
+                  .onChange(async (isOn: boolean) => {
+                    let positions: position[] = await JGRequest.post("/api/v1/wms/position/list", {
+                      "coordinate": this.selectSpace.x + '-' + this.selectSpace.y,
+                      "type": 1,
+                    })
+                    if (!positions || positions.length <= 0) {
+                      return
+                    }
+                    await JGRequest.post("/api/v1/wms/position/update", {
+                      "enable": isOn ? 1 : 0,
+                      "id": positions[0].id
+                    })
                     let enableState = isOn ? 1 : 2
                     this.selectSpace.enableState = enableState
                     this.spaceArray[this.selectSpace.y - 1][this.selectSpace.x - 1].enableState = enableState
@@ -651,12 +662,22 @@ struct EditCapacityDialog {
           .height('50%')
           .borderRadius($r('app.float.robot_set_radius'))
           .backgroundColor($r('app.color.robot_set_card_blue'))
-          .onClick(() => {
+          .onClick(async () => {
             if (this.controller != undefined) {
-              this.controller.close()
               this.selectSpace.capacity = Number.parseInt(this.selectCapacity)
+              let positions: position[] = await JGRequest.post("/api/v1/wms/position/list", {
+                "coordinate": this.selectSpace.x + '-' + this.selectSpace.y,
+                "type": 1,
+              })
+              if (!positions || positions.length <= 0) {
+                return
+              }
+              await JGRequest.post("/api/v1/wms/position/update", {
+                "layer": this.selectSpace.capacity,
+                "id": positions[0].id
+              })
               StorageSpaceModel.updateStorageSpace(this.selectSpace.id, this.selectSpace.enableState, this.selectSpace.storageType, this.selectSpace.capacity, this.selectSpace.canWay, this.selectSpace.canPark, this.selectSpace.parkType)
-              // this.confirm()
+              this.controller.close()
             }
           })
       }
@@ -1146,4 +1167,45 @@ function getParkTypeStr(parkType: number, typeArray: string[]): string {
     return ''
   }
   return typeArray[parkType - 1]
+}
+
+class position {
+  // 区域
+  area:	string
+  // 储位坐标
+  coordinate:	string
+  // 创建时间
+  created: string
+  // 创建人
+  creator: string
+  // 部门ID
+  deptId:	string
+  // 是否可用 0 可用 1不可用
+  enable: number
+  // 仓库名称
+  houseName: string
+  // 仓库编号
+  houseNo: string
+  // 主键
+  id:	number
+  // 使用层数
+  layer: number
+  // 储位编号
+  locationNo: string
+  // 物料类型
+  materialType: string
+  // 储位名称
+  name: string
+  // 组织ID
+  orgId: string
+  // 仓库大小
+  size: string
+  // 储位状态；0-空闲；1-半载； 2-满载
+  state: number
+  // 储位类型 1 线边仓 2 干燥柜 3 货架
+  type: number
+  // 修改时间
+  updated: string
+  // 上次修改人
+  updator: string
 }

entry/src/main/ets/view/processview/MaterialCollectView.ets

@@ -1,7 +1,7 @@
 import CommonConstants from '../../common/constants/CommonConstants'
 import MaterialInfo from '../../model/MaterialInfo'
 import HashMap from '@ohos.util.HashMap'
-import ProcessData from '../../model/ProcessData'
+import ProcessData from '../../viewmodel/ProcessData'
 
 @Component
 export struct MaterialCollectView {

entry/src/main/ets/view/processview/NameplateBindView.ets

@@ -25,7 +25,7 @@ export struct NameplateBindView {
 
   @State selectBing: number = -1
 
-  @Link mainMaterial: string
+  mainMaterial: string
 
   // 绑定确认弹窗
   bindConfirmController: CustomDialogController = new CustomDialogController({

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

@@ -2,7 +2,8 @@
  * 工序数据类
  * */
 export default class ProcessData {
-
+  // 工序ID
+  operationId?: number
   // 完成数量
   completeNum?: string
   // 工序码

entry/src/main/ets/viewmodel/ProcessStep.ets

@@ -0,0 +1,29 @@
+/*
+ * 工步数据类
+ * */
+export default class ProcessStep {
+  // 组件名称
+  compentName?: string
+  // 组件类型
+  compentType?: number
+  // 创建时间
+  created?: string
+  // 创建人
+  creator?: string
+  // 删除标识
+  deleted?: number
+  // 部门ID
+  deptId?: string
+  // 主键id
+  id?: number
+  // 工序id
+  operationId?: string
+  // 组织ID
+  orgId?: string
+  // 工艺路线id
+  processRouteId?: string
+  // 备注
+  remark?: string
+  // 排序标识
+  sortNum?: number
+}

entry/src/main/ets/viewmodel/StartWorkInfo.ets

@@ -0,0 +1,61 @@
+/*
+ * 开工信息
+ * */
+export default class StartWorkInfo {
+  // 状态更改时间
+  changeWhen?: string
+  // 创建时间
+  created?:	string
+  // 创建人
+  creator?:	string
+  // 当前状态-字段process_state
+  currentState?: string
+  // 部门ID
+  deptId?: string
+  // 主键
+  id?: string
+  // 物料编码
+  materialCode?: string
+  // 物料型号
+  materialModel?: string
+  // 物料名称
+  materialName?: string
+  // 是否下线0 否 1是
+  offLine?:	number
+  // 工序id
+  operationId?:	number
+  // 工序名称
+  operationName?:	string
+  // 操作人
+  operator?: string
+  // 订单编码
+  orderCode?:	string
+  // 订单id
+  orderId?:	string
+  // 组织ID
+  orgId?:	string
+  // 是否委外 0否 1是
+  outsource?:	number
+  // 实际结束时间
+  realEndWhen?:	string
+  // 实际开始时间
+  realStartWhen?:	string
+  // 维修id
+  repairId?:	string
+  // 返工id
+  reworkId?:	string
+  // 序列号
+  seqNo?:	string
+  // 工位id
+  stanId?:	string
+  // 总共用时
+  totalTime?:	string
+  // 修改时间
+  updated?:	string
+  // 上次修改人
+  updator?:	string
+  // 工单编码
+  workOrderCode?:	string
+  // 工单id
+  workOrderId?:	string
+}