diff --git a/blade-common/src/main/java/org/springblade/common/constant/LauncherConstant.java b/blade-common/src/main/java/org/springblade/common/constant/LauncherConstant.java index 844bce86..7b82fcee 100644 --- a/blade-common/src/main/java/org/springblade/common/constant/LauncherConstant.java +++ b/blade-common/src/main/java/org/springblade/common/constant/LauncherConstant.java @@ -14,7 +14,7 @@ public interface LauncherConstant { */ // String NACOS_NAMESPACE = "feaf627f-a847-463b-8b73-24a0538f526e"; // 生产环境 -// String NACOS_NAMESPACE = "db3f4da1-ae19-4104-8c17-6d9b8f069401"; + String NACOS_NAMESPACE = "db3f4da1-ae19-4104-8c17-6d9b8f069401"; // 测试环境 // String NACOS_NAMESPACE = "6cdd0310-0d61-4f54-891a-7fb06224d9b8"; diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankTaskVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankTaskVO.java index 0445ee8d..bd38c145 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankTaskVO.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankTaskVO.java @@ -11,6 +11,7 @@ import org.springblade.desk.quality.pojo.entity.LiquidTankTask; import java.io.Serial; import java.time.LocalDate; +import java.time.LocalDateTime; /** * 视图实体类 @@ -91,6 +92,6 @@ public class LiquidTankTaskVO extends LiquidTankTask { @Schema(description = "控制规范(报告)") private String norm; @Schema(description = "槽液到期时间") - private LocalDate tankEndTime; + private LocalDateTime tankEndTime; } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/DsTaskingMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/DsTaskingMapper.java index 9f9b9f27..8638fd9c 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/DsTaskingMapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/DsTaskingMapper.java @@ -132,5 +132,5 @@ public interface DsTaskingMapper extends BaseMapper { List getOldMesAllPart(@Param("startTime") String startTime, @Param("endTime") String endTime, - @Param("partCode") String partCode); + @Param("partCodeList") List partCodeList); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/PartMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/PartMapper.xml index 249e0ac9..bebcb4ea 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/PartMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/PartMapper.xml @@ -391,7 +391,7 @@ src.PART_CODE, src.SUB_CODE, src.SUB_NAME, src.QUOTA, src.SUB_TYPE, src.PRODUCT_TYPE, src.AREA, src.CONFIG_NO, src.PLATE, src.MATERIAL, src.PLATE_CODE, src.SIN_TER_TYPE - FROM TOOL_MES.DS_PART_SUB src where src.PART_CODE = #{partCode} + FROM MJMES.DS_PART_SUB src where src.PART_CODE = #{partCode} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsTaskingServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsTaskingServiceImpl.java index 41233778..d80613a8 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsTaskingServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsTaskingServiceImpl.java @@ -1572,10 +1572,10 @@ public class DsTaskingServiceImpl extends BaseServiceImpl codeList = Arrays.asList(partCode.split(",")); //查询所有老mes零件 - List dsPartEntityList = taskingMapper.getOldMesAllPart(startTime,endTime,partCode); + List dsPartEntityList = taskingMapper.getOldMesAllPart(startTime,endTime,codeList); for (DsPartEntity partEntity : dsPartEntityList) { - // 2. 递归处理零件及其子件 DsPartEntity newPart = processPartRecursively(partEntity); if (newPart == null) { diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/device/controller/EquipmentController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/controller/EquipmentController.java index bf76daa3..701be700 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/device/controller/EquipmentController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/controller/EquipmentController.java @@ -25,6 +25,7 @@ */ package org.springblade.desk.device.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; @@ -37,6 +38,7 @@ import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.Valid; import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; import org.springblade.core.boot.ctrl.BladeController; import org.springblade.core.excel.util.ExcelUtil; import org.springblade.core.log.annotation.ApiLog; @@ -63,6 +65,7 @@ import java.util.Map; * @author qyl * @since 2025-12-26 */ +@Slf4j @RestController @AllArgsConstructor @RequestMapping("/equipment") @@ -77,9 +80,14 @@ public class EquipmentController extends BladeController { @GetMapping("/detail") @ApiOperationSupport(order = 1) @Operation(summary = "详情", description = "传入equipment") - public R detail(EquipmentEntity equipment) { - EquipmentEntity detail = equipmentService.getOne(Condition.getQueryWrapper(equipment)); - return R.data(EquipmentWrapper.build().entityVO(detail)); + public R detail(EquipmentEntity equipment) { + log.error("设备的ID是"+equipment.getId()); + EquipmentEntity detail = equipmentService.getById(equipment.getId()); + log.error("设备数据000001: {}"+ detail); + JSONObject result = JSONObject.parseObject(detail.toString()); + log.error("设备数据: {}"+ result.toJSONString()); +// EquipmentEntity detail = equipmentService.getOne(Condition.getQueryWrapper(equipment)); + return R.data(detail); } /** diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/device/service/impl/FeiBaSetServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/service/impl/FeiBaSetServiceImpl.java index 276bd888..3a6d3f60 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/device/service/impl/FeiBaSetServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/service/impl/FeiBaSetServiceImpl.java @@ -104,7 +104,7 @@ public class FeiBaSetServiceImpl extends BaseServiceImpl jsonList = JSONArray.parseArray(result.getJSONArray("data").toJSONString(), JSONObject.class); if (CollectionUtils.isEmpty(jsonList)) { diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/WorkPlanMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/WorkPlanMapper.xml index fc71968f..e0651ff2 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/WorkPlanMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/WorkPlanMapper.xml @@ -148,7 +148,7 @@ @@ -171,7 +171,7 @@ diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/MakeRecServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/MakeRecServiceImpl.java index b7b69586..83178c25 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/MakeRecServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/MakeRecServiceImpl.java @@ -95,7 +95,8 @@ public class MakeRecServiceImpl extends BaseServiceImpl } YieldOrder yieldOrder = yieldOrderService.getById(wo.getYoId()); WorkPlanDto workPlanDto = new WorkPlanDto(yieldOrder, wo, wp, isBinging); - workPlanDto.setCurrentWpTitle(""); + BsProcessSetEntity currentWp = bsProcessSetService.getById(wp.getPpsId()); + workPlanDto.setCurrentWpTitle(currentWp.getName()); workPlanDto.setCurrentMakeTeam(""); workPlanDto.setFrontWpTitle(""); workPlanDto.setFrontMakeTeam(""); diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkOrderServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkOrderServiceImpl.java index 85f9aac8..a5005c32 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkOrderServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkOrderServiceImpl.java @@ -1170,8 +1170,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl detail(InspectionTask inspectionTask) { - InspectionTask detail = service.getOne(Condition.getQueryWrapper(inspectionTask)); - InspectionTaskDetailVO detailDetailVO = InspectionTaskDetailWrapper.build().entityVO(detail); + +// InspectionTask detail = service.getOne(Condition.getQueryWrapper(inspectionTask)); + log.error("[检验任务]id="+inspectionTask.getId()); + InspectionTask detail = service.getById(inspectionTask.getId()); + log.error("检验任务数据000001: {}"+ detail); + JSONObject result = JSONObject.parseObject(detail.toString()); + log.error("检验任务数据: {}"+ result.toJSONString()); +// InspectionTaskDetailVO detailDetailVO = InspectionTaskDetailWrapper.build().entityVO(detail); + +// InspectionTaskDetailVO detailDetailVO = InspectionTaskDetailWrapper.build().entityVO(detail); + InspectionTaskDetailVO detailDetailVO = new InspectionTaskDetailVO(); + BeanUtils.copyProperties(inspectionTask, detailDetailVO); BladeUser user = AuthUtil.getUser(); // InspectionTaskListVO detailDetail = service.detailById(inspectionTask); service.setDetailVOValue(detailDetailVO); diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/InspectionTaskDetailWrapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/InspectionTaskDetailWrapper.java index e3d39b54..8a103886 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/InspectionTaskDetailWrapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/InspectionTaskDetailWrapper.java @@ -7,6 +7,7 @@ import org.springblade.core.mp.support.BaseEntityWrapper; import org.springblade.core.tool.utils.BeanUtil; import org.springblade.desk.quality.pojo.entity.InspectionTask; import org.springblade.desk.quality.pojo.vo.InspectionTaskDetailVO; +import org.springframework.beans.BeanUtils; import java.util.Objects; @@ -24,7 +25,11 @@ public class InspectionTaskDetailWrapper extends BaseEntityWrapper detail(EquipmentEntity equipment) { - EquipmentEntity detail = equipmentService.getOne(Condition.getQueryWrapper(equipment)); - return R.data(EquipmentWrapper.build().entityVO(detail)); + public R detail(EquipmentEntity equipment) { + + log.error("设备的ID是"+equipment.getId()); + EquipmentEntity detail = equipmentService.getById(equipment.getId()); + log.error("设备数据000001: {}"+ detail); + JSONObject result = JSONObject.parseObject(detail.toString()); + log.error("设备数据: {}"+ result.toJSONString()); +// EquipmentEntity detail = equipmentService.getOne(Condition.getQueryWrapper(equipment)); + return R.data(detail); } /** * 设备信息表 分页 diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/QualityGradeMapper.xml b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/QualityGradeMapper.xml index ede9c976..cb0ba8be 100644 --- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/QualityGradeMapper.xml +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/QualityGradeMapper.xml @@ -24,6 +24,9 @@ and type LIKE '%' || #{param2.type} || '%'; + + and QUALITY_GRADE LIKE '%' || #{param2.qualityGrade} || '%'; + diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/SameTroughMapper.xml b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/SameTroughMapper.xml index ca2583e8..9e8b2cd8 100644 --- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/SameTroughMapper.xml +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/SameTroughMapper.xml @@ -55,6 +55,7 @@ FROM MES_YIELD_ORDER a LEFT JOIN DS_PART b ON a.PART_CODE = b.PART_CODE + LEFT JOIN DS_PART_VERSION d ON b.ID = d.PART_ID AND a.PART_VERSION = d.PART_VERSION AND a.PART_CODE = d.PART_CODE LEFT JOIN MES_YIELD_ORDER_CRAFT c ON a.id = c.yo_id a.is_deleted = 0 AND c.WORK_CENTER_ID IS NOT NULL diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/WorkOrderMapper.xml b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/WorkOrderMapper.xml index 93f456ae..9c01a6eb 100644 --- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/WorkOrderMapper.xml +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/WorkOrderMapper.xml @@ -129,9 +129,9 @@ and a.wo_code = #{woCode} - + and b.equip_name = #{equipName} diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/WorkOrderServiceImpl.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/WorkOrderServiceImpl.java index 552a0a97..036234bd 100644 --- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/WorkOrderServiceImpl.java +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/WorkOrderServiceImpl.java @@ -282,6 +282,20 @@ public class WorkOrderServiceImpl extends BaseServiceImpl { + return entry.getValue().stream() + .anyMatch(dto -> workOrder.getTeamName().equals(dto.getTeamName())); + }) + .collect(Collectors.toMap( + Map.Entry::getKey, + Map.Entry::getValue, + (oldValue, newValue) -> oldValue, + LinkedHashMap::new + )); + } List resultList = new ArrayList<>(); for (Map.Entry> entry : woCodeGroup.entrySet()) { //根据工序名称过滤订单 @@ -413,9 +427,10 @@ public class WorkOrderServiceImpl extends BaseServiceImpl craftAbilityMap) { List glassCakeOutList = new ArrayList<>(); List workOrderList = new ArrayList<>(); - list = mergeYieldOrderList(list); + //list = mergeYieldOrderList(list); LocalDateTime localDateTime = LocalDateTime.now(); for (YieldOrderEntity order : list) { + log.info("当前订单id是：" + order.getId()); try { DsPartVersionEntity partVersion = partVersionService.getOne(Wrappers.lambdaQuery().eq(DsPartVersionEntity::getPartCode,order.getPartCode()).eq(DsPartVersionEntity::getPartVersion,order.getPartVersion())); if(partVersion == null){ @@ -463,6 +478,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpllambdaQuery().eq(OutsourceProcessEntity::getProcessId, craft.getPpsId())); @@ -891,7 +907,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl> dealCommonCraftOrders() { + log.info("处理前置公共工序开始！"); List commonCraftOrderList = yieldOrderService.selectCommonCraftOrderList(); Map> planMap = new HashMap<>(); if (CollectionUtils.isNotEmpty(commonCraftOrderList)) { @@ -1295,6 +1312,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl sintList = sintMap.get(craft.getPpsId()); List> sintMaterialList = new ArrayList<>(); - sintList.stream().map(SintTempCurveEntity::getGlassCode).collect(Collectors.toList()).forEach(item -> sintMaterialList.add(Arrays.asList(item.split(",")))); + sintList.stream().map(SintTempCurveEntity::getGlassCode).collect(Collectors.toList()).forEach(item -> sintMaterialList.add(Arrays.asList(item.split(" ")))); //根据零件号获取子件信息 List partRelationList = partRelationService.list(Wrappers.lambdaQuery().eq(PartRelationEntity::getPartId,part.getId()));