jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/controller/BsOrderSchedulingController.java
@@ -6,6 +6,7 @@ import com.alibaba.excel.ExcelWriter; import com.alibaba.excel.write.metadata.WriteSheet; import com.alibaba.excel.write.style.column.LongestMatchColumnWidthStyleStrategy; import com.github.pagehelper.PageInfo; import com.jcdm.common.annotation.Log; import com.jcdm.common.core.controller.BaseController; import com.jcdm.common.core.domain.AjaxResult; @@ -211,9 +212,11 @@ { startPage(); List<BsOrderScheduling> list = new ArrayList<>(); long total = 0; if (StringUtils.isNotEmpty(bsOrderScheduling.getOrderNo())){ list = bsOrderSchedulingService.selectBsOrderSchedulingPage(bsOrderScheduling); if (CollUtil.isNotEmpty(list)){ total = new PageInfo(list).getTotal(); list.forEach(x -> { if (StrUtil.isNotBlank(x.getWorkingHours())){ x.setWorkingHoursInt(Integer.parseInt(x.getWorkingHours())); @@ -224,11 +227,14 @@ list = list.stream().sorted(Comparator.comparing(BsOrderScheduling::getWorkingHoursInt)).collect(Collectors.toList()); } } List<BsOrderScheduling> collect = list.stream().filter(x -> Constants.UN_QUALIFIED.equals(x.getQualityStatus())).collect(Collectors.toList()); if (CollUtil.isNotEmpty(collect)){ String.valueOf(collect.size()); } return getDataTable(list); // List<BsOrderScheduling> collect = list.stream().filter(x -> Constants.UN_QUALIFIED.equals(x.getQualityStatus())).collect(Collectors.toList()); // if (CollUtil.isNotEmpty(collect)){ // String.valueOf(collect.size()); // } TableDataInfo dataTable = getDataTable(list); dataTable.setTotal(total); return dataTable; } /** jcdm-main/src/main/java/com/jcdm/main/webservice/service/ReceivingServices.java
@@ -240,16 +240,24 @@ if (ObjectUtil.isNotNull(result)){ logger.info("messageLocation2,"+result); String string = result.get("EV_MESSAGE").toString(); if (string.contains("查询成功")){ logger.info("messageLocation3,"+string); JsonObject etData = jsonObject2 .getAsJsonObject("SOAP:Envelope") .getAsJsonObject("SOAP:Body") .getAsJsonObject("n0:ZPP_CF_MES_005.Response") .getAsJsonObject("ET_DATA"); data = etData.toString(); logger.info("messageLocation4,"+data); } // if (string.contains("查询成功")){ // logger.info("messageLocation3,"+string); // JsonObject etData = jsonObject2 // .getAsJsonObject("SOAP:Envelope") // .getAsJsonObject("SOAP:Body") // .getAsJsonObject("n0:ZPP_CF_MES_005.Response") // .getAsJsonObject("ET_DATA"); // data = etData.toString(); // logger.info("messageLocation4,"+data); // } logger.info("messageLocation3,"+string); JsonObject etData = jsonObject2 .getAsJsonObject("SOAP:Envelope") .getAsJsonObject("SOAP:Body") .getAsJsonObject("n0:ZPP_CF_MES_005.Response") .getAsJsonObject("ET_DATA"); data = etData.toString(); logger.info("messageLocation4,"+data); } return data; jcdm-ui/src/views/main/om/productionOrde/detail.vue
@@ -145,6 +145,7 @@ message:'操作成功', type:'success' }) this.repairFlag = false this.getListData() } }) jcdm-ui/src/views/main/om/productionOrde/index.vue
@@ -165,7 +165,7 @@ </template> </el-table-column> <el-table-column label="产线" align="center" prop="lineCode"> <el-table-column label="工厂编号" align="center" prop="workshopCode"> </el-table-column> <el-table-column label="制单人" width="80" align="center" prop="createUser"> @@ -529,7 +529,7 @@ getProductionNotice(this.queryParams).then(response => { this.$modal.msgSuccess(response.msg); this.queryParams = {} // this.queryParams = {} this.getList(); }); }, @@ -607,6 +607,7 @@ /** 查询生产工单列表 */ getList() { this.loading = true; console.log('this.queryParams',this.queryParams) listProductionOrde(this.queryParams).then(response => { this.productionOrdeList = response.rows; this.total = response.total;
