调整

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

@@ -138,13 +138,14 @@
         <th>订单编号</th>
         <th>物料编码</th>
         <th>物料名称</th>
-        <th>工艺流程</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>
       </tr>
     </thead>
@@ -157,11 +158,12 @@
         <td>{{item.materielCode}}</td>
         <td>{{item.materielName}}</td>
         <td>{{item.fbsTechnologicalProcessItemName}}</td>
-        <!-- <td nzAlign="center">{{item.standardWorkingHoursProcess}}</td> -->
+       
         <td>{{item.personnelCode}}</td>
         <td>{{item.personnelName}}</td>
         <!-- <td>{{item.firstTime}}</td>
         <td>{{item.finalTime}}</td> -->
+         <td nzAlign="center">{{item.standardWorkingHoursProcess}}</td>
         <td nzAlign="center">{{item.workingHours}}</td>
         <td nzAlign="center">{{item.efficiency}}%</td>
       </tr>
@@ -172,14 +174,14 @@
         <td></td>
         <td></td>
         <!-- <td></td> -->
+        <!-- <td></td> -->
         <td></td>
         <td></td>
         <td></td>
         <td></td>
-        <td></td>
-        <td></td>
+        <td nzAlign="center">{{totalList.standardWorkingHoursProcess}}</td>
         <td nzAlign="center">{{totalList.workingHoursTotal}}</td>
-        <td nzAlign="center"></td>
+        <td nzAlign="center">{{totalList.efficiency}}%</td>
 
       </tr>
     </tbody>

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

@@ -105,6 +105,8 @@ export class EfficiencyReportListComponent implements OnInit {
      this.totalList = {
        workingHoursTotal: 0,
        qualifiedNumberTotal: 0,
+       standardWorkingHoursProcess:0,
+       efficiency:0
      };
    }
    /**
@@ -115,9 +117,12 @@ export class EfficiencyReportListComponent implements OnInit {
      dataList.forEach(element => {
        this.totalList.workingHoursTotal += Number(element.workingHours);
        this.totalList.qualifiedNumberTotal += Number(element.qualifiedNumber);
+       this.totalList.standardWorkingHoursProcess +=Number(element.standardWorkingHoursProcess);
      });
-     this.totalList.workingHoursTotal = this.totalList.workingHoursTotal.toFixed(1);
+     this.totalList.standardWorkingHoursProcess=this.totalList.standardWorkingHoursProcess.toFixed(2)
+     this.totalList.workingHoursTotal = this.totalList.workingHoursTotal.toFixed(2);
      this.totalList.qualifiedNumberTotal = this.totalList.qualifiedNumberTotal.toFixed(1);
+     this.totalList.efficiency=Number((this.totalList.standardWorkingHoursProcess/this.totalList.workingHoursTotal).toFixed(2))*100
    }
  
    /**

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

@@ -240,19 +240,19 @@
     </tr>
     <tr style="font-weight:bolder;text-align: center;">
       <td>总计</td>
-      <td>{{totalList.overtimeHours}}</td>
+      <td>{{totalList.invalidWork}}</td>
       <td>{{totalList.train}}</td>
       <td>{{totalList.meeting}}</td>
       <td>{{totalList.researchAndDevelopment}}</td>
       <td>{{totalList.fiveS}}</td>
-      <td>{{totalList.pack}}</td>
+      <!-- <td>{{totalList.pack}}</td> -->
       <td>{{totalList.other}}</td>
-      <td>{{totalList.quality}}</td>
-      <td>{{totalList.materiel}}</td>
-      <td>{{totalList.equipment}}</td>
-      <td>{{totalList.design}}</td>
-      <td>{{totalList.energy}}</td>
-      <td>{{totalList.plan}}</td>
+      <td>{{totalList.abnormalWorkingHours}}</td>
+      <td>{{totalList.anomalyClassification1}}</td>
+      <td>{{totalList.anomalyClassification2}}</td>
+      <td>{{totalList.anomalyClassification3}}</td>
+      <td>{{totalList.anomalyClassification4}}</td>
+      <td>{{totalList.anomalyClassification5}}</td>
       <!-- <td>{{totalList.mixedIngredients}}</td>
       <td>{{totalList.warehousing}}</td>
       <td>{{totalList.pack}}</td> -->

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

@@ -161,6 +161,7 @@ export class FbsAbnormalWorkingHoursListComponent implements OnInit {
   totalList: any = {};
   initializationTotal() {
     this.totalList = {
+      invalidWork:0,
       overtimeHours: 0,
       train: 0,
       meeting: 0,
@@ -176,7 +177,13 @@ export class FbsAbnormalWorkingHoursListComponent implements OnInit {
       plan: 0,
       mixedIngredients: 0,
       warehousing: 0,
-      pack: 0
+      pack: 0,
+      abnormalWorkingHours:0,
+      anomalyClassification1:0,
+      anomalyClassification2:0,
+      anomalyClassification3:0,
+      anomalyClassification4:0,
+      anomalyClassification5:0,
     };
   }
 
@@ -187,7 +194,7 @@ export class FbsAbnormalWorkingHoursListComponent implements OnInit {
     this.fbsAbnormalWorkingHours.start = this.datePipe.transform(this.fbsAbnormalWorkingHours.start, 'yyyy-MM-dd');
     this.fbsAbnormalWorkingHours.end = this.datePipe.transform(this.fbsAbnormalWorkingHours.end, 'yyyy-MM-dd');
     let fbsAbnormalWorkingHours=JSON.parse(JSON.stringify(this.fbsAbnormalWorkingHours));
-    fbsAbnormalWorkingHours.pageSize=10000;
+    fbsAbnormalWorkingHours.pageSize=-1;
     this.fbsAbnormalWorkingHoursService.list(fbsAbnormalWorkingHours).then((response)=>{
       if(response.success){//查询成功
         let dataList=response.result.records;//表格数据
@@ -204,19 +211,25 @@ export class FbsAbnormalWorkingHoursListComponent implements OnInit {
     this.initializationTotal();
     if (dataList) {
       dataList.forEach(element => {
-        this.totalList.overtimeHours = (Number(this.totalList.overtimeHours) + Number(element.overtimeHours)).toFixed(1);
+        this.totalList.invalidWork = (Number(this.totalList.invalidWork) + Number(element.invalidWork)).toFixed(1);
         this.totalList.train = (Number(this.totalList.train) + Number(element.train)).toFixed(1);
         this.totalList.meeting = (Number(this.totalList.meeting) + Number(element.meeting)).toFixed(1);
         this.totalList.researchAndDevelopment = (Number(this.totalList.researchAndDevelopment) + Number(element.researchAndDevelopment)).toFixed(1);
         this.totalList.fiveS = (Number(this.totalList.fiveS) + Number(element.fiveS)).toFixed(1);
-        this.totalList.pack = (Number(this.totalList.pack) + Number(element.pack)).toFixed(1);
+        // this.totalList.pack = (Number(this.totalList.pack) + Number(element.pack)).toFixed(1);
         this.totalList.other = (Number(this.totalList.other) + Number(element.other)).toFixed(1);
-        this.totalList.quality = (Number(this.totalList.quality) + Number(element.quality)).toFixed(1);
-        this.totalList.materiel = (Number(this.totalList.materiel) + Number(element.materiel)).toFixed(1);
-        this.totalList.equipment = (Number(this.totalList.equipment) + Number(element.equipment)).toFixed(1);
-        this.totalList.design = (Number(this.totalList.design) + Number(element.design)).toFixed(1);
-        this.totalList.energy = (Number(this.totalList.energy) + Number(element.energy)).toFixed(1);
-        this.totalList.plan = (Number(this.totalList.plan) + Number(element.plan)).toFixed(1);
+        // this.totalList.quality = (Number(this.totalList.quality) + Number(element.quality)).toFixed(1);
+        this.totalList.abnormalWorkingHours = (Number(this.totalList.abnormalWorkingHours) + Number(element.abnormalWorkingHours)).toFixed(1);
+        // this.totalList.materiel = (Number(this.totalList.materiel) + Number(element.materiel)).toFixed(1);
+        // this.totalList.equipment = (Number(this.totalList.equipment) + Number(element.equipment)).toFixed(1);
+        // this.totalList.design = (Number(this.totalList.design) + Number(element.design)).toFixed(1);
+        // this.totalList.energy = (Number(this.totalList.energy) + Number(element.energy)).toFixed(1);
+        // this.totalList.plan = (Number(this.totalList.plan) + Number(element.plan)).toFixed(1);
+        this.totalList.anomalyClassification1 = (Number(this.totalList.anomalyClassification1) + Number(element.anomalyClassification1)).toFixed(1);
+        this.totalList.anomalyClassification2 = (Number(this.totalList.anomalyClassification2) + Number(element.anomalyClassification2)).toFixed(1);
+        this.totalList.anomalyClassification3 = (Number(this.totalList.anomalyClassification3) + Number(element.anomalyClassification3)).toFixed(1);
+        this.totalList.anomalyClassification4 = (Number(this.totalList.anomalyClassification4) + Number(element.anomalyClassification4)).toFixed(1);
+        this.totalList.anomalyClassification5 = (Number(this.totalList.anomalyClassification5) + Number(element.anomalyClassification5)).toFixed(1);
       });
     }
   }

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

@@ -59,13 +59,13 @@
         <td>{{item.name}}</td>
         <td>{{item.cinvCName}}</td>
         <td>
-          <!-- <a (click)="update(item)">修改</a> -->
+          <a (click)="update(item)">修改</a>
           
-          <a (click)="update(item)">详情</a>
+          <!-- <a (click)="update(item)">详情</a> -->
           <!-- 删除 -->
-          <!-- <span>&nbsp;|&nbsp;</span>
+          <span>&nbsp;|&nbsp;</span>
           <a nz-popconfirm nzTitle="是否删除" nzOkText="是" nzCancelText="否"
-            (nzOnConfirm)="delete(item)">删除</a> -->
+            (nzOnConfirm)="delete(item)">删除</a>
           </td>
         </tr>
     </nz-table>

src/app/routes/fbs-technological-process/list/list.component.ts

@@ -109,15 +109,15 @@ export class FbsTechnologicalProcessListComponent implements OnInit {
             model.close();
           },
         },
-        // {
-        //   label: '保存',
-        //   type: 'primary',
-        //   onClick: model=> {
-        //     model.save().then(()=>{
-        //       this.getList()
-        //     })
-        //   }
-        // }
+        {
+          label: '保存',
+          type: 'primary',
+          onClick: model=> {
+            model.save().then(()=>{
+              this.getList()
+            })
+          }
+        }
       ]
     });
   }

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

@@ -45,7 +45,7 @@
               <th nzWidth="50%">工艺路线</th>
               <th nzWidth="20%">标准工时</th>
               <th nzWidth="20%">排序</th>
-              <!-- <th nzWidth="10%">操作</th> -->
+              <th nzWidth="10%">操作</th>
             </tr>
           </thead>
           <tbody>
@@ -53,7 +53,7 @@
               <td><input nz-input name="name" [(ngModel)]="data.name" /></td>
               <td><input nz-input name="standardWorkingHours" [(ngModel)]="data.standardWorkingHours" /></td>
               <td><input nz-input name="sort" [(ngModel)]="data.sort" /></td>
-              <!-- <td><a nz-popconfirm nzTitle="是否删除?" (nzOnConfirm)="deleteRow(data.sort)">删除</a></td> -->
+              <td><a nz-popconfirm nzTitle="是否删除?" (nzOnConfirm)="deleteRow(data.sort)">删除</a></td>
             </tr>
           </tbody>
         </nz-table>

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

@@ -131,22 +131,30 @@ export class FbsWorkshopDispatchListListComponent implements OnInit {
     let manHoursCompletedHide=0;//之累计完成数量不为0的
     if (dataList) {
       dataList.forEach(element => {
+        
+        if(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 =
+          this.totalList.standardWorkingHours + Number(element.standardWorkingHours);
+          this.totalList.manHoursCompleted = this.totalList.manHoursCompleted + Number(element.manHoursCompleted);
+          if(Number(element.latestCompletedQuantity)>0){
+            completeStandardWorkingHours=completeStandardWorkingHours+(Number(element.standardWorkingHoursZ)*Number(element.latestCompletedQuantity))
+            manHoursCompletedHide=manHoursCompletedHide+(Number(element.manHoursCompleted))
+          }
+        }
         // element.standardWorkingHours=Number(element.standardWorkingHours).toFixed(1)
-        element.standardWorkingHours=(Number(element.standardWorkingHoursZ)* Number(element.numberOfTasks)).toFixed(2)
         // 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);
-        if(Number(element.latestCompletedQuantity)>0){
-          completeStandardWorkingHours=completeStandardWorkingHours+(Number(element.standardWorkingHoursZ)*Number(element.latestCompletedQuantity))
-          manHoursCompletedHide=manHoursCompletedHide+(Number(element.manHoursCompleted))
-        }
+        
+
       });
       // this.totalList.standardWorkingHours = this.totalList.standardWorkingHours.toFixed(1);
       // this.totalList.manHoursCompleted = this.totalList.manHoursCompleted.toFixed(1);
+     
+
       this.totalList.standardWorkingHours = this.totalList.standardWorkingHours.toFixed(2);
       this.totalList.manHoursCompleted = this.totalList.manHoursCompleted.toFixed(2);
       this.totalList.numberEfficiency=((this.totalList.latestCompletedQuantity/this.totalList.numberOfTasks)*100).toFixed(0);