From dea86d3e387e65f1d0266909082fc1657cf577e2 Mon Sep 17 00:00:00 2001
From: "xiangwei.zhang" <752558143@qq.com>
Date: Fri, 18 Apr 2025 19:22:32 +0800
Subject: [PATCH] =?UTF-8?q?46348=20PCN=EF=BC=9A=E6=8E=92=E5=BA=8F=E6=B1=87?=
 =?UTF-8?q?=E6=8A=A5=E7=9A=84=E6=B1=87=E6=8A=A5=E7=B1=BB=E5=9E=8B=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF=EF=BC=8C=E6=98=BE=E7=A4=BA=E2=80=9C=E6=8A=A5=E5=B7=A5?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mes/pcn/apiservice/serviceimpl/busi/MesWorkOrderService.java  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesWorkOrderService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesWorkOrderService.java
index e02babc..0f1c1f0 100644
--- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesWorkOrderService.java
+++ b/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(mesWorkOrderDb.getReportType());
+                newMesProductOffLine.setReportType(MesExtEnumUtil.MES_ALL_REPORT_TYPE.REPORT.getValue());
                 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(oldMesWorkOrder.getReportType());
+        newMesProductOffLine.setReportType(MesExtEnumUtil.MES_ALL_REPORT_TYPE.REPORT.getValue());
         if (Objects.equals(MesExtEnumUtil.ORDER_TYPE.BTO.getValue(), oldMesWorkOrder.getWorkOrderType())){
             newMesProductOffLine.setWorkCenterCode(mesProductVersion.getWorkCenterCode());
         }
@@ -1446,7 +1446,7 @@ public class MesWorkOrderService implements IMesWorkOrderService {
         newMesProductOffLine.setWorkOrderType(mesWorkOrder.getWorkOrderType());
         newMesProductOffLine.setWorkCenterCode(mesProductVersion.getWorkCenterCode());
         newMesProductOffLine.setWorkCellCode(mesWorkOrder.getWorkCellCode());
-        newMesProductOffLine.setReportType(mesWorkOrder.getReportType());
+        newMesProductOffLine.setReportType(MesExtEnumUtil.MES_ALL_REPORT_TYPE.REPORT.getValue());
         newMesProductOffLine.setSapWorkCenter(mesProductVersion.getWorkCenterCode());
         newMesProductOffLine.setOrganizeCode(mesWorkOrder.getOrganizeCode());
         newMesProductOffLine.setDescription(nowTime);
@@ -1733,7 +1733,7 @@ public class MesWorkOrderService implements IMesWorkOrderService {
         newMesProductOffLine.setWorkOrderType(workOrder.getWorkOrderType());
         newMesProductOffLine.setWorkCenterCode(record.getWorkCenterCode());
         newMesProductOffLine.setWorkCellCode(record.getWorkCellCode());
-        newMesProductOffLine.setReportType(record.getReportType());
+        newMesProductOffLine.setReportType(MesExtEnumUtil.MES_ALL_REPORT_TYPE.REPORT.getValue());
         newMesProductOffLine.setOrganizeCode(model.getOrganizeCode());
         newMesProductOffLine.setDescription(record.getCompleteDateTime());
         ConvertBean.serviceModelInitialize(newMesProductOffLine, model.getUserName());