报工问题修改

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

@@ -558,11 +558,17 @@ public class MesWorkOrderService implements IMesWorkOrderService {
             throw new ImppBusiException(String.format("物料【%s】生产版本信息不存在", productionRecord.getPartNo()));
         }
 
-        //物料+生产版本获取bom信息
+        //查询物料信息
-        ddlPackBean = DdlPackBean.getDdlPackBean(organizeCode);
+        DdlPackBean ddlPackBeanPart = DdlPackBean.getDdlPackBean(organizeCode);
-        DdlPreparedPack.getStringEqualPack(productionRecord.getPartNo(), "partNo", ddlPackBean);
+        DdlPreparedPack.getStringEqualPack(productionRecord.getPartNo(), "partNo", ddlPackBeanPart);
-        DdlPreparedPack.getStringEqualPack(mesProductVersion.getAlternativePartList(), "bomVersion", ddlPackBean);
+        MesPart mesPart = mesPartRDao.getByProperty(ddlPackBeanPart);
-        List<MesBom> mesBoms = mesBomRDao.findByHqlWhere(ddlPackBean);
+        if (null == mesPart) {
+            MesPcnException.throwMesBusiException("物料【%s】信息不存在", productionRecord.getPartNo());
+        }
+
+        List<MesBom> mesBoms = findBomList(organizeCode, mesPart, mesProductVersion.getAlternativePartList());
+
+
         if (CollectionUtils.isEmpty(mesBoms)) {
             LOGGER.error(String.format("物料【%s】生产版本【%s】对应bom信息不存在",
                     productionRecord.getPartNo(), mesProductVersion.getProductVersion()));
@@ -823,7 +829,7 @@ public class MesWorkOrderService implements IMesWorkOrderService {
             List<String> centerList = Arrays.asList(workCenterCodes.split(","));
             DdlPreparedPack.getNotInPack(centerList, "workCenterCode", ddlPackBean);
         }
-        /*String workCenterCodes ="B19CK01A";
+        /*String workCenterCodes ="K03CK01A";
         if (!StringUtils.isEmpty(workCenterCodes)) {
             List<String> centerList = Arrays.asList(workCenterCodes.split(","));
             DdlPreparedPack.getInPack(centerList, "workCenterCode", ddlPackBean);