调整

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

@@ -455,6 +455,7 @@ export class DashboardAnalysisComponent implements OnInit {
       ['订单编号'], // 订单编号
       ['物料编码'], // 物料编码
       ['物料名称'], // 物料名称
+      ['状态'], // 状态
       ['数量'], // 数量
       ['完成数量'], // 累计完成数量
       ['剩余数量'], // 剩余
@@ -482,6 +483,7 @@ export class DashboardAnalysisComponent implements OnInit {
       
       row.push(element.productId)
       row.push(element.product)
+      row.push(element.lackOfMaterialState)
       row.push(convertingNumbers(element.numberOfTasksTotal))//
       row.push(element.quantityCompletedTotal)//quantityCompletedTotal//latestCompletedQuantity
       row.push(convertingNumbers(element.surplusNumberOfTasksTotal))//numberOfTasksTotal

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

@@ -132,31 +132,33 @@
     (nzPageIndexChange)="pageIndexChange($event)">
     <thead>
       <tr>
-        <th>项目编号</th>
-        <th>项目名称</th>
+        <!-- <th>项目编号</th> -->
+        <th style="width: 10%;">项目名称</th>
         <th>工作中心</th>
         <th>订单编号</th>
         <th>物料编码</th>
-        <th>物料名称</th>
+        <th style="width: 15%;">物料名称</th>
+        <th nzAlign="center">订单数</th>
         <th>工序</th>
        
         <th>人员编码</th>
         <th>姓名</th>
         <!-- <th>上岗时间</th>
         <th>下岗时间</th> -->
-         <th nzAlign="center">工艺标准工时</th>
-        <th nzAlign="center">实际工时</th>
+         <th nzAlign="center">工艺标准总工时</th>
+        <th nzAlign="center">实际总工时</th>
         <th nzAlign="center">效率</th>
       </tr>
     </thead>
     <tbody>
       <tr *ngFor="let item of  borderedTable.data">
-        <td>{{item.costItemCode}}</td>
+        <!-- <td>{{item.costItemCode}}</td> -->
         <td>{{item.projectName}}</td>
         <td>{{item.workCenter}}</td>
         <td>{{item.orderNumber}}</td>
         <td>{{item.materielCode}}</td>
         <td>{{item.materielName}}</td>
+        <td nzAlign="center">{{item.numberOfTasks}}</td>
         <td>{{item.fbsTechnologicalProcessItemName}}</td>
        
         <td>{{item.personnelCode}}</td>
@@ -169,13 +171,14 @@
       </tr>
       <tr style="font-weight:bolder">
         <td>总计</td>
-        <td></td>
+        <!-- <td></td> -->
         <td></td>
         <td></td>
         <td></td>
         <!-- <td></td> -->
         <!-- <td></td> -->
         <td></td>
+        <td nzAlign="center">{{totalList.numberOfTasks}}</td>
         <td></td>
         <td></td>
         <td></td>

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

@@ -106,7 +106,8 @@ export class EfficiencyReportListComponent implements OnInit {
        workingHoursTotal: 0,
        qualifiedNumberTotal: 0,
        standardWorkingHoursProcess:0,
-       efficiency:0
+       efficiency:0,
+       numberOfTasks:0
      };
    }
    /**
@@ -118,6 +119,7 @@ export class EfficiencyReportListComponent implements OnInit {
        this.totalList.workingHoursTotal += Number(element.workingHours);
        this.totalList.qualifiedNumberTotal += Number(element.qualifiedNumber);
        this.totalList.standardWorkingHoursProcess +=Number(element.standardWorkingHoursProcess);
+       this.totalList.numberOfTasks+=Number(element.numberOfTasks);
      });
      this.totalList.standardWorkingHoursProcess=this.totalList.standardWorkingHoursProcess.toFixed(2)
      this.totalList.workingHoursTotal = this.totalList.workingHoursTotal.toFixed(2);

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

@@ -71,7 +71,7 @@
       <!-- 订单编号 -->
       <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)]="fbsAbnormalWorkingHours.productionOrderNumberName" name="productionOrderNumberName" nz-input
               placeholder="请输入" />

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

@@ -132,7 +132,7 @@ export class FbsWorkshopDispatchListListComponent implements OnInit {
     if (dataList) {
       dataList.forEach(element => {
         
-        if(this.fbsWorkshopDispatchList.stateList.indexOf("3")!=-1&&element.productionOrderNumberName.slice(0,2)=="23"){
+        if(this.fbsWorkshopDispatchList.stateList&&this.fbsWorkshopDispatchList.stateList.indexOf("3")!=-1&&element.productionOrderNumberName.slice(0,2)=="23"){
         }else{
           element.standardWorkingHours=(Number(element.standardWorkingHoursZ)* Number(element.numberOfTasks)).toFixed(2)
           this.totalList.standardWorkingHours =