首页 派工单 扫码记录

src/app/entity/fbs/fbs-warehouse.ts

@@ -73,6 +73,14 @@ export class FbsWarehouse extends Page{
   otherMemo?: string;
   //日期
   date?:string;
+  //配辅料
+  accessories?:number;
+  //配辅料-出库单号
+  accessoriesDeliveryOrderNo?:string;
+  //支给
+  defray?:number;
+  //支给-备注
+  defrayMemo?:string;
 
   start?:string;
   end?:string;

src/app/layout/default/header/header.component.html

@@ -6,9 +6,9 @@
     <img class="alain-default__header-logo-collapsed" src="./assets/fangda_logo_b.png" alt="{{settings.app.name}}"
       style="max-height:30px;" /> -->
 
-      <img class="alain-default__header-logo-expanded" src="./assets/fbs.png" alt="{{settings.app.name}}"
+      <img class="alain-default__header-logo-expanded" src="./assets/logo_fbs_left.png" alt="{{settings.app.name}}"
       style="max-height:40px;" />
-    <img class="alain-default__header-logo-collapsed" src="./assets/logo_fbs_b.png" alt="{{settings.app.name}}"
+    <img class="alain-default__header-logo-collapsed" src="./assets/logo_fbs_left2.png" alt="{{settings.app.name}}"
       style="max-height:30px;" />
   </a>
 </div>

src/app/layout/passport/passport.component.html

@@ -7,9 +7,11 @@
         <!-- <span class="title">{{'app.login.title' | translate}}</span><span
           style="margin-left: 10px;"><strong>(v20.0924)</strong></span> -->
           
-          <img class="logo" src="./assets/logo_fbs_b.png">
-          <span class="title">福玻斯</span><span
-          style="margin-left: 10px;"><strong>(v20.1013)</strong></span>
+          <!-- <img class="logo" src="./assets/logo_fbs_b.png">
+          <span class="title">福玻斯</span>
+          <span
+          style="margin-left: 10px;"><strong>(v20.1013)</strong></span> -->
+          <span class="title" ><img class="logo" style="width: 300px;height: 200px;" src="./assets/logo_fbs_login.jpg"></span>
         <!-- 测试包才有 -->
         <!-- <span class="title" >(<span style="color: red;">测试</span>)</span> -->
       </div>

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

@@ -157,7 +157,7 @@
                 <th nzLeft="794px" rowSpan="2" nzWidth="70px" nzAlign="center" style="background-color:rgb(223, 223, 219)">
                   <strong>生产效率</strong></th>
                   <th nzLeft="864px" rowSpan="2" nzWidth="100px" nzAlign="center" style="background-color:rgb(223, 223, 219)">
-                    <strong>预计开工时间</strong></th>
+                    <strong>计划开完工时间</strong></th>
                   <th nzLeft="964px" rowSpan="2" nzWidth="50px" nzAlign="center" style="background-color:rgb(223, 223, 219)">
                     <strong>状态</strong></th>
             <ng-container *ngFor="let date of dateList">
@@ -194,8 +194,8 @@
               <td nzLeft="506px" nzAlign="center">{{data.surplusStandardWorkingHoursTotal}}</td>
               <td nzLeft="576px" nzAlign="center">{{data.quantityCompletedTotal}}</td>
               <td nzLeft="645px" nzAlign="center">{{data.manHoursCompletedTotal}}</td>
-              <td nzLeft="714px" nzAlign="center">{{data.achievementRate}}</td>
-              <td nzLeft="794px" nzAlign="center">{{data.productionEfficiency}}</td>
+              <td nzLeft="714px" nzAlign="center">{{data.achievementRate}}%</td>
+              <td nzLeft="794px" nzAlign="center">{{data.productionEfficiency}}%</td>
               <td nzLeft="864px" nzAlign="center">{{data.startDate}}至{{data.dueDate}}</td>
               <td nzLeft="964px" nzAlign="center">
                 <ng-container *ngIf="data.lackOfMaterialState=='正常'">
@@ -269,6 +269,7 @@
             <td  nzLeft="217px" nzAlign="center" style="font-weight:bolder">月生产效率</td>
             <td  nzLeft="336px" nzAlign="center">{{productivityTotal}}%</td>
             <td  nzLeft="436px" colSpan="8"></td>
+            <td [colSpan]="dateList.length*6" rowSpan="2"></td>
           </tr>
           <tr>
             <td  nzLeft="0px"></td>
@@ -430,26 +431,43 @@
   <div nz-row [nzGutter]="{xs:12,sm:15,md:29,lg: 36, xl: 40}">
     <div nz-col nzXs="24" nzSm="4" nzLg="4">
       <nz-form-item class="nz-form-item">
-        <nz-form-label [nzSpan]="6" >日期</nz-form-label>
+        <nz-form-label [nzSpan]="6" ><strong>日期</strong></nz-form-label>
         <nz-form-control [nzSpan]="12">
           {{fbsWorkshopDispatchListPlanningReport.year}}
         </nz-form-control>
       </nz-form-item>
     </div>
+    <div nz-col nzXs="24" nzSm="4" nzLg="4">
+      <nz-form-item class="nz-form-item">
+        <nz-form-label [nzSpan]="6" ><strong>周末</strong></nz-form-label>
+        <nz-form-control [nzSpan]="12" >
+          <span style="background-color: yellow;border:1px solid #000000">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
+        </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="24" nzLg="24" >
      
       <nz-table  class="tableTdPadding" nzSize="small" #columnTable2 nzBordered [nzData]="planningReportList"
       [nzScroll]="{x:columnTable2Width+'px',y:'35vw'}" [nzShowPagination]="false" [nzFrontPagination]="false">
         <thead>
           <tr>
-            <th style="background-color:rgb(223, 223, 219);" nzWidth="30px" nzLeft="0px" nzAlign="center"><strong>序号</strong></th>
-            <th style="background-color:rgb(223, 223, 219);" nzWidth="90px" nzLeft="30px" nzAlign="center"><strong>生产订单</strong></th>
+            <th style="background-color:rgb(223, 223, 219);" nzWidth="40px" nzLeft="0px" nzAlign="center"><strong>序号</strong></th>
+            <th style="background-color:rgb(223, 223, 219);" nzWidth="90px" nzLeft="40px" nzAlign="center"><strong>生产订单</strong></th>
             <th style="background-color:rgb(223, 223, 219);" nzWidth="90px" nzLeft="120px" nzAlign="center"><strong>物料编码</strong></th>
             <th style="background-color:rgb(223, 223, 219);" nzWidth="120px" nzLeft="210px" nzAlign="center"><strong>物料名称</strong></th>
-            <th style="background-color:rgb(223, 223, 219);" nzWidth="30px" nzLeft="310px" nzAlign="center"><strong>数量</strong></th>
+            <th style="background-color:rgb(223, 223, 219);" nzWidth="40px" nzLeft="310px" nzAlign="center"><strong>数量</strong></th>
+            <th style="background-color:rgb(223, 223, 219);" nzWidth="80px" nzLeft="350px" nzAlign="center"><strong>标准工时</strong></th>
             <!-- <th style="background-color:rgb(223, 223, 219);" nzWidth="4vw"><strong>{{fbsWorkshopDispatchListPlanningReport.year}}</strong></th> -->
             <ng-container *ngFor="let day of fbsWorkshopDispatchListPlanningReport.dayList">
-              <th style="background-color:rgb(223, 223, 219);padding: 2px;" nzWidth="25px" nzAlign="center">{{day}}</th>
+              <ng-container *ngIf="day.week=='2'">
+                <th style="background-color:rgb(223, 223, 219);padding: 2px;" nzWidth="25px" nzAlign="center">{{day.day}}</th>
+              </ng-container>
+              <ng-container *ngIf="day.week=='1'">
+                <th style="background-color:yellow;padding: 2px;" nzWidth="25px" nzAlign="center">{{day.day}}</th>
+              </ng-container>
+              
             </ng-container>
 
           </tr>
@@ -457,10 +475,11 @@
         <tbody>
           <tr *ngFor="let data of columnTable2.data;let i = index">
             <td nzLeft="0px" nzAlign="center" >{{i+1}}</td>
-            <td nzLeft="30px">{{data.productionOrderNumberName}}</td>
+            <td nzLeft="40px">{{data.productionOrderNumberName}}</td>
             <td nzLeft="120px">{{data.productId}}</td>
             <td nzLeft="210px">{{data.product}}</td>
             <td nzLeft="310px" nzAlign="center">{{data.numberOfTasks}}</td>
+            <td nzLeft="350px" nzAlign="center">{{data.standardWorkingHours}}</td>
             <!-- <td ></td> -->
             <ng-container *ngFor="let color of data.isColor">
               <ng-container *ngIf="color==='1'">

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

@@ -530,7 +530,7 @@ export class DashboardAnalysisComponent implements OnInit {
     this.fbsWorkshopDispatchListService.getPlanningReport().then((response)=>{
       this.fbsWorkshopDispatchListPlanningReport=response.result;
       this.planningReportList=response.result.fbsWorkshopDispatchListList;
-      this.columnTable2Width=response.result.dayList.length*25+360
+      this.columnTable2Width=response.result.dayList.length*25+420
       this.planningReportLoading=false;
     })
   }

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

@@ -102,7 +102,7 @@ export class FbsAbnormalWorkingHoursListComponent implements OnInit {
   view(item) {
     //打开详情抽屉
     const drawerRef = this.nzDrawerService.create<FbsAbnormalWorkingHoursViewComponent>({
-      nzTitle: '详情生产异常信息统计单',
+      nzTitle: '详情生产报表',
       nzContent: FbsAbnormalWorkingHoursViewComponent,
       nzWidth: window.innerWidth,
       nzBodyStyle: { height: 'calc(100% - 55px)', overflow: 'auto', 'padding-bottom': '53px' },

src/app/routes/fbs-scan-code/list/list.component.html

@@ -78,11 +78,12 @@
     <thead>
       <tr>
         <th>人员编码</th>
-        <th>人员名称</th>
+        <th>姓名</th>
         <th>	
           生产订单号</th>
         <th>物料编码</th>
         <th>物料名称</th>
+        <th>工艺流程</th>
         <th>上岗时间</th>
         <th>下岗时间</th>
         <th>扫码信息</th>
@@ -98,6 +99,7 @@
         <td>{{item.orderNumber}}</td>
         <td>{{item.materielCode}}</td>
         <td>{{item.materielName}}</td>
+        <td>{{item.fbsTechnologicalProcessItemName}}</td>
         <td>{{item.firstTime}}</td>
         <td>{{item.finalTime}}</td>
         <td>{{item.finalInfo}}</td>
@@ -112,6 +114,7 @@
         <td></td>
         <td></td>
         <td></td>
+        <td></td>
         <td ></td>
         <td></td>
         <td ></td>

src/app/routes/fbs-scan-code/list/list.component.ts

@@ -69,7 +69,8 @@ export class FbsScanCodeListComponent implements OnInit {
         //查询成功
         this.dataList = response.result.records; //表格数据
         this.page = response.result; //分页数据
-        // this.getTotal();//查询总计
+        // this.getTotal();//查询总计//计算各个合计
+        this.getTotalList();
         this.isLoading = false;
       }
     });

src/app/routes/fbs-warehouse/add/add.component.html

@@ -69,7 +69,7 @@
         </td>
       </tr>
       <tr>
-        <td rowspan="9">工时统计</td>
+        <td rowspan="11">工时统计</td>
         <td>工单配料</td>
         <td><nz-input-number [(ngModel)]="fbsWarehouse.workOrderBatching" [nzMin]="0" [nzStep]="1">
         </nz-input-number></td>
@@ -98,17 +98,17 @@
         <td colSpan="9"><input nz-input [(ngModel)]="fbsWarehouse.developmentDeliveryOrderNo"/></td>
       </tr>
       <tr>
-        <td>项目配料</td>
+        <td>补发发货</td>
         <td><nz-input-number [(ngModel)]="fbsWarehouse.projectIngredients" [nzMin]="0" [nzStep]="1">
         </nz-input-number></td>
         <td>出库单号</td>
         <td colSpan="9"><input nz-input [(ngModel)]="fbsWarehouse.projectDeliveryOrderNo"/></td>
       </tr>
       <tr>
-        <td>项目发货</td>
+        <td>售后发货</td>
         <td><nz-input-number [(ngModel)]="fbsWarehouse.projectDelivery" [nzMin]="0" [nzStep]="1">
         </nz-input-number></td>
-        <td>项目名称</td>
+        <td>出库单号</td>
         <td colSpan="9"><input nz-input [(ngModel)]="fbsWarehouse.deliveryProjectName"/></td>
       </tr>
       <tr>
@@ -119,12 +119,26 @@
         <td colSpan="9"><input nz-input [(ngModel)]="fbsWarehouse.packProjectName"/></td>
       </tr>
       <tr>
-        <td>装车</td>
+        <td>配辅料</td>
+        <td><nz-input-number [(ngModel)]="fbsWarehouse.accessories" [nzMin]="0" [nzStep]="1">
+        </nz-input-number></td>
+        <td>出库单号</td>
+        <td colSpan="9"><input nz-input [(ngModel)]="fbsWarehouse.accessoriesDeliveryOrderNo"/></td>
+      </tr>
+      <tr>
+        <td>装车/卸载</td>
         <td><nz-input-number [(ngModel)]="fbsWarehouse.loading" [nzMin]="0" [nzStep]="1">
         </nz-input-number></td>
-        <td>项目名称</td>
+        <td>备注</td>
         <td colSpan="9"><input nz-input [(ngModel)]="fbsWarehouse.loadingProjectName"/></td>
       </tr>
+      <tr>
+        <td>支给</td>
+        <td><nz-input-number [(ngModel)]="fbsWarehouse.defray" [nzMin]="0" [nzStep]="1">
+        </nz-input-number></td>
+        <td>备注</td>
+        <td colSpan="9"><input nz-input [(ngModel)]="fbsWarehouse.defrayMemo"/></td>
+      </tr>
       <tr>
         <td>盘点</td>
         <td><nz-input-number [(ngModel)]="fbsWarehouse.inventory" [nzMin]="0" [nzStep]="1">

src/app/routes/fbs-warehouse/list/list.component.html

@@ -56,10 +56,12 @@
             <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>
+            <th nzAlign="center">配辅料</th>
+            <th nzAlign="center">装车/卸载</th>
+            <th nzAlign="center">支给</th>
             <th nzAlign="center">盘点</th>
             <th nzAlign="center">培训</th>
             <th nzAlign="center">会议</th>
@@ -79,7 +81,9 @@
             <td nzAlign="center">{{item.projectIngredients}}</td>
             <td nzAlign="center">{{item.projectDelivery}}</td>
             <td nzAlign="center">{{item.packProject}}</td>
+            <td nzAlign="center">{{item.accessories}}</td>
             <td nzAlign="center">{{item.loading}}</td>
+            <td nzAlign="center">{{item.defray}}</td>
             <td nzAlign="center">{{item.inventory}}</td>
             <td nzAlign="center">{{item.train}}</td>
             <td nzAlign="center">{{item.meeting}}</td>
@@ -108,7 +112,9 @@
             <td>{{totalList.projectIngredients}}</td>
             <td>{{totalList.projectDelivery}}</td>
             <td>{{totalList.packProject}}</td>
+            <td>{{totalList.accessories}}</td>
             <td>{{totalList.loading}}</td>
+            <td>{{totalList.defray}}</td>
             <td>{{totalList.inventory}}</td>
             <td>{{totalList.train}}</td>
             <td>{{totalList.meeting}}</td>

src/app/routes/fbs-warehouse/list/list.component.ts

@@ -59,6 +59,8 @@ export class FbsWarehouseListComponent implements OnInit {
         this.dataList=response.result.records;//表格数据
         this.page=response.result;//分页数据
         // this.getTotal();//统计合计
+        //总计
+    this.getTotalList()
         this.isLoading=false;
       }
     })
@@ -166,7 +168,9 @@ export class FbsWarehouseListComponent implements OnInit {
       projectIngredients: 0,
       projectDelivery: 0,
       packProject: 0,
+      accessories: 0,
       loading: 0,
+      defray: 0,
       inventory: 0,
       train: 0,
       meeting: 0,
@@ -207,7 +211,9 @@ export class FbsWarehouseListComponent implements OnInit {
         this.totalList.projectIngredients = (Number(this.totalList.projectIngredients) + Number(element.projectIngredients)).toFixed(1);
         this.totalList.projectDelivery = (Number(this.totalList.projectDelivery) + Number(element.projectDelivery)).toFixed(1);
         this.totalList.packProject = (Number(this.totalList.packProject) + Number(element.packProject)).toFixed(1);
+        this.totalList.accessories = (Number(this.totalList.accessories) + Number(element.accessories)).toFixed(1);
         this.totalList.loading = (Number(this.totalList.loading) + Number(element.loading)).toFixed(1);
+        this.totalList.defray = (Number(this.totalList.defray) + Number(element.defray)).toFixed(1);
         this.totalList.inventory = (Number(this.totalList.inventory) + Number(element.inventory)).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);
@@ -249,10 +255,12 @@ export class FbsWarehouseListComponent implements OnInit {
           ['成品收存'], // 
           ['原材料收存'], // 
           ['研发领用'], // 
-          ['项目配料'], // 
-          ['项目发货'], // 
+          ['补发发货'], // 
+          ['售后发货'], // 
           ['项目打包'], // 
-          ['装车'], // 
+          ['配辅料'], // 
+          ['装车/卸载'], // 
+          ['支给'], // 
           ['盘点'], // 
           ['培训'], // 
           // ['返工'], // 
@@ -284,7 +292,9 @@ export class FbsWarehouseListComponent implements OnInit {
           row.push(convertingNumbers(element.projectIngredients));
           row.push(convertingNumbers(element.projectDelivery));
           row.push(convertingNumbers(element.packProject));
+          row.push(convertingNumbers(element.accessories));
           row.push(convertingNumbers(element.loading));
+          row.push(convertingNumbers(element.defray));
           row.push(convertingNumbers(element.inventory));
           // row.push(convertingNumbers(element.rework));
           row.push(convertingNumbers(element.train));

src/app/routes/fbs-warehouse/update/update.component.html

@@ -69,7 +69,7 @@
         </td>
       </tr>
       <tr>
-        <td rowspan="9">工时统计</td>
+        <td rowspan="11">工时统计</td>
         <td>工单配料</td>
         <td>
           <nz-input-number [(ngModel)]="fbsWarehouse.workOrderBatching" [nzMin]="0" [nzStep]="1">
@@ -106,40 +106,46 @@
         <td colSpan="9"><input nz-input [(ngModel)]="fbsWarehouse.developmentDeliveryOrderNo" /></td>
       </tr>
       <tr>
-        <td>项目配料</td>
-        <td>
-          <nz-input-number [(ngModel)]="fbsWarehouse.projectIngredients" [nzMin]="0" [nzStep]="1">
-          </nz-input-number>
-        </td>
+        <td>补发发货</td>
+        <td><nz-input-number [(ngModel)]="fbsWarehouse.projectIngredients" [nzMin]="0" [nzStep]="1">
+        </nz-input-number></td>
         <td>出库单号</td>
-        <td colSpan="9"><input nz-input [(ngModel)]="fbsWarehouse.projectDeliveryOrderNo" /></td>
+        <td colSpan="9"><input nz-input [(ngModel)]="fbsWarehouse.projectDeliveryOrderNo"/></td>
       </tr>
       <tr>
-        <td>项目发货</td>
-        <td>
-          <nz-input-number [(ngModel)]="fbsWarehouse.projectDelivery" [nzMin]="0" [nzStep]="1">
-          </nz-input-number>
-        </td>
-        <td>项目名称</td>
-        <td colSpan="9"><input nz-input [(ngModel)]="fbsWarehouse.deliveryProjectName" /></td>
+        <td>售后发货</td>
+        <td><nz-input-number [(ngModel)]="fbsWarehouse.projectDelivery" [nzMin]="0" [nzStep]="1">
+        </nz-input-number></td>
+        <td>出库单号</td>
+        <td colSpan="9"><input nz-input [(ngModel)]="fbsWarehouse.deliveryProjectName"/></td>
       </tr>
       <tr>
         <td>项目打包</td>
-        <td>
-          <nz-input-number [(ngModel)]="fbsWarehouse.packProject" [nzMin]="0" [nzStep]="1">
-          </nz-input-number>
-        </td>
+        <td><nz-input-number [(ngModel)]="fbsWarehouse.packProject" [nzMin]="0" [nzStep]="1">
+        </nz-input-number></td>
         <td>项目名称</td>
-        <td colSpan="9"><input nz-input [(ngModel)]="fbsWarehouse.packProjectName" /></td>
+        <td colSpan="9"><input nz-input [(ngModel)]="fbsWarehouse.packProjectName"/></td>
       </tr>
       <tr>
-        <td>装车</td>
-        <td>
-          <nz-input-number [(ngModel)]="fbsWarehouse.loading" [nzMin]="0" [nzStep]="1">
-          </nz-input-number>
-        </td>
-        <td>项目名称</td>
-        <td colSpan="9"><input nz-input [(ngModel)]="fbsWarehouse.loadingProjectName" /></td>
+        <td>配辅料</td>
+        <td><nz-input-number [(ngModel)]="fbsWarehouse.accessories" [nzMin]="0" [nzStep]="1">
+        </nz-input-number></td>
+        <td>出库单号</td>
+        <td colSpan="9"><input nz-input [(ngModel)]="fbsWarehouse.accessoriesDeliveryOrderNo"/></td>
+      </tr>
+      <tr>
+        <td>装车/卸载</td>
+        <td><nz-input-number [(ngModel)]="fbsWarehouse.loading" [nzMin]="0" [nzStep]="1">
+        </nz-input-number></td>
+        <td>备注</td>
+        <td colSpan="9"><input nz-input [(ngModel)]="fbsWarehouse.loadingProjectName"/></td>
+      </tr>
+      <tr>
+        <td>支给</td>
+        <td><nz-input-number [(ngModel)]="fbsWarehouse.defray" [nzMin]="0" [nzStep]="1">
+        </nz-input-number></td>
+        <td>备注</td>
+        <td colSpan="9"><input nz-input [(ngModel)]="fbsWarehouse.defrayMemo"/></td>
       </tr>
       <tr>
         <td>盘点</td>

src/app/routes/fbs-warehouse/view/view.component.html

@@ -60,7 +60,7 @@
         </td>
       </tr>
       <tr>
-        <td rowspan="9">工时统计</td>
+        <td rowspan="11">工时统计</td>
         <td>工单配料</td>
         <td>{{fbsWarehouse.workOrderBatching}}</td>
         <td>生产订单号</td>
@@ -85,15 +85,15 @@
         <td colSpan="9">{{fbsWarehouse.developmentDeliveryOrderNo}}</td>
       </tr>
       <tr>
-        <td>项目配料</td>
+        <td>补发发货</td>
         <td>{{fbsWarehouse.projectIngredients}}</td>
         <td>出库单号</td>
         <td colSpan="9">{{fbsWarehouse.projectDeliveryOrderNo}}</td>
       </tr>
       <tr>
-        <td>项目发货</td>
+        <td>售后发货</td>
         <td>{{fbsWarehouse.projectDelivery}}</td>
-        <td>项目名称</td>
+        <td>出库单号</td>
         <td colSpan="9">{{fbsWarehouse.deliveryProjectName}}</td>
       </tr>
       <tr>
@@ -103,11 +103,23 @@
         <td colSpan="9">{{fbsWarehouse.packProjectName}}</td>
       </tr>
       <tr>
-        <td>装车</td>
+        <td>配辅料</td>
+        <td>{{fbsWarehouse.accessories}}</td>
+        <td>出库单号</td>
+        <td colSpan="9">{{fbsWarehouse.accessoriesDeliveryOrderNo}}</td>
+      </tr>
+      <tr>
+        <td>装车/卸载</td>
         <td>{{fbsWarehouse.loading}}</td>
-        <td>项目名称</td>
+        <td>备注</td>
         <td colSpan="9">{{fbsWarehouse.loadingProjectName}}</td>
       </tr>
+      <tr>
+        <td>支给</td>
+        <td>{{fbsWarehouse.defray}}</td>
+        <td>备注</td>
+        <td colSpan="9">{{fbsWarehouse.defrayMemo}}</td>
+      </tr>
       <tr>
         <td>盘点</td>
         <td>{{fbsWarehouse.inventory}}</td>

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

@@ -31,31 +31,55 @@
           </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-label [nzSpan]="8">生产订单号</nz-form-label>
           <nz-form-control [nzSpan]="16">
-            <input [(ngModel)]="fbsWorkshopDispatchList.product" name="product" nz-input
+            <input [(ngModel)]="fbsWorkshopDispatchList.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-label [nzSpan]="8">物料名称</nz-form-label>
           <nz-form-control [nzSpan]="16">
-            <input [(ngModel)]="fbsWorkshopDispatchList.productionOrderNumberName" name="productionOrderNumberName" nz-input
+            <input [(ngModel)]="fbsWorkshopDispatchList.product" name="product" 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)]="fbsWorkshopDispatchList.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)]="fbsWorkshopDispatchList.projectName" name="projectName" 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">
@@ -83,19 +107,7 @@
               </nz-select>
           </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)]="fbsWorkshopDispatchList.projectName" name="productionOrderNumberName" nz-input
-              placeholder="请输入" />
-          </nz-form-control>
-        </nz-form-item>
-      </div>
+     </div>
     </div>
     <div nz-row [nzGutter]="{xs:12,sm:15,md:29,lg: 36, xl: 40}">
       <!-- 按钮 -->
@@ -127,10 +139,10 @@
         <th nzAlign="center">完成工时</th>
         <th nzAlign="center">达成率</th>
         <th nzAlign="center">生产效率</th>
-        <th nzAlign="center">是否可扫码</th>
         <th nzAlign="center">工艺流程</th>
         <th>状态</th>
         <th>实际完成时间</th>
+        <th nzAlign="center">是否可扫码</th>
         <!-- <th>计划开工时间</th>
         <th>计划完工时间</th> -->
         <th style="width:10%">{{ 'table.operation' | translate }}</th>
@@ -150,12 +162,6 @@
         <td nzAlign="center">{{item.manHoursCompleted}}</td>
         <td nzAlign="center">{{item.numberEfficiency}}%</td>
         <td nzAlign="center">{{item.workingHoursEfficiency}}%</td>
-        <td nzAlign="center">
-          <nz-switch [(ngModel)]="item.isScanCodeSwith" name="isScanCodeSwith"
-                          nzCheckedChildren="是"
-                          nzUnCheckedChildren="否" (ngModelChange)="isSwitchChange(item)">
-                        </nz-switch>
-        </td>
         <td>
          <div>{{item.fbsTechnologicalProcessItemName}}</div> 
 
@@ -172,6 +178,12 @@
             {{item.firstTime}}至{{item.finalTime}}
           </ng-container>
         </td>
+        <td nzAlign="center">
+          <nz-switch [(ngModel)]="item.isScanCodeSwith" name="isScanCodeSwith"
+                          nzCheckedChildren="是"
+                          nzUnCheckedChildren="否" (ngModelChange)="isSwitchChange(item)">
+                        </nz-switch>
+        </td>
         <!-- <td>{{item.plannedStartTime}}</td>
         <td>{{item.plannedEndTime}}</td> -->
         <td>
@@ -189,7 +201,7 @@
       </tr>
       <tr style="font-weight:bolder">
         <td>总计</td>
-        <!-- <td></td> -->
+        <td></td>
         <td></td>
         <td></td>
         <td nzAlign="center">{{totalList.plannedQuantity}}</td>

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

@@ -82,6 +82,7 @@ export class FbsWorkshopDispatchListListComponent implements OnInit {
         this.page = response.result; //分页数据
         this.isLoading = false;
         // this.getTotal(); //计算当页的总计数量
+        this.getTotleList();//计算当页的总计数量
         
       }
     });