Merge remote-tracking branch 'origin/dev_temp_xw_20250610_46906' into mes-dev

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/MesReworkTaskServiceImpl.java

@@ -1100,10 +1100,10 @@ public class MesReworkTaskServiceImpl implements IMesReworkTaskService {
             if (!StringUtils.isEmpty(requestModel.getSn())) {
                 DdlPackBean partInspectionPackBean = DdlPackBean.getDdlPackBean(requestModel.getOrganizeCode());
                 DdlPreparedPack.getStringEqualPack(requestModel.getSn(), "sn", partInspectionPackBean);
-                DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"createDatetime"}, packBean);
-                MesPartInspection partInspection = mesPartInspectionRepository.getByProperty(packBean);
+                DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"createDatetime"}, partInspectionPackBean);
+                MesPartInspection partInspection = mesPartInspectionRepository.getByProperty(partInspectionPackBean);
                 if (partInspection == null) {
-                    throw new ImppBusiException(String.format("条码:%s,还未进行初判", requestModel.getSn()));
+                    throw new ImppBusiException(String.format("条码:%s,不存在或者还未进行初判", requestModel.getSn()));
                 }
                 if (Objects.equals(MesExtEnumUtil.PART_INSPECTION_NC_STATUS.CREATE.getValue(),partInspection.getNcStatus())) {
                     throw new ImppBusiException(String.format("条码:%s,还未进行NC处理", requestModel.getSn()));