diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/RaiseHand.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/RaiseHand.java index c1781811..2b877e52 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/RaiseHand.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/RaiseHand.java @@ -33,6 +33,7 @@ public class RaiseHand extends BaseEntity { */ @Schema(description = "提出人") private Long reportUserId; + private String reportUserName; /** * 岗位 */ diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/ReviewSheet.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/ReviewSheet.java index 84bb604b..66ce4176 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/ReviewSheet.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/ReviewSheet.java @@ -417,4 +417,10 @@ public class ReviewSheet extends BaseEntity { */ @Schema(description = "提请审批时间") private LocalDateTime toReviewDate; + + private Long toReviewUserId; + private String toReviewUserName; + + //当前工序id + private Long ppsId; } diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetInitVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetInitVO.java index 80a10453..62672d6e 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetInitVO.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetInitVO.java @@ -38,5 +38,13 @@ public class ReviewSheetInitVO extends ReviewSheet { private String reviewStatusName; @Schema(description = "审理[用户]真名") private String reviewUserRealName; + @Schema(description = "发现工序") private String findPrecessName; + + @Schema(description = "[物料]名称") + private String materialName; + @Schema(description = "[物料]编号") + private String materialCode; + + private Long ppsId; } diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetRedoScrapVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetRedoScrapVO.java index ce70a623..9a9c18e0 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetRedoScrapVO.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetRedoScrapVO.java @@ -24,4 +24,6 @@ public class ReviewSheetRedoScrapVO extends ReviewSheet { private String oemName; @Schema(description = "镀前价格") private String priceBeforePlate; + @Schema(description = "物料名称") + private String partName; } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/IotThicknessController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/IotThicknessController.java index de06e6ff..a8afc716 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/IotThicknessController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/IotThicknessController.java @@ -3,6 +3,7 @@ */ package org.springblade.desk.quality.controller; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; @@ -26,16 +27,23 @@ import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.tool.utils.Func; import org.springblade.desk.basic.util.ExcelExtUtil; +import org.springblade.desk.device.pojo.entity.EquipmentEntity; +import org.springblade.desk.device.service.IEquipmentService; import org.springblade.desk.quality.constant.QAModuleConst; import org.springblade.desk.quality.excel.IotThicknessExcel; +import org.springblade.desk.quality.pojo.entity.IotHardness; import org.springblade.desk.quality.pojo.entity.IotThickness; import org.springblade.desk.quality.pojo.vo.IotThicknessVO; import org.springblade.desk.quality.service.IIotThicknessService; import org.springblade.desk.quality.wrapper.IotThicknessWrapper; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; +import java.net.InetAddress; +import java.util.ArrayList; +import java.util.Date; import java.util.List; import java.util.Map; import java.util.stream.Collectors; @@ -57,7 +65,8 @@ public class IotThicknessController extends BladeController { @Resource private IIotThicknessService service; - + @Autowired + private IEquipmentService equipmentService; /** * [IOT厚度] 详情 */ @@ -109,6 +118,85 @@ public class IotThicknessController extends BladeController { } + @GetMapping(value = "/queryChyData") + public R queryChyData(@RequestBody JSONObject data) throws Exception { + InetAddress inetAddress = InetAddress.getLocalHost(); + String ip = inetAddress.getHostAddress(); + ip = "192.168.134.115"; + + QueryWrapper qw = new QueryWrapper<>(); + qw.eq("DEVICE_IP",ip); + EquipmentEntity card = equipmentService.getOne(qw); + //根据ip查询设备 + if (card == null) { + return R.fail(-2, "ip未找到对应的测量仪设备！" + ip); + } + String deviceCode = card.getDeviceCode(); + log.info("找到设备，设备编码: {}", deviceCode); + + Date startTime = data.getDate("startTime"); + Date endTime = data.getDate("endTime"); + Boolean allData = data.getBoolean("allData"); + + List qcHardnessIotList = new ArrayList<>(); + if (allData) { +// sb.append(" and not_use = 0"); + QueryWrapper qwhard = new QueryWrapper<>(); + qwhard.eq("EQUIPMENT_CODE",card.getDeviceCode()); + qwhard.eq("FLAG_READ",0); + if(startTime != null && endTime != null){ + qwhard.between("CREATE_TIME", startTime, endTime); + } + qwhard.orderByDesc("CREATE_TIME"); + qcHardnessIotList = service.list(qwhard); + }else { +// sb.append(" and not_use = 1"); + + QueryWrapper qwhard = new QueryWrapper<>(); + qwhard.eq("EQUIPMENT_CODE",card.getDeviceCode()); + qwhard.eq("FLAG_READ",1); + if(startTime != null && endTime != null){ + qwhard.between("CREATE_TIME", startTime, endTime); + } + qwhard.orderByDesc("CREATE_TIME"); + qcHardnessIotList = service.list(qwhard); + } + + List resultList = new ArrayList<>(); + + // 记录查询到的数据数量 + if (qcHardnessIotList != null) { + log.info("查询到 {} 条硬度数据", qcHardnessIotList.size()); + } else { + log.info("未查询到硬度数据"); + } + + boolean hasNewData = qcHardnessIotList != null && !qcHardnessIotList.isEmpty(); + + if (hasNewData) { + log.info("设备[{}]查询到 {} 条新数据", deviceCode, qcHardnessIotList.size()); + for (IotThickness iot : qcHardnessIotList) { + if(null != iot.getData()){ + resultList.add(JSONObject.parseObject(iot.getData())); + } + if (allData) { + iot.setFlagRead(1); + }else{ + iot.setFlagRead(2); + } + service.updateById(iot); + } + // 查到数据后，重置标记（返回null，前端下次请求不带标记） +// timeMarker = null; + } else { + log.info("设备[{}]未查询到新数据", deviceCode); + } + return R.data(resultList); + } + + + + /** * [IOT厚度] page分页 */ diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/ReviewSheetController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/ReviewSheetController.java index e312fd33..a1e26c31 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/ReviewSheetController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/ReviewSheetController.java @@ -86,6 +86,18 @@ public class ReviewSheetController extends BladeController { return R.data(detaiinit); } + + @GetMapping("/getByCardNo") + @ApiOperationSupport(order = 10) + @Operation(summary = "详情", description = "传入ReviewSheet Obj") + public R getByCardNo(ReviewSheetDetailVO reviewSheet) { + + ReviewSheetDetailVO list = service.getByCardNo(reviewSheet.getId(),reviewSheet.getCardNo()); + return R.data(list); + } + + + /** * [生产处置单] list分页 */ diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/InspectionTaskMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/InspectionTaskMapper.xml index c66427aa..61d5be22 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/InspectionTaskMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/InspectionTaskMapper.xml @@ -80,7 +80,7 @@ --ts.TS_NAME,oem.OC_NAME, yo.PRODUCT_TYPE as prodType,yo.PART_NAME as prodName,yo.PLATE as platingInfo, - yo.USE_DEPT as needDeptName,wo.batch_no as batchNo,wo.batch_no as poBatchNo, + yo.USE_DEPT as needDeptName,wo.batch_no as batchNo,wo.batch_no as poBatchNo,ps.NAME as processName, ps.NAME as currentProcessName,ps01.NAME as nextProcessName,wo.MAKE_QTY as poQty, yo.YP_AREA * wo.MAKE_QTY as areaTotal,yo.YP_AREA as area,yo.PRODUCT_IDENT as prodIdent, t.*,wo.WO_CODE as woCode, diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ReviewSheetMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ReviewSheetMapper.java index f70172ae..90eac3bc 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ReviewSheetMapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ReviewSheetMapper.java @@ -48,6 +48,11 @@ public interface ReviewSheetMapper extends BaseMapper { ReviewSheetInitVO getById(Long id); +// ReviewSheetInitVO getByCardNo(String woCode); + + List getByCardNo(String woCode,Long ppsId); + + List listReviewRedoScrap(IPage page, @Param("q") ReviewSheetRedoScrapSearch search); diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ReviewSheetMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ReviewSheetMapper.xml index 76848d82..7c5a7b1a 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ReviewSheetMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ReviewSheetMapper.xml @@ -68,7 +68,8 @@ + + +