派工单 看板

src/app/entity/fbs/fbs-workshop-dispatch-list.ts

@@ -78,4 +78,5 @@ export class FbsWorkshopDispatchList extends Page{
 	firstTime?:string;
 	finalTime?:string;
 	workCenter?:string;//工作中心
+	processSequence?:string;
 }

src/app/routes/fbs-abnormal-working-hours/list/list.component.html

@@ -35,14 +35,18 @@
       <!-- 按钮 -->
       <div nz-col nzXs="24" nzSm="4" nzLg="8">
         <nz-form-item class="nz-form-item">
-          <nz-form-label [nzSpan]="2" [nzNoColon]="true"></nz-form-label>
-          <nz-form-control [nzSpan]="22" style="text-align: right;">
+          <nz-form-label [nzSpan]="4" [nzNoColon]="true"></nz-form-label>
+          <nz-form-control [nzSpan]="20" >
             <!-- 查询 -->
             <button nz-button nzType="primary" (click)="query()">查询</button>
+            &nbsp;&nbsp;
+            <a *ngIf="!isShow" (click)="getShow()">展开&nbsp;<i nz-icon nzType="down" nzTheme="outline"></i></a>
+            <a *ngIf="isShow" (click)="getShow()">收起&nbsp;<i nz-icon nzType="up" nzTheme="outline"></i></a>
           </nz-form-control>
         </nz-form-item>
       </div>
     </div>
+    <div *ngIf="isShow">
     <div nz-row [nzGutter]="{xs:12,sm:15,md:29,lg: 36, xl: 40}">
       <!-- 项目编号 -->
       <div nz-col nzXs="24" nzSm="4" nzLg="8">
@@ -97,6 +101,7 @@
         </nz-form-item>
       </div>
     </div>
+  </div>
   </form>
   <!-- 数据表 -->
   <!-- <nz-table nzSize="small" class="buttonDistance" [nzData]="dataList" [nzLoading]="isLoading"

src/app/routes/fbs-abnormal-working-hours/list/list.component.ts

@@ -221,6 +221,16 @@ export class FbsAbnormalWorkingHoursListComponent implements OnInit {
     }
   }
 
+  //控制查询条件展开与收起
+  isShow=false;
+  getShow(){
+    if(this.isShow){
+      this.isShow=false;
+    }else{
+      this.isShow=true;
+    }
+  }
+
   /**
    * 导出
    */

src/app/routes/fbs-workshop-dispatch-list/add/add.component.ts

@@ -120,7 +120,7 @@ export class FbsWorkshopDispatchListAddComponent implements OnInit {
     // this.productionOrderNumberList=[
     //   {id:"SC001",name:"SC001"}
     // ]
-    this.fbsWorkshopDispatchListService.getFbsMomOrder().then((response)=>{
+    this.fbsWorkshopDispatchListService.getFbsMomOrder(null).then((response)=>{
       this.productionOrderNumberList=response.result;
     })
   }

src/app/routes/fbs-workshop-dispatch-list/add/reference/reference.component.html

@@ -58,6 +58,31 @@
         </nz-form-item>
       </div>
     </div>
+    <div nz-row [nzGutter]="{xs:12,sm:15,md:29,lg: 36, xl: 40}">
+      <div nz-col nzXs="24" nzSm="4" nzLg="8">
+        <nz-form-item class="nz-form-item">
+        <nz-form-label [nzSpan]="8">开工时间</nz-form-label>
+        <nz-form-control [nzSpan]="16">
+          <!-- <input [(ngModel)]="fbsWorkshopDispatchList.name" name="name" nz-input
+            placeholder="请输入" /> -->
+            <nz-date-picker name="startDate" [(ngModel)]="fbsMomOrderdetail.startDate" nzPlaceHolder="请选择" >
+            </nz-date-picker>
+        </nz-form-control>
+      </nz-form-item>
+      </div>
+      <div nz-col nzXs="24" nzSm="4" nzLg="8">
+        <nz-form-item class="nz-form-item">
+        <nz-form-label [nzSpan]="8">完工时间</nz-form-label>
+        <nz-form-control [nzSpan]="16">
+          <!-- <input [(ngModel)]="fbsWorkshopDispatchList.name" name="name" nz-input
+            placeholder="请输入" /> -->
+            <nz-date-picker name="dueDate" [(ngModel)]="fbsMomOrderdetail.dueDate" nzPlaceHolder="请选择" >
+            </nz-date-picker>
+        </nz-form-control>
+      </nz-form-item>
+      </div>
+      
+    </div>
     
     <div nz-row [nzGutter]="{xs:12,sm:15,md:29,lg: 36, xl: 40}">
       <!-- 按钮 -->

src/app/routes/fbs-workshop-dispatch-list/add/reference/reference.component.ts

@@ -2,6 +2,7 @@ import { Component, OnInit } from '@angular/core';
 import { NzModalRef, NzMessageService, NzNotificationService } from 'ng-zorro-antd';
 import { _HttpClient } from '@delon/theme';
 import { FbsWorkshopDispatchListService } from 'app/services/fbs/fbs-workshop-dispatch-list.service';
+import { DatePipe } from '@angular/common';
 
 @Component({
   selector: 'app-fbs-workshop-dispatch-list-add-reference',
@@ -13,7 +14,8 @@ export class FbsWorkshopDispatchListAddReferenceComponent implements OnInit {
   constructor(
     private modal: NzModalRef,
     private fbsWorkshopDispatchListService:FbsWorkshopDispatchListService,
-    private nzNotificationService:NzNotificationService
+    private nzNotificationService:NzNotificationService,
+    private datePipe:DatePipe
   ) { }
 
   ngOnInit(): void {
@@ -37,6 +39,17 @@ export class FbsWorkshopDispatchListAddReferenceComponent implements OnInit {
   fbsMomOrderdetail:any={}
   getList(){
     this.isLoading=true;
+    if(this.fbsMomOrderdetail.startDate){
+      console.log(this.fbsMomOrderdetail.startDate)
+      this.fbsMomOrderdetail.startDate = this.datePipe.transform(this.fbsMomOrderdetail.startDate, 'yyyy-MM-dd');
+    }else{
+      delete this.fbsMomOrderdetail.startDate
+    }
+    if(this.fbsMomOrderdetail.dueDate){
+      this.fbsMomOrderdetail.dueDate = this.datePipe.transform(this.fbsMomOrderdetail.dueDate, 'yyyy-MM-dd');
+    }else{
+      delete this.fbsMomOrderdetail.dueDate
+    }
     this.fbsWorkshopDispatchListService.getFbsMomOrder(this.fbsMomOrderdetail).then((response)=>{
       this.dataList=response.result;
       this.isLoading=false;

src/app/routes/fbs-workshop-dispatch-list/list/list.component.html

@@ -31,6 +31,56 @@
           </nz-form-control>
         </nz-form-item>
       </div>
+      <!-- 按钮 -->
+      <div nz-col nzXs="24" nzSm="4" nzLg="8">
+        <nz-form-item class="nz-form-item">
+          <nz-form-label [nzSpan]="4" [nzNoColon]="true"></nz-form-label>
+          <nz-form-control [nzSpan]="20" >
+            <!-- 查询 -->
+            <button nz-button nzType="primary" (click)="query()">查询</button>
+            &nbsp;&nbsp;
+            <a *ngIf="!isShow" (click)="getShow()">展开&nbsp;<i nz-icon nzType="down" nzTheme="outline"></i></a>
+            <a *ngIf="isShow" (click)="getShow()">收起&nbsp;<i nz-icon nzType="up" nzTheme="outline"></i></a>
+          </nz-form-control>
+        </nz-form-item>
+      </div>
+      
+    </div>
+    
+    <div *ngIf="isShow">
+    <div nz-row [nzGutter]="{xs:12,sm:15,md:29,lg: 36, xl: 40}">
+      <!-- 项目编码 -->
+      <div nz-col nzXs="24" nzSm="4" nzLg="8">
+        <nz-form-item class="nz-form-item">
+          <nz-form-label [nzSpan]="8">项目编码</nz-form-label>
+          <nz-form-control [nzSpan]="16">
+            <input [(ngModel)]="fbsWorkshopDispatchList.costItemCode" name="costItemCode" nz-input
+              placeholder="请输入" />
+          </nz-form-control>
+        </nz-form-item>
+      </div>
+      <!-- 项目名称 -->
+      <div nz-col nzXs="24" nzSm="4" nzLg="8">
+        <nz-form-item class="nz-form-item">
+          <nz-form-label [nzSpan]="8">项目名称</nz-form-label>
+          <nz-form-control [nzSpan]="16">
+            <input [(ngModel)]="fbsWorkshopDispatchList.projectName" name="projectName" nz-input
+              placeholder="请输入" />
+          </nz-form-control>
+        </nz-form-item>
+      </div>
+      <!-- 工作中心 -->
+      <div nz-col nzXs="24" nzSm="4" nzLg="8">
+        <nz-form-item class="nz-form-item">
+          <nz-form-label [nzSpan]="8">工作中心</nz-form-label>
+          <nz-form-control [nzSpan]="16">
+            <input [(ngModel)]="fbsWorkshopDispatchList.workCenter" name="workCenter" nz-input
+              placeholder="请输入" />
+          </nz-form-control>
+        </nz-form-item>
+      </div>
+    </div>
+    <div nz-row [nzGutter]="{xs:12,sm:15,md:29,lg: 36, xl: 40}">
       <!-- 生产订单号 -->
       <div nz-col nzXs="24" nzSm="4" nzLg="8">
         <nz-form-item class="nz-form-item">
@@ -42,9 +92,6 @@
         </nz-form-item>
         
       </div>
-      
-    </div>
-    <div nz-row [nzGutter]="{xs:12,sm:15,md:29,lg: 36, xl: 40}">
       <!-- 物料名称 -->
       <div nz-col nzXs="24" nzSm="4" nzLg="8">
         <nz-form-item class="nz-form-item">
@@ -66,7 +113,7 @@
         </nz-form-item>
       </div>
       <!-- 项目名称 -->
-      <div nz-col nzXs="24" nzSm="4" nzLg="8">
+      <!-- <div nz-col nzXs="24" nzSm="4" nzLg="8">
         <nz-form-item class="nz-form-item">
           <nz-form-label [nzSpan]="8">项目名称</nz-form-label>
           <nz-form-control [nzSpan]="16">
@@ -75,11 +122,11 @@
           </nz-form-control>
         </nz-form-item>
         
-      </div>
+      </div> -->
     </div>
     <div nz-row [nzGutter]="{xs:12,sm:15,md:29,lg: 36, xl: 40}">
        <!-- 姓名 -->
-       <div nz-col nzXs="24" nzSm="4" nzLg="8">
+       <!-- <div nz-col nzXs="24" nzSm="4" nzLg="8">
         <nz-form-item class="nz-form-item">
           <nz-form-label [nzSpan]="8">姓名</nz-form-label>
           <nz-form-control [nzSpan]="16">
@@ -91,7 +138,7 @@
             </nz-select>
           </nz-form-control>
         </nz-form-item>
-      </div>
+      </div> -->
       <!-- 状态 -->
       <div nz-col nzXs="24" nzSm="4" nzLg="8">
         <nz-form-item class="nz-form-item">
@@ -109,18 +156,7 @@
         </nz-form-item>
      </div>
     </div>
-    <div nz-row [nzGutter]="{xs:12,sm:15,md:29,lg: 36, xl: 40}">
-      <!-- 按钮 -->
-      <div nz-col nzXs="24" nzSm="4" nzLg="24">
-        <nz-form-item class="nz-form-item">
-          <nz-form-label [nzSpan]="2" [nzNoColon]="true"></nz-form-label>
-          <nz-form-control [nzSpan]="22" style="text-align: right;">
-            <!-- 查询 -->
-            <button nz-button nzType="primary" (click)="query()">查询</button>
-          </nz-form-control>
-        </nz-form-item>
-      </div>
-    </div>
+  </div>
   </form>
   <!-- 数据表 -->
   <nz-table nzSize="small" class="buttonDistance" [nzData]="dataList" [nzLoading]="isLoading"
@@ -128,18 +164,22 @@
     (nzPageIndexChange)="pageIndexChange($event)">
     <thead>
       <tr>
-        <th  style="width:10%">姓名</th>
+        <th>项目编码</th>
         <th>项目名称</th>
+        <th>工作中心</th>
         <th>生产订单号</th>
+        <th>物料编码</th>
         <th>物料名称</th>
+        <!-- <th  style="width:10%">姓名</th> -->
         <th nzAlign="center">计划数量</th>
         <th nzAlign="center">派工数量</th>
-        <th nzAlign="center">标准工时</th>
         <th nzAlign="center">完成数量</th>
-        <th nzAlign="center">完成工时</th>
+        <th nzAlign="center">剩余数量</th>
         <th nzAlign="center">达成率</th>
+        <th nzAlign="center">标准工时</th>
+        <th nzAlign="center">实际工时</th>
         <th nzAlign="center">生产效率</th>
-        <th nzAlign="center">工艺流程</th>
+        <!-- <th nzAlign="center">工艺流程</th> -->
         <th>状态</th>
         <th>实际完成时间</th>
         <th nzAlign="center">是否可扫码</th>
@@ -151,21 +191,25 @@
     <tbody>
       <tr *ngFor="let item of  borderedTable.data">
         <!-- <td >{{item.milestoneCode}}</td> -->
-        <td>{{item.name}}</td>
-        <td>{{item.projectName}}</td>
+        <td>{{item.costItemCode}}</td>
+        <td style="width: 8%;">{{item.projectName}}</td>
+        <td>{{item.workCenter}}</td>
         <td>{{item.productionOrderNumberName}}</td>
-        <td style="width: 15%;">{{item.product}}</td>
+        <td style="width: 7%;">{{item.productId}}</td>
+        <td style="width: 7%;">{{item.product}}</td>
+        <!-- <td>{{item.name}}</td> -->
         <td  nzAlign="center" >{{item.plannedQuantity}}</td>
         <td nzAlign="center">{{item.numberOfTasks}}</td>
-        <td nzAlign="center">{{item.standardWorkingHours}}</td>
         <td nzAlign="center">{{item.latestCompletedQuantity}}</td>
-        <td nzAlign="center">{{item.manHoursCompleted}}</td>
+        <td nzAlign="center">{{item.latestCompletedQuantity}}</td>
         <td nzAlign="center">{{item.numberEfficiency}}%</td>
+        <td nzAlign="center">{{item.standardWorkingHours}}</td>
+        <td nzAlign="center">{{item.manHoursCompleted}}</td>
         <td nzAlign="center">{{item.workingHoursEfficiency}}%</td>
-        <td>
+        <!-- <td>
          <div>{{item.fbsTechnologicalProcessItemName}}</div> 
 
-        </td>
+        </td> -->
         <td>
           <nz-badge nzStatus="yellow" *ngIf="item.state=='0'" nzText="派工"></nz-badge>
           <nz-badge nzStatus="green" *ngIf="item.state=='1'" nzText="上岗"></nz-badge>
@@ -203,12 +247,16 @@
         <td></td>
         <td></td>
         <td></td>
+        <td></td>
+        <td></td>
+        <!-- <td></td> -->
         <td nzAlign="center">{{totalList.plannedQuantity}}</td>
         <td nzAlign="center">{{totalList.numberOfTasks}}</td>
-        <td nzAlign="center">{{totalList.standardWorkingHours}}</td>
         <td nzAlign="center">{{totalList.latestCompletedQuantity}}</td>
-        <td nzAlign="center">{{totalList.manHoursCompleted}}</td>
+        <td nzAlign="center">{{totalList.latestCompletedQuantity}}</td>
         <td nzAlign="center">{{totalList.numberEfficiency}}%</td>
+        <td nzAlign="center">{{totalList.standardWorkingHours}}</td>
+        <td nzAlign="center">{{totalList.manHoursCompleted}}</td>
         <td nzAlign="center">{{totalList.workingHoursEfficiency}}%</td>
         <td></td>
       </tr>

src/app/routes/fbs-workshop-dispatch-list/list/list.component.ts

@@ -402,4 +402,13 @@ export class FbsWorkshopDispatchListListComponent implements OnInit {
       }
     });
   }
+  //控制查询条件展开与收起
+  isShow=false;
+  getShow(){
+    if(this.isShow){
+      this.isShow=false;
+    }else{
+      this.isShow=true;
+    }
+  }
 }

src/app/routes/fbs-workshop-dispatch-list/update/update-history

@@ -0,0 +1,123 @@
+<nz-spin [nzSpinning]="saveLoading">
+  <nz-table nzSize="small" [nzNoResult]="' '" nzBordered #basicTable [nzShowPagination]="false">
+    <thead>
+      <tr>
+        <!-- 派工单 -->
+        <th colspan="4">
+          <h2><strong>派工单</strong></h2>
+        </th>
+      </tr>
+    </thead>
+    <tbody>
+      <tr>
+        <td style="width: 25%;">姓名</td>
+        <td style="width: 25%;">
+          <nz-select [nzMaxTagCount]="3" nzMode="multiple" [(ngModel)]="fbsWorkshopDispatchList.personnelIds" style="width: 100%;" nzShowSearch nzAllowClear
+            nzPlaceHolder="请选择" >
+            <ng-container *ngFor="let proper of properList">
+              <nz-option [nzLabel]="proper.personnelName" [nzValue]="proper.personnelCode"> </nz-option>
+            </ng-container>
+          </nz-select>
+        </td>
+        <td style="width: 25%;">日期</td>
+        <td style="width: 25%;">
+          <nz-date-picker [(ngModel)]="fbsWorkshopDispatchList.date" nzPlaceHolder="请选择" >
+          </nz-date-picker>
+        </td>
+      </tr>
+      <tr>
+        <td>项目编码</td>
+        <td>{{fbsWorkshopDispatchList.costItemCode}}</td>
+        <td>项目名称</td>
+        <td>{{fbsWorkshopDispatchList.projectName}}</td>
+      </tr>
+      <tr>
+        <td>工作中心</td>
+        <td>{{fbsWorkshopDispatchList.workCenter}}</td>
+      </tr>
+
+      <tr>
+        <td>生产订单号</td>
+        <td>
+          <nz-select [(ngModel)]="fbsWorkshopDispatchList.productionOrderNumberId" style="width: 200px" nzShowSearch
+          nzAllowClear nzPlaceHolder="请选择" (ngModelChange)="productionOrderNumberChange($event)" [nzDropdownMatchSelectWidth]="false">
+          <ng-container *ngFor="let productionOrderNumber of productionOrderNumberList">
+            <nz-option nzLabel="{{productionOrderNumber.mocode}}--{{productionOrderNumber.cinvcode}}--{{productionOrderNumber.cinvname}}--{{productionOrderNumber.qty}}" [nzValue]="productionOrderNumber.moid"> </nz-option>
+          </ng-container>
+        </nz-select>
+        </td>
+        <td>物料编码</td>
+        <td>{{fbsWorkshopDispatchList.productId}}</td>
+      </tr>
+      <tr>
+        <td>物料名称</td>
+        <td>
+          <nz-select [(ngModel)]="fbsWorkshopDispatchList.productId" style="width: 100%;" nzShowSearch
+            nzAllowClear nzPlaceHolder="请选择" (ngModelChange)="productChange($event,fbsWorkshopDispatchList)">
+            <ng-container *ngFor="let produc of productList">
+              <nz-option [nzLabel]="produc.cinvname" [nzValue]="produc.cinvcode"> </nz-option>
+            </ng-container>
+          </nz-select>
+        </td>
+        <td>计划数量</td>
+        <td>{{fbsWorkshopDispatchList.plannedQuantity}}</td>
+      </tr>
+      <tr>
+        <td>剩余数量</td>
+        <td>{{fbsWorkshopDispatchList.remainingQuantity}}</td>
+        <td>完成数量</td>
+        <td>{{fbsWorkshopDispatchList.latestCompletedQuantity}}</td>
+      </tr>
+      <tr>
+        <td>派工数量</td>
+        <td><nz-input-number [(ngModel)]="fbsWorkshopDispatchList.numberOfTasks" [nzMin]="0" [nzStep]="1" (ngModelChange)="numberOfTasksChange($event,fbsWorkshopDispatchList)"></nz-input-number></td>
+        <td>标准工时</td>
+        <td><nz-input-number [(ngModel)]="fbsWorkshopDispatchList.standardWorkingHours" [nzMin]="0" [nzStep]="1"></nz-input-number></td>
+      </tr>
+      <tr>
+        <td>完成工时</td>
+        <td><nz-input-number [(ngModel)]="fbsWorkshopDispatchList.manHoursCompleted" [nzMin]="0" [nzStep]="1"></nz-input-number></td>
+        <td colSpan="2"></td>
+      </tr>
+      <tr>
+        <td>计划开工时间</td>
+        <td>
+          <nz-date-picker nzFormat="yyyy-MM-dd HH:mm:ss" [(ngModel)]="fbsWorkshopDispatchList.plannedStartTime" nzPlaceHolder="请选择" [nzShowTime]="{ nzDefaultOpenValue: timeDefaultValue }">
+          </nz-date-picker>
+        </td>
+        <td>计划完工时间</td>
+        <td>
+          <nz-date-picker nzFormat="yyyy-MM-dd HH:mm:ss" [(ngModel)]="fbsWorkshopDispatchList.plannedEndTime" nzPlaceHolder="请选择" [nzShowTime]="{ nzDefaultOpenValue: timeDefaultValue }">
+          </nz-date-picker>
+        </td>
+      </tr>
+      <tr>
+        <td>工艺</td>
+        <td>
+          <nz-select [(ngModel)]="fbsWorkshopDispatchList.fbsTechnologicalProcessId" style="width: 200px" nzShowSearch nzAllowClear
+          nzPlaceHolder="请选择" (ngModelChange)="fbsTechnologicalProcessChange($event,fbsWorkshopDispatchList)" [nzDropdownMatchSelectWidth]="false">
+          <ng-container *ngFor="let fbsTechnologicalProcess of fbsTechnologicalProcessList">
+            <nz-option nzLabel="{{fbsTechnologicalProcess.name}}" [nzValue]="fbsTechnologicalProcess.id"> </nz-option>
+          </ng-container>
+        </nz-select>
+      </td>
+        <td></td>
+        <td></td>
+      </tr>
+      <tr>
+        <td>备注</td>
+        <td colSpan="3"><textarea rows="2" nz-input [(ngModel)]="fbsWorkshopDispatchList.memo"></textarea></td>
+      </tr>
+    </tbody>
+  </nz-table>
+</nz-spin>
+<!-- 底部按钮 -->
+<div class="base">
+  <!-- 底部关闭按钮 -->
+  <a nz-popconfirm style="margin-right: 2%" nzTitle="确认关闭吗(关闭前请确认数据已保存)" (nzOnConfirm)="close()">
+    <button nz-button class="ant-btn buttonDistance"><span>关闭
+      </span></button>
+  </a>
+  <!-- 底部保存按钮 -->
+  <button nzbutton (click)="save()" nz-button nzType="primary" [nzLoading]="saveLoading"><span>保存</span></button>
+</div>

src/app/routes/fbs-workshop-dispatch-list/update/update.component.html

@@ -9,7 +9,7 @@
       </tr>
     </thead>
     <tbody>
-      <tr>
+      <!-- <tr>
         <td style="width: 25%;">姓名</td>
         <td style="width: 25%;">
           <nz-select [nzMaxTagCount]="3" nzMode="multiple" [(ngModel)]="fbsWorkshopDispatchList.personnelIds" style="width: 100%;" nzShowSearch nzAllowClear
@@ -24,16 +24,33 @@
           <nz-date-picker [(ngModel)]="fbsWorkshopDispatchList.date" nzPlaceHolder="请选择" >
           </nz-date-picker>
         </td>
+      </tr> -->
+      <tr>
+        <td style="width: 25%;">项目编码</td>
+        <td style="width: 25%;">{{fbsWorkshopDispatchList.costItemCode}}</td>
+        <td style="width: 25%;">项目名称</td>
+        <td style="width: 25%;">{{fbsWorkshopDispatchList.projectName}}</td>
+      </tr>
+      <tr>
+        <td>工作中心</td>
+        <td>{{fbsWorkshopDispatchList.workCenter}}</td>
+        <td>日期</td>
+        <td>
+          <nz-date-picker [(ngModel)]="fbsWorkshopDispatchList.date" nzPlaceHolder="请选择" >
+          </nz-date-picker>
+        </td>
       </tr>
+
       <tr>
         <td>生产订单号</td>
         <td>
-          <nz-select [(ngModel)]="fbsWorkshopDispatchList.productionOrderNumberId" style="width: 200px" nzShowSearch
+          <!-- <nz-select [(ngModel)]="fbsWorkshopDispatchList.productionOrderNumberId" style="width: 200px" nzShowSearch
           nzAllowClear nzPlaceHolder="请选择" (ngModelChange)="productionOrderNumberChange($event)" [nzDropdownMatchSelectWidth]="false">
           <ng-container *ngFor="let productionOrderNumber of productionOrderNumberList">
             <nz-option nzLabel="{{productionOrderNumber.mocode}}--{{productionOrderNumber.cinvcode}}--{{productionOrderNumber.cinvname}}--{{productionOrderNumber.qty}}" [nzValue]="productionOrderNumber.moid"> </nz-option>
           </ng-container>
-        </nz-select>
+        </nz-select> -->
+        {{fbsWorkshopDispatchList.productionOrderNumberName}}
         </td>
         <td>物料编码</td>
         <td>{{fbsWorkshopDispatchList.productId}}</td>
@@ -41,12 +58,13 @@
       <tr>
         <td>物料名称</td>
         <td>
-          <nz-select [(ngModel)]="fbsWorkshopDispatchList.productId" style="width: 100%;" nzShowSearch
+          <!-- <nz-select [(ngModel)]="fbsWorkshopDispatchList.productId" style="width: 100%;" nzShowSearch
             nzAllowClear nzPlaceHolder="请选择" (ngModelChange)="productChange($event,fbsWorkshopDispatchList)">
             <ng-container *ngFor="let produc of productList">
               <nz-option [nzLabel]="produc.cinvname" [nzValue]="produc.cinvcode"> </nz-option>
             </ng-container>
-          </nz-select>
+          </nz-select> -->
+          {{fbsWorkshopDispatchList.product}}
         </td>
         <td>计划数量</td>
         <td>{{fbsWorkshopDispatchList.plannedQuantity}}</td>
@@ -83,15 +101,23 @@
       <tr>
         <td>工艺</td>
         <td>
-          <nz-select [(ngModel)]="fbsWorkshopDispatchList.fbsTechnologicalProcessId" style="width: 200px" nzShowSearch nzAllowClear
+          <!-- <nz-select [(ngModel)]="fbsWorkshopDispatchList.fbsTechnologicalProcessId" style="width: 200px" nzShowSearch nzAllowClear
           nzPlaceHolder="请选择" (ngModelChange)="fbsTechnologicalProcessChange($event,fbsWorkshopDispatchList)" [nzDropdownMatchSelectWidth]="false">
           <ng-container *ngFor="let fbsTechnologicalProcess of fbsTechnologicalProcessList">
             <nz-option nzLabel="{{fbsTechnologicalProcess.name}}" [nzValue]="fbsTechnologicalProcess.id"> </nz-option>
           </ng-container>
+        </nz-select> -->
+        {{fbsWorkshopDispatchList.processSequence}}
+      </td>
+      <td >姓名</td>
+      <td>
+        <nz-select [nzMaxTagCount]="3" nzMode="multiple" [(ngModel)]="fbsWorkshopDispatchList.personnelIds" style="width: 100%;" nzShowSearch nzAllowClear
+          nzPlaceHolder="请选择" >
+          <ng-container *ngFor="let proper of properList">
+            <nz-option [nzLabel]="proper.personnelName" [nzValue]="proper.personnelCode"> </nz-option>
+          </ng-container>
         </nz-select>
       </td>
-        <td></td>
-        <td></td>
       </tr>
       <tr>
         <td>备注</td>

src/app/routes/fbs-workshop-dispatch-list/update/update.component.ts

@@ -87,7 +87,7 @@ export class FbsWorkshopDispatchListUpdateComponent implements OnInit {
     // this.productionOrderNumberList=[
     //   {id:"SC001",name:"SC001"}
     // ]
-    this.fbsWorkshopDispatchListService.getFbsMomOrder().then((response)=>{
+    this.fbsWorkshopDispatchListService.getFbsMomOrder(null).then((response)=>{
       this.productionOrderNumberList=response.result;
     })
   }

src/app/routes/fbs-workshop-dispatch-list/view/view.component.html

@@ -8,12 +8,16 @@
     </thead>
     <tbody>
       <tr>
-        <td style="width: 25%;">姓名</td>
-        <td style="width: 25%;">
-          {{fbsWorkshopDispatchList.personnelNameU8}}
-        </td>
-        <td style="width: 25%;">日期</td>
-        <td style="width: 25%;">
+        <td style="width: 25%;">项目编码</td>
+        <td style="width: 25%;">{{fbsWorkshopDispatchList.costItemCode}}</td>
+        <td style="width: 25%;">项目名称</td>
+        <td style="width: 25%;">{{fbsWorkshopDispatchList.projectName}}</td>
+      </tr>
+      <tr>
+        <td>工作中心</td>
+        <td>{{fbsWorkshopDispatchList.workCenter}}</td>
+        <td>日期</td>
+        <td>
           {{fbsWorkshopDispatchList.date}}
         </td>
       </tr>
@@ -53,9 +57,9 @@
       </tr>
       <tr>
         <td>工艺</td>
-        <td>{{fbsWorkshopDispatchList.fbsTechnologicalProcessName}}</td>
-        <td></td>
+        <td>{{fbsWorkshopDispatchList.processSequence}}</td>
         <td></td>
+        <td>{{fbsWorkshopDispatchList.personnelNameU8}}</td>
       </tr>
       <tr>
         <td >备注</td>