U8接口对接 异常工时报表

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

@@ -52,6 +52,9 @@ export class FbsAbnormalWorkingHours extends Page{
   /**生产线名称*/
 	productionLineName?:string;
 	
+	/**生产线id */
+	productionLineId?:string;
+	
 	//异常工时描述集合
 	fbsAbnormalWorkingHoursDescribeList?:any[];
 

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

@@ -17,6 +17,8 @@ export class FbsWorkshopDispatchList extends Page{
 	productionOrderNumberName?:string;
 	/**产品*/
 	product?:string;
+	/**产品ID*/
+	productId?:string;
 	/**任务数量*/
 	numberOfTasks?:number;
 	/**标准工时*/
@@ -28,5 +30,7 @@ export class FbsWorkshopDispatchList extends Page{
 	/**备注*/
 	memo?:string;
   /**生产线名称*/
-  productionLineName?:string;
+	productionLineName?:string;
+	/**生产线id */
+	productionLineId?:string;
 }

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

@@ -49,18 +49,181 @@
   </nz-col>
 </div> -->
 
-<div nz-row [nzGutter]="24" class="pt-lg">
+<!-- <div nz-row [nzGutter]="24" class="pt-lg">
   <div nz-col nzXs="24" nzSm="24" nzMd="24" nzLg="24">
     <nz-card [nzLoading]="loading" [nzBordered]="false" nzTitle="{{'last.90.days.project.statistics' | translate}}"
       class="mb-0">
-      <!-- <h4 class="margin:5px 0 105px 0;"></h4> -->
       <g2-pie *ngIf="isVisible" [data]="projectFeeData" [hasLegend]="true" [subTitle]="'项目状态（个数）' | translate" [height]="600"
         [lineWidth]="4" [total]="projectFeeTotal" [valueFormat]="projectFeeFormat" [inner]="0.4">
       </g2-pie>
-      <!-- <g2-custom *ngIf="salesPieData" (render)="render($event)"></g2-custom> -->
     </nz-card>
   </div>
+</div> -->
+<!-- class="tableTdPadding" -->
+<div nz-row [nzGutter]="24" class="pt-lg">
+  <div nz-col nzXs="24" nzSm="24" nzMd="24" nzLg="24">
+    <nz-table  nzSize="small" #columnTable nzBordered  [nzData]="listOfData" [nzScroll]="{ x: '1300px', y:'800px'}" [nzShowPagination]="false" [nzFrontPagination]="false">
+      <thead>
+        
+        <tr>
+          <th nzLeft="0px" nzWidth="60px"><strong>序号</strong></th>
+          <th nzLeft="60px" nzWidth="100px"><strong>生产线</strong></th>
+          <th nzLeft="160px" nzWidth="100px"><strong>生产订单号</strong></th>
+          <th nzWidth="100px"><strong>物料编码</strong></th>
+          <th nzWidth="100px"><strong>物料名称</strong></th>
+          <th nzWidth="60px"><strong>月度计划</strong></th>
+          <th nzWidth="60px"><strong>标准工时（H）</strong></th>
+          <th nzWidth="60px"><strong>累计完成数量</strong></th>
+          <th nzWidth="60px"><strong>累计完成工时</strong></th>
+          <th nzWidth="100px"><strong>当日计算数量</strong></th>
+          <th nzWidth="100px"><strong>当日完成数量</strong></th>
+          <th nzWidth="100px"><strong>当日完成工时 </strong></th>
+          <th nzWidth="100px"><strong>当日标准工时</strong></th>
+          <th nzWidth="100px"><strong>当日生产效率</strong></th>
+          <th nzWidth="100px"><strong>当日达成率</strong></th>
+        </tr>
+        <tr>
+          <th colspan="9"></th>
+          <th colspan="6" style="background-color:cyan"><strong>10月16日</strong></th>
+        </tr>
+      </thead>
+      <tbody>
+        <tr *ngFor="let data of columnTable.data">
+          <td nzLeft="0px">{{ data.name }}</td>
+          <td nzLeft="60px">{{ data.age }}</td>
+          <td nzLeft="160px">{{ data.address }}</td>
+          <td></td>
+          <td></td>
+          <td>1</td>
+          <td>0.5</td>
+          <td>1</td>
+          <td>0.5</td>
+          <td></td>
+          <td></td>
+          <td></td>
+          <td>0</td>
+          <td>0%</td>
+          <td>0%</td>
+          
+        </tr>
+        <tr style="background-color:chocolate">
+          <td nzLeft="0px" style="background-color:chocolate"></td>
+          <td nzLeft="60px" style="background-color:chocolate">统计</td>
+          <td nzLeft="160px" style="background-color:chocolate"></td>
+          <td></td>
+          <td></td>
+          <td>1</td>
+          <td>1</td>
+          <td>1</td>
+          <td>1</td>
+          <td>1</td>
+          <td>1</td>
+          <td>1</td>
+          <td>1</td>
+          <td>1</td>
+          <td>1</td>
+        </tr>
+        <tr></tr>
+      </tbody>
+      <tbody>
+        <tr>
+          <td nzLeft="0px"></td>
+          <td nzLeft="60px">月计划达成率</td>
+          <td nzLeft="160px">1.95%</td>
+          <td>月生产效率</td>
+          <td >根据生产计划进度。实时变化</td>
+          <td colSpan="4">出勤情况</td>
+          <td>应到人数</td>
+          <td>1</td>
+          <td>实到人数</td>
+          <td>1</td>
+          <td>出勤工时</td>
+          <td>1</td>
+        </tr>
+        <tr>
+          <td nzLeft="0px"></td>
+          <td nzLeft="60px"></td>
+          <td nzLeft="160px"></td>
+          <td></td>
+          <td></td>
+          <td colSpan="4">加班记录</td>
+          <td>加班工时</td>
+          <td>1</td>
+          <td>加班原因</td>
+          <td colSpan="3">1</td>
+        </tr>
+        <tr>
+          <td nzLeft="0px" rowSpan="2"></td>
+          <td nzLeft="60px" rowSpan="2"></td>
+          <td nzLeft="160px" rowSpan="2"></td>
+          <td rowSpan="2"></td>
+          <td rowSpan="2"></td>
+          <td colSpan="4" rowSpan="2">其他工时统计</td>
+          <td>培训</td>
+          <td>1</td>
+          <td>会议</td>
+          <td>1</td>
+          <td>5S</td>
+          <td>1</td>
+        </tr>
+        <tr>
+          <td>研发</td>
+          <td>1</td>
+          <td></td>
+          <td></td>
+          <td></td>
+          <td></td>
+        </tr>
+        <tr>
+          <td nzLeft="0px" rowSpan="3"></td>
+          <td nzLeft="60px" rowSpan="3"></td>
+          <td nzLeft="160px" rowSpan="3"></td>
+          <td rowSpan="3"></td>
+          <td rowSpan="3"></td>
+          <td colSpan="4" rowSpan="3">异常工时统计</td>
+          <td>质量</td>
+          <td>1</td>
+          <td>设计</td>
+          <td>1</td>
+          <td>返工</td>
+          <td>1</td>
+        </tr>
+        <tr>
+          <td>物料</td>
+          <td>1</td>
+          <td>能源</td>
+          <td>1</td>
+          <td>其他</td>
+          <td>1</td>
+        </tr>
+        <tr>
+          <td>设备</td>
+          <td>1</td>
+          <td>计划</td>
+          <td>1</td>
+          <td></td>
+          <td></td>
+        </tr>
+        
+        <tr>
+          <td nzLeft="0px" ></td>
+          <td nzLeft="60px"></td>
+          <td nzLeft="160px"></td>
+          <td ></td>
+          <td></td>
+          <td colSpan="4">异常原因描述</td>
+          <td colSpan="4">
+            质量质量质量质量质量<br>
+            质量质量质量质量质量<br>
+            质量质量质量质量质量<br>
+          </td>
+        </tr>
+        
+      </tbody>
+    </nz-table>
+  </div>
 </div>
+
 <!-- <div nz-row [nzGutter]="24" class="pt-lg">
     <div nz-col nzXs="24" nzSm="24" nzMd="24" nzLg="24">
         <nz-card [nzLoading]="loading" [nzBordered]="false" [nzTitle]="'项目费用占比' | translate"  class="mb-0">

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

@@ -266,4 +266,20 @@ export class DashboardAnalysisComponent implements OnInit {
   alertFormat(val: number) {
     return `&yen ${val.toFixed(2)}`;
   }
+
+
+  listOfData=[
+    {
+      index: 0,
+      name: `1`,
+      age: "电器组装",
+      address: ``
+    },
+    {
+      index: 2,
+      name: `2`,
+      age: "机械组装",
+      address: ``
+    }
+  ]
 }

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

@@ -16,7 +16,7 @@
           <nz-select [(ngModel)]="fbsAbnormalWorkingHours.personnelIdU8" style="width: 100%;" nzShowSearch nzAllowClear
             nzPlaceHolder="请选择" (ngModelChange)="personnelChange($event)">
             <ng-container *ngFor="let proper of properList">
-              <nz-option [nzLabel]="proper.id" [nzValue]="proper.name"> </nz-option>
+              <nz-option  [nzLabel]="proper.cpersonname" [nzValue]="proper.cpersoncode"> </nz-option>
             </ng-container>
           </nz-select>
         </td>

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

@@ -4,6 +4,7 @@ import { _HttpClient } from '@delon/theme';
 import { FbsAbnormalWorkingHours } from 'app/entity/fbs/fbs-abnormal-working-hours';
 import { FbsAbnormalWorkingHoursService } from 'app/services/fbs/fbs-abnormal-working-hours.service';
 import { DatePipe } from '@angular/common';
+import { FbsWorkshopDispatchListService } from 'app/services/fbs/fbs-workshop-dispatch-list.service';
 
 @Component({
   selector: 'app-fbs-abnormal-working-hours-add',
@@ -31,6 +32,7 @@ export class FbsAbnormalWorkingHoursAddComponent implements OnInit {
     private drawerRef:NzDrawerRef,
     private fbsAbnormalWorkingHoursService:FbsAbnormalWorkingHoursService,
     private nzNotificationService: NzNotificationService,
+    private fbsWorkshopDispatchListService:FbsWorkshopDispatchListService,
     private datePipe:DatePipe
   ) { }
 
@@ -48,21 +50,22 @@ export class FbsAbnormalWorkingHoursAddComponent implements OnInit {
    * 初始化人员下拉数据集合
    */
   getProperList(){
-    this.properList=[
-      {id:"张三",name:"张三"}
-    ]
+    this.fbsWorkshopDispatchListService.getPerAndDerp().then((response)=>{
+      this.properList=response.result
+    })
   }
 
-   /**
+  /**
    * 人员下拉款选择事件
    */
   personnelChange(personnelIdU8){
     //获取名称
     this.properList.forEach(element => {
-      if(personnelIdU8===element.id){
-        this.fbsAbnormalWorkingHours.name=element.name;
-        this.fbsAbnormalWorkingHours.personnelNameU8=element.name;
-        this.fbsAbnormalWorkingHours.productionLineName="电器组装";
+      if(personnelIdU8===element.cpersoncode){
+        this.fbsAbnormalWorkingHours.name=element.cpersonname;
+        this.fbsAbnormalWorkingHours.personnelNameU8=element.cpersonname;
+        this.fbsAbnormalWorkingHours.productionLineId=element.cdepcode;//生产线id
+        this.fbsAbnormalWorkingHours.productionLineName=element.cdepname;//生产线名产
       }
     });
   }

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

@@ -16,7 +16,7 @@
           <nz-select [(ngModel)]="fbsAbnormalWorkingHours.personnelIdU8" style="width: 100%;" nzShowSearch nzAllowClear
             nzPlaceHolder="请选择" (ngModelChange)="personnelChange($event)">
             <ng-container *ngFor="let proper of properList">
-              <nz-option [nzLabel]="proper.id" [nzValue]="proper.name"> </nz-option>
+              <nz-option [nzLabel]="proper.cpersonname" [nzValue]="proper.cpersoncode"> </nz-option>
             </ng-container>
           </nz-select>
         </td>

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

@@ -6,6 +6,7 @@ import { FbsAbnormalWorkingHoursService } from 'app/services/fbs/fbs-abnormal-wo
 import { DatePipe } from '@angular/common';
 import { FbsAbnormalWorkingHoursDescribe } from 'app/entity/fbs/fbs-abnormal-working-hours-describe';
 import { FbsAbnormalWorkingHoursType } from 'app/entity/fbs/fbs-abnormal-working-hours-type';
+import { FbsWorkshopDispatchListService } from 'app/services/fbs/fbs-workshop-dispatch-list.service';
 
 @Component({
   selector: 'app-fbs-abnormal-working-hours-update',
@@ -32,6 +33,7 @@ export class FbsAbnormalWorkingHoursUpdateComponent implements OnInit {
     private fbsAbnormalWorkingHoursService: FbsAbnormalWorkingHoursService,
     private nzNotificationService: NzNotificationService,
     private datePipe: DatePipe,
+    private fbsWorkshopDispatchListService:FbsWorkshopDispatchListService
   ) {}
 
   ngOnInit(): void {
@@ -51,20 +53,23 @@ export class FbsAbnormalWorkingHoursUpdateComponent implements OnInit {
   /**
    * 初始化人员下拉数据集合
    */
-  getProperList() {
-    this.properList = [{ id: '张三', name: '张三' }];
+  getProperList(){
+    this.fbsWorkshopDispatchListService.getPerAndDerp().then((response)=>{
+      this.properList=response.result
+    })
   }
 
-   /**
+  /**
    * 人员下拉款选择事件
    */
   personnelChange(personnelIdU8){
     //获取名称
     this.properList.forEach(element => {
-      if(personnelIdU8===element.id){
-        this.fbsAbnormalWorkingHours.name=element.name;
-        this.fbsAbnormalWorkingHours.personnelNameU8=element.name;
-        this.fbsAbnormalWorkingHours.productionLineName="电器组装";
+      if(personnelIdU8===element.cpersoncode){
+        this.fbsAbnormalWorkingHours.name=element.cpersonname;
+        this.fbsAbnormalWorkingHours.personnelNameU8=element.cpersonname;
+        this.fbsAbnormalWorkingHours.productionLineId=element.cdepcode;//生产线id
+        this.fbsAbnormalWorkingHours.productionLineName=element.cdepname;//生产线名产
       }
     });
   }

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

@@ -15,7 +15,7 @@
           <nz-select [(ngModel)]="fbsWorkshopDispatchList.personnelIdU8" style="width: 100%;" nzShowSearch nzAllowClear
             nzPlaceHolder="请选择" (ngModelChange)="personnelChange($event)">
             <ng-container *ngFor="let proper of properList">
-              <nz-option [nzLabel]="proper.id" [nzValue]="proper.name"> </nz-option>
+              <nz-option [nzLabel]="proper.cpersonname" [nzValue]="proper.cpersoncode"> </nz-option>
             </ng-container>
           </nz-select>
         </td>
@@ -31,13 +31,18 @@
           <nz-select [(ngModel)]="fbsWorkshopDispatchList.productionOrderNumberId" style="width: 100%;" nzShowSearch
             nzAllowClear nzPlaceHolder="请选择" (ngModelChange)="productionOrderNumberChange($event)">
             <ng-container *ngFor="let productionOrderNumber of productionOrderNumberList">
-              <nz-option [nzLabel]="productionOrderNumber.id" [nzValue]="productionOrderNumber.name"> </nz-option>
+              <nz-option [nzLabel]="productionOrderNumber.mocode" [nzValue]="productionOrderNumber.moid"> </nz-option>
             </ng-container>
           </nz-select>
         </td>
         <td>产品</td>
         <td>
-          {{fbsWorkshopDispatchList.product}}
+          <nz-select [(ngModel)]="fbsWorkshopDispatchList.productId" style="width: 100%;" nzShowSearch
+            nzAllowClear nzPlaceHolder="请选择" (ngModelChange)="productChange($event)">
+            <ng-container *ngFor="let produc of productList">
+              <nz-option [nzLabel]="produc.cinvname" [nzValue]="produc.cinvcode"> </nz-option>
+            </ng-container>
+          </nz-select>
         </td>
       </tr>
       <tr>

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

@@ -55,9 +55,9 @@ export class FbsWorkshopDispatchListAddComponent implements OnInit {
    * 初始化人员下拉数据集合
    */
   getProperList(){
-    this.properList=[
-      {id:"张三",name:"张三"}
-    ]
+    this.fbsWorkshopDispatchListService.getPerAndDerp().then((response)=>{
+      this.properList=response.result
+    })
   }
 
   /**
@@ -66,9 +66,11 @@ export class FbsWorkshopDispatchListAddComponent implements OnInit {
   personnelChange(personnelIdU8){
     //获取名称
     this.properList.forEach(element => {
-      if(personnelIdU8===element.id){
-        this.fbsWorkshopDispatchList.name=element.name;
-        this.fbsWorkshopDispatchList.personnelNameU8=element.name;
+      if(personnelIdU8===element.cpersoncode){
+        this.fbsWorkshopDispatchList.name=element.cpersonname;
+        this.fbsWorkshopDispatchList.personnelNameU8=element.cpersonname;
+        this.fbsWorkshopDispatchList.productionLineId=element.cdepcode;//生产线id
+        this.fbsWorkshopDispatchList.productionLineName=element.cdepname;//生产线名产
       }
     });
   }
@@ -77,19 +79,56 @@ export class FbsWorkshopDispatchListAddComponent implements OnInit {
    * 初始化生产订单号下拉数据集合
    */
   getProductionOrderNumberList(){
-    this.productionOrderNumberList=[
-      {id:"SC001",name:"SC001"}
-    ]
+    // this.productionOrderNumberList=[
+    //   {id:"SC001",name:"SC001"}
+    // ]
+    this.fbsWorkshopDispatchListService.getFbsMomOrder().then((response)=>{
+      this.productionOrderNumberList=response.result;
+    })
   }
 
   /**
    * 生产订单号选中事件
    */
   productionOrderNumberChange(productionOrderNumberId){
-    this.fbsWorkshopDispatchList.productionLineName="电器组装"
-    this.fbsWorkshopDispatchList.productionOrderNumberName="SC001"
-    this.fbsWorkshopDispatchList.product="产品001"
-    this.fbsWorkshopDispatchList.standardWorkingHours="8";
+    // this.fbsWorkshopDispatchList.productionLineName="电器组装"
+    // this.fbsWorkshopDispatchList.productionOrderNumberName="SC001"
+    // this.fbsWorkshopDispatchList.product="产品001"
+    // this.fbsWorkshopDispatchList.standardWorkingHours="8";
+    if(productionOrderNumberId){
+      //获取生产编号
+      this.productionOrderNumberList.forEach(element => {
+        if(productionOrderNumberId===element.moid){
+          this.fbsWorkshopDispatchList.productionOrderNumberName=element.mocode
+        }
+      });
+      //获取产品集合
+      this.getProductList(productionOrderNumberId);
+    }
+    
+  }
+
+  /**
+   * 根据生产id查询产品
+   */
+  productList=[];//产品集合
+  getProductList(moId){
+    this.fbsWorkshopDispatchListService.getInventoryGetByOrderId(moId).then((response)=>{
+      this.productList=response.result;
+    })
+  }
+
+  /**
+   * 产品选中事件 获取产品名称
+   */
+  productChange(event){
+    if(event){
+      this.productList.forEach(element => {
+        if(element.cInvCode===event){
+          this.fbsWorkshopDispatchList.product=element.cinvname;
+        }
+      });
+    }
   }
 
   /**

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

@@ -15,7 +15,7 @@
           <nz-select [(ngModel)]="fbsWorkshopDispatchList.personnelIdU8" style="width: 100%;" nzShowSearch nzAllowClear
             nzPlaceHolder="请选择" (ngModelChange)="personnelChange($event)">
             <ng-container *ngFor="let proper of properList">
-              <nz-option [nzLabel]="proper.id" [nzValue]="proper.name"> </nz-option>
+              <nz-option [nzLabel]="proper.cpersonname" [nzValue]="proper.cpersoncode"> </nz-option>
             </ng-container>
           </nz-select>
         </td>
@@ -31,13 +31,18 @@
           <nz-select [(ngModel)]="fbsWorkshopDispatchList.productionOrderNumberId" style="width: 100%;" nzShowSearch
             nzAllowClear nzPlaceHolder="请选择" (ngModelChange)="productionOrderNumberChange($event)">
             <ng-container *ngFor="let productionOrderNumber of productionOrderNumberList">
-              <nz-option [nzLabel]="productionOrderNumber.id" [nzValue]="productionOrderNumber.name"> </nz-option>
+              <nz-option [nzLabel]="productionOrderNumber.mocode" [nzValue]="productionOrderNumber.moid"> </nz-option>
             </ng-container>
           </nz-select>
         </td>
         <td>产品</td>
         <td>
-          {{fbsWorkshopDispatchList.product}}
+          <nz-select [(ngModel)]="fbsWorkshopDispatchList.productId" style="width: 100%;" nzShowSearch
+            nzAllowClear nzPlaceHolder="请选择" (ngModelChange)="productChange($event)">
+            <ng-container *ngFor="let produc of productList">
+              <nz-option [nzLabel]="produc.cinvname" [nzValue]="produc.cinvcode"> </nz-option>
+            </ng-container>
+          </nz-select>
         </td>
       </tr>
       <tr>

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

@@ -51,9 +51,9 @@ export class FbsWorkshopDispatchListUpdateComponent implements OnInit {
    * 初始化人员下拉数据集合
    */
   getProperList(){
-    this.properList=[
-      {id:"张三",name:"张三"}
-    ]
+    this.fbsWorkshopDispatchListService.getPerAndDerp().then((response)=>{
+      this.properList=response.result
+    })
   }
 
   /**
@@ -62,9 +62,11 @@ export class FbsWorkshopDispatchListUpdateComponent implements OnInit {
   personnelChange(personnelIdU8){
     //获取名称
     this.properList.forEach(element => {
-      if(personnelIdU8===element.id){
-        this.fbsWorkshopDispatchList.name=element.name;
-        this.fbsWorkshopDispatchList.personnelNameU8=element.name;
+      if(personnelIdU8===element.cpersoncode){
+        this.fbsWorkshopDispatchList.name=element.cpersonname;
+        this.fbsWorkshopDispatchList.personnelNameU8=element.cpersonname;
+        this.fbsWorkshopDispatchList.productionLineId=element.cdepcode;//生产线id
+        this.fbsWorkshopDispatchList.productionLineName=element.cdepname;//生产线名产
       }
     });
   }
@@ -73,19 +75,56 @@ export class FbsWorkshopDispatchListUpdateComponent implements OnInit {
    * 初始化生产订单号下拉数据集合
    */
   getProductionOrderNumberList(){
-    this.productionOrderNumberList=[
-      {id:"SC001",name:"SC001"}
-    ]
+    // this.productionOrderNumberList=[
+    //   {id:"SC001",name:"SC001"}
+    // ]
+    this.fbsWorkshopDispatchListService.getFbsMomOrder().then((response)=>{
+      this.productionOrderNumberList=response.result;
+    })
   }
 
   /**
    * 生产订单号选中事件
    */
   productionOrderNumberChange(productionOrderNumberId){
-    this.fbsWorkshopDispatchList.productionLineName="电器组装"
-    this.fbsWorkshopDispatchList.productionOrderNumberName="SC001"
-    this.fbsWorkshopDispatchList.product="产品001"
-    this.fbsWorkshopDispatchList.standardWorkingHours="8";
+    // this.fbsWorkshopDispatchList.productionLineName="电器组装"
+    // this.fbsWorkshopDispatchList.productionOrderNumberName="SC001"
+    // this.fbsWorkshopDispatchList.product="产品001"
+    // this.fbsWorkshopDispatchList.standardWorkingHours="8";
+    if(productionOrderNumberId){
+      //获取生产编号
+      this.productionOrderNumberList.forEach(element => {
+        if(productionOrderNumberId===element.moid){
+          this.fbsWorkshopDispatchList.productionOrderNumberName=element.mocode
+        }
+      });
+      //获取产品集合
+      this.getProductList(productionOrderNumberId);
+    }
+    
+  }
+
+  /**
+   * 根据生产id查询产品
+   */
+  productList=[];//产品集合
+  getProductList(moId){
+    this.fbsWorkshopDispatchListService.getInventoryGetByOrderId(moId).then((response)=>{
+      this.productList=response.result;
+    })
+  }
+
+  /**
+   * 产品选中事件 获取产品名称
+   */
+  productChange(event){
+    if(event){
+      this.productList.forEach(element => {
+        if(element.cInvCode===event){
+          this.fbsWorkshopDispatchList.product=element.cinvname;
+        }
+      });
+    }
   }
 
   id="";

src/app/services/fbs/fbs-abnormal-working-hours.service.ts

@@ -65,4 +65,6 @@ export class FbsAbnormalWorkingHoursService {
   async getTypeList(body:any): Promise<BaseResponse<Result<FbsAbnormalWorkingHoursType[]>>> {
     return await this.http.get<BaseResponse<Result<FbsAbnormalWorkingHoursType[]>>>('/fbsAbnormalWorkingHours/fbsAbnormalWorkingHoursType/list',{params:body}).toPromise();
   }
+
+  
 }

src/app/services/fbs/fbs-workshop-dispatch-list.service.ts

@@ -43,4 +43,19 @@ export class FbsWorkshopDispatchListService {
   async deleteAndChild(id: string): Promise<BaseResponse<FbsWorkshopDispatchList>> {
     return await this.http.delete<BaseResponse<FbsWorkshopDispatchList>>('/fbsWorkshopDispatchList/fbsWorkshopDispatchList/deleteAndChild', { params: { id: id } }).toPromise();
   }
+
+  // 查询u8人员数据
+  async getPerAndDerp(): Promise<BaseResponse<any>> {
+    return await this.http.get<BaseResponse<any>>('/fbsWorkshopDispatchList/fbsWorkshopDispatchList/getPerAndDerp').toPromise();
+  }
+
+  // U8生产订单查询
+  async getFbsMomOrder(): Promise<BaseResponse<any>> {
+    return await this.http.get<BaseResponse<any>>('/fbsWorkshopDispatchList/fbsWorkshopDispatchList/getFbsMomOrder').toPromise();
+  }
+
+  // 根据生产订单id查询产品
+  async getInventoryGetByOrderId(moId:string): Promise<BaseResponse<any>> {
+    return await this.http.get<BaseResponse<any>>('/fbsWorkshopDispatchList/fbsWorkshopDispatchList/getInventoryGetByOrderId',{params:{moId:moId}}).toPromise();
+  }
 }