工序详情接口优化

liweidong
李涛 1 month ago
parent 1775738338
commit c2433c360b
  1. 3
      blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/vo/ProduceMonitorDsPartVO.java
  2. 23
      blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkOrderServiceImpl.java

@ -54,4 +54,7 @@ public class ProduceMonitorDsPartVO {
@Schema(description = "是否印字:1、否,2、单,3、双")
private String isPrint;
@Schema(description = "pdm零件图纸地址")
private String url;
}

@ -68,6 +68,7 @@ import org.springframework.transaction.annotation.Transactional;
import javax.imageio.ImageIO;
import java.awt.image.BufferedImage;
import java.io.ByteArrayOutputStream;
import java.math.BigDecimal;
import java.time.Duration;
import java.time.Instant;
import java.time.LocalDateTime;
@ -1131,6 +1132,8 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
// 组装零件信息
BeanUtils.copyProperties(dsPartEntity, dsPartVO);
// todo erp查询pdm零件图纸地址
dsPartVO.setUrl("http://MESLoginUser:MESloginUseradmin@pdm.caoe.com/Windchill/netmarkets/jsp/ext/caoe/mes/export.jsp?oid=");
orderDataVO.setDsPart(dsPartVO);
// 组装工序信息
@ -1384,6 +1387,26 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
}
}
}
// 测试数据
ProduceMonitorFileSlotVO fileSlotVO = new ProduceMonitorFileSlotVO();
List<MesRbFilePreserveDetailEntity> childrenList = new ArrayList<>();
MesRbFilePreserveDetailEntity detailEntity = new MesRbFilePreserveDetailEntity();
fileSlotVO.setRfpsType((short) 1);
fileSlotVO.setInsertIndex("1");
fileSlotVO.setSlotIndex("1");
fileSlotVO.setSlotName("测试槽位001");
detailEntity.setRfpsId(BigDecimal.valueOf(1L));
detailEntity.setDetailName("明细名称1");
detailEntity.setDetailIndex("1");
detailEntity.setAsk("工艺要求1");
detailEntity.setRfpdTime("2026-3-6 18:36:44");
detailEntity.setQualified("合格");
detailEntity.setParamName("参数名称1");
detailEntity.setParamValue("参数值1");
childrenList.add(detailEntity);
fileSlotVO.setChildrenList(childrenList);
dsRbFilePreserveSlotList.add(fileSlotVO);
planDataVO.setDsRbFilePreserveSlotList(dsRbFilePreserveSlotList);
}
}

Loading…
Cancel
Save