44744 修复同一条码完成返工后完成质检成功，后续无法再次操作电子化检验问题

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

@@ -427,7 +427,18 @@ public class MesInputDefectRecordService implements IMesInputDefectRecordService
                     DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"createDatetime"}, reworkPackBean);
                     int count = reworkTaskRepository.findByHqlWhereCount(reworkPackBean);
                     if (count > 0) {
-                        throw new ImppBusiException(String.format("【%s】该条码需要完成质检,再重新录入电子化检验", model.getSn()));
+                        // 如果是批次还需要移库
+                        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(org);
+                        DdlPreparedPack.getStringEqualPack(model.getPartNo(), "partNo", ddlPackBean);
+                        MesProductVersion version = productVersionRepository.getByProperty(ddlPackBean);
+                        String srcNo = configService.getCfgValue(org, "LGORT");
+                        if (version != null) {
+                            srcNo = version.getReceiveInventoryPoint();
+                        }
+                        String destLocateNo = getDestLocateNo(model, org);
+                        if(!Objects.equals(srcNo, destLocateNo)) {
+                            throw new ImppBusiException(String.format("【%s】该条码需要完成质检,再重新录入电子化检验", model.getSn()));
+                        }
                     }
 
                     checkProduceSn(produceSn, model.getSn());
@@ -542,7 +553,18 @@ public class MesInputDefectRecordService implements IMesInputDefectRecordService
                     DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"createDatetime"}, reworkPackBean);
                     int count = reworkTaskRepository.findByHqlWhereCount(reworkPackBean);
                     if (count > 0) {
-                        throw new ImppBusiException(String.format("【%s】该条码需要完成质检,再重新录入电子化检验", model.getSn()));
+                        // 如果是批次还需要移库
+                        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(org);
+                        DdlPreparedPack.getStringEqualPack(model.getPartNo(), "partNo", ddlPackBean);
+                        MesProductVersion version = productVersionRepository.getByProperty(ddlPackBean);
+                        String srcNo = configService.getCfgValue(org, "LGORT");
+                        if (version != null) {
+                            srcNo = version.getReceiveInventoryPoint();
+                        }
+                        String destLocateNo = getDestLocateNo(model, org);
+                        if(!Objects.equals(srcNo, destLocateNo)) {
+                            throw new ImppBusiException(String.format("【%s】该条码需要完成质检,再重新录入电子化检验", model.getSn()));
+                        }
                     }
 
                     checkProduceSn(produceSn, model.getSn());