首页

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

@@ -257,7 +257,7 @@
           <td nzLeft="157px" rowSpan="2"></td>
           <td nzLeft="265px" rowSpan="2"></td>
           <td nzLeft="383px" rowSpan="2"></td> -->
-          <td nzLeft="0px" colspan="5" rowSpan="6"></td>
+          <td nzLeft="0px" colspan="5" rowSpan="8"></td>
           <td nzLeft="580px" rowSpan="2" class="bolder">其他总工时</td>
           <td nzLeft="659px" rowSpan="2" nzAlign="center">{{AbnormalWorkingHoursTotal.train}}</td>
           <td nzLeft="758px" colSpan="2" rowSpan="2" nzAlign="right" class="bolder">其他工时统计</td>
@@ -323,6 +323,28 @@
             <td></td>
           </ng-container>
         </tr>
+        <tr>
+          <td nzLeft="580px" rowSpan="2" class="bolder">仓库总工时统计</td>
+          <td nzLeft="659px" rowSpan="2" nzAlign="center">{{AbnormalWorkingHoursTotal.warehouse}}</td>
+          <td nzLeft="758px" colSpan="2" 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 ></td>
@@ -334,7 +356,9 @@
           <ng-container *ngFor="let abnormalWorkingHours of abnormalWorkingHoursList">
             <td colSpan="6">
               <ng-container *ngFor="let describe of abnormalWorkingHours.fbsAbnormalWorkingHoursDescribeList">
-                {{describe.describes}}<br>
+                <ng-container *ngIf="describe.describes">
+                  {{describe.describes}}<br>
+                </ng-container>
               </ng-container>
             </td>
           </ng-container>

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

@@ -318,12 +318,12 @@ export class DashboardAnalysisComponent implements OnInit {
   getEfficiencyTotal(){
     this.listOfData.forEach(element => {
       let numberOfTasksTotal=element.numberOfTasksTotal;//计划数量
-      let standardWorkingHoursTotal=element.standardWorkingHoursTotal;//标准工时
+      let standardWorkingHoursActualTotal=element.standardWorkingHoursActualTotal;//实际标准工时
       let quantityCompletedTotal=element.quantityCompletedTotal;//完成数量
       let manHoursCompletedTotal=element.manHoursCompletedTotal;//完成工时
       if(element.projectName==="统计"){
         this.achievementRateTotal=((Number(quantityCompletedTotal)/Number(numberOfTasksTotal))*100).toFixed(1);
-        this.productivityTotal=((Number(standardWorkingHoursTotal)/Number(manHoursCompletedTotal))*100).toFixed(1)
+        this.productivityTotal=((Number(standardWorkingHoursActualTotal)/Number(manHoursCompletedTotal))*100).toFixed(1)
       }
     });
   }
@@ -352,6 +352,7 @@ export class DashboardAnalysisComponent implements OnInit {
       let overtimeHours=0;//加班总工时
       let train=0;//其他总工时
       let abnormalWorkingHours=0;//异常总工时统计
+      let warehouse=0;//仓库总工时统计
       this.abnormalWorkingHoursList.forEach(element => {
         if(element.attendanceHours){
           attendanceHours=attendanceHours+Number(element.attendanceHours);
@@ -361,11 +362,13 @@ export class DashboardAnalysisComponent implements OnInit {
         }
         train=train+Number(element.train)+Number(element.meeting)+Number(element.fiveS)+Number(element.researchAndDevelopment);
         abnormalWorkingHours=abnormalWorkingHours+Number(element.quality)+Number(element.design)+Number(element.rework)+Number(element.materiel)+Number(element.energy)+Number(element.other)+Number(element.equipment)+Number(element.plan);
+        warehouse=warehouse+Number(element.mixedIngredients)+Number(element.warehousing)+Number(element.pack)+Number(element.warehouseOthers)
       });
       this.AbnormalWorkingHoursTotal.attendanceHours=attendanceHours;
       this.AbnormalWorkingHoursTotal.overtimeHours=overtimeHours;
       this.AbnormalWorkingHoursTotal.train=train;
       this.AbnormalWorkingHoursTotal.abnormalWorkingHours=abnormalWorkingHours;
+      this.AbnormalWorkingHoursTotal.warehouse=warehouse;
     })
   }
 
@@ -443,7 +446,7 @@ export class DashboardAnalysisComponent implements OnInit {
       row.push(element.product)
       row.push(element.numberOfTasksTotal)
       row.push(element.standardWorkingHoursTotal)
-      row.push(element.latestCompletedQuantity)
+      row.push(element.latestCompletedQuantity)//quantityCompletedTotal
       row.push(element.manHoursCompletedTotal)
       data.push(row);
     });