调整

src/app/entity/fbs/fbs-abnormal-working-hours-describe.ts

@@ -25,7 +25,7 @@ export class FbsAbnormalWorkingHoursDescribe extends Page {
   //计划数量
   plannedQuantity?:number;
 
-  	/**生产订单号*/
+  	/**订单编号*/
 	productionOrderNumberName?:string;
 	/**不良物料名称*/
 	materielName?:string;

src/app/entity/fbs/fbs-warehouse.ts

@@ -21,11 +21,11 @@ export class FbsWarehouse extends Page{
   overtimeReason?: string;
   /**工单配料*/
   workOrderBatching?: number;
-  /**工单配料-生产订单号*/
+  /**工单配料-订单编号*/
   batchingProductionOrderNumberCode?: string;
   /**成品收存*/
   storageFinishedProducts?: number;
-  /**成品收存-生产订单号*/
+  /**成品收存-订单编号*/
   productsProductionOrderNumberCode?: string;
   /**原材料收存*/
   storageRawMaterials?: number;

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

@@ -12,9 +12,9 @@ export class FbsWorkshopDispatchList extends Page{
 	personnelIds?:any[];
 	/**日期*/
 	date?:string;
-	/**生产订单号id*/
+	/**订单编号id*/
 	productionOrderNumberId?:string;
-	/**生产订单号名称*/
+	/**订单编号名称*/
 	productionOrderNumberName?:string;
 	/**产品*/
 	product?:string;

src/app/routes/dashboard/analysis-history

@@ -62,13 +62,13 @@
 <!-- class="tableTdPadding" -->
 <!-- <th nzLeft="0px" nzWidth="60px"><strong>序号</strong></th>
 <th nzLeft="60px" nzWidth="100px"><strong>生产线</strong></th>
-<th nzLeft="160px" nzWidth="100px"><strong>生产订单号</strong></th> -->
+<th nzLeft="160px" nzWidth="100px"><strong>订单编号</strong></th> -->
 <nz-spin [nzSpinning]="saveLoading">
   <form nz-form>
     <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-label [nzSpan]="8">订单编号</nz-form-label>
           <nz-form-control [nzSpan]="16">
             <!-- <input [(ngModel)]="fbsWorkshopDispatchList.productionOrderNumberName" name="productionOrderNumberName" nz-input
             placeholder="请输入" /> -->
@@ -130,7 +130,7 @@
           <tr>
             <!-- <th nzLeft="0px" nzWidth="60px" nzAlign="center" style="background-color:rgb(223, 223, 219)"><strong>序号</strong></th>
           <th nzLeft="58px" nzWidth="100px" nzAlign="center" style="background-color:rgb(223, 223, 219)"><strong>项目名称</strong></th>
-          <th nzLeft="157px" nzWidth="110px" nzAlign="center" style="background-color:rgb(223, 223, 219)"><strong>生产订单号</strong></th>
+          <th nzLeft="157px" nzWidth="110px" nzAlign="center" style="background-color:rgb(223, 223, 219)"><strong>订单编号</strong></th>
           <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> -->
 
@@ -139,7 +139,7 @@
             <th nzLeft="29px" rowSpan="2" nzWidth="80px" nzAlign="center" style="background-color:rgb(223, 223, 219)">
               <strong>项目名称</strong></th>
             <th nzLeft="108px" rowSpan="2" nzWidth="110px" nzAlign="center" style="background-color:rgb(223, 223, 219)">
-              <strong>生产订单号</strong></th>
+              <strong>订单编号</strong></th>
             <th nzLeft="217px" rowSpan="2" nzWidth="120px" nzAlign="center" style="background-color:rgb(223, 223, 219)">
               <strong>物料编码</strong></th>
             <th nzLeft="336px" rowSpan="2" nzWidth="100px" nzAlign="center" style="background-color:rgb(223, 223, 219)">
@@ -153,7 +153,7 @@
             <th nzLeft="645px" rowSpan="2" nzWidth="70px" nzAlign="center" style="background-color:rgb(223, 223, 219)">
               <strong>实际工时</strong></th>
               <th nzLeft="714px" rowSpan="2" nzWidth="80px" nzAlign="center" style="background-color:rgb(223, 223, 219)">
-                <strong>计划达成率</strong></th>
+                <strong>订单达成率</strong></th>
                 <th nzLeft="794px" rowSpan="2" nzWidth="70px" nzAlign="center" style="background-color:rgb(223, 223, 219)">
                   <strong>生产效率</strong></th>
                   <th nzLeft="864px" rowSpan="2" nzWidth="100px" nzAlign="center" style="background-color:rgb(223, 223, 219)">
@@ -264,7 +264,7 @@
         <tbody>
           <tr>
             <td  nzLeft="0px"></td>
-            <td  nzLeft="29px" nzAlign="center" style="font-weight:bolder">月计划达成率</td>
+            <td  nzLeft="29px" nzAlign="center" style="font-weight:bolder">月订单达成率</td>
             <td  nzLeft="108px" nzAlign="center">{{achievementRateTotal}}%</td>
             <td  nzLeft="217px" nzAlign="center" style="font-weight:bolder">月生产效率</td>
             <td  nzLeft="336px" nzAlign="center">{{productivityTotal}}%</td>
@@ -454,7 +454,7 @@
         <thead>
           <tr>
             <th style="background-color:rgb(223, 223, 219);" nzWidth="40px" nzLeft="0px" nzAlign="center"><strong>序号</strong></th>
-            <th style="background-color:rgb(223, 223, 219);" nzWidth="90px" nzLeft="40px" nzAlign="center"><strong>生产订单</strong></th>
+            <th style="background-color:rgb(223, 223, 219);" nzWidth="90px" nzLeft="40px" nzAlign="center"><strong>订单编号</strong></th>
             <th style="background-color:rgb(223, 223, 219);" nzWidth="90px" nzLeft="120px" nzAlign="center"><strong>物料编码</strong></th>
             <th style="background-color:rgb(223, 223, 219);" nzWidth="120px" nzLeft="210px" nzAlign="center"><strong>物料名称</strong></th>
             <th style="background-color:rgb(223, 223, 219);" nzWidth="40px" nzLeft="310px" nzAlign="center"><strong>数量</strong></th>
@@ -1292,14 +1292,14 @@ export class DashboardAnalysisComponent implements OnInit {
     let data = [];
     let title = [
       ['项目名称'], // 项目名称
-      ['生产订单号'], // 生产订单号
+      ['订单编号'], // 订单编号
       ['物料编码'], // 物料编码
       ['物料名称'], // 物料名称
       ['计划数量'], // 月度计划
       ['标准工时'], // 标准工时
       ['完成数量'], // 累计完成数量
       ['实际工时'], // 累计完成工时
-      ['计划达成率'], // 计划达成率
+      ['订单达成率'], // 订单达成率
       ['计划生产效率'], // 计划生产效率
     ];
     data.push(title);

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

@@ -62,7 +62,7 @@
 <!-- class="tableTdPadding" -->
 <!-- <th nzLeft="0px" nzWidth="60px"><strong>序号</strong></th>
 <th nzLeft="60px" nzWidth="100px"><strong>生产线</strong></th>
-<th nzLeft="160px" nzWidth="100px"><strong>生产订单号</strong></th> -->
+<th nzLeft="160px" nzWidth="100px"><strong>订单编号</strong></th> -->
 <nz-spin [nzSpinning]="saveLoading">
   <form nz-form>
     <div nz-row [nzGutter]="{xs:12,sm:15,md:29,lg: 36, xl: 40}">
@@ -90,6 +90,7 @@
           <nz-form-control [nzSpan]="22">
             <!-- 查询 -->
             <button nz-button nzType="primary" (click)="getSumDispatchReport()">查询</button>
+            <button nz-button nzType="primary" (click)="export()" [nzLoading]="exportLoading">导出</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>
@@ -139,7 +140,7 @@
       <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-label [nzSpan]="8">订单编号</nz-form-label>
             <nz-form-control [nzSpan]="16">
               <!-- <input [(ngModel)]="fbsWorkshopDispatchList.productionOrderNumberName" name="productionOrderNumberName" nz-input
               placeholder="请输入" /> -->
@@ -180,7 +181,7 @@
           <tr>
             <!-- <th nzLeft="0px" nzWidth="60px" nzAlign="center" style="background-color:rgb(223, 223, 219)"><strong>序号</strong></th>
           <th nzLeft="58px" nzWidth="100px" nzAlign="center" style="background-color:rgb(223, 223, 219)"><strong>项目名称</strong></th>
-          <th nzLeft="157px" nzWidth="110px" nzAlign="center" style="background-color:rgb(223, 223, 219)"><strong>生产订单号</strong></th>
+          <th nzLeft="157px" nzWidth="110px" nzAlign="center" style="background-color:rgb(223, 223, 219)"><strong>订单编号</strong></th>
           <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> -->
 
@@ -193,7 +194,7 @@
             <th rowSpan="2" nzAlign="center" style="width: 7%;background-color:rgb(223, 223, 219)">
               <strong>工作中心</strong></th>
             <th rowSpan="2" nzAlign="center" style="width: 7%;background-color:rgb(223, 223, 219)">
-              <strong>生产订单号</strong></th>
+              <strong>订单编号</strong></th>
             <th rowSpan="2" nzAlign="center" style="width: 7%;background-color:rgb(223, 223, 219)">
               <strong>物料编码</strong></th>
             <th rowSpan="2" nzAlign="center" style="width: 7%;background-color:rgb(223, 223, 219)">
@@ -211,7 +212,7 @@
             <th rowSpan="2" nzAlign="center" style="width: 3%;background-color:rgb(223, 223, 219)">
               <strong>实际工时</strong></th>
             <th rowSpan="2" nzAlign="center" style="width: 3%;background-color:rgb(223, 223, 219)">
-              <strong>计划达成率</strong></th>
+              <strong>订单达成率</strong></th>
             <th rowSpan="2" nzAlign="center" style="width: 3%;background-color:rgb(223, 223, 219)">
               <strong>生产效率</strong></th>
             <th rowSpan="2" nzAlign="center" style="width: 14%;background-color:rgb(223, 223, 219)">
@@ -287,45 +288,31 @@
             <ng-container *ngIf="data.projectName==='统计'">
               <td style="background-color:rgb(223, 223, 219)"></td>
               <td style="background-color:rgb(223, 223, 219);font-weight:bolder" nzAlign="center">
-                <!-- 剩余工时 -->标准总工时
+                <!-- 标准总工时 -->
               </td>
               <td style="background-color:rgb(223, 223, 219)" nzAlign="center">
-                <!-- {{data.remainingWorkTotal}} -->{{data.standardWorkingHoursTotal}}
+                <!-- {{data.standardWorkingHoursTotal}} -->
               </td>
               <td style="background-color:rgb(223, 223, 219);font-weight:bolder" nzAlign="center"></td>
-              <td style="background-color:rgb(223, 223, 219);font-weight:bolder">统计</td>
+              <td style="background-color:rgb(223, 223, 219);font-weight:bolder">
+                <!-- 统计 -->
+              </td>
               <td></td>
               <td></td>
               <td></td>
-              <td>{{data.numberOfTasksTotal}}</td>
-              <td>{{data.quantityCompletedTotal}}</td>
+              <td nzAlign="center">{{data.numberOfTasksTotal}}</td>
+              <td nzAlign="center">{{data.quantityCompletedTotal}}</td>
               <td nzAlign="center">{{data.surplusNumberOfTasksTotal}}</td>
               <!-- <td nzAlign="center">{{data.surplusStandardWorkingHoursTotal}}</td> -->
               <td nzAlign="center">{{data.standardWorkingHoursTotal}}</td>
               <td nzAlign="center">{{data.manHoursCompletedTotal}}</td>
               <td nzAlign="center"  colSpan="3"></td>
-              <!-- <td nzLeft="836px" nzAlign="center"></td> -->
-              <!-- <ng-container *ngFor="let dateChild of data.fbsWorkshopDispatchListList">
-                <td nzAlign="center">{{dateChild.numberOfTasks}}</td>
-                <td nzAlign="center">{{dateChild.qualifiedNumber}}</td>
-                <td nzAlign="center">{{dateChild.manHoursCompleted}}</td>
-                <td nzAlign="center">{{dateChild.standardWorkingHours}}</td>
-                <td nzAlign="center">
-                  <ng-container *ngIf="dateChild.productionEfficiency">{{dateChild.productionEfficiency}}%
-                  </ng-container>
-                  <ng-container *ngIf="!dateChild.productionEfficiency">0%</ng-container>
-                </td>
-                <td nzAlign="center">
-                  <ng-container *ngIf="dateChild.achievementRate">{{dateChild.achievementRate}}%</ng-container>
-                  <ng-container *ngIf="!dateChild.achievementRate">0%</ng-container>
-                </td>
-              </ng-container> -->
             </ng-container>
           </tr>
           <tr></tr>
         </tbody>
         <!-- 异常工时 -->
-        <tbody>
+        <!-- <tbody>
           <tr>
             <td></td>
             <td nzAlign="center" style="font-weight:bolder">月计划达成率</td>
@@ -333,7 +320,6 @@
             <td nzAlign="center" style="font-weight:bolder">月生产效率</td>
             <td nzAlign="center">{{productivityTotal}}%</td>
             <td colSpan="11"></td>
-            <!-- <td [colSpan]="dateList.length*6" rowSpan="2"></td> -->
           </tr>
           <tr>
             <td></td>
@@ -349,130 +335,8 @@
             <td nzAlign="center">{{abnormalWorkingHours.plan}}</td>
             <td nzAlign="center" colSpan="2"></td>
           </tr>
-          <!-- <tr>
-            <td  nzLeft="0px"></td>
-            <td  nzLeft="29px" nzAlign="center" style="font-weight:bolder">总达成率</td>
-            <td  nzLeft="109px" nzAlign="center">{{achievementRateTotal}}%</td>
-            <td  nzLeft="218px" nzAlign="center" style="font-weight:bolder">总生产效率</td>
-            <td  nzLeft="337px" nzAlign="center">{{productivityTotal}}%</td>
-            <td nzLeft="437px" class="bolder">出勤总工时</td>
-            <td nzLeft="486px" nzAlign="center">{{AbnormalWorkingHoursTotal.attendanceHours}}</td>
-            <td nzLeft="536px" colSpan="4" nzAlign="right" class="bolder">出勤情况</td>
-            <ng-container *ngFor="let abnormalWorkingHours of abnormalWorkingHoursList">
-              <td>应到人数</td>
-              <td nzAlign="center">{{abnormalWorkingHours.numberOfPeopleToArrive}}</td>
-              <td>实到人数</td>
-              <td nzAlign="center">{{abnormalWorkingHours.actualNumberOfPeople}}</td>
-              <td>出勤工时</td>
-              <td nzAlign="center">{{abnormalWorkingHours.attendanceHours}}</td>
-            </ng-container>
-          </tr>
-          <tr>
-            <td nzLeft="0px" colspan="5" rowSpan="9"></td>
-            <td nzLeft="437px" class="bolder">加班总工时</td>
-            <td nzLeft="486px" nzAlign="center">{{AbnormalWorkingHoursTotal.overtimeHours}}</td>
-            <td nzLeft="536px" colSpan="4" nzAlign="right" class="bolder">加班记录</td>
-            <ng-container *ngFor="let abnormalWorkingHours of abnormalWorkingHoursList">
-              <td>加班工时</td>
-              <td nzAlign="center">{{abnormalWorkingHours.overtimeHours}}</td>
-              <td>加班原因</td>
-              <td colSpan="3">{{abnormalWorkingHours.overtimeReason}}</td>
-            </ng-container>
-          </tr>
-          <tr>
-            
-            <td nzLeft="437px" rowSpan="2" class="bolder">其他总工时</td>
-            <td nzLeft="486px" rowSpan="2" nzAlign="center">{{AbnormalWorkingHoursTotal.train}}</td>
-            <td nzLeft="536px" colSpan="4" rowSpan="2" nzAlign="right" class="bolder">其他工时统计</td>
-            <ng-container *ngFor="let abnormalWorkingHours of abnormalWorkingHoursList">
-              <td>培训</td>
-              <td nzAlign="center">{{abnormalWorkingHours.train}}</td>
-              <td>会议</td>
-              <td nzAlign="center">{{abnormalWorkingHours.meeting}}</td>
-              <td>5S</td>
-              <td nzAlign="center">{{abnormalWorkingHours.fiveS}}</td>
-            </ng-container>
-          </tr>
-          <tr>
-            <ng-container *ngFor="let abnormalWorkingHours of abnormalWorkingHoursList">
-              <td>研发</td>
-              <td nzAlign="center">{{abnormalWorkingHours.researchAndDevelopment}}</td>
-              <td></td>
-              <td></td>
-              <td></td>
-              <td></td>
-            </ng-container>
-          </tr>
-          <tr>
-            <td nzLeft="437px" rowSpan="3" class="bolder">异常总工时统计</td>
-            <td nzLeft="486px" rowSpan="3" nzAlign="center">{{AbnormalWorkingHoursTotal.abnormalWorkingHours}}</td>
-            <td nzLeft="536px" colSpan="4" rowSpan="3" nzAlign="right" class="bolder">异常工时统计</td>
-            <ng-container *ngFor="let abnormalWorkingHours of abnormalWorkingHoursList">
-              <td>质量</td>
-              <td nzAlign="center">{{abnormalWorkingHours.quality}}</td>
-              <td>设计</td>
-              <td nzAlign="center">{{abnormalWorkingHours.design}}</td>
-              <td>返工</td>
-              <td nzAlign="center">{{abnormalWorkingHours.rework}}</td>
-            </ng-container>
-          </tr>
-          <tr>
-            <ng-container *ngFor="let abnormalWorkingHours of abnormalWorkingHoursList">
-              <td>物料</td>
-              <td nzAlign="center">{{abnormalWorkingHours.materiel}}</td>
-              <td>能源</td>
-              <td nzAlign="center">{{abnormalWorkingHours.energy}}</td>
-              <td>其他</td>
-              <td nzAlign="center">{{abnormalWorkingHours.other}}</td>
-            </ng-container>
-          </tr>
-          <tr>
-            <ng-container *ngFor="let abnormalWorkingHours of abnormalWorkingHoursList">
-              <td>设备</td>
-              <td nzAlign="center">{{abnormalWorkingHours.equipment}}</td>
-              <td>计划</td>
-              <td nzAlign="center">{{abnormalWorkingHours.plan}}</td>
-              <td></td>
-              <td></td>
-            </ng-container>
-          </tr>
-          <tr>
-            <td nzLeft="437px" rowSpan="2" class="bolder">仓库总工时统计</td>
-            <td nzLeft="486px" rowSpan="2" nzAlign="center">{{AbnormalWorkingHoursTotal.warehouse}}</td>
-            <td nzLeft="536px" colSpan="4" rowSpan="2" nzAlign="right" class="bolder">仓库工时统计</td>
-            <ng-container *ngFor="let abnormalWorkingHours of abnormalWorkingHoursList">
-              <td>配料</td>
-              <td nzAlign="center">{{abnormalWorkingHours.mixedIngredients}}</td>
-              <td>入库</td>
-              <td nzAlign="center">{{abnormalWorkingHours.warehousing}}</td>
-              <td>打包</td>
-              <td nzAlign="center">{{abnormalWorkingHours.pack}}</td>
-            </ng-container>
-          </tr>
-          <tr>
-            <ng-container *ngFor="let abnormalWorkingHours of abnormalWorkingHoursList">
-              <td>其他</td>
-              <td nzAlign="center">{{abnormalWorkingHours.warehouseOthers}}</td>
-              <td>备注</td>
-              <td nzAlign="center" colSpan="3">{{abnormalWorkingHours.memo}}</td>
-            </ng-container>
-          </tr>
-
 
-          <tr>
-            <td nzLeft="437px" colSpan="6" class="bolder">异常原因描述</td>
-            <ng-container *ngFor="let abnormalWorkingHours of abnormalWorkingHoursList">
-              <td colSpan="6">
-                <ng-container *ngFor="let describe of abnormalWorkingHours.fbsAbnormalWorkingHoursDescribeList">
-                  <ng-container *ngIf="describe.describes">
-                    {{describe.describes}}<br>
-                  </ng-container>
-                </ng-container>
-              </td>
-            </ng-container>
-          </tr> -->
-
-        </tbody>
+        </tbody> -->
       </nz-table>
     </div>
   </div>
@@ -484,7 +348,7 @@
           <nz-form-label [nzSpan]="2" [nzNoColon]="true"></nz-form-label>
           <nz-form-control [nzSpan]="16">
             <!-- 查询 -->
-            <button nz-button nzType="primary" (click)="export()" [nzLoading]="exportLoading">导出</button>
+            <!-- <button nz-button nzType="primary" (click)="export()" [nzLoading]="exportLoading">导出</button> -->
           </nz-form-control>
         </nz-form-item>
       </div>
@@ -492,7 +356,8 @@
   </form>
 
 </nz-spin>
-<nz-spin [nzSpinning]="planningReportLoading">
+<!-- 计划 -->
+<!-- <nz-spin [nzSpinning]="planningReportLoading">
   <div nz-row [nzGutter]="{xs:12,sm:15,md:29,lg: 36, xl: 40}">
     <div nz-col nzXs="24" nzSm="4" nzLg="4">
       <nz-form-item class="nz-form-item">
@@ -521,7 +386,7 @@
             <th style="background-color:rgb(223, 223, 219);" nzWidth="40px" nzLeft="0px" nzAlign="center">
               <strong>序号</strong></th>
             <th style="background-color:rgb(223, 223, 219);" nzWidth="90px" nzLeft="40px" nzAlign="center">
-              <strong>生产订单</strong></th>
+              <strong>订单编号</strong></th>
             <th style="background-color:rgb(223, 223, 219);" nzWidth="90px" nzLeft="120px" nzAlign="center">
               <strong>物料编码</strong></th>
             <th style="background-color:rgb(223, 223, 219);" nzWidth="120px" nzLeft="210px" nzAlign="center">
@@ -530,7 +395,6 @@
               <strong>数量</strong></th>
             <th style="background-color:rgb(223, 223, 219);" nzWidth="80px" nzLeft="350px" nzAlign="center">
               <strong>标准工时</strong></th>
-            <!-- <th style="background-color:rgb(223, 223, 219);" nzWidth="4vw"><strong>{{fbsWorkshopDispatchListPlanningReport.year}}</strong></th> -->
             <ng-container *ngFor="let day of fbsWorkshopDispatchListPlanningReport.dayList">
               <ng-container *ngIf="day.week=='2'">
                 <th style="background-color:rgb(223, 223, 219);padding: 2px;" nzWidth="25px" nzAlign="center">
@@ -552,7 +416,6 @@
             <td nzLeft="210px">{{data.product}}</td>
             <td nzLeft="310px" nzAlign="center">{{data.numberOfTasks}}</td>
             <td nzLeft="350px" nzAlign="center">{{data.standardWorkingHours}}</td>
-            <!-- <td ></td> -->
             <ng-container *ngFor="let color of data.isColor">
               <ng-container *ngIf="color==='1'">
                 <td style="background-color:greenyellow;"></td>
@@ -567,7 +430,7 @@
       </nz-table>
     </div>
   </div>
-</nz-spin>
+</nz-spin> -->
 
 
 

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

@@ -449,7 +449,7 @@ export class DashboardAnalysisComponent implements OnInit {
       ['项目编码'], // 项目编码
       ['项目名称'], // 项目名称
       ['工作中心'], // 工作中心
-      ['生产订单号'], // 生产订单号
+      ['订单编号'], // 订单编号
       ['物料编码'], // 物料编码
       ['物料名称'], // 物料名称
       ['数量'], // 数量
@@ -457,7 +457,7 @@ export class DashboardAnalysisComponent implements OnInit {
       ['剩余数量'], // 剩余
       ['标准工时'], // 标准工时
       ['实际工时'], // 累计完成工时
-      ['计划达成率'], // 计划达成率
+      ['订单达成率'], // 订单达成率
       ['计划生产效率'], // 计划生产效率
       ['计划开完工时间']
     ];

src/app/routes/dashboard/home-page/home-page.component.html

@@ -62,13 +62,13 @@
 <!-- class="tableTdPadding" -->
 <!-- <th nzLeft="0px" nzWidth="60px"><strong>序号</strong></th>
 <th nzLeft="60px" nzWidth="100px"><strong>生产线</strong></th>
-<th nzLeft="160px" nzWidth="100px"><strong>生产订单号</strong></th> -->
+<th nzLeft="160px" nzWidth="100px"><strong>订单编号</strong></th> -->
 <nz-spin [nzSpinning]="saveLoading">
   <form nz-form>
     <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-label [nzSpan]="8">订单编号</nz-form-label>
           <nz-form-control [nzSpan]="16">
             <!-- <input [(ngModel)]="fbsWorkshopDispatchList.productionOrderNumberName" name="productionOrderNumberName" nz-input
             placeholder="请输入" /> -->
@@ -132,13 +132,13 @@
         <tr>
           <!-- <th nzLeft="0px" nzWidth="60px" nzAlign="center" style="background-color:rgb(223, 223, 219)"><strong>序号</strong></th>
           <th nzLeft="58px" nzWidth="100px" nzAlign="center" style="background-color:rgb(223, 223, 219)"><strong>项目名称</strong></th>
-          <th nzLeft="157px" nzWidth="110px" nzAlign="center" style="background-color:rgb(223, 223, 219)"><strong>生产订单号</strong></th>
+          <th nzLeft="157px" nzWidth="110px" nzAlign="center" style="background-color:rgb(223, 223, 219)"><strong>订单编号</strong></th>
           <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 nzLeft="0px" rowSpan="2"  nzWidth="60px" nzAlign="center" style="background-color:rgb(223, 223, 219)"><strong>序号</strong></th>
           <th nzLeft="58px" rowSpan="2" nzWidth="100px" nzAlign="center" style="background-color:rgb(223, 223, 219)"><strong>项目名称</strong></th>
-          <th nzLeft="157px" rowSpan="2" nzWidth="110px" nzAlign="center" style="background-color:rgb(223, 223, 219)"><strong>生产订单号</strong></th>
+          <th nzLeft="157px" rowSpan="2" nzWidth="110px" nzAlign="center" style="background-color:rgb(223, 223, 219)"><strong>订单编号</strong></th>
           <th nzLeft="265px" rowSpan="2" nzWidth="120px" nzAlign="center" style="background-color:rgb(223, 223, 219)"><strong>物料编码</strong></th>
           <th nzLeft="383px" rowSpan="2" nzWidth="200px" nzAlign="center" style="background-color:rgb(223, 223, 219)"><strong>物料名称</strong></th>
           <th nzLeft="580px" rowSpan="2" nzWidth="80px" nzAlign="center" style="background-color:rgb(223, 223, 219)"><strong>月度计划</strong></th>
@@ -236,7 +236,7 @@
           <td rowSpan="2" nzLeft="157px" nzAlign="center">{{achievementRateTotal}}%</td>
           <td rowSpan="2" nzLeft="265px" nzAlign="center" style="font-weight:bolder">总生产效率</td>
           <td rowSpan="2" nzLeft="383px" nzAlign="center">{{productivityTotal}}%</td>
-          <!-- <td>月计划达成率</td>
+          <!-- <td>月订单达成率</td>
           <td>1.95%</td>
           <td>月生产效率</td>
           <td>根据生产计划进度。实时变化</td> -->

src/app/routes/dashboard/home-page/home-page.component.ts

@@ -433,7 +433,7 @@ export class RoutesDashboardHomePageComponent implements OnInit {
     let data = [];
     let title = [
       ['项目名称'], // 项目名称
-      ['生产订单号'], // 生产订单号
+      ['订单编号'], // 订单编号
       ['物料编码'], // 物料编码
       ['物料名称'], // 物料名称
       ['月度计划'], // 月度计划

src/app/routes/efficiency-report/list/list.component.html

@@ -77,7 +77,7 @@
     <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-label [nzSpan]="8">订单编号</nz-form-label>
           <nz-form-control [nzSpan]="16">
             <input [(ngModel)]="fbsWorkingStatistics.orderNumber" name="orderNumber" nz-input placeholder="请输入" />
           </nz-form-control>
@@ -135,15 +135,15 @@
         <th>项目编号</th>
         <th>项目名称</th>
         <th>工作中心</th>
-        <th>生产订单号</th>
+        <th>订单编号</th>
         <th>物料编码</th>
         <th>物料名称</th>
         <th>工艺流程</th>
         <!-- <th nzAlign="center">工艺标准工时</th> -->
         <th>人员编码</th>
         <th>姓名</th>
-        <th>上岗时间</th>
-        <th>下岗时间</th>
+        <!-- <th>上岗时间</th>
+        <th>下岗时间</th> -->
         <th nzAlign="center">工时</th>
         <th nzAlign="center">效率</th>
       </tr>
@@ -160,8 +160,8 @@
         <!-- <td nzAlign="center">{{item.standardWorkingHoursProcess}}</td> -->
         <td>{{item.personnelCode}}</td>
         <td>{{item.personnelName}}</td>
-        <td>{{item.firstTime}}</td>
-        <td>{{item.finalTime}}</td>
+        <!-- <td>{{item.firstTime}}</td>
+        <td>{{item.finalTime}}</td> -->
         <td nzAlign="center">{{item.workingHours}}</td>
         <td nzAlign="center">{{item.efficiency}}%</td>
       </tr>

src/app/routes/efficiency-report/list/list.component.ts

@@ -165,7 +165,7 @@ export class EfficiencyReportListComponent implements OnInit {
           ['项目编号'],
           ['项目名称'],
           ['工作中心'],
-          ['生产订单号'],
+          ['订单编号'],
           ['物料编码'],
           ['物料名称'],
           ['工艺流程'],

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

@@ -311,7 +311,7 @@
               <th nzWidth="8%">项目编码</th>
               <th nzWidth="8%">项目名称</th>
               <th nzWidth="8%">工作中心</th>
-              <th nzWidth="8%">生产订单</th>
+              <th nzWidth="8%">订单编号</th>
               <th nzWidth="8%">物料编码</th>
               <th nzWidth="8%">物料名称</th>
               <th nzWidth="5%">计划数量</th>
@@ -333,7 +333,17 @@
               <td>{{data.projectName}}</td>
               <td>{{data.workCenter}}</td>
               <td>{{data.productionOrderNumberName}}</td>
-              <td>{{data.productId}}</td>
+              <td>
+                <ng-container >
+                  <nz-select [(ngModel)]="data.productId" style="width: 100%;" nzShowSearch nzAllowClear
+                    nzPlaceHolder="请选择" (ngModelChange)="productChange($event,data)"
+                    [nzDropdownMatchSelectWidth]="false">
+                    <ng-container *ngFor="let produc of productList">
+                      <nz-option [nzLabel]="produc.productId" [nzValue]="produc.productId"> </nz-option>
+                    </ng-container>
+                  </nz-select>
+                </ng-container>
+              </td>
               <!-- <td>
                 <nz-select [(ngModel)]="data.type" style="width: 100%;" nzShowSearch nzAllowClear nzPlaceHolder="请选择"
                   [nzDropdownMatchSelectWidth]="false">

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

@@ -68,7 +68,7 @@
           </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>

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

@@ -309,7 +309,7 @@
               <th nzWidth="8%">项目编码</th>
               <th nzWidth="8%">项目名称</th>
               <th nzWidth="8%">工作中心</th>
-              <th nzWidth="8%">生产订单</th>
+              <th nzWidth="8%">订单编号</th>
               <th nzWidth="8%">物料编码</th>
               <th nzWidth="8%">物料名称</th>
               <th nzWidth="5%">计划数量</th>
@@ -331,7 +331,17 @@
               <td>{{data.projectName}}</td>
               <td>{{data.workCenter}}</td>
               <td>{{data.productionOrderNumberName}}</td>
-              <td>{{data.productId}}</td>
+              <td>
+                <ng-container >
+                  <nz-select [(ngModel)]="data.productId" style="width: 100%;" nzShowSearch nzAllowClear
+                    nzPlaceHolder="请选择" (ngModelChange)="productChange($event,data)"
+                    [nzDropdownMatchSelectWidth]="false">
+                    <ng-container *ngFor="let produc of productList">
+                      <nz-option [nzLabel]="produc.productId" [nzValue]="produc.productId"> </nz-option>
+                    </ng-container>
+                  </nz-select>
+                </ng-container>
+              </td>
               <!-- <td>
                 <nz-select [(ngModel)]="data.type" style="width: 100%;" nzShowSearch nzAllowClear nzPlaceHolder="请选择"
                   [nzDropdownMatchSelectWidth]="false">

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

@@ -293,7 +293,7 @@
               <th nzWidth="8%">项目编码</th>
               <th nzWidth="8%">项目名称</th>
               <th nzWidth="8%">工作中心</th>
-              <th nzWidth="8%">生产订单</th>
+              <th nzWidth="8%">订单编号</th>
               <th nzWidth="8%">物料编码</th>
               <th nzWidth="8%">物料名称</th>
               <th nzWidth="5%">计划数量</th>

src/app/routes/fbs-scan-code/list/list.component.html

@@ -59,16 +59,16 @@
           </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-label [nzSpan]="8">订单编号</nz-form-label>
           <nz-form-control [nzSpan]="16">
             <input [(ngModel)]="fbsWorkingStatistics.orderNumber" name="orderNumber" 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>
@@ -93,7 +93,7 @@
         <th>人员编码</th>
         <th>姓名</th>
         <th>
-          生产订单号</th>
+          订单编号</th>
         <th>物料编码</th>
         <th>物料名称</th>
         <th>工艺流程</th>

src/app/routes/fbs-technological-process/add/add.component.html

@@ -20,7 +20,7 @@
           [nzShowPagination]="false" [nzFrontPagination]=false>
           <thead>
             <tr>
-              <th nzWidth="70%">工艺</th>
+              <th nzWidth="70%">工艺路线</th>
               <th nzWidth="20%">排序</th>
               <th nzWidth="10%">操作</th>
             </tr>

src/app/routes/fbs-technological-process/update/update.component.html

@@ -42,7 +42,7 @@
           [nzShowPagination]="false" [nzFrontPagination]=false>
           <thead>
             <tr>
-              <th nzWidth="50%">工艺</th>
+              <th nzWidth="50%">工艺路线</th>
               <th nzWidth="20%">标准工时</th>
               <th nzWidth="20%">排序</th>
               <!-- <th nzWidth="10%">操作</th> -->

src/app/routes/fbs-warehouse/add/add.component.html

@@ -73,14 +73,14 @@
         <td>工单配料</td>
         <td><nz-input-number [(ngModel)]="fbsWarehouse.workOrderBatching" [nzMin]="0" [nzStep]="1">
         </nz-input-number></td>
-        <td>生产订单号</td>
+        <td>订单编号</td>
         <td colSpan="9"><input nz-input [(ngModel)]="fbsWarehouse.batchingProductionOrderNumberCode"/></td>
       </tr>
       <tr>
         <td>成品收存</td>
         <td><nz-input-number [(ngModel)]="fbsWarehouse.storageFinishedProducts" [nzMin]="0" [nzStep]="1">
         </nz-input-number></td>
-        <td>生产订单号</td>
+        <td>订单编号</td>
         <td colSpan="9"><input nz-input [(ngModel)]="fbsWarehouse.productsProductionOrderNumberCode"/></td>
       </tr>
       <tr>

src/app/routes/fbs-warehouse/update/update.component.html

@@ -75,7 +75,7 @@
           <nz-input-number [(ngModel)]="fbsWarehouse.workOrderBatching" [nzMin]="0" [nzStep]="1">
           </nz-input-number>
         </td>
-        <td>生产订单号</td>
+        <td>订单编号</td>
         <td colSpan="9"><input nz-input [(ngModel)]="fbsWarehouse.batchingProductionOrderNumberCode" /></td>
       </tr>
       <tr>
@@ -84,7 +84,7 @@
           <nz-input-number [(ngModel)]="fbsWarehouse.storageFinishedProducts" [nzMin]="0" [nzStep]="1">
           </nz-input-number>
         </td>
-        <td>生产订单号</td>
+        <td>订单编号</td>
         <td colSpan="9"><input nz-input [(ngModel)]="fbsWarehouse.productsProductionOrderNumberCode" /></td>
       </tr>
       <tr>

src/app/routes/fbs-warehouse/view/view.component.html

@@ -63,13 +63,13 @@
         <td rowspan="11">工时统计</td>
         <td>工单配料</td>
         <td>{{fbsWarehouse.workOrderBatching}}</td>
-        <td>生产订单号</td>
+        <td>订单编号</td>
         <td colSpan="9">{{fbsWarehouse.batchingProductionOrderNumberCode}}</td>
       </tr>
       <tr>
         <td>成品收存</td>
         <td>{{fbsWarehouse.storageFinishedProducts}}</td>
-        <td>生产订单号</td>
+        <td>订单编号</td>
         <td colSpan="9">{{fbsWarehouse.productsProductionOrderNumberCode}}</td>
       </tr>
       <tr>

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

@@ -27,7 +27,7 @@
         </td>
       </tr>
       <tr>
-        <td>生产订单号</td>
+        <td>订单编号</td>
         <td>
           <nz-select [(ngModel)]="fbsWorkshopDispatchList.productionOrderNumberId" style="width: 100%;" nzShowSearch
             nzAllowClear nzPlaceHolder="请选择" (ngModelChange)="productionOrderNumberChange($event)">
@@ -96,7 +96,7 @@
           <th nzWidth="5%">项目编码</th>
           <th nzWidth="5%">项目名称</th>
           <th nzWidth="5%">工作中心</th>
-          <th nzWidth="6%">生产订单号</th>
+          <th nzWidth="6%">订单编号</th>
           <th nzWidth="5%">物料编码</th>
           <th nzWidth="5%">物料名称</th>
           <th nzWidth="7%">日期</th>
@@ -107,7 +107,7 @@
           <th nzWidth="6%">计划开工时间</th>
           <th nzWidth="6%">计划完工时间</th>
           <th nzWidth="6%">是否可扫码</th>
-          <th nzWidth="6%">工艺</th>
+          <th nzWidth="6%">工艺路线</th>
           <th nzWidth="5%">姓名</th>
           <th nzWidth="5%">备注</th>
           <th nzWidth="3%">操作</th>

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

@@ -55,7 +55,7 @@ export class FbsWorkshopDispatchListAddComponent implements OnInit {
 
   saveLoading=false;//加载动态
   properList=[];//人员数据下拉集合
-  productionOrderNumberList=[];//生产订单号下拉数据集合
+  productionOrderNumberList=[];//订单编号下拉数据集合
   fbsWorkshopDispatchList:FbsWorkshopDispatchList={
     date:new Date().toString()
   }
@@ -114,7 +114,7 @@ export class FbsWorkshopDispatchListAddComponent implements OnInit {
 
 
   /**
-   * 初始化生产订单号下拉数据集合
+   * 初始化订单编号下拉数据集合
    */
   getProductionOrderNumberList(){
     // this.productionOrderNumberList=[
@@ -126,7 +126,7 @@ export class FbsWorkshopDispatchListAddComponent implements OnInit {
   }
 
   /**
-   * 生产订单号选中事件
+   * 订单编号选中事件
    */
   productionOrderNumberChange(productionOrderNumberId,data){
     // this.fbsWorkshopDispatchList.productionLineName="电器组装"

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

@@ -27,7 +27,7 @@
         </td>
       </tr>
       <tr>
-        <td>生产订单号</td>
+        <td>订单编号</td>
         <td>
           <nz-select [(ngModel)]="fbsWorkshopDispatchList.productionOrderNumberId" style="width: 100%;" nzShowSearch
             nzAllowClear nzPlaceHolder="请选择" (ngModelChange)="productionOrderNumberChange($event)">
@@ -94,7 +94,7 @@
           <th nzWidth="5%">工作中心</th>
           <th nzWidth="5%">姓名</th>
           <th nzWidth="6%">日期</th>
-          <th nzWidth="6%">生产订单号</th>
+          <th nzWidth="6%">订单编号</th>
           <th nzWidth="5%">物料编码</th>
           <th nzWidth="5%">物料名称</th>
           <th nzWidth="5%">计划数量</th>

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

@@ -22,10 +22,10 @@
           </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-label [nzSpan]="8">订单编号</nz-form-label>
           <nz-form-control [nzSpan]="16">
             <input [(ngModel)]="fbsMomOrderdetail.mocode" name="mocode" nz-input
               placeholder="请输入" />
@@ -110,7 +110,7 @@
         <th>项目编码</th>
         <th>项目名称</th>
         <th>工作中心</th>
-        <th>生产订单号</th>
+        <th>订单编号</th>
         <th nzAlign="center">物料编码</th>
         <th nzAlign="center">物料名称</th>
         <th nzAlign="center">数量</th>

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

@@ -81,10 +81,10 @@
       </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-label [nzSpan]="8">订单编号</nz-form-label>
           <nz-form-control [nzSpan]="16">
             <input [(ngModel)]="fbsWorkshopDispatchList.productionOrderNumberName" name="productionOrderNumberName" nz-input
               placeholder="请输入" />
@@ -167,7 +167,7 @@
         <th>项目编码</th>
         <th>项目名称</th>
         <th>工作中心</th>
-        <th>生产订单号</th>
+        <th>订单编号</th>
         <th>物料编码</th>
         <th>物料名称</th>
         <!-- <th  style="width:10%">姓名</th> -->

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

@@ -226,7 +226,7 @@ export class FbsWorkshopDispatchListListComponent implements OnInit {
           ['项目名称'], // 项目名称
           ['工作中心'], // 工作中心
           // ['姓名'], // 姓名
-          ['生产订单号'], // 生产订单号
+          ['订单编号'], // 订单编号
           ['物料编码'], // 物料
           ['物料名称'], // 物料名称
           ['计划数量'], // 计划数量

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

@@ -37,7 +37,7 @@
       </tr>
 
       <tr>
-        <td>生产订单号</td>
+        <td>订单编号</td>
         <td>
           <nz-select [(ngModel)]="fbsWorkshopDispatchList.productionOrderNumberId" style="width: 200px" nzShowSearch
           nzAllowClear nzPlaceHolder="请选择" (ngModelChange)="productionOrderNumberChange($event)" [nzDropdownMatchSelectWidth]="false">

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

@@ -42,7 +42,7 @@
       </tr>
 
       <tr>
-        <td>生产订单号</td>
+        <td>订单编号</td>
         <td>
           <!-- <nz-select [(ngModel)]="fbsWorkshopDispatchList.productionOrderNumberId" style="width: 200px" nzShowSearch
           nzAllowClear nzPlaceHolder="请选择" (ngModelChange)="productionOrderNumberChange($event)" [nzDropdownMatchSelectWidth]="false">
@@ -99,7 +99,7 @@
         </td>
       </tr>
       <tr>
-        <td>工艺</td>
+        <td>工艺路线</td>
         <td>
           <!-- <nz-select [(ngModel)]="fbsWorkshopDispatchList.fbsTechnologicalProcessId" style="width: 200px" nzShowSearch nzAllowClear
           nzPlaceHolder="请选择" (ngModelChange)="fbsTechnologicalProcessChange($event,fbsWorkshopDispatchList)" [nzDropdownMatchSelectWidth]="false">

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

@@ -81,7 +81,7 @@ export class FbsWorkshopDispatchListUpdateComponent implements OnInit {
   }
 
   /**
-   * 初始化生产订单号下拉数据集合
+   * 初始化订单编号下拉数据集合
    */
   getProductionOrderNumberList(){
     // this.productionOrderNumberList=[
@@ -93,7 +93,7 @@ export class FbsWorkshopDispatchListUpdateComponent implements OnInit {
   }
 
   /**
-   * 生产订单号选中事件
+   * 订单编号选中事件
    */
   productionOrderNumberChange(productionOrderNumberId){
     if(productionOrderNumberId){

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

@@ -22,7 +22,7 @@
         </td>
       </tr>
       <tr>
-        <td>生产订单号</td>
+        <td>订单编号</td>
         <td>
           {{fbsWorkshopDispatchList.productionOrderNumberName}}
         </td>
@@ -56,7 +56,7 @@
         <td>{{fbsWorkshopDispatchList.plannedEndTime}}</td>
       </tr>
       <tr>
-        <td>工艺</td>
+        <td>工艺路线</td>
         <td>{{fbsWorkshopDispatchList.processSequence}}</td>
         <td></td>
         <td>{{fbsWorkshopDispatchList.personnelNameU8}}</td>