From 92fa3eb9303bda4cb33365ac1edaf56dd314930e Mon Sep 17 00:00:00 2001
From: "xiangwei.zhang" <752558143@qq.com>
Date: Fri, 30 May 2025 11:37:53 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AC=AC=E4=BA=8C=E5=A4=A9=E6=8A=A5=E5=B7=A5?=
 =?UTF-8?q?=E5=8F=96=E9=94=99=E7=94=9F=E4=BA=A7=E7=89=88=E6=9C=AC=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pcn/apiservice/serviceimpl/busi/MesWorkOrderService.java  | 11 +++++------
 1 file changed, 5 insertions(+), 6 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 fe71435..f221fa8 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
@@ -1414,16 +1414,12 @@ public class MesWorkOrderService implements IMesWorkOrderService {
         return mesWorkOrder;
     }
 
+
     private MesProductVersion checkMesProductVersion(MesWorkOrder item) {
         DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
         DdlPreparedPack.getStringEqualPack(item.getPartNo(), "partNo", ddlPackBean);
-        DdlPreparedPack.getStringEqualPack(item.getErpWorkCenter(), "workCenterCode", ddlPackBean);
         List<MesProductVersion> mesProductVersions = mesProductVersionRDao.findByHqlWhere(ddlPackBean);
-        if (CollectionUtils.isEmpty(mesProductVersions)) {
-            ddlPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
-            DdlPreparedPack.getStringEqualPack(item.getPartNo(), "partNo", ddlPackBean);
-            mesProductVersions = mesProductVersionRDao.findByHqlWhere(ddlPackBean);
-        }
+
         if (CollectionUtils.isEmpty(mesProductVersions)) {
             LOGGER.info("物料{}产线{}生产版本{}信息不存在",  item.getPartNo(), item.getWorkCenterCode(), item.getProductVersion() );
             MesPcnException.throwMesBusiException("物料【%s】产线【%s】生产版本【%s】信息不存在", item.getPartNo(), item.getWorkCenterCode(), item.getProductVersion());
@@ -1433,6 +1429,9 @@ public class MesWorkOrderService implements IMesWorkOrderService {
         if (!CollectionUtils.isEmpty(mesProductOneVersions)) {
             mesProductVersion = mesProductOneVersions.get(0);
         } else {
+            if (mesProductOneVersions.size() > 1) {
+                MesPcnException.throwMesBusiException("物料【%s】生产版本【%s】对应多条非0001版本的信息", item.getPartNo(), item.getProductVersion());
+            }
             mesProductVersion = mesProductVersions.get(0);
         }
         return mesProductVersion;