Browse Source

派工单

chenc 4 years ago
parent
commit
cae01a2d14

+ 2 - 0
src/app/entity/fbs/fbs-workshop-dispatch-list.ts

@@ -54,6 +54,8 @@ export class FbsWorkshopDispatchList extends Page{
 	isScanCode?:string;
 	isScanCode?:string;
 	//是否可扫码(页面控件使用)
 	//是否可扫码(页面控件使用)
 	isScanCodeSwith?:boolean;
 	isScanCodeSwith?:boolean;
+	//
+	fbsTechnologicalProcessName?:string;
 
 
 	latestCompletedQuantity?:string;
 	latestCompletedQuantity?:string;
   manHoursCompleted?:string;
   manHoursCompleted?:string;

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

@@ -131,7 +131,7 @@ export class FbsWorkshopDispatchListListComponent implements OnInit {
     if (dataList) {
     if (dataList) {
       dataList.forEach(element => {
       dataList.forEach(element => {
         element.standardWorkingHours=Number(element.standardWorkingHours).toFixed(1)
         element.standardWorkingHours=Number(element.standardWorkingHours).toFixed(1)
-        this.totalList.plannedQuantity = this.totalList.plannedQuantity + Number(element.plannedQuantity);
+        // this.totalList.plannedQuantity = this.totalList.plannedQuantity + Number(element.plannedQuantity);
         this.totalList.numberOfTasks = this.totalList.numberOfTasks + Number(element.numberOfTasks);
         this.totalList.numberOfTasks = this.totalList.numberOfTasks + Number(element.numberOfTasks);
         this.totalList.standardWorkingHours =
         this.totalList.standardWorkingHours =
           this.totalList.standardWorkingHours + Number(element.standardWorkingHours);
           this.totalList.standardWorkingHours + Number(element.standardWorkingHours);
@@ -147,9 +147,33 @@ export class FbsWorkshopDispatchListListComponent implements OnInit {
       this.totalList.manHoursCompleted = this.totalList.manHoursCompleted.toFixed(1);
       this.totalList.manHoursCompleted = this.totalList.manHoursCompleted.toFixed(1);
       this.totalList.numberEfficiency=((this.totalList.latestCompletedQuantity/this.totalList.numberOfTasks)*100).toFixed(1);
       this.totalList.numberEfficiency=((this.totalList.latestCompletedQuantity/this.totalList.numberOfTasks)*100).toFixed(1);
       this.totalList.workingHoursEfficiency=((completeStandardWorkingHours/manHoursCompletedHide)*100).toFixed(1);
       this.totalList.workingHoursEfficiency=((completeStandardWorkingHours/manHoursCompletedHide)*100).toFixed(1);
+      this.totalList.plannedQuantity = this.getPlannedQuantityTotal(dataList);
     }
     }
   }
   }
 
 
+  getPlannedQuantityTotal(dataList){
+    let list:any=[];
+    dataList.forEach(element => {
+      let isC=false;
+      list.forEach(element2 => {
+        if(element.productionOrderNumberName===element2.productionOrderNumberName){
+          isC=true;
+        }
+      });
+      if(isC===false){
+        list=[
+          ...list,
+          element
+        ]
+      }
+    });
+    let plannedQuantity=0;
+    list.forEach(element => {
+      plannedQuantity=plannedQuantity + Number(element.plannedQuantity);
+    });
+    return plannedQuantity;
+  }
+
   /**
   /**
    * 更改是否可扫码
    * 更改是否可扫码
    */
    */