工艺与生产报表

src/app/entity/fbs/fbs-abnormal-working-hours.ts

@@ -60,6 +60,9 @@ export class FbsAbnormalWorkingHours extends Page{
 	productId?:string;
 	workshopDispatchListId?:string;
 	rejectsNumber?:string;
+	costItemCode?:string;
+	projectName?:string;
+	productionOrderNumberName?:string;
 
 	/**应到人数*/
 	numberOfPeopleToArrive?:number;

src/app/entity/fbs/fbs-technological-process.ts

@@ -9,6 +9,8 @@ export class FbsTechnologicalProcess extends Page{
   sort?:number;
   /**备注*/
   memo?:string;
+  /**物料名称 */
+  cinvCName?:string;
 
   //明细
   fbsTechnologicalProcessItemList?:any[];

src/app/entity/fbs/fbs-workshop-dispatch-list.ts

@@ -36,6 +36,8 @@ export class FbsWorkshopDispatchList extends Page{
 	productionLineId?:string;
 	/**项目名称 */
 	projectName?:string;
+	/**项目编码 */
+	costItemCode?:string;
 	//行号
 	rowNumber?:string;
 	//开始

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

@@ -78,7 +78,7 @@
         </td>
       </tr>
       <tr>
-        <td  rowSpan="6">其他工时统计</td>
+        <td  rowSpan="5">无效工时统计</td>
         <td >培训</td>
         <td >
           <nz-input-number [(ngModel)]="fbsAbnormalWorkingHours.train" [nzMin]="0" [nzStep]="1"></nz-input-number>
@@ -100,7 +100,7 @@
       </tr>
       
       <tr>
-        <td>研发</td>
+        <td>待料</td>
         <td>
           <nz-input-number [(ngModel)]="fbsAbnormalWorkingHours.researchAndDevelopment" [nzMin]="0" [nzStep]="1">
           </nz-input-number>
@@ -120,7 +120,7 @@
           <input nz-input [(ngModel)]="fbsAbnormalWorkingHours.fiveSMemo" />
         </td>
       </tr>
-      <tr>
+      <!-- <tr>
         <td >打包</td>
         <td >
           <nz-input-number [(ngModel)]="fbsAbnormalWorkingHours.pack" [nzMin]="0" [nzStep]="1"></nz-input-number>
@@ -129,7 +129,7 @@
         <td colspan="9">
           <input nz-input [(ngModel)]="fbsAbnormalWorkingHours.packMemo" />
         </td>
-      </tr>
+      </tr> -->
       <tr>
         <td >其他</td>
         <td >
@@ -140,7 +140,7 @@
           <input nz-input [(ngModel)]="fbsAbnormalWorkingHours.otherMemo" />
         </td>
       </tr>
-      <tr>
+      <!-- <tr>
         <td rowSpan="6">异常工时统计</td>
         <td>质量</td>
         <td>
@@ -200,7 +200,7 @@
         <td colspan="9">
           <input nz-input [(ngModel)]="fbsAbnormalWorkingHours.planMemo" />
         </td>
-      </tr>
+      </tr> -->
       <!-- <tr>
         <td>设计</td>
         <td>
@@ -308,21 +308,30 @@
           <thead>
             <tr>
               <th nzWidth="5%">序号</th>
-              <th nzWidth="10%">生产订单</th>
-              <th nzWidth="10%">物料编码</th>
-              <th nzWidth="10%">物料名称</th>
+              <th nzWidth="8%">项目编码</th>
+              <th nzWidth="8%">项目名称</th>
+              <th nzWidth="8%">工作中心</th>
+              <th nzWidth="8%">生产订单</th>
+              <th nzWidth="8%">物料编码</th>
+              <th nzWidth="8%">物料名称</th>
               <th nzWidth="5%">计划数量</th>
-              <th nzWidth="5%">不良品数量</th>
-              <th nzWidth="15%">不良描述</th>
+              <!-- <th nzWidth="5%">不良品数量</th> -->
+              <th nzWidth="15%">异常描述</th>
+              <th nzWidth="8%">异常分类</th>
+              <th nzWidth="5%">异常工时</th>
               <th nzWidth="10%">不良物料名称</th>
-              <th nzWidth="5%">数量</th>
-              <th nzWidth="5%">不良数量</th>
+              <th nzWidth="5%">不良率(%)</th>
+              <!-- <th nzWidth="5%">数量</th>
+              <th nzWidth="5%">不良数量</th> -->
               <th nzWidth="10%">操作</th>
             </tr>
           </thead>
           <tbody>
             <tr *ngFor="let data of editRowTable.data">
               <td>{{data.sort}}</td>
+              <td>{{data.costItemCode}}</td>
+              <td>{{data.projectName}}</td>
+              <td>{{data.workCenter}}</td>
               <td>{{data.productionOrderNumberName}}</td>
               <td>{{data.productId}}</td>
               <!-- <td>
@@ -361,10 +370,24 @@
                 </ng-container> -->
                 {{data.plannedQuantity}}
               </td>
-              <td>
+              <!-- <td>
                 <nz-input-number [(ngModel)]="data.rejectsNumber" [nzMin]="0" [nzStep]="1"></nz-input-number>
-              </td>
+              </td> -->
               <td><textarea rows="1" nz-input [(ngModel)]="data.describes"></textarea></td>
+              <td>
+                <ng-container >
+                  <nz-select [(ngModel)]="data.anomalyClassification" style="width: 100%;" nzShowSearch nzAllowClear
+                    nzPlaceHolder="请选择"
+                    [nzDropdownMatchSelectWidth]="false">
+                      <nz-option nzLabel="设计" nzValue="1"> </nz-option>
+                      <nz-option nzLabel="物料" nzValue="2"> </nz-option>
+                      <nz-option nzLabel="计划" nzValue="3"> </nz-option>
+                      <nz-option nzLabel="制程" nzValue="4"> </nz-option>
+                      <nz-option nzLabel="其他" nzValue="5"> </nz-option>
+                  </nz-select>
+                </ng-container>
+              </td>
+              <td><nz-input-number [(ngModel)]="data.abnormalWorkingHours" [nzMin]="0" [nzStep]="1"></nz-input-number></td>
               <td>
                 <!-- <nz-select [(ngModel)]="data.typeId" style="width: 100%;" nzShowSearch
                   nzAllowClear nzPlaceHolder="请选择" (ngModelChange)="typeChange($event,data)">
@@ -374,12 +397,13 @@
                 </nz-select> -->
                 <input nz-input name="data.materielName" [(ngModel)]="data.materielName" />
               </td>
-              <td>
+              <td><nz-input-number [(ngModel)]="data.defectiveRate" [nzMin]="0" [nzStep]="1"></nz-input-number></td>
+              <!-- <td>
                 <nz-input-number [(ngModel)]="data.materielNumberOfTasks" [nzMin]="0" [nzStep]="1"></nz-input-number>
               </td>
               <td>
                 <nz-input-number [(ngModel)]="data.materielBadNumber" [nzMin]="0" [nzStep]="1"></nz-input-number>
-              </td>
+              </td> -->
               <td><a nz-popconfirm nzTitle="是否删除?" (nzOnConfirm)="describeDeleteRow(data.sort)">删除</a></td>
             </tr>
           </tbody>

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

@@ -92,6 +92,9 @@ export class FbsAbnormalWorkingHoursAddComponent implements OnInit {
           data.product=element.product;//产品名称
           data.plannedQuantity=element.plannedQuantity;//计划数量
           data.productionOrderNumberName=element.productionOrderNumberName;
+          data.costItemCode=element.costItemCode;//项目编码
+          data.projectName=element.projectName;//项目名称
+          data.workCenter=element.workCenter;//工作中心
         }
       });
     }

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

@@ -43,14 +43,67 @@
         </nz-form-item>
       </div>
     </div>
+    <div nz-row [nzGutter]="{xs:12,sm:15,md:29,lg: 36, xl: 40}">
+      <!-- 项目编号 -->
+      <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">
+            <input [(ngModel)]="fbsAbnormalWorkingHours.costItemCode" name="costItemCode" nz-input
+              placeholder="请输入" />
+          </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">
+            <input [(ngModel)]="fbsAbnormalWorkingHours.projectName" name="projectName" nz-input
+              placeholder="请输入" />
+          </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">
+            <input [(ngModel)]="fbsAbnormalWorkingHours.productionOrderNumberName" name="productionOrderNumberName" nz-input
+              placeholder="请输入" />
+          </nz-form-control>
+        </nz-form-item>
+      </div>
+    </div>
+    <div nz-row [nzGutter]="{xs:12,sm:15,md:29,lg: 36, xl: 40}">
+      <!-- 物料编码 -->
+      <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">
+            <input [(ngModel)]="fbsAbnormalWorkingHours.productId" name="productId" nz-input
+              placeholder="请输入" />
+          </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">
+            <input [(ngModel)]="fbsAbnormalWorkingHours.product" name="product" nz-input
+              placeholder="请输入" />
+          </nz-form-control>
+        </nz-form-item>
+      </div>
+    </div>
   </form>
   <!-- 数据表 -->
-  <nz-table nzSize="small" class="buttonDistance" [nzData]="dataList" [nzLoading]="isLoading"
+  <!-- <nz-table nzSize="small" class="buttonDistance" [nzData]="dataList" [nzLoading]="isLoading"
     [nzFrontPagination]="false" #borderedTable [nzTotal]="page.total" [nzPageIndex]="page.current"
     (nzPageIndexChange)="pageIndexChange($event)">
     <thead>
       <tr>
-        <!-- <th>姓名</th> -->
         <th>日期</th>
         <th nzAlign="center">加班工时</th>
         <th nzAlign="center">培训</th>
@@ -58,7 +111,6 @@
         <th nzAlign="center">研发</th>
         <th nzAlign="center">5S</th>
         <th nzAlign="center">打包</th>
-        <!-- <th nzAlign="center">返工</th> -->
         <th nzAlign="center">其他</th>
         <th nzAlign="center">质量</th>
         <th nzAlign="center">物料</th>
@@ -66,16 +118,13 @@
         <th nzAlign="center">设计</th>
         <th nzAlign="center">能源</th>
         <th nzAlign="center">计划</th>
-        <!-- <th nzAlign="center">配料</th>
-        <th nzAlign="center">入库</th>
-        <th nzAlign="center">打包</th> -->
+       
         <th style="width:15%">{{ 'table.operation' | translate }}</th>
       </tr>
     </thead>
     <tbody>
       <tr *ngFor="let item of  borderedTable.data">
-        <!-- <td >{{item.milestoneCode}}</td> -->
-        <!-- <td>{{item.name}}</td> -->
+       
         <td>{{item.date}}</td>
         <td nzAlign="center">{{item.overtimeHours}}</td>
         <td nzAlign="center">{{item.train}}</td>
@@ -83,7 +132,6 @@
         <td nzAlign="center">{{item.researchAndDevelopment}}</td>
         <td nzAlign="center">{{item.fiveS}}</td>
         <td nzAlign="center">{{item.pack}}</td>
-        <!-- <td nzAlign="center">{{item.rework}}</td> -->
         <td nzAlign="center">{{item.other}}</td>
         <td nzAlign="center">{{item.quality}}</td>
         <td nzAlign="center">{{item.materiel}}</td>
@@ -91,16 +139,10 @@
         <td nzAlign="center">{{item.design}}</td>
         <td nzAlign="center">{{item.energy}}</td>
         <td nzAlign="center">{{item.plan}}</td>
-        <!-- <td nzAlign="center">{{item.mixedIngredients}}</td>
-        <td nzAlign="center">{{item.warehousing}}</td>
-        <td nzAlign="center">{{item.pack}}</td> -->
         <td>
-          <!-- 详情 -->
           <a (click)="view(item)">{{ 'table.view' | translate }}</a>
-          <!-- 修改 -->
           <span>&nbsp;|&nbsp;</span>
           <a (click)="update(item)">{{ 'contract.index.update' | translate }}</a>
-          <!-- 删除 -->
           <span>&nbsp;|&nbsp;</span>
           <a nz-popconfirm nzTitle="是否删除" nzOkText="是" nzCancelText="否"
             (nzOnConfirm)="delete(item)">{{ 'table.delete' | translate }}</a>
@@ -122,11 +164,95 @@
         <td>{{totalList.design}}</td>
         <td>{{totalList.energy}}</td>
         <td>{{totalList.plan}}</td>
-        <!-- <td>{{totalList.mixedIngredients}}</td>
-        <td>{{totalList.warehousing}}</td>
-        <td>{{totalList.pack}}</td> -->
         <td></td>
       </tr>
     </tbody>
-  </nz-table>
+  </nz-table> -->
+
+  <nz-table nzSize="small" class="buttonDistance" [nzData]="dataList" [nzLoading]="isLoading"
+  [nzFrontPagination]="false" #borderedTable [nzTotal]="page.total" [nzPageIndex]="page.current"
+  (nzPageIndexChange)="pageIndexChange($event)">
+  <thead>
+    <tr>
+      <th rowspan="2">日期</th>
+      <th rowspan="2" nzAlign="center" >无效工时</th>
+      <th colspan="5" nzAlign="center">分类</th>
+      <th rowspan="2" nzAlign="center" >异常工时</th>
+      <th colspan="5" nzAlign="center">分类</th>
+      <th rowspan="2" style="width:15%">{{ 'table.operation' | translate }}</th>
+    </tr>
+    <tr>
+      <th nzAlign="center">培训</th>
+      <th nzAlign="center">会议</th>
+      <th nzAlign="center">待料</th>
+      <th nzAlign="center">5S</th>
+      <th nzAlign="center">其他</th>
+
+      <th nzAlign="center">设计</th>
+      <th nzAlign="center">物料</th>
+      <th nzAlign="center">计划</th>
+      <th nzAlign="center">制程</th>
+      <th nzAlign="center">其他</th>
+      <!-- <th nzAlign="center">配料</th>
+      <th nzAlign="center">入库</th>
+      <th nzAlign="center">打包</th> -->
+    </tr>
+  </thead>
+  <tbody>
+    <tr *ngFor="let item of  borderedTable.data">
+      <!-- <td >{{item.milestoneCode}}</td> -->
+      <!-- <td>{{item.name}}</td> -->
+      <td>{{item.date}}</td>
+      <td nzAlign="center">{{item.invalidWork}}</td>
+      <td nzAlign="center">{{item.train}}</td>
+      <td nzAlign="center">{{item.meeting}}</td>
+      <td nzAlign="center">{{item.researchAndDevelopment}}</td>
+      <td nzAlign="center">{{item.fiveS}}</td>
+      <td nzAlign="center">{{item.other}}</td>
+
+      <td nzAlign="center">{{item.abnormalWorkingHours}}</td>
+      <td nzAlign="center">{{item.anomalyClassification1}}</td>
+      <td nzAlign="center">{{item.anomalyClassification2}}</td>
+      <td nzAlign="center">{{item.anomalyClassification3}}</td>
+      <td nzAlign="center">{{item.anomalyClassification4}}</td>
+      <td nzAlign="center">{{item.anomalyClassification5}}</td>
+      
+      <!-- <td nzAlign="center">{{item.mixedIngredients}}</td>
+      <td nzAlign="center">{{item.warehousing}}</td>
+      <td nzAlign="center">{{item.pack}}</td> -->
+      <td>
+        <!-- 详情 -->
+        <a (click)="view(item)">{{ 'table.view' | translate }}</a>
+        <!-- 修改 -->
+        <span>&nbsp;|&nbsp;</span>
+        <a (click)="update(item)">{{ 'contract.index.update' | translate }}</a>
+        <!-- 删除 -->
+        <span>&nbsp;|&nbsp;</span>
+        <a nz-popconfirm nzTitle="是否删除" nzOkText="是" nzCancelText="否"
+          (nzOnConfirm)="delete(item)">{{ 'table.delete' | translate }}</a>
+
+      </td>
+    </tr>
+    <tr style="font-weight:bolder;text-align: center;">
+      <td>总计</td>
+      <td>{{totalList.overtimeHours}}</td>
+      <td>{{totalList.train}}</td>
+      <td>{{totalList.meeting}}</td>
+      <td>{{totalList.researchAndDevelopment}}</td>
+      <td>{{totalList.fiveS}}</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.mixedIngredients}}</td>
+      <td>{{totalList.warehousing}}</td>
+      <td>{{totalList.pack}}</td> -->
+      <td></td>
+    </tr>
+  </tbody>
+</nz-table>
 </nz-card>

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

@@ -77,7 +77,7 @@
         </td>
       </tr>
       <tr>
-        <td  rowSpan="6">其他工时统计</td>
+        <td  rowSpan="5">无效工时</td>
         <td >培训</td>
         <td >
           <nz-input-number [(ngModel)]="fbsAbnormalWorkingHours.train" [nzMin]="0" [nzStep]="1"></nz-input-number>
@@ -99,7 +99,7 @@
       </tr>
       
       <tr>
-        <td>研发</td>
+        <td>待料</td>
         <td>
           <nz-input-number [(ngModel)]="fbsAbnormalWorkingHours.researchAndDevelopment" [nzMin]="0" [nzStep]="1">
           </nz-input-number>
@@ -119,7 +119,7 @@
           <input nz-input [(ngModel)]="fbsAbnormalWorkingHours.fiveSMemo" />
         </td>
       </tr>
-      <tr>
+      <!-- <tr>
         <td >打包</td>
         <td >
           <nz-input-number [(ngModel)]="fbsAbnormalWorkingHours.pack" [nzMin]="0" [nzStep]="1"></nz-input-number>
@@ -128,7 +128,7 @@
         <td colspan="9">
           <input nz-input [(ngModel)]="fbsAbnormalWorkingHours.packMemo" />
         </td>
-      </tr>
+      </tr> -->
       <tr>
         <td >其他</td>
         <td >
@@ -139,7 +139,7 @@
           <input nz-input [(ngModel)]="fbsAbnormalWorkingHours.otherMemo" />
         </td>
       </tr>
-      <tr>
+      <!-- <tr>
         <td rowSpan="6">异常工时统计</td>
         <td>质量</td>
         <td>
@@ -199,7 +199,7 @@
         <td colspan="9">
           <input nz-input [(ngModel)]="fbsAbnormalWorkingHours.planMemo" />
         </td>
-      </tr>
+      </tr> -->
       <!-- <tr>
         <td>设计</td>
         <td>
@@ -306,21 +306,30 @@
           <thead>
             <tr>
               <th nzWidth="5%">序号</th>
-              <th nzWidth="10%">生产订单</th>
-              <th nzWidth="10%">物料编码</th>
-              <th nzWidth="10%">物料名称</th>
+              <th nzWidth="8%">项目编码</th>
+              <th nzWidth="8%">项目名称</th>
+              <th nzWidth="8%">工作中心</th>
+              <th nzWidth="8%">生产订单</th>
+              <th nzWidth="8%">物料编码</th>
+              <th nzWidth="8%">物料名称</th>
               <th nzWidth="5%">计划数量</th>
-              <th nzWidth="5%">不良品数量</th>
-              <th nzWidth="15%">不良描述</th>
+              <!-- <th nzWidth="5%">不良品数量</th> -->
+              <th nzWidth="15%">异常描述</th>
+              <th nzWidth="8%">异常分类</th>
+              <th nzWidth="5%">异常工时</th>
               <th nzWidth="10%">不良物料名称</th>
-              <th nzWidth="5%">数量</th>
-              <th nzWidth="5%">不良数量</th>
+              <th nzWidth="5%">不良率(%)</th>
+              <!-- <th nzWidth="5%">数量</th>
+              <th nzWidth="5%">不良数量</th> -->
               <th nzWidth="10%">操作</th>
             </tr>
           </thead>
           <tbody>
             <tr *ngFor="let data of editRowTable.data">
               <td>{{data.sort}}</td>
+              <td>{{data.costItemCode}}</td>
+              <td>{{data.projectName}}</td>
+              <td>{{data.workCenter}}</td>
               <td>{{data.productionOrderNumberName}}</td>
               <td>{{data.productId}}</td>
               <!-- <td>
@@ -358,8 +367,24 @@
               </ng-container> -->
               {{data.plannedQuantity}}
               </td>
-              <td><nz-input-number [(ngModel)]="data.rejectsNumber" [nzMin]="0" [nzStep]="1"></nz-input-number></td>
+              <!-- <td><nz-input-number [(ngModel)]="data.rejectsNumber" [nzMin]="0" [nzStep]="1"></nz-input-number></td> -->
               <td><textarea rows="1" nz-input [(ngModel)]="data.describes"></textarea></td>
+              <td>
+                <ng-container >
+                  <nz-select [(ngModel)]="data.anomalyClassification" style="width: 100%;" nzShowSearch nzAllowClear
+                    nzPlaceHolder="请选择"
+                    [nzDropdownMatchSelectWidth]="false">
+                      <nz-option nzLabel="设计" nzValue="1"> </nz-option>
+                      <nz-option nzLabel="物料" nzValue="2"> </nz-option>
+                      <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>
+              <td><nz-input-number [(ngModel)]="data.abnormalWorkingHours" [nzMin]="0" [nzStep]="1"></nz-input-number></td>
+              
               <td>
                 <!-- <nz-select [(ngModel)]="data.typeId" style="width: 100%;" nzShowSearch
                   nzAllowClear nzPlaceHolder="请选择" (ngModelChange)="typeChange($event,data)">
@@ -369,12 +394,14 @@
                 </nz-select> -->
                 <input nz-input name="data.materielName" [(ngModel)]="data.materielName" />
               </td>
-              <td>
+              <td><nz-input-number [(ngModel)]="data.defectiveRate" [nzMin]="0" [nzStep]="1"></nz-input-number></td>
+              
+              <!-- <td>
                 <nz-input-number [(ngModel)]="data.materielNumberOfTasks" [nzMin]="0" [nzStep]="1"></nz-input-number>
               </td>
               <td>
                 <nz-input-number [(ngModel)]="data.materielBadNumber" [nzMin]="0" [nzStep]="1"></nz-input-number>
-              </td>
+              </td> -->
               <td><a nz-popconfirm nzTitle="是否删除?" (nzOnConfirm)="describeDeleteRow(data.sort)">删除</a></td>
             </tr>
           </tbody>

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

@@ -68,7 +68,7 @@
         </td>
       </tr>
       <tr>
-        <td  rowSpan="6">其他工时统计</td>
+        <td  rowSpan="5">无效工时</td>
         <td >培训</td>
         <td >
           {{fbsAbnormalWorkingHours.train}}
@@ -90,7 +90,7 @@
       </tr>
       
       <tr>
-        <td>研发</td>
+        <td>待料</td>
         <td>
           {{fbsAbnormalWorkingHours.researchAndDevelopment}}
         </td>
@@ -109,7 +109,7 @@
           {{fbsAbnormalWorkingHours.fiveSMemo}}
         </td>
       </tr>
-      <tr>
+      <!-- <tr>
         <td >打包</td>
         <td >
           {{fbsAbnormalWorkingHours.pack}}
@@ -118,7 +118,7 @@
         <td colspan="9">
           {{fbsAbnormalWorkingHours.packMemo}}
         </td>
-      </tr>
+      </tr> -->
       <tr>
         <td >其他</td>
         <td >
@@ -129,7 +129,7 @@
           {{fbsAbnormalWorkingHours.otherMemo}}
         </td>
       </tr>
-      <tr>
+      <!-- <tr>
         <td rowSpan="6">异常工时统计</td>
         <td>质量</td>
         <td>
@@ -189,7 +189,7 @@
         <td colspan="9">
           {{fbsAbnormalWorkingHours.planMemo}}
         </td>
-      </tr>
+      </tr> -->
       <!-- <tr>
         <td>设计</td>
         <td>
@@ -290,30 +290,59 @@
           <thead>
             <tr>
               <th nzWidth="5%">序号</th>
-              <th nzWidth="10%">生产订单</th>
-              <th nzWidth="10%">物料编码</th>
-              <th nzWidth="10%">物料名称</th>
+              <th nzWidth="8%">项目编码</th>
+              <th nzWidth="8%">项目名称</th>
+              <th nzWidth="8%">工作中心</th>
+              <th nzWidth="8%">生产订单</th>
+              <th nzWidth="8%">物料编码</th>
+              <th nzWidth="8%">物料名称</th>
               <th nzWidth="5%">计划数量</th>
-              <th nzWidth="5%">不良品数量</th>
-              <th nzWidth="15%">不良描述</th>
+              <!-- <th nzWidth="5%">不良品数量</th> -->
+              <th nzWidth="15%">异常描述</th>
+              <th nzWidth="8%">异常分类</th>
+              <th nzWidth="5%">异常工时</th>
               <th nzWidth="10%">不良物料名称</th>
-              <th nzWidth="5%">数量</th>
-              <th nzWidth="5%">不良数量</th>
+              <th nzWidth="5%">不良率(%)</th>
+              <!-- <th nzWidth="5%">数量</th>
+              <th nzWidth="5%">不良数量</th> -->
               <!-- <th nzWidth="10%">操作</th> -->
             </tr>
           </thead>
           <tbody>
             <tr *ngFor="let data of editRowTable.data">
               <td>{{data.sort}}</td>
+              <td>{{data.costItemCode}}</td>
+              <td>{{data.projectName}}</td>
+              <td>{{data.workCenter}}</td>
               <td>{{data.productionOrderNumberName}}</td>
               <td>{{data.productId}}</td>
               <td>{{data.product}}</td>
               <td>{{data.plannedQuantity}}</td>
-              <td>{{data.rejectsNumber}}</td>
+              <!-- <td>{{data.rejectsNumber}}</td> -->
               <td>{{data.describes}}</td>
+              
+              <td>
+                <ng-container *ngIf="data.anomalyClassification=='1'">
+                  设计
+                </ng-container>
+                <ng-container *ngIf="data.anomalyClassification=='2'">
+                  物料
+                </ng-container>
+                <ng-container *ngIf="data.anomalyClassification=='3'">
+                  计划
+                </ng-container>
+                <ng-container *ngIf="data.anomalyClassification=='4'">
+                  制程
+                </ng-container>
+                <ng-container *ngIf="data.anomalyClassification=='5'">
+                  其他
+                </ng-container>
+              </td>
+              <td>{{data.abnormalWorkingHours}}</td>
               <td>{{data.materielName}}</td>
-              <td>{{data.materielNumberOfTasks}}</td>
-              <td>{{data.materielBadNumber}}</td>
+              <td>{{data.defectiveRate}}</td>
+              <!-- <td>{{data.materielNumberOfTasks}}</td>
+              <td>{{data.materielBadNumber}}</td> -->
             </tr>
           </tbody>
         </nz-table>

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

@@ -4,19 +4,59 @@
   </ng-template>
 </page-header>
 <nz-card>
+  <form nz-form>
+    <!-- 查询条件 -->
+    <div nz-row [nzGutter]="{xs:12,sm:15,md:29,lg: 36, xl: 40}">
+       <!-- 物料编码 -->
+       <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">
+            <input [(ngModel)]="fbsTechnologicalProcess.name" name="name" nz-input
+              placeholder="请输入" />
+          </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">
+            <input [(ngModel)]="fbsTechnologicalProcess.cinvCName" name="cinvCName" nz-input
+              placeholder="请输入" />
+          </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]="2" [nzNoColon]="true"></nz-form-label>
+          <nz-form-control [nzSpan]="22" style="text-align: right;">
+            <!-- 查询 -->
+            <button nz-button nzType="primary" (click)="query()">查询</button>
+          </nz-form-control>
+        </nz-form-item>
+      </div>
+    </div>
+  </form>
+
   <nz-table nzSize="small" class="buttonDistance" [nzData]="dataList" [nzLoading]="isLoading"
     [nzFrontPagination]="false" #borderedTable [nzTotal]="page.total" [nzPageIndex]="page.current"
     (nzPageIndexChange)="pageIndexChange($event)">
     <thead>
       <tr>
         <!-- <th>姓名</th> -->
-        <th style="width:85%">名称</th>
+        <th style="width:20%">工作中心</th>
+        <th style="width:20%">物料编码</th>
+        <th style="width:45%">物料名称</th>
         <th style="width:15%">操作</th>
       </tr>
     </thead>
     <tbody>
       <tr *ngFor="let item of  borderedTable.data">
+        <td>{{item.memo}}</td>
         <td>{{item.name}}</td>
+        <td>{{item.cinvCName}}</td>
         <td>
           <a (click)="update(item)">修改</a>
           <!-- 删除 -->

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

@@ -20,7 +20,8 @@
           [nzShowPagination]="false" [nzFrontPagination]=false>
           <thead>
             <tr>
-              <th nzWidth="70%">工艺</th>
+              <th nzWidth="50%">工艺</th>
+              <th nzWidth="20%">标准工时</th>
               <th nzWidth="20%">排序</th>
               <th nzWidth="10%">操作</th>
             </tr>
@@ -28,6 +29,7 @@
           <tbody>
             <tr *ngFor="let data of editRowTable.data">
               <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>
             </tr>

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

@@ -137,8 +137,11 @@ export class FbsWorkshopDispatchListAddComponent implements OnInit {
         if(productionOrderNumberId===element.moid){
           data.productionOrderNumberName=element.mocode
           data.projectName=element.define12;
+          data.costItemCode=element.costitemcode;
+          
         }
       });
+      console.log(this.workshopDispatchListList)
       //获取产品集合
       this.getProductList(productionOrderNumberId,data);
     }

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

@@ -140,6 +140,7 @@ export class FbsWorkshopDispatchListUpdateComponent implements OnInit {
         if(element.cinvcode===event){
           this.fbsWorkshopDispatchList.product=element.cinvname;
           this.fbsWorkshopDispatchList.projectName=element.CostItemName;
+          this.fbsWorkshopDispatchList.costItemCode=element.costItemCode;
           this.fbsWorkshopDispatchList.rowNumber=element.sortSeq;
           this.fbsWorkshopDispatchList.plannedQuantity=element.qty;
           this.fbsWorkshopDispatchList.standardWorkingHoursZ=element.cinvdefine13;