From 149f7609590690422a9d6dfe7ed1925e2c39c2f2 Mon Sep 17 00:00:00 2001
From: jun <junsheng.li@estsh.com>
Date: Mon, 3 Jun 2024 15:39:06 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E6=96=99=E4=BF=A1=E6=81=AF=E4=B8=BB?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mes/pcn/apiservice/serviceimpl/busi/MesNcProcessingService.java  | 2 +-
 .../i3plus/ext/mes/pcn/pojo/model/MesNcProcessingInputModel.java     | 3 ++-
 .../i3plus/ext/mes/pcn/pojo/model/MesPartInspectionInputModel.java   | 5 ++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesNcProcessingService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesNcProcessingService.java
index e4aa7a9..2039695 100644
--- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesNcProcessingService.java
+++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesNcProcessingService.java
@@ -320,7 +320,7 @@ public class MesNcProcessingService implements IMesNcProcessingService {
      * @param person
      * @param org
      */
-    private void saveDate(MesNcProcessingInputModel model, MesPart part, Integer type, MesDefectType person, String org) {
+    private void saveDate(MesNcProcessingInputModel model, MesPartSap part, Integer type, MesDefectType person, String org) {
 
 
         if (type == MesExtEnumUtil.NC_TYPE.NORMAL.getValue()) {
diff --git a/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/model/MesNcProcessingInputModel.java b/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/model/MesNcProcessingInputModel.java
index 7033e7a..86638d8 100644
--- a/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/model/MesNcProcessingInputModel.java
+++ b/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/model/MesNcProcessingInputModel.java
@@ -2,6 +2,7 @@ package cn.estsh.i3plus.ext.mes.pcn.pojo.model;
 
 import cn.estsh.i3plus.pojo.mes.bean.MesDefectType;
 import cn.estsh.i3plus.pojo.mes.bean.MesPart;
+import cn.estsh.i3plus.pojo.mes.bean.MesPartSap;
 import cn.estsh.i3plus.pojo.mes.bean.nc.MesPartInspection;
 import cn.estsh.i3plus.pojo.mes.bean.nc.MesPartInspectionDetail;
 import io.swagger.annotations.ApiParam;
@@ -29,7 +30,7 @@ public class MesNcProcessingInputModel {
     private MesDefectType person;
 
     @ApiParam("物料")
-    private MesPart part;
+    private MesPartSap part;
 
     @ApiParam("NC-零件检测详情")
     private List<MesPartInspectionDetail> partInspectionDetailList;
diff --git a/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/model/MesPartInspectionInputModel.java b/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/model/MesPartInspectionInputModel.java
index dce68d6..b846ec5 100644
--- a/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/model/MesPartInspectionInputModel.java
+++ b/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/model/MesPartInspectionInputModel.java
@@ -1,9 +1,8 @@
 package cn.estsh.i3plus.ext.mes.pcn.pojo.model;
 
-import cn.estsh.i3plus.pojo.mes.bean.MesPart;
+import cn.estsh.i3plus.pojo.mes.bean.MesPartSap;
 import cn.estsh.i3plus.pojo.mes.bean.nc.MesPartInspection;
 import cn.estsh.i3plus.pojo.mes.bean.nc.MesPartInspectionDetail;
-import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
@@ -21,7 +20,7 @@ public class MesPartInspectionInputModel {
 
 
     @ApiParam("物料")
-    private MesPart part;
+    private MesPartSap part;
 
     @ApiParam("产线代码")
     private String workCenterCode;