生产质量检验详情修改

liweidong
pangyang 3 weeks ago
parent 39fcd23178
commit e2e012c04c
  1. 4
      blade-service/blade-desk/src/main/java/org/springblade/desk/device/controller/EquipmentController.java
  2. 6
      blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionTaskController.java
  3. 4
      blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/EquipmentController.java

@ -84,8 +84,8 @@ public class EquipmentController extends BladeController {
log.error("设备的ID是"+equipment.getId()); log.error("设备的ID是"+equipment.getId());
EquipmentEntity detail = equipmentService.getById(equipment.getId()); EquipmentEntity detail = equipmentService.getById(equipment.getId());
log.error("设备数据000001: {}"+ detail); log.error("设备数据000001: {}"+ detail);
JSONObject result = JSONObject.parseObject(detail.toString()); // JSONObject result = JSONObject.parseObject(detail.toString());
log.error("设备数据: {}"+ result.toJSONString()); // log.error("设备数据: {}"+ result.toJSONString());
// EquipmentEntity detail = equipmentService.getOne(Condition.getQueryWrapper(equipment)); // EquipmentEntity detail = equipmentService.getOne(Condition.getQueryWrapper(equipment));
return R.data(detail); return R.data(detail);
} }

@ -125,13 +125,13 @@ public class InspectionTaskController extends BladeController {
log.error("[检验任务]id="+inspectionTask.getId()); log.error("[检验任务]id="+inspectionTask.getId());
InspectionTask detail = service.getById(inspectionTask.getId()); InspectionTask detail = service.getById(inspectionTask.getId());
log.error("检验任务数据000001: {}"+ detail); log.error("检验任务数据000001: {}"+ detail);
JSONObject result = JSONObject.parseObject(detail.toString()); // JSONObject result = JSONObject.parseObject(detail.toString());
log.error("检验任务数据: {}"+ result.toJSONString()); // log.error("检验任务数据: {}"+ result.toJSONString());
// InspectionTaskDetailVO detailDetailVO = InspectionTaskDetailWrapper.build().entityVO(detail); // InspectionTaskDetailVO detailDetailVO = InspectionTaskDetailWrapper.build().entityVO(detail);
// InspectionTaskDetailVO detailDetailVO = InspectionTaskDetailWrapper.build().entityVO(detail); // InspectionTaskDetailVO detailDetailVO = InspectionTaskDetailWrapper.build().entityVO(detail);
InspectionTaskDetailVO detailDetailVO = new InspectionTaskDetailVO(); InspectionTaskDetailVO detailDetailVO = new InspectionTaskDetailVO();
BeanUtils.copyProperties(inspectionTask, detailDetailVO); BeanUtils.copyProperties(detail, detailDetailVO);
BladeUser user = AuthUtil.getUser(); BladeUser user = AuthUtil.getUser();
// InspectionTaskListVO detailDetail = service.detailById(inspectionTask); // InspectionTaskListVO detailDetail = service.detailById(inspectionTask);
service.setDetailVOValue(detailDetailVO); service.setDetailVOValue(detailDetailVO);

@ -82,8 +82,8 @@ public class EquipmentController extends BladeController {
log.error("设备的ID是"+equipment.getId()); log.error("设备的ID是"+equipment.getId());
EquipmentEntity detail = equipmentService.getById(equipment.getId()); EquipmentEntity detail = equipmentService.getById(equipment.getId());
log.error("设备数据000001: {}"+ detail); log.error("设备数据000001: {}"+ detail);
JSONObject result = JSONObject.parseObject(detail.toString()); // JSONObject result = JSONObject.parseObject(detail.toString());
log.error("设备数据: {}"+ result.toJSONString()); // log.error("设备数据: {}"+ result.toJSONString());
// EquipmentEntity detail = equipmentService.getOne(Condition.getQueryWrapper(equipment)); // EquipmentEntity detail = equipmentService.getOne(Condition.getQueryWrapper(equipment));
return R.data(detail); return R.data(detail);
} }

Loading…
Cancel
Save