第二天报工取错生产版本问题修复

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;