工序报工推送ERP，添加报工人编码、姓名字段

mes/src/main/java/com/ximai/mes/pro/dto/task/FeedbackDto.java

@@ -16,4 +16,8 @@ public class FeedbackDto {
     ProTaskWorkunit nextTaskWorkunit;
     /** 报工表 machine_time（分钟） */
     String machineTime;
+    /** 报工人编码 */
+    String userName;
+    /** 报工人姓名 */
+    String nickName;
 }

mes/src/main/java/com/ximai/mes/pro/service/impl/ProFeedbackServiceImpl.java

@@ -790,6 +790,8 @@ public class ProFeedbackServiceImpl implements IProFeedbackService {
                 .currTaskWorkunit(currTaskWorkunit)
                 .nextTaskWorkunit(nextTaskWorkunit)
                 .machineTime(feedback.getMachineTime())
+                .userName(feedback.getUserName())
+                .nickName(feedback.getNickName())
                 .build();
         processReportCreateProcess.process(new Object[]{feedbackDto, qualifyQuantity}, null);
         pushType = FeedbackSapPushConst.TYPE_REPORT;

mes/src/main/java/com/ximai/mes/pro/service/impl/task/ProTaskServiceImpl.java

@@ -955,7 +955,10 @@ public class ProTaskServiceImpl implements IProTaskService, ApplicationContextAw
                         .stripTrailingZeros()
                         .toPlainString();
                 FeedbackDto feedbackDto = FeedbackDto.builder().workorder(v.getWorkorder()).currTask(task).currTaskWorkunit(taskWorkunit)
-                        .nextTask(nextTask).nextTaskWorkunit(nextTaskWorkunit.get()).machineTime(machineTimeMinutes).build();
+                        .nextTask(nextTask).nextTaskWorkunit(nextTaskWorkunit.get()).machineTime(machineTimeMinutes)
+                        .userName(v.getFeedbackList().isEmpty() ? null : v.getFeedbackList().get(0).getUserName())
+                        .nickName(v.getFeedbackList().isEmpty() ? null : v.getFeedbackList().get(0).getNickName())
+                        .build();
                 applicationContext.getBean(ProTaskServiceImpl.class).feedbackToErp(feedbackDto, v.getQuantityQualify(), v.getQuantityUnqualify());
                 v.getFeedbackList().forEach(f -> proFeedbackService.markSapPushedAfterAuto(
                         f.getRecordId(), "erp.process.report.create.enable", com.ximai.mes.constant.FeedbackSapPushConst.TYPE_REPORT));

mes/src/main/java/com/ximai/mes/remote/dto/ProcessReportCreate.java

@@ -52,6 +52,10 @@ public class ProcessReportCreate {
     @JsonProperty("te004")
     private String employeeNo;
 
+    @ApiModelProperty("报工人姓名")
+    @JsonProperty("udf01")
+    private String employeeName;
+
     @ApiModelProperty("机器编号")
     @JsonProperty("te005")
     private String machineNo;

mes/src/main/java/com/ximai/mes/remote/process/ProcessReportCreateProcess.java

@@ -41,6 +41,8 @@ public class ProcessReportCreateProcess implements IExtendedProcess {
         create.setUnQualifyQty(BigDecimal.ZERO);
         create.setType("1");
         create.setMachineHours(ErpMachineTimeConverter.toMachineSeconds(feedbackDto.getMachineTime()));
+        create.setEmployeeNo(feedbackDto.getUserName());
+        create.setEmployeeName(feedbackDto.getNickName());
 
         List<ProWorkOrderProcess> workorderProcessList = workOrderProcessService.selectListByQw(
                 new QueryWrapper<ProWorkOrderProcess>()