增加新编程序统计；固化程序统计

yangys

2025-09-07 d34d3c83500d5a68715a280eee3d930c88291d71

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

@@ -2,13 +2,11 @@
package org.springblade.mdm.flow.service;

import com.itextpdf.text.*;
import com.itextpdf.text.pdf.*;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springblade.core.oss.OssTemplate;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.mdm.basesetting.machine.MachineService;
import org.springblade.mdm.basesetting.machine.service.MachineService;
import org.springblade.mdm.basesetting.machine.entity.Machine;
import org.springblade.mdm.basesetting.producedivision.entity.QinzheFgb;
import org.springblade.mdm.basesetting.producedivision.service.QinzheFgbService;
@@ -16,7 +14,6 @@
import org.springblade.mdm.commons.service.ParamService;
import org.springblade.mdm.commons.support.TemplatedPdfWriter;
import org.springblade.mdm.flow.vo.ApproveTableInfo;
import org.springblade.mdm.program.entity.NcNode;
import org.springblade.mdm.program.service.NcNodeService;
import org.springblade.system.feign.IDictBizClient;
import org.springblade.system.feign.IUserClient;
@@ -123,7 +120,7 @@

      //零组件名称
      data.put("drawingName",getDrawingName(props.getDrawingNo()));
      data.put("deviation",props.getDeviation());
      data.put("deviation",props.getDeviation()!=null?props.getDeviation():StringUtils.EMPTY);



@@ -139,6 +136,8 @@
      data.put("fuheY","Y");//TODO 有 检验员 则符合
      data.put("keyongY","Y");//TODO 有 检验员 则符合

      data.put("jly","来源MES/2025-1-1");
      data.put("jln","来源MES/2025-1-1");
      ApproveTableInfo approveInfo = approveInfoQueryService.getApproveInfo(props);
      data.put("programmerName",approveInfo.getProgrammerName());
      data.put("checkerName",approveInfo.getCheckerName());