扫码

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

@@ -50,6 +50,10 @@ export class FbsWorkshopDispatchList extends Page{
 	//剩余数量
 	remainingQuantity?:number;
 	state?:string;
+	//是否可上岗
+	isScanCode?:string;
+	//是否可扫码（页面控件使用）
+	isScanCodeSwith?:boolean;
 
 	latestCompletedQuantity?:string;
   manHoursCompleted?:string;

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

@@ -173,8 +173,8 @@
           <td nzLeft="157px" >{{ data.productionOrderNumberName }}</td>
           <td nzLeft="265px">{{data.productId}}</td>
           <td nzLeft="383px">{{data.product}}</td>
-          <td nzLeft="580px" nzAlign="center">{{data.numberOfTasksTotal}}</td>
-          <td nzLeft="659px" nzAlign="center">{{data.standardWorkingHoursTotal}}</td>
+          <td nzLeft="580px" nzAlign="center">{{data.surplusNumberOfTasksTotal}}</td>
+          <td nzLeft="659px" nzAlign="center">{{data.surplusStandardWorkingHoursTotal}}</td>
           <td nzLeft="758px" nzAlign="center">{{data.quantityCompletedTotal}}</td>
           <td nzLeft="867px" nzAlign="center">{{data.manHoursCompletedTotal}}</td>
           <ng-container *ngFor="let dateChild of data.fbsWorkshopDispatchListList">
@@ -197,12 +197,16 @@
         <tr style="background-color:rgb(223, 223, 219)" *ngFor="let data of columnTable.data;let i = index">
           <ng-container *ngIf="data.projectName==='统计'">
           <td nzLeft="0px" style="background-color:rgb(223, 223, 219)"></td>
-          <td nzLeft="58px" style="background-color:rgb(223, 223, 219);font-weight:bolder" nzAlign="center">剩余工时</td>
-          <td nzLeft="157px" style="background-color:rgb(223, 223, 219)" nzAlign="center">{{data.remainingWorkTotal}}</td>
+          <td nzLeft="58px" style="background-color:rgb(223, 223, 219);font-weight:bolder" nzAlign="center">
+            <!-- 剩余工时 -->
+          </td>
+          <td nzLeft="157px" style="background-color:rgb(223, 223, 219)" nzAlign="center">
+            <!-- {{data.remainingWorkTotal}} -->
+          </td>
           <td nzLeft="265px" style="background-color:rgb(223, 223, 219);font-weight:bolder" nzAlign="center">统计</td>
           <td  nzLeft="383px"></td>
-          <td nzLeft="580px" nzAlign="center">{{data.numberOfTasksTotal}}</td>
-          <td nzLeft="659px" nzAlign="center">{{data.standardWorkingHoursTotal}}</td>
+          <td nzLeft="580px" nzAlign="center">{{data.surplusNumberOfTasksTotal}}</td>
+          <td nzLeft="659px" nzAlign="center">{{data.surplusStandardWorkingHoursTotal}}</td>
           <td nzLeft="758px" nzAlign="center">{{data.quantityCompletedTotal}}</td>
           <td nzLeft="867px" nzAlign="center">{{data.manHoursCompletedTotal}}</td>
           <ng-container *ngFor="let dateChild of data.fbsWorkshopDispatchListList">

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

@@ -100,6 +100,7 @@
           <th nzWidth="5%">标准工时</th>
           <th nzWidth="6%">计划开工时间</th>
           <th nzWidth="6%">计划完工时间</th>
+          <th nzWidth="6%">是否可扫码</th>
           <th nzWidth="5%">备注</th>
           <th nzWidth="3%">操作</th>
         </tr>
@@ -160,6 +161,12 @@
             <nz-date-picker nzFormat="yyyy-MM-dd HH:mm:ss" [(ngModel)]="data.plannedEndTime" nzPlaceHolder="请选择" [nzShowTime]="{ nzDefaultOpenValue: timeDefaultValue }">
             </nz-date-picker>
           </td>
+          <td>
+            <nz-switch [(ngModel)]="data.isScanCodeSwith" name="isScanCodeSwith"
+                          nzCheckedChildren="是"
+                          nzUnCheckedChildren="否">
+                        </nz-switch>
+          </td>
           <td><textarea rows="2" nz-input [(ngModel)]="data.memo"></textarea></td>
           <td><a nz-popconfirm nzTitle="是否删除?" (nzOnConfirm)="workshopDispatchDeleteRow(data.sort)">删除</a></td>
         </tr>

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

@@ -211,6 +211,11 @@ export class FbsWorkshopDispatchListAddComponent implements OnInit {
         element.date=this.datePipe.transform(element.date, 'yyyy-MM-dd HH:mm:ss');
         element.plannedStartTime=this.datePipe.transform(element.plannedStartTime, 'yyyy-MM-dd HH:mm:ss');
         element.plannedEndTime=this.datePipe.transform(element.plannedEndTime, 'yyyy-MM-dd HH:mm:ss');
+        if(element.isScanCodeSwith){
+          element.isScanCode="1"
+        }else{
+          element.isScanCode="2"
+        }
       });
 
       //获取人员id与名称
@@ -262,6 +267,7 @@ export class FbsWorkshopDispatchListAddComponent implements OnInit {
       ...this.workshopDispatchListList,
       {
         date:new Date().toString(),
+        isScanCodeSwith:false,
         sort: this.sort,
       },
     ];

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

@@ -115,6 +115,7 @@
         <th nzAlign="center">完成工时</th>
         <th nzAlign="center">达成率</th>
         <th nzAlign="center">生产效率</th>
+        <th nzAlign="center">是否可扫码</th>
         <th>状态</th>
         <!-- <th>计划开工时间</th>
         <th>计划完工时间</th> -->
@@ -139,6 +140,18 @@
         <td nzAlign="center">{{item.manHoursCompleted}}</td>
         <td nzAlign="center">{{item.numberEfficiency}}%</td>
         <td nzAlign="center">{{item.workingHoursEfficiency}}%</td>
+        <td nzAlign="center">
+          <!-- <ng-container *ngIf="item.isScanCode=='1'">
+            是
+          </ng-container>
+          <ng-container *ngIf="item.isScanCode=='2'">
+            否
+          </ng-container> -->
+          <nz-switch [(ngModel)]="item.isScanCodeSwith" name="isScanCodeSwith"
+                          nzCheckedChildren="是"
+                          nzUnCheckedChildren="否" (ngModelChange)="isSwitchChange(item)">
+                        </nz-switch>
+        </td>
         <td>
           <nz-badge nzStatus="yellow" *ngIf="item.state=='0'" nzText="派工"></nz-badge>
           <nz-badge nzStatus="green" *ngIf="item.state=='1'" nzText="上岗"></nz-badge>

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

@@ -70,6 +70,14 @@ export class FbsWorkshopDispatchListListComponent implements OnInit {
       if (response.success) {
         //查询成功
         this.dataList = response.result.records; //表格数据
+        this.dataList.forEach(element => {
+          if(element.isScanCode==="1"){
+            element.isScanCodeSwith=true;
+          }else{
+            element.isScanCodeSwith=false;
+          }
+        });
+        
         this.getEfficiency(this.dataList); //计算效率
         this.page = response.result; //分页数据
         this.isLoading = false;
@@ -142,6 +150,28 @@ export class FbsWorkshopDispatchListListComponent implements OnInit {
     }
   }
 
+  /**
+   * 更改是否可扫码
+   */
+  isSwitchChange(item){
+    var fbsWorkshopDispatchList=new FbsWorkshopDispatchList();
+    fbsWorkshopDispatchList.id=item.id;
+    if(item.isScanCodeSwith){
+      fbsWorkshopDispatchList.isScanCode="1"
+      item.isScanCode="1"
+    }else{
+      fbsWorkshopDispatchList.isScanCode="2"
+      item.isScanCode="2"
+    }
+    this.fbsWorkshopDispatchListService.edit(fbsWorkshopDispatchList).then((response)=>{
+      if(response.success){
+        this.nzNotificationService.success("修改成功","");
+      }else{
+        this.nzNotificationService.success("修改失败",response.message);
+      }
+    })
+  }
+
   /**
    * 导出
    */