添加弹窗

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

@@ -17,6 +17,8 @@ import ProcessInfo from '../viewmodel/process/ProcessInfo';
 import { MaterialCollectView } from '../view/process/MaterialCollectView';
 import { WorkOrderPage } from '../viewmodel/WorkOrderPage';
 import { UserInfo } from '../viewmodel/UserInfo';
+import { CompleteReceiveDialog } from '../view/CompleteReceiveDialog';
+import { WorkInstructionsDialog } from '../view/WorkInstructionsDialog';
 
 @Entry
 @Component
@@ -166,6 +168,28 @@ struct ProcessIndex {
     alignment:DialogAlignment.Center,
     maskColor: 'rgba(0,0,0,0.8)',  // 黑色遮罩
   })
+  // 作业指导弹窗控制器
+  workInstructionsController: CustomDialogController = new CustomDialogController({
+    builder: WorkInstructionsDialog({
+      materialCode: this.selectWorkOder.materialCode!,
+    }),
+    autoCancel: true, // 点击遮罩关闭
+    customStyle: true,
+    alignment:DialogAlignment.Center,
+    maskColor: 'rgba(0,0,0,0.8)',  // 黑色遮罩
+  })
+
+  // 齐套接收弹窗控制器
+  completeReceiveController: CustomDialogController = new CustomDialogController({
+    builder: CompleteReceiveDialog({
+      currentWorkOrderCode: this.selectWorkOder.workOrderCode!,
+      currentOperationId: this.selectOperationId
+    }),
+    autoCancel: true, // 点击遮罩关闭
+    customStyle: true,
+    alignment:DialogAlignment.Center,
+    maskColor: 'rgba(0,0,0,0.8)',  // 黑色遮罩
+  })
 
 
   handleAllClick():void {
@@ -646,6 +670,13 @@ struct ProcessIndex {
           .justifyContent(FlexAlign.Center)
           .backgroundColor($r('app.color.20FFFFFF'))
           .borderRadius($r('app.float.fontSize_16'))
+          .onClick(()=>{
+            if (!this.selectWorkOder.workOrderCode) {
+              return
+            }
+            this.completeReceiveController.open()
+          })
+
           Row().width('1.5%')
           Row({space: 4}) {
             Image($r('app.media.process_complete_reception'))
@@ -662,6 +693,12 @@ struct ProcessIndex {
           .justifyContent(FlexAlign.Center)
           .backgroundColor($r('app.color.20FFFFFF'))
           .borderRadius($r('app.float.fontSize_16'))
+          .onClick(()=>{
+            if (!this.selectWorkOder.workOrderCode) {
+              return
+            }
+            this.completeReceiveController.open()
+          })
 
           Blank()
           Column({space: 2}) {

entry/src/main/ets/view/CompleteReceiveDialog.ets

@@ -12,7 +12,7 @@ export struct CompleteReceiveDialog {
   //工序载具列表
   @State processVehicleList: VehicleInfo[] = []
   //当前工单号
-  @Link currentWorkOrderCode:string
+  currentWorkOrderCode:string = ''
   //当前工序号
   @Link currentOperationId:string
   //当前载具物料列表

entry/src/main/ets/view/WorkInstructionsDialog.ets

@@ -10,6 +10,8 @@ export struct WorkInstructionsDialog {
   //作业图片列表
   @State drawingList: DrawingInfo[] = []
 
+  materialCode: string = ''
+
   controller: CustomDialogController
   onConfirm: () => void = () => {
   }
@@ -17,6 +19,7 @@ export struct WorkInstructionsDialog {
   //加载所有作业
   loadWorkInstructions = async () => {
     this.drawingList = await ProcessRequest.post('/api/v1/base/drawing/list', {
+      materialCode: this.materialCode!
     } as RequestParamModel) as DrawingInfo[];
   };
 

entry/src/main/ets/viewmodel/RequestParamModel.ets

@@ -90,4 +90,6 @@ export default class RequestParamModel {
   deviceNo?:string
   //工号
   jobNumber?:string
+  //物料编码
+  materialCode?:string
 }