多人派工需求调整

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

@@ -9,6 +9,7 @@ export class FbsWorkshopDispatchList extends Page{
 	personnelIdU8?:string;
 	/**U8获取*/
 	personnelNameU8?:string;
+	personnelIds?:any[];
 	/**日期*/
 	date?:string;
 	/**生产订单号id*/

src/app/routes/dashboard/analysis/analysis.component.html

@@ -70,8 +70,14 @@
         <nz-form-item class="nz-form-item">
           <nz-form-label [nzSpan]="8">生产订单</nz-form-label>
           <nz-form-control [nzSpan]="16">
-            <input [(ngModel)]="fbsWorkshopDispatchList.productionOrderNumberName" name="productionOrderNumberName" nz-input
-            placeholder="请输入" />
+            <!-- <input [(ngModel)]="fbsWorkshopDispatchList.productionOrderNumberName" name="productionOrderNumberName" nz-input
+            placeholder="请输入" /> -->
+            <nz-select [(ngModel)]="fbsWorkshopDispatchList.productionOrderNumberName" name="productionOrderNumberName" style="width: 100%" nzShowSearch
+              nzAllowClear nzPlaceHolder="请选择" >
+              <ng-container *ngFor="let list of listOfDataSelect">
+                <nz-option [nzLabel]="list.productionOrderNumberName" [nzValue]="list.productionOrderNumberName"> </nz-option>
+              </ng-container>
+            </nz-select>
           </nz-form-control>
         </nz-form-item>
       </div>
@@ -99,15 +105,15 @@
           <th nzLeft="265px" nzWidth="120px" nzAlign="center" style="background-color:rgb(223, 223, 219)"><strong>物料编码</strong></th>
           <th nzLeft="383px" nzWidth="200px" nzAlign="center" style="background-color:rgb(223, 223, 219)"><strong>物料名称</strong></th> -->
           
-          <th  nzWidth="60px" nzAlign="center" style="background-color:rgb(223, 223, 219)"><strong>序号</strong></th>
-          <th nzWidth="100px" nzAlign="center" style="background-color:rgb(223, 223, 219)"><strong>项目名称</strong></th>
-          <th  nzWidth="110px" nzAlign="center" style="background-color:rgb(223, 223, 219)"><strong>生产订单号</strong></th>
-          <th nzWidth="120px" nzAlign="center" style="background-color:rgb(223, 223, 219)"><strong>物料编码</strong></th>
-          <th nzWidth="200px" nzAlign="center" style="background-color:rgb(223, 223, 219)"><strong>物料名称</strong></th>
-          <th nzWidth="80px" nzAlign="center" style="background-color:rgb(223, 223, 219)"><strong>月度计划</strong></th>
-          <th nzWidth="100px" nzAlign="center" style="background-color:rgb(223, 223, 219)"><strong>标准总工时</strong></th>
-          <th nzWidth="110px" nzAlign="center" style="background-color:rgb(223, 223, 219)"><strong>累计完成数量</strong></th>
-          <th nzWidth="110px" nzAlign="center" style="background-color:rgb(223, 223, 219)"><strong>累计完成工时</strong></th>
+          <th rowSpan="2"  nzWidth="60px" nzAlign="center" style="background-color:rgb(223, 223, 219)"><strong>序号</strong></th>
+          <th rowSpan="2" nzWidth="100px" nzAlign="center" style="background-color:rgb(223, 223, 219)"><strong>项目名称</strong></th>
+          <th rowSpan="2" nzWidth="110px" nzAlign="center" style="background-color:rgb(223, 223, 219)"><strong>生产订单号</strong></th>
+          <th rowSpan="2" nzWidth="120px" nzAlign="center" style="background-color:rgb(223, 223, 219)"><strong>物料编码</strong></th>
+          <th rowSpan="2" nzWidth="200px" nzAlign="center" style="background-color:rgb(223, 223, 219)"><strong>物料名称</strong></th>
+          <th rowSpan="2" nzWidth="80px" nzAlign="center" style="background-color:rgb(223, 223, 219)"><strong>月度计划</strong></th>
+          <th rowSpan="2" nzWidth="100px" nzAlign="center" style="background-color:rgb(223, 223, 219)"><strong>标准总工时</strong></th>
+          <th rowSpan="2" nzWidth="110px" nzAlign="center" style="background-color:rgb(223, 223, 219)"><strong>累计完成数量</strong></th>
+          <th rowSpan="2" nzWidth="110px" nzAlign="center" style="background-color:rgb(223, 223, 219)"><strong>累计完成工时</strong></th>
           <ng-container *ngFor="let date of dateList">
             <th nzWidth="120px" nzAlign="center"><strong>当日计划数量</strong></th>
             <th nzWidth="120px" nzAlign="center"><strong>当日完成数量</strong></th>
@@ -120,7 +126,7 @@
         <tr>
           <!-- <th colspan="5" nzLeft="0px"></th>
           <th colspan="4" ></th> -->
-          <th colspan="9" ></th>
+          <!-- <th colspan="9" ></th> -->
           <ng-container *ngFor="let date of dateList;let i=index">
             <th colspan="6" *ngIf="i%2===0" style="background-color:rgb(223, 223, 219)"><strong>{{date.finalTime|date:'y-MM-dd'}}</strong></th>
             <th colspan="6" *ngIf="i%2!==0" ><strong>{{date.finalTime|date:'y-MM-dd'}}</strong></th>
@@ -189,70 +195,70 @@
       <!-- 异常工时 -->
       <tbody>
         <tr>
+          <td colspan="5" rowSpan="8"></td>
+          <!-- <td ></td>
           <td ></td>
           <td ></td>
-          <td ></td>
-          <td ></td>
-          <td ></td>
+          <td ></td> -->
           <!-- <td>月计划达成率</td>
           <td>1.95%</td>
           <td>月生产效率</td>
           <td>根据生产计划进度。实时变化</td> -->
-          <td >出勤总工时</td>
-          <td>{{AbnormalWorkingHoursTotal.attendanceHours}}</td>
-          <td colSpan="2" nzAlign="right">出勤情况</td>
+          <td class="bolder">出勤总工时</td>
+          <td nzAlign="center">{{AbnormalWorkingHoursTotal.attendanceHours}}</td>
+          <td colSpan="2" nzAlign="right" class="bolder">出勤情况</td>
           <ng-container *ngFor="let abnormalWorkingHours of abnormalWorkingHoursList">
-            <td>应到人数</td>
-            <td>{{abnormalWorkingHours.numberOfPeopleToArrive}}</td>
+            <td >应到人数</td>
+            <td nzAlign="center">{{abnormalWorkingHours.numberOfPeopleToArrive}}</td>
             <td>实到人数</td>
-            <td>{{abnormalWorkingHours.actualNumberOfPeople}}</td>
+            <td nzAlign="center">{{abnormalWorkingHours.actualNumberOfPeople}}</td>
             <td>出勤工时</td>
-            <td>{{abnormalWorkingHours.attendanceHours}}</td>
+            <td nzAlign="center">{{abnormalWorkingHours.attendanceHours}}</td>
           </ng-container>
         </tr>
         <tr>
+          <!-- <td ></td>
           <td ></td>
           <td ></td>
           <td ></td>
-          <td ></td>
-          <td ></td>
-          <td >加班总工时</td>
-          <td >{{AbnormalWorkingHoursTotal.overtimeHours}}</td>
-          <td colSpan="2" nzAlign="right">加班记录</td>
+          <td ></td> -->
+          <td class="bolder">加班总工时</td>
+          <td nzAlign="center">{{AbnormalWorkingHoursTotal.overtimeHours}}</td>
+          <td colSpan="2" nzAlign="right" class="bolder">加班记录</td>
           <ng-container *ngFor="let abnormalWorkingHours of abnormalWorkingHoursList">
             <td>加班工时</td>
-            <td>{{abnormalWorkingHours.overtimeHours}}</td>
+            <td nzAlign="center">{{abnormalWorkingHours.overtimeHours}}</td>
             <td>加班原因</td>
             <td colSpan="3">{{abnormalWorkingHours.overtimeReason}}</td>
           </ng-container>
         </tr>
         <tr>
+          <!-- <td rowSpan="2"></td>
           <td rowSpan="2"></td>
           <td rowSpan="2"></td>
           <td rowSpan="2"></td>
-          <td rowSpan="2"></td>
-          <td rowSpan="2"></td>
+          <td rowSpan="2"></td> -->
           <!-- <td nzLeft="0px" rowSpan="2"></td>
           <td nzLeft="58px" rowSpan="2"></td>
           <td nzLeft="157px" rowSpan="2"></td>
           <td nzLeft="265px" rowSpan="2"></td>
           <td nzLeft="383px" rowSpan="2"></td> -->
-          <td rowSpan="2">其他总工时</td>
-          <td rowSpan="2">{{AbnormalWorkingHoursTotal.train}}</td>
-          <td colSpan="2" rowSpan="2" nzAlign="right">其他工时统计</td>
+          <td rowSpan="2" class="bolder">其他总工时</td>
+          <td rowSpan="2" nzAlign="center">{{AbnormalWorkingHoursTotal.train}}</td>
+          <td colSpan="2" rowSpan="2" nzAlign="right" class="bolder">其他工时统计</td>
           <ng-container *ngFor="let abnormalWorkingHours of abnormalWorkingHoursList">
             <td>培训</td>
-            <td>{{abnormalWorkingHours.train}}</td>
+            <td nzAlign="center">{{abnormalWorkingHours.train}}</td>
             <td>会议</td>
-            <td>{{abnormalWorkingHours.meeting}}</td>
+            <td nzAlign="center">{{abnormalWorkingHours.meeting}}</td>
             <td>5S</td>
-            <td>{{abnormalWorkingHours.fiveS}}</td>
+            <td nzAlign="center">{{abnormalWorkingHours.fiveS}}</td>
           </ng-container>
         </tr>
         <tr>
           <ng-container *ngFor="let abnormalWorkingHours of abnormalWorkingHoursList">
             <td>研发</td>
-            <td>{{abnormalWorkingHours.researchAndDevelopment}}</td>
+            <td nzAlign="center">{{abnormalWorkingHours.researchAndDevelopment}}</td>
             <td></td>
             <td></td>
             <td></td>
@@ -260,56 +266,56 @@
           </ng-container>
         </tr>
         <tr>
+          <!-- <td rowSpan="3"></td>
           <td rowSpan="3"></td>
           <td rowSpan="3"></td>
           <td rowSpan="3"></td>
-          <td rowSpan="3"></td>
-          <td rowSpan="3"></td>
+          <td rowSpan="3"></td> -->
           <!-- <td nzLeft="0px" rowSpan="3"></td>
           <td nzLeft="58px" rowSpan="3"></td>
           <td nzLeft="157px" rowSpan="3"></td>
           <td nzLeft="265px" rowSpan="3"></td>
           <td nzLeft="383px" rowSpan="3"></td> -->
-          <td rowSpan="3">异常总工时统计</td>
-          <td rowSpan="3">{{AbnormalWorkingHoursTotal.abnormalWorkingHours}}</td>
-          <td colSpan="2" rowSpan="3" nzAlign="right">异常工时统计</td>
+          <td rowSpan="3" class="bolder">异常总工时统计</td>
+          <td rowSpan="3" nzAlign="center">{{AbnormalWorkingHoursTotal.abnormalWorkingHours}}</td>
+          <td colSpan="2" rowSpan="3" nzAlign="right" class="bolder">异常工时统计</td>
           <ng-container *ngFor="let abnormalWorkingHours of abnormalWorkingHoursList">
             <td>质量</td>
-            <td>{{abnormalWorkingHours.quality}}</td>
+            <td nzAlign="center">{{abnormalWorkingHours.quality}}</td>
             <td>设计</td>
-            <td>{{abnormalWorkingHours.design}}</td>
+            <td nzAlign="center">{{abnormalWorkingHours.design}}</td>
             <td>返工</td>
-            <td>{{abnormalWorkingHours.rework}}</td>
+            <td nzAlign="center">{{abnormalWorkingHours.rework}}</td>
           </ng-container>
         </tr>
         <tr>
           <ng-container *ngFor="let abnormalWorkingHours of abnormalWorkingHoursList">
             <td>物料</td>
-            <td>{{abnormalWorkingHours.materiel}}</td>
+            <td nzAlign="center">{{abnormalWorkingHours.materiel}}</td>
             <td>能源</td>
-            <td>{{abnormalWorkingHours.energy}}</td>
+            <td nzAlign="center">{{abnormalWorkingHours.energy}}</td>
             <td>其他</td>
-            <td>{{abnormalWorkingHours.other}}</td>
+            <td nzAlign="center">{{abnormalWorkingHours.other}}</td>
           </ng-container>
         </tr>
         <tr>
           <ng-container *ngFor="let abnormalWorkingHours of abnormalWorkingHoursList">
             <td>设备</td>
-            <td>{{abnormalWorkingHours.equipment}}</td>
+            <td nzAlign="center">{{abnormalWorkingHours.equipment}}</td>
             <td>计划</td>
-            <td>{{abnormalWorkingHours.plan}}</td>
+            <td nzAlign="center">{{abnormalWorkingHours.plan}}</td>
             <td></td>
             <td></td>
           </ng-container>
         </tr>
 
         <tr>
+          <!-- <td ></td>
           <td ></td>
           <td ></td>
           <td ></td>
-          <td ></td>
-          <td ></td>
-          <td colSpan="4">异常原因描述</td>
+          <td ></td> -->
+          <td colSpan="4" class="bolder">异常原因描述</td>
           <ng-container *ngFor="let abnormalWorkingHours of abnormalWorkingHoursList">
             <td colSpan="6">
               <ng-container *ngFor="let describe of abnormalWorkingHours.fbsAbnormalWorkingHoursDescribeList">

src/app/routes/dashboard/analysis/analysis.component.ts

@@ -25,6 +25,9 @@ import { FbsWorkshopDispatchList } from 'app/entity/fbs/fbs-workshop-dispatch-li
     td{
       border:solid#000 1px;
     }
+    .bolder{
+      font-weight:bolder;
+    }
     `
   ]
   // changeDetection: ChangeDetectionStrategy.OnPush,
@@ -292,10 +295,15 @@ export class DashboardAnalysisComponent implements OnInit {
   /**
    * 获取报表数据
    */
+  listOfDataSelect=null;
   getSumDispatchReport(){
     this.saveLoading=true;
     this.fbsWorkshopDispatchListService.getSumDispatchReport(this.fbsWorkshopDispatchList).then((response)=>{
       this.listOfData=response.result;
+      if(this.listOfDataSelect===null){
+        this.listOfDataSelect=JSON.parse(JSON.stringify(response.result));
+      }
+      
       //获取时间集合数据
       this.getDateList();
       this.saveLoading=false;
@@ -367,7 +375,7 @@ export class DashboardAnalysisComponent implements OnInit {
     }
     
    }
-
+   
   exportLoading=false;
   export(){
     let month=this.year.substring(2,4)+this.month;

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

@@ -108,8 +108,8 @@
         <tr *ngFor="let data of editRowTable.data">
           <td>{{data.sort}}</td>
           <td>
-            <nz-select [(ngModel)]="data.personnelIdU8" style="width: 100px" nzShowSearch
-              nzAllowClear nzPlaceHolder="请选择" (ngModelChange)="personnelChange($event,data)">
+            <nz-select [nzMaxTagCount]="3" nzMode="multiple" [(ngModel)]="data.personnelIds" style="width: 100px" nzShowSearch
+              nzAllowClear nzPlaceHolder="请选择"  [nzDropdownMatchSelectWidth]="false">
               <ng-container *ngFor="let proper of properList">
                 <nz-option [nzLabel]="proper.personnelName" [nzValue]="proper.personnelCode"> </nz-option>
               </ng-container>
@@ -120,7 +120,7 @@
             </nz-date-picker>
           </td>
           <td>
-            <nz-select [(ngModel)]="data.productionOrderNumberId" style="width: 200px" nzShowSearch
+            <nz-select [(ngModel)]="data.productionOrderNumberId" style="width: 150px" nzShowSearch
               nzAllowClear nzPlaceHolder="请选择" (ngModelChange)="productionOrderNumberChange($event,data)" [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>

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

@@ -210,6 +210,30 @@ export class FbsWorkshopDispatchListAddComponent implements OnInit {
         element.plannedStartTime=this.datePipe.transform(element.plannedStartTime, 'yyyy-MM-dd HH:mm:ss');
         element.plannedEndTime=this.datePipe.transform(element.plannedEndTime, 'yyyy-MM-dd HH:mm:ss');
       });
+
+      //获取人员id与名称
+      this.workshopDispatchListList.forEach(working => {
+        let isOne=true;
+        //多选的id集合
+        working.personnelIds.forEach(personnelIdSelect => {
+          //人员下拉集合
+          this.properList.forEach(personnelIdEntity => {
+            //找到选中人员获取数据
+            if(personnelIdSelect===personnelIdEntity.personnelCode){
+              if(isOne){
+                working.name=personnelIdEntity.personnelName;
+                working.personnelIdU8=personnelIdEntity.personnelCode;
+                working.personnelNameU8=personnelIdEntity.personnelName;
+                isOne=false;
+              }else{
+                working.name+=","+personnelIdEntity.personnelName;
+                working.personnelIdU8+=","+personnelIdEntity.personnelCode;
+                working.personnelNameU8+=","+personnelIdEntity.personnelName;
+              }
+            }
+          });
+        });
+      });
     }
     let workshopDispatchList=new FbsWorkshopDispatchList();
     workshopDispatchList.fbsWorkshopDispatchListList=this.workshopDispatchListList;

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

@@ -22,7 +22,7 @@ export class FbsWorkshopDispatchListListComponent implements OnInit {
     private nzNotificationService: NzNotificationService,
     private datePipe: DatePipe,
     private xlsx: XlsxService,
-    private fbsPersonnelService:FbsPersonnelService
+    private fbsPersonnelService: FbsPersonnelService,
   ) {}
 
   ngOnInit() {
@@ -71,7 +71,7 @@ export class FbsWorkshopDispatchListListComponent implements OnInit {
         this.getEfficiency(this.dataList); //计算效率
         this.page = response.result; //分页数据
         this.isLoading = false;
-        this.getTotal();//计算当页的总计数量
+        this.getTotal(); //计算当页的总计数量
       }
     });
   }
@@ -79,31 +79,33 @@ export class FbsWorkshopDispatchListListComponent implements OnInit {
   /**
    * 初始化总计
    */
-  totalList:any={}
-  initializationTotal(){
-    this.totalList={
-      plannedQuantity:0,
-      numberOfTasks:0,
-      standardWorkingHours:0,
-      latestCompletedQuantity:0,
-      manHoursCompleted:0
-    }
+  totalList: any = {};
+  initializationTotal() {
+    this.totalList = {
+      plannedQuantity: 0,
+      numberOfTasks: 0,
+      standardWorkingHours: 0,
+      latestCompletedQuantity: 0,
+      manHoursCompleted: 0,
+    };
   }
 
   /**
    * 计算当页的总计数据
    */
-  getTotal(){
+  getTotal() {
     this.initializationTotal();
-    if(this.dataList){
+    if (this.dataList) {
       this.dataList.forEach(element => {
-        this.totalList.plannedQuantity=this.totalList.plannedQuantity+Number(element.plannedQuantity);
-        this.totalList.numberOfTasks=this.totalList.numberOfTasks+Number(element.numberOfTasks);
-        this.totalList.standardWorkingHours=this.totalList.standardWorkingHours+Number(element.standardWorkingHours);
-        this.totalList.latestCompletedQuantity=this.totalList.latestCompletedQuantity+Number(element.latestCompletedQuantity);
-        this.totalList.manHoursCompleted=this.totalList.manHoursCompleted+Number(element.manHoursCompleted);
+        this.totalList.plannedQuantity = this.totalList.plannedQuantity + Number(element.plannedQuantity);
+        this.totalList.numberOfTasks = this.totalList.numberOfTasks + Number(element.numberOfTasks);
+        this.totalList.standardWorkingHours =
+          this.totalList.standardWorkingHours + Number(element.standardWorkingHours);
+        this.totalList.latestCompletedQuantity =
+          this.totalList.latestCompletedQuantity + Number(element.latestCompletedQuantity);
+        this.totalList.manHoursCompleted = this.totalList.manHoursCompleted + Number(element.manHoursCompleted);
       });
-      this.totalList.manHoursCompleted=this.totalList.manHoursCompleted.toFixed(2)
+      this.totalList.manHoursCompleted = this.totalList.manHoursCompleted.toFixed(2);
     }
   }
 
@@ -181,7 +183,7 @@ export class FbsWorkshopDispatchListListComponent implements OnInit {
       let numberOfTasks = element.numberOfTasks; //任务数量
       let standardWorkingHours = element.standardWorkingHours; //标准工时
       let latestCompletedQuantity = element.latestCompletedQuantity; //完成数量
-      let standardWorkingHoursZ=element.standardWorkingHoursZ;//rep标准工时
+      let standardWorkingHoursZ = element.standardWorkingHoursZ; //rep标准工时
       let manHoursCompleted = element.manHoursCompleted; //完成工时
       if (latestCompletedQuantity && Number(latestCompletedQuantity) !== 0) {
         element.numberEfficiency = ((Number(latestCompletedQuantity) / Number(numberOfTasks)) * 100).toFixed(0);
@@ -198,13 +200,19 @@ export class FbsWorkshopDispatchListListComponent implements OnInit {
           Number(manHoursCompleted) !== 0 &&
           latestCompletedQuantity &&
           Number(latestCompletedQuantity) !== 0
-          &&
-          standardWorkingHoursZ &&
-          Number(standardWorkingHoursZ) !== 0
         ) {
-          element.workingHoursEfficiency = ((Number(standardWorkingHoursZ)*Number(latestCompletedQuantity) / Number(manHoursCompleted)) * 100).toFixed(
-            0,
-          );
+          //单个标准工时不为空则按单个与完成数量计算
+          if (standardWorkingHoursZ && Number(standardWorkingHoursZ) !== 0) {
+            element.workingHoursEfficiency = (
+              ((Number(standardWorkingHoursZ) * Number(latestCompletedQuantity)) / Number(manHoursCompleted)) *
+              100
+            ).toFixed(0);
+          }else{//没有则标准工时除完成工时
+            element.workingHoursEfficiency = (
+              ((Number(standardWorkingHours)) / Number(manHoursCompleted)) *
+              100
+            ).toFixed(0);
+          }
         } else {
           element.workingHoursEfficiency = 0;
         }
@@ -215,17 +223,16 @@ export class FbsWorkshopDispatchListListComponent implements OnInit {
   /**
    * 初始化人员下拉数据集合
    */
-  properList=[];
-  getProperList(){
+  properList = [];
+  getProperList() {
     // this.fbsWorkshopDispatchListService.getPerAndDerp().then((response)=>{
     //   this.properList=response.result
     // })
-    this.fbsPersonnelService.list({pageSize:1000}).then((response)=>{
-      this.properList=response.result.records
-    })
+    this.fbsPersonnelService.list({ pageSize: 1000 }).then(response => {
+      this.properList = response.result.records;
+    });
   }
 
-
   /**
    * 新增页面
    */

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

@@ -12,8 +12,8 @@
       <tr>
         <td style="width: 25%;">姓名</td>
         <td style="width: 25%;">
-          <nz-select [(ngModel)]="fbsWorkshopDispatchList.personnelIdU8" style="width: 100%;" nzShowSearch nzAllowClear
-            nzPlaceHolder="请选择" (ngModelChange)="personnelChange($event,fbsWorkshopDispatchList)">
+          <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>

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

@@ -178,6 +178,7 @@ export class FbsWorkshopDispatchListUpdateComponent implements OnInit {
     this.fbsWorkshopDispatchListService.getById(this.id).then((response)=>{
       if(response.success){
         this.fbsWorkshopDispatchList=response.result;
+        this.fbsWorkshopDispatchList.personnelIds=this.fbsWorkshopDispatchList.personnelIdU8.split(",");//获取修改的多选人员id
         this.remainingQuantity=this.fbsWorkshopDispatchList.remainingQuantity;
         this.productionOrderNumberChange(this.fbsWorkshopDispatchList.productionOrderNumberId);
         this.saveLoading=false;
@@ -204,6 +205,27 @@ export class FbsWorkshopDispatchListUpdateComponent implements OnInit {
       this.fbsWorkshopDispatchList.state="3";
 
     }
+    //获取人员id与名称
+      let isOne=true;
+      //多选的id集合
+      this.fbsWorkshopDispatchList.personnelIds.forEach(personnelIdSelect => {
+        //人员下拉集合
+        this.properList.forEach(personnelIdEntity => {
+          //找到选中人员获取数据
+          if(personnelIdSelect===personnelIdEntity.personnelCode){
+            if(isOne){
+              this.fbsWorkshopDispatchList.name=personnelIdEntity.personnelName;
+              this.fbsWorkshopDispatchList.personnelIdU8=personnelIdEntity.personnelCode;
+              this.fbsWorkshopDispatchList.personnelNameU8=personnelIdEntity.personnelName;
+              isOne=false;
+            }else{
+              this.fbsWorkshopDispatchList.name+=","+personnelIdEntity.personnelName;
+              this.fbsWorkshopDispatchList.personnelIdU8+=","+personnelIdEntity.personnelCode;
+              this.fbsWorkshopDispatchList.personnelNameU8+=","+personnelIdEntity.personnelName;
+            }
+          }
+        });
+      });
     this.fbsWorkshopDispatchListService.editR(this.fbsWorkshopDispatchList).then((response)=>{
       if(response.success){//保存成功
         this.nzNotificationService.success("保存成功","");