报工问题修改

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

@@ -528,9 +528,9 @@ public class MesWorkOrderService implements IMesWorkOrderService {
         }
         MesWorkOrder oldMesWorkOrder = getBestWorkOrder(productionRecord, oldMesWorkOrderList, mesWorkCenter);
         if (oldMesWorkOrder == null) {
-            LOGGER.error(String.format("未找到匹配的加工单"));
+            LOGGER.error(String.format("未找到匹配的加工单, 条码=%s",productionRecord.getCustSn()));
-
+            return;
-            throw new ImppBusiException(String.format("未找到匹配的加工单"));
+            //throw new ImppBusiException(String.format("未找到匹配的加工单"));
         }
         //获取生产版本
         ddlPackBean = DdlPackBean.getDdlPackBean(organizeCode);
@@ -777,7 +777,7 @@ public class MesWorkOrderService implements IMesWorkOrderService {
             DdlPreparedPack.getNotInPack(centerList, "workCenterCode", ddlPackBean);
         }
         DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.ASC.getValue()}, new String[]{"modifyDatetime"}, ddlPackBean);
-        List<MesProductionRecord> mesProductionRecordList = productionRecordRao.findByHqlTopWhere(ddlPackBean, 100);
+        List<MesProductionRecord> mesProductionRecordList = productionRecordRao.findByHqlTopWhere(ddlPackBean, 1000);
         List<MesProductionRecord> recordList = new ArrayList<>();
         // 根据零件号分组
         if(!CollectionUtils.isEmpty(mesProductionRecordList)) {