固化流程1

yangys

2025-08-14 6043e2e1c832db2bf7bb1868ae9ca727f7b988b3

 blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/ApproveTableService.java

@@ -14,8 +14,10 @@
import org.springblade.mdm.flow.entity.ApproveRecord;
import org.springblade.mdm.flow.mapper.ApproveRecordMapper;
import org.springblade.mdm.flow.vo.ApproveRecordVO;
import org.springblade.mdm.program.entity.NcNode;
import org.springblade.mdm.program.entity.NcProgram;
import org.springblade.mdm.program.entity.ProcessProgRef;
import org.springblade.mdm.program.service.NcNodeService;
import org.springblade.mdm.program.service.NcProgramService;
import org.springblade.mdm.program.service.ProcessProgRefService;
import org.springframework.beans.BeanUtils;
@@ -36,10 +38,9 @@
@Service
@AllArgsConstructor
public class ApproveTableService{
   private final ProcessProgRefService processProgRefService;
   private final FlowCommonService flowCommonService;
   private final ApproveRecordService approveRecordService;
   private final NcProgramService ncProgramService;
   private final NcNodeService ncNodeService;
   private final MachineService machineService;
   private static final String UNCHECK_BOX = "☐";
   private static final String CHECKED_BOX = "☑";
@@ -69,7 +70,7 @@
      List<ApproveRecord> records = approveRecordService.lambdaQuery().eq(ApproveRecord::getProcessInstanceId, processInstanceId).orderByAsc(ApproveRecord::getCreateTime).list();
      for(int i=0;i<records.size();i++){
         ApproveRecord record = records.get(i);
         if(record.getNcProgramId() ==null){
         if(record.getNcNodeId() ==null){
            continue;
         }
         printStep(document,bfChinese,record);
@@ -82,13 +83,13 @@
   }

   void printStep(Document document,BaseFont bfChinese,ApproveRecord record) throws DocumentException, IOException {
      NcProgram ncProgram;
      NcNode programPackageNode;
      Machine machine;
      if(record.getNcProgramId() !=null ) {
         ncProgram = ncProgramService.getById(record.getNcProgramId());
         machine = machineService.getByCode(ncProgram.getMachineCode());
      if(record.getNcNodeId() !=null ) {
         programPackageNode = ncNodeService.getById(record.getNcNodeId());
         machine = machineService.getByCode(programPackageNode.getMachineCode());
      }else{
         ncProgram = new NcProgram();
         programPackageNode = new NcNode();
         machine = new Machine();
      }

@@ -123,10 +124,10 @@
      //PdfPCell cell12 = new PdfPCell();
      //cell12.setColspan(2);
      //cell12.addElement(new Phrase(ncProgram.getDrawingNo()));
      table.addCell(getCell(ncProgram.getDrawingNo(),ft));//零组件号
      table.addCell(getCell(programPackageNode.getDrawingNo(),ft));//零组件号

      table.addCell(getCell(ncProgram.getProcessNo(),ft));//工序号
      table.addCell(getCell(ncProgram.getCraftEdition(),ft));//工艺版次
      table.addCell(getCell(programPackageNode.getProcessNo(),ft));//工序号
      table.addCell(getCell(programPackageNode.getCraftEdition(),ft));//工艺版次
      table.addCell(getCell(machine.getName(),ft));//机床型号
      table.addCell("");//负责人，工段负责人派出时间

@@ -161,10 +162,10 @@
      Chunk block2 = square;
      Date programDate = null;
      Date checkDate = null;
      if(StringUtils.equals(record.getTaskDefinitionId(),"programmingTask")){
      if(StringUtils.equals(record.getTaskDefinitionKey(),"programmingTask")){
         block1 = check;
         programDate = record.getCreateTime();
      }else if(StringUtils.equals(record.getTaskDefinitionId(),"check")){
      }else if(StringUtils.equals(record.getTaskDefinitionKey(),"check")){
         block2 = check;
         checkDate = record.getCreateTime();
      }
@@ -208,7 +209,8 @@

      PdfPCell cell2 = new PdfPCell();
      cell2.setColspan(2);
      cell2.addElement(new Phrase(ncProgram.getCode(),ft));//数控程序编号

      cell2.addElement(new Phrase(programPackageNode.getProgramNo(),ft));//数控程序编号
      table.addCell(cell2);

      String pDateStr = " ";