调整

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

@@ -81,4 +81,8 @@ export class FbsWorkingStatistics extends Page{
 	workReportingActivities?:string;//报工活动
 
 	speedOfProgress?:number;//完成进度
+	latestCompletedQuantity?:number;//工单完成数量
+	sapState?:string;//sap完工状态
+	latestTime?:string;//工单最晚扫码日期
 }
+

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

@@ -123,6 +123,22 @@
           </nz-form-control>
         </nz-form-item>
       </div>
+      <!-- 状态 -->
+      <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-control [nzSpan]="16">
+            <nz-select nzMode="multiple" [(ngModel)]="fbsWorkingStatistics.stateList" name="state" style="width: 100%" nzShowSearch nzAllowClear
+              nzPlaceHolder="请选择" [nzDropdownMatchSelectWidth]="false">
+              <nz-option nzLabel="派工" nzValue="0"> </nz-option>
+              <nz-option nzLabel="上岗" nzValue="1"> </nz-option>
+              <nz-option nzLabel="暂停" nzValue="2"> </nz-option>
+              <nz-option nzLabel="进行中" nzValue="4"> </nz-option>
+              <nz-option nzLabel="完工" nzValue="3"> </nz-option>
+              </nz-select>
+          </nz-form-control>
+        </nz-form-item>
+     </div>
     </div>
   </div>
   </form>
@@ -139,6 +155,7 @@
         <th>物料编码</th>
         <th style="width: 15%;">物料名称</th>
         <th nzAlign="center">订单数</th>
+        <th >工单状态</th>
         <th>工序</th>
        
         <!-- <th>人员编码</th> -->
@@ -159,6 +176,13 @@
         <td>{{item.materielCode}}</td>
         <td>{{item.materielName}}</td>
         <td nzAlign="center">{{item.numberOfTasks}}</td>
+        <td >
+          <nz-badge nzStatus="yellow" *ngIf="item.state=='0'" nzText="派工"></nz-badge>
+          <nz-badge nzStatus="green" *ngIf="item.state=='1'" nzText="上岗"></nz-badge>
+          <nz-badge nzStatus="red" *ngIf="item.state=='2'" nzText="暂停"></nz-badge>
+          <nz-badge nzStatus="green" *ngIf="(item.state=='3'&&item.numberOfTasks==item.latestCompletedQuantity)||item.sapState=='REL CNF'" nzText="完工"></nz-badge>
+          <nz-badge nzStatus="green" *ngIf="item.state=='3'&&item.numberOfTasks!=item.latestCompletedQuantity&&item.sapState!='REL CNF'" nzText="进行中"></nz-badge>
+        </td>
         <td>{{item.fbsTechnologicalProcessItemName}}</td>
        
         <!-- <td>{{item.personnelCode}}</td> -->
@@ -182,6 +206,7 @@
         <!-- <td></td> -->
         <td></td>
         <td></td>
+        <td></td>
         <td nzAlign="center">{{totalList.standardWorkingHoursProcess}}</td>
         <td nzAlign="center">{{totalList.workingHoursTotal}}</td>
         <td nzAlign="center">{{totalList.efficiency}}%</td>

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

@@ -185,9 +185,11 @@ export class EfficiencyReportListComponent implements OnInit {
           ['项目名称'],
           ['工作中心'],
           ['订单编号'],
+          ['最晚扫码日期'],
           ['物料编码'],
           ['物料名称'],
           ['订单数'],
+          ['工单状态'],
           ['工艺流程'],
           ['人员编码'],
           ['姓名'],
@@ -206,9 +208,26 @@ export class EfficiencyReportListComponent implements OnInit {
             row.push(element.projectName)
             row.push(element.workCenter)
             row.push(element.orderNumber)
+            row.push(element.latestTime)
             row.push(element.materielCode)
             row.push(element.materielName)
             row.push(element.numberOfTasks)
+            if(element.state=='0'){
+              row.push('派工')
+            }
+            if(element.state=='1'){
+              row.push('上岗')
+            }
+            if(element.state=='2'){
+              row.push('暂停')
+            }
+            if((element.state=='3'&&element.numberOfTasks==element.latestCompletedQuantity)||element.sapState=='REL CNF'){
+              row.push('完工')
+            }
+            if(element.state=='3'&&element.numberOfTasks!=element.latestCompletedQuantity&&element.sapState!='REL CNF'){
+              row.push('进行中')
+            }
+
             row.push(element.fbsTechnologicalProcessItemName)
             row.push(element.personnelCode)
             row.push(element.personnelName)
@@ -230,10 +249,12 @@ export class EfficiencyReportListComponent implements OnInit {
             '',
             '',
             '',
+            '',
             this.totalList.numberOfTasks,
             '',
             '',
             '',
+            '',
             this.totalList.standardWorkingHoursProcess,
             this.totalList.workingHoursTotal,
             this.totalList.efficiency+"%"