merge 46348 排序汇报的汇报类型错误，显示“报工调整” 代码调整

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesWorkOrderService.java

@@ -293,7 +293,7 @@ public class MesWorkOrderService implements IMesWorkOrderService {
                 newMesProductOffLine.setWorkOrderType(mesWorkOrderDb.getWorkOrderType());
                 newMesProductOffLine.setWorkCenterCode(mesWorkOrderDb.getWorkCenterCode());
                 newMesProductOffLine.setWorkCellCode(mesWorkOrderDb.getWorkCellCode());
-                newMesProductOffLine.setReportType(MesExtEnumUtil.MES_ALL_REPORT_TYPE.REPORT.getValue());
+                newMesProductOffLine.setReportType(mesProductionRecord.getReportType());
                 newMesProductOffLine.setSapWorkCenter(mesWorkOrderDb.getErpWorkCenter());
                 newMesProductOffLine.setOrganizeCode(organizeCode);
                 newMesProductOffLine.setDescription(mesProductionRecord.getCompleteDateTime());
@@ -769,7 +769,7 @@ public class MesWorkOrderService implements IMesWorkOrderService {
         newMesProductOffLine.setWorkOrderType(oldMesWorkOrder.getWorkOrderType());
         newMesProductOffLine.setWorkCenterCode(oldMesWorkOrder.getWorkCenterCode());
         newMesProductOffLine.setWorkCellCode(oldMesWorkOrder.getWorkCellCode());
-        newMesProductOffLine.setReportType(MesExtEnumUtil.MES_ALL_REPORT_TYPE.REPORT.getValue());
+        newMesProductOffLine.setReportType(productionRecord.getReportType());
         if (Objects.equals(MesExtEnumUtil.ORDER_TYPE.BTO.getValue(), oldMesWorkOrder.getWorkOrderType())){
             newMesProductOffLine.setWorkCenterCode(mesProductVersion.getWorkCenterCode());
         }
@@ -1733,7 +1733,7 @@ public class MesWorkOrderService implements IMesWorkOrderService {
         newMesProductOffLine.setWorkOrderType(workOrder.getWorkOrderType());
         newMesProductOffLine.setWorkCenterCode(record.getWorkCenterCode());
         newMesProductOffLine.setWorkCellCode(record.getWorkCellCode());
-        newMesProductOffLine.setReportType(MesExtEnumUtil.MES_ALL_REPORT_TYPE.REPORT.getValue());
+        newMesProductOffLine.setReportType(record.getReportType());
         newMesProductOffLine.setOrganizeCode(model.getOrganizeCode());
         newMesProductOffLine.setDescription(record.getCompleteDateTime());
         ConvertBean.serviceModelInitialize(newMesProductOffLine, model.getUserName());