hh преди 2 седмици
родител
ревизия
6cc1022643

+ 2 - 4
entry/src/main/ets/common/util/request/ProcessRequest.ets

@@ -11,10 +11,8 @@ import { printError, printRequest, printResponse, handleRes } from './Helps';
 
 
 // jiaxiaoqiang:这里要改
-//const baseUrl = "http://192.168.1.3:11010/" //chuangke
-//const baseUrl = "http://192.168.1.174:8079"//huajing
-//  const baseUrl = "http://192.168.1.3:20010"//huajing
-const baseUrl = "http://192.168.1.246:8079" // huhao本地
+ const baseUrl = "http://192.168.1.3:30010"//huajing
+// const baseUrl = "http://192.168.1.246:8058" // huhao本地
 const DEBUG = true //
 
 // 创建实例

+ 9 - 1
entry/src/main/ets/pages/ProcessIndex.ets

@@ -156,7 +156,8 @@ struct ProcessIndex {
     this.process = await ProcessRequest.post('/api/v1/process/info/scan', {
       operationId: this.selectOperationId,
       qrCode: this.scanCode,
-      workOrderCode: this.selectWorkOder.workOrderCode!
+      workOrderCode: this.selectWorkOder.workOrderCode!,
+      stationId: this.currentStationId
     } as RequestParamModel)
     if (this.process && this.process.id) {
       this.scanState = 1
@@ -775,6 +776,13 @@ struct ProcessIndex {
                     selectOperationId: this.selectOperationId,
                     process: this.process,
                   })
+                } else if (this.selectComponentType === '6') {
+                  SelfInspectView({
+                    scanState: this.scanState,
+                    seqNo: this.seqNo,
+                    selectOperationId: this.selectOperationId,
+                    process: this.process,
+                  })
                 }
               }
               .width('79.1%')

+ 36 - 0
entry/src/main/ets/view/process/DeviceCheckView.ets

@@ -0,0 +1,36 @@
+import ProcessRequest from '../../common/util/request/ProcessRequest'
+import ProcessCheck from '../../viewmodel/process/ProcessCheck'
+import ProcessInfo from '../../viewmodel/process/ProcessInfo'
+import RequestParamModel from '../../viewmodel/RequestParamModel'
+import promptAction from '@ohos.promptAction'
+import PageInfo from '../../viewmodel/PageInfo'
+import { AddUnqualifiedRecordDialog } from '../AddUnqualifiedRecordDialog'
+import DictValue from '../../viewmodel/DictValue'
+import ProcessEscalationFault from '../../viewmodel/process/ProcessEscalationFault'
+import ProcessDeviceDailyCheck from '../../viewmodel/process/ProcessDeviceDailyCheck'
+
+// 设备点检工序
+@Component
+export struct DeviceCheckView {
+  // 设备每日点检
+  @Link deviceChecks: ProcessDeviceDailyCheck[]
+  // 扫码开工状态(0:未开工 1:已开工)
+  // @Link @Watch('queryByScanState') scanState: number
+  // 当前流转卡号
+  @Link seqNo: string
+  // 选中工序id
+  @Link selectOperationId: string
+  // 扫码开工后的生产过程信息
+  @Link process: ProcessInfo
+
+
+  async aboutToAppear() {
+
+  }
+
+  build() {
+    Column()
+    .width('100%')
+    .height('100%')
+  }
+}

+ 1 - 0
entry/src/main/ets/view/process/MaterialCollectView.ets

@@ -8,6 +8,7 @@ import promptAction from '@ohos.promptAction'
 import { ModifyMaterialNumDialog } from '../ModifyMaterialNumDialog'
 import PageInfo from '../../viewmodel/PageInfo'
 
+// 物料采集工序
 @Component
 export struct MaterialCollectView {
   @State scanCode: string = ''

+ 1 - 1
entry/src/main/ets/view/process/MultiMediaCollect.ets

@@ -2,7 +2,6 @@ import image from '@ohos.multimedia.image';
 import fs from "@ohos.file.fs"
 import CommonEventManager from '@ohos.commonEventManager'
 import uploadInstance from '../../common/util/UploadUtil';
-import router from '@ohos.router';
 import { DrawingInfo, DrawingPage } from '../../viewmodel/DrawingInfo';
 import CommonConstants from '../../common/constants/CommonConstants';
 import ProcessRequest from '../../common/util/request/ProcessRequest';
@@ -14,6 +13,7 @@ import ProcessInfo from '../../viewmodel/process/ProcessInfo';
 
 const TAG = "Process camera upload"
 
+// 多媒体采集工序
 @Component
 export struct MultiMediaCollect {
   private scrollerPhoto: Scroller = new Scroller()

+ 1 - 0
entry/src/main/ets/view/process/SelfInspectView.ets

@@ -8,6 +8,7 @@ import { AddUnqualifiedRecordDialog } from '../AddUnqualifiedRecordDialog'
 import DictValue from '../../viewmodel/DictValue'
 import ProcessEscalationFault from '../../viewmodel/process/ProcessEscalationFault'
 
+// 自检工序
 @Component
 export struct SelfInspectView {
   // 点检列表

+ 2 - 0
entry/src/main/ets/viewmodel/process/ProcessDeviceDailyCheck.ets

@@ -18,4 +18,6 @@ export default class ProcessCheck {
   warrantyPeriod?: string;
   // 维保状态(1:有效 0:过期)
   warrantyState?: number;
+  // 创建时间
+  created?: number;
 }