派工界面增加选择主管工艺

yangys

2025-09-07 56f5157ae8dba22eb30fb6c7cb132f80b7161932

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

@@ -9,6 +9,7 @@
import org.springblade.mdm.basesetting.machine.entity.Machine;
import org.springblade.mdm.basesetting.machine.service.MachineService;
import org.springblade.mdm.commons.service.ParamService;
import org.springblade.mdm.commons.service.UserCommonService;
import org.springblade.mdm.flow.constants.FlowContants;
import org.springblade.mdm.flow.entity.TaskDispatch;
import org.springblade.mdm.flow.service.ApproveInfoQueryService;
@@ -39,7 +40,7 @@
@Service
public class ApproveTableService {
   @Autowired
   private NcNodeService ncNodeService;
   private UserCommonService userCommonService;
   @Autowired
   private MachineService machineService;
   @Autowired
@@ -90,27 +91,28 @@
         dispatchDateStr = DateUtil.format(approveInfo.getDispatchDate(), DATE_PATTERN);
      }

      dataMap.put("teamLeader",approveInfo.getTeamLeaderName()+"/"+dispatchDateStr);
      dataMap.put("startTime",dispatchDateStr);//工段负责人/单元负责人派出时间
      dataMap.put("fuzeren",approveInfo.getProgrammerName());//负责人
      int isProgram = 0;
      if(StringUtils.equals(props.getHasCuredProgram(),FlowContants.Y)){
         //校对任务
         dataMap.put("jd", WordReplaceUtil.CHECKED);
         dataMap.put("bc", WordReplaceUtil.UNCHECKED);
         dataMap.put("bz", WordReplaceUtil.UNCHECKED);

      }else{
         //编程任务
         dataMap.put("jd", WordReplaceUtil.UNCHECKED);
         dataMap.put("bc", WordReplaceUtil.CHECKED);
         dataMap.put("bz", WordReplaceUtil.CHECKED);
      }

      dataMap.put("programNo",dispatch.getProgramNo());
      dataMap.put("fzy",WordReplaceUtil.CHECKED);
      dataMap.put("fzn",WordReplaceUtil.UNCHECKED);

      dataMap.put("fzy",WordReplaceUtil.CHECKED); //仿真 是
      dataMap.put("fzn",WordReplaceUtil.UNCHECKED);//仿真 否
      Date programDate = approveInfo.getCheckDate();
      Date checkDate = approveInfo.getCheckDate();

      String bianzhiDateStr = DateUtil.format(dispatch.getCreateTime(), DATE_PATTERN);


      String checkDateStr = " ";
      if (checkDate != null) {
@@ -121,8 +123,9 @@
      if (approveInfo.getApproveDate() != null) {
         approveDateStr = DateUtil.format(approveInfo.getApproveDate(), DATE_PATTERN);
      }

      dataMap.put("programmer",approveInfo.getProgrammerName()+"/"+bianzhiDateStr);
      String bianzhi = userCommonService.getUserNameById(dispatch.getCreateUser());
      String bianzhiDateStr =  DateUtil.format(dispatch.getCreateTime(), DATE_PATTERN);
      dataMap.put("bianzhi",bianzhi+"/"+bianzhiDateStr);//编制：计划员/发起时间
      dataMap.put("jiaodui",approveInfo.getTeamLeaderName()+"/时间不确定");
      dataMap.put("shenpi",approveInfo.getSeniorName()+"/时间不确定");