设备确认修改

entry/src/main/ets/pages/ProcessIndex.ets

@@ -102,7 +102,7 @@ struct ProcessIndex {
   // 扫码开工后的生产过程信息
   @State process: ProcessInfo = {}
   // 扫码开工状态(0:未开工 1:已开工)
-  @State @Watch('queryByScanState') scanState: number = 0
+  @State scanState: number = 0
   // 工单下流转卡号列表
   @State seqList: WorkOrderSeq[] = []
   // 设备每日点检
@@ -172,13 +172,6 @@ struct ProcessIndex {
     }
   }
 
-  async queryByScanState() {
-    if (this.scanState === 1) {
-      await this.scanCodeToStartWork()
-    } else {
-      await this.getComponentsForNotStartWork()
-    }
-  }
   // 扫码开工
   async scanCodeToStartWork() {
     this.process = await ProcessRequest.post('/api/v1/process/info/scan', {
@@ -246,6 +239,9 @@ struct ProcessIndex {
       remark: '',
       sortNum: 0
     })
+    for (const element of this.opComponents ) {
+      console.log('hhtest', JSON.stringify(element))
+    }
   }
 
   // 刷新当前工单已扫码流水号数量
@@ -589,7 +585,7 @@ struct ProcessIndex {
                       .borderRadius($r('app.float.virtualSize_40'))
                       .backgroundImage(this.selectOperationId === item.operationId ? $r('app.media.process_select_operation') : $r('app.media.process_no_select_operation'))
                       .backgroundImageSize(ImageSize.Cover)
-                      .onClick(() => {
+                      .onClick(async () => {
                         if (!this.selectWorkOder.workOrderCode || !this.currentUserName || !this.currentStationId) {
                           return
                         }
@@ -607,9 +603,9 @@ struct ProcessIndex {
                           }
                         } else if (this.scanState === 0 && this.seqNo) {
                           // 未开工查询工序组件
-                          this.getComponentsForNotStartWork()
+                          await this.getComponentsForNotStartWork()
                         } else if (this.scanState === 1) {
-                          this.scanCodeToStartWork()
+                          await this.scanCodeToStartWork()
                         }
                         if (!this.seqNo || this.seqNo.length <= 0) {
                           this.handleAllClick()
@@ -857,7 +853,7 @@ struct ProcessIndex {
                     selectOperationId: this.selectOperationId,
                     process: this.process,
                   })
-                } else if (this.selectComponentType === '6') {
+                } else if (this.selectComponentType === '12') {
                   DeviceCheckView({
                     deviceChecks: this.deviceChecks,
                     scanState: this.scanState,
@@ -1076,10 +1072,13 @@ struct ProcessIndex {
                 return
               }
               if (this.scanState === 0) {
-                this.scanState = 1
-                this.loadProcessVehicle()
-                // this.scanCodeToStartWork()
+                await this.scanCodeToStartWork()
+                if (this.process && this.process.id) {
+                  this.scanState = 1
+                  this.loadProcessVehicle()
+                }
               } else if (this.scanState === 1) {
+                await this.getComponentsForNotStartWork()
                 this.reportTimeBasedController.open()
               }
             })

entry/src/main/ets/view/process/DeviceCheckView.ets

@@ -8,6 +8,7 @@ import DictValue from '../../viewmodel/DictValue'
 import ProcessDeviceDailyCheck from '../../viewmodel/process/ProcessDeviceDailyCheck'
 import HashMap from '@ohos.util.HashMap'
 import TimeUtil from '../../common/util/TimeUtil'
+import CommonConstants from '../../common/constants/CommonConstants'
 
 // 设备点检工序
 @Component
@@ -51,6 +52,7 @@ export struct DeviceCheckView {
   async aboutToAppear() {
     let deviceDicts: DictValue[] = await ProcessRequest.get(`/api/v1/sys/dictData/queryByType/${this.deviceTypeDictCode}`)
     if (deviceDicts) {
+      this.deviceTypes = new HashMap()
       for (const dict of deviceDicts) {
         this.deviceTypes.set(dict.dictValue!, dict.dictLabel!);
       }
@@ -96,7 +98,13 @@ export struct DeviceCheckView {
                 }
               }
               let check: ProcessDeviceDailyCheck = await ProcessRequest.get(`/api/v1/process/deviceDailyCheck/getServiceLifeByDeviceNo/${this.queryDeviceNo}`)
-              this.deviceChecks.unshift(check)
+              check.stationIp = this.stationIp
+              await ProcessRequest.post('/api/v1/process/deviceDailyCheck/add', check)
+              this.deviceChecks = []
+              this.deviceChecks = await ProcessRequest.post('/api/v1/process/deviceCheck/queryAndSave', {
+                stationIp: this.stationIp,
+                processId: this.process.id!,
+              } as RequestParamModel)
             })
             .onChange((value: string) => {
               this.queryDeviceNo = value;
@@ -116,19 +124,19 @@ export struct DeviceCheckView {
 
       Column() {
         List({scroller: this.scrollerDevice }) {
-          ForEach(this.deviceChecks, (item: ProcessDeviceDailyCheck, index) => {
+          ForEach(this.deviceChecks, (item: ProcessDeviceDailyCheck) => {
             ListItem() {
               Row() {
                 Column(){
                   Text(this.deviceTypes && item.deviceType && this.deviceTypes.hasKey(item.deviceType) ? this.deviceTypes.get(item.deviceType) : '')
                     .fontSize($r('app.float.fontSize_24'))
                     .fontColor($r('app.color.FFFFFF'))
-                  Text(`名称：${item.deviceName!}`)
+                  Text('名称：' + item.deviceNo && item.deviceName ? item.deviceName : '')
                     .fontSize($r('app.float.fontSize_16'))
                     .fontColor($r('app.color.FFFFFF'))
                     .fontWeight(FontWeight.Lighter)
                     .margin({top:'2%',bottom:'1%'})
-                  Text(`编码：${item.deviceNo!}`)
+                  Text('编码：' + item.deviceNo ? item.deviceNo : '')
                     .fontSize($r('app.float.fontSize_16'))
                     .fontColor($r('app.color.FFFFFF'))
                     .fontWeight(FontWeight.Lighter)
@@ -144,7 +152,7 @@ export struct DeviceCheckView {
                     .fontSize($r('app.float.fontSize_16'))
                     .fontColor($r('app.color.FFFFFF'))
                     .fontWeight(FontWeight.Lighter)
-                  if (this.scanState === 1) {
+                  if (this.scanState === 1 && item.deviceNo) {
                     Row(){
                       Image(item.meteringState! === 1 ? $r('app.media.device_normal') : $r('app.media.device_expire'))
                         .width($r('app.float.virtualSize_24'))
@@ -171,7 +179,7 @@ export struct DeviceCheckView {
                     .fontSize($r('app.float.fontSize_16'))
                     .fontColor($r('app.color.FFFFFF'))
                     .fontWeight(FontWeight.Lighter)
-                  if (this.scanState === 1) {
+                  if (this.scanState === 1 && item.deviceNo) {
                     Row() {
                       Image(item.warrantyState! === 1 ? $r('app.media.device_normal') : $r('app.media.device_expire'))
                         .width($r('app.float.virtualSize_24'))