jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/domain/PrintOfflineReportInfo.java
@@ -7,6 +7,7 @@ private String inspectionDate; private String reviewerDate; private String productNum; private String productCode; private String param18; private String param19; private String param20; jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/controller/DaParamCollectionController.java
@@ -16,6 +16,8 @@ import com.jcdm.main.da.paramCollection.service.IDaParamCollectionService; import com.jcdm.main.da.testDeviceInterface.domain.DaTestDeviceInterface; import com.jcdm.main.da.testDeviceInterface.service.IDaTestDeviceInterfaceService; import com.jcdm.main.om.productionOrde.domain.OmProductionOrdeInfo; import com.jcdm.main.om.productionOrde.service.IOmProductionOrdeInfoService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; @@ -45,6 +47,9 @@ @Autowired private IDaTestDeviceInterfaceService daTestDeviceInterfaceService; @Autowired private IOmProductionOrdeInfoService omProductionOrdeInfoService; /** * 查询设备产品过程参数采集列表 */ @@ -53,6 +58,9 @@ { String result = "S"; PrintOfflineReportInfo info = new PrintOfflineReportInfo(); OmProductionOrdeInfo orderInfo = omProductionOrdeInfoService.getOne(new LambdaQueryWrapper<OmProductionOrdeInfo>().eq(OmProductionOrdeInfo::getProductNum, daParamCollection.getProductNum())); info.setProductCode(orderInfo.getProductCode()); DaParamCollection OP130_InsulationResistance1 = daParamCollectionService.getOne(new LambdaQueryWrapper<DaParamCollection>().eq(DaParamCollection::getParamCode, "OP130_InsulationResistance1").eq(DaParamCollection::getSfcCode,daParamCollection.getProductNum())); info.setParam18(OP130_InsulationResistance1.getParamValue());
@@ -15,7 +15,7 @@ </tr> <tr> <td colspan="3"> <span>产品名称/零部件号：电驱动系统总成/9900200461</span> <span>产品名称/零部件号：电驱动系统总成/{{printParam.productCode}}</span> </td> <td colspan="4"> <span>检验日期：{{printParam.inspectionDate}}</span> jcdm-ui/src/views/main/kb/repairOnline/index.vue
@@ -264,13 +264,15 @@ }, methods: { repairClick(){ if(this.headContent.processesCode !== '' && this.engravingStatus !== '' && this.headContent.sfcCode !== ''){ if(this.headContent.processesCode !== '' && this.engravingStatus !== '' && this.shellBarcode !== ''){ writeRepairInformationIntoPlc({ processesCode: this.headContent.processesCode, engravingStatus: this.engravingStatus, sfcCode: this.headContent.sfcCode, sfcCode: this.shellBarcode, workOrderNo: this.workpieceInformation.workOrderNo, }).then(response => {}); }).then(response => { this.$message("返修信息写入成功！"); }); }else { this.$message.error("基础参数缺失，请检查工位编号和打刻状态是否已选择！"); } @@ -289,7 +291,7 @@ console.log(tab, event); }, handleEnter() { if(this.headContent.processesCode !== '' && this.engravingStatus !== ''){ // if(this.headContent.processesCode !== '' && this.engravingStatus !== ''){ this.queryParams.productNum = this.shellBarcode listProductionOrde(this.queryParams).then(response => { let rowsData = response.rows[0]; @@ -303,9 +305,10 @@ this.$message.error('系统没有此工单，请重新扫码！'); } }); }else { this.$message.error("基础参数缺失，请检查工位编号和打刻状态是否已选择！"); } // } // else { // this.$message.error("基础参数缺失，请检查工位编号和打刻状态是否已选择！"); // } },
