t调整

src/app/entity/fbs/fbs-working-statistics.ts

@@ -62,4 +62,6 @@ export class FbsWorkingStatistics extends Page{
 	workCenter?:string;//工作中心
 	fbsTechnologicalProcessItemName?:string;//工艺名称
 	efficiency?:number;//效率
+	numberOfTasks?:number;//订单数
+	standardWorkingHoursProcess?:number;//标准总工时
 }

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

@@ -302,6 +302,7 @@
               <td></td>
               <td nzAlign="center">{{data.numberOfTasksTotal}}</td>
               <td nzAlign="center">{{data.quantityCompletedTotal}}</td>
+              <!-- <td nzAlign="center">{{data.latestCompletedQuantityTotal}}</td> -->
               <td nzAlign="center">{{data.surplusNumberOfTasksTotal}}</td>
               <!-- <td nzAlign="center">{{data.surplusStandardWorkingHoursTotal}}</td> -->
               <td nzAlign="center">{{data.standardWorkingHoursTotal}}</td>

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

@@ -169,18 +169,20 @@ export class EfficiencyReportListComponent implements OnInit {
         let data=[];
         //设置导出头
         let title=[
-          ['项目编号'],
+          // ['项目编号'],
           ['项目名称'],
           ['工作中心'],
           ['订单编号'],
           ['物料编码'],
           ['物料名称'],
+          ['订单数'],
           ['工艺流程'],
           ['人员编码'],
           ['姓名'],
-          ['上岗时间'],
-          ['下岗时间'],
-          ['工时'],
+          // ['上岗时间'],
+          // ['下岗时间'],
+          ['工艺标准总工时'],
+          ['实际总工时'],
           ['效率']
         ]
         data.push(title);
@@ -188,17 +190,19 @@ export class EfficiencyReportListComponent implements OnInit {
         if(dataList){
           dataList.forEach(element => {
             let row=[];
-            row.push(element.costItemCode)
+            // row.push(element.costItemCode)
             row.push(element.projectName)
             row.push(element.workCenter)
             row.push(element.orderNumber)
             row.push(element.materielCode)
             row.push(element.materielName)
+            row.push(element.numberOfTasks)
             row.push(element.fbsTechnologicalProcessItemName)
             row.push(element.personnelCode)
             row.push(element.personnelName)
-            row.push(element.firstTime)
-            row.push(element.finalTime)
+            // row.push(element.firstTime)
+            // row.push(element.finalTime)
+            row.push(element.standardWorkingHoursProcess)
             row.push(element.workingHours)
             if(element.efficiency){
               row.push(element.efficiency+"%")
@@ -207,6 +211,20 @@ export class EfficiencyReportListComponent implements OnInit {
             }
             data.push(row)
           });
+          data.push([
+            '总计',
+            '',
+            '',
+            '',
+            '',
+            this.totalList.numberOfTasks,
+            '',
+            '',
+            '',
+            this.totalList.standardWorkingHoursProcess,
+            this.totalList.workingHoursTotal,
+            this.totalList.efficiency+"%"
+          ])
         }
         // 导出
         this.xlsx.export({

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

@@ -389,7 +389,6 @@
                       <nz-option nzLabel="计划" nzValue="3"> </nz-option>
                       <nz-option nzLabel="制程" nzValue="4"> </nz-option>
                       <nz-option nzLabel="其他" nzValue="5"> </nz-option>
-                      <nz-option nzLabel="设计" nzValue="6"> </nz-option>
                   </nz-select>
                 </ng-container>
               </td>

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

@@ -222,7 +222,7 @@ export class FbsWorkshopDispatchListListComponent implements OnInit {
     let fbsWorkshopDispatchList = new FbsWorkshopDispatchList();
     fbsWorkshopDispatchList=JSON.parse(JSON.stringify(this.fbsWorkshopDispatchList))
     fbsWorkshopDispatchList.pageNo=1
-    fbsWorkshopDispatchList.pageSize = 20000;
+    fbsWorkshopDispatchList.pageSize = -1;
     // fbsWorkshopDispatchList.start = this.datePipe.transform(this.fbsWorkshopDispatchList.start, 'yyyy-MM-dd');
     // fbsWorkshopDispatchList.end = this.datePipe.transform(this.fbsWorkshopDispatchList.end, 'yyyy-MM-dd');
     // fbsWorkshopDispatchList.productionOrderNumberName = this.fbsWorkshopDispatchList.productionOrderNumberName;
@@ -262,7 +262,7 @@ export class FbsWorkshopDispatchListListComponent implements OnInit {
           row.push(element.product);
           row.push(element.plannedQuantity);
           row.push(element.numberOfTasks);
-          row.push(element.latestCompletedQuantity);
+          row.push(Number(element.latestCompletedQuantity));
           row.push(Number(element.numberOfTasks)-Number(element.latestCompletedQuantity));
           row.push(element.numberEfficiency + '%');
           row.push(element.standardWorkingHours);
@@ -276,6 +276,16 @@ export class FbsWorkshopDispatchListListComponent implements OnInit {
           
           data.push(row);
         });
+        data.push(['合计','','','','','',
+        this.totalList.plannedQuantity,
+        this.totalList.numberOfTasks,
+        this.totalList.latestCompletedQuantity,
+        this.totalList.numberOfTasks-this.totalList.latestCompletedQuantity,
+        this.totalList.numberEfficiency+'%',
+        this.totalList.standardWorkingHours,
+        this.totalList.manHoursCompleted,
+        this.totalList.workingHoursEfficiency+'%'
+      ])
         // 导出
         this.xlsx.export({
           sheets: [