45119 PCN-芜湖客退电子化检验返工初检问题

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

@@ -264,6 +264,28 @@ public class MesInputDefectRecordService implements IMesInputDefectRecordService
                 partInspection = partInspectionRepository.save(partInspection);
 
                 if (model.getSourceType() == MesExtEnumUtil.PART_INSPECTION_SOURCE_TYPE.SINGLE.getValue()) {
+                    //已创建返修单
+                    DdlPackBean reworkPackBean = DdlPackBean.getDdlPackBean(org);
+                    DdlPreparedPack.getStringEqualPack(model.getSn(), "sn", reworkPackBean);
+                    DdlPreparedPack.getNumEqualPack(MesExtEnumUtil.REWORK_TASK_STATUS.FINISH.getValue(), "status", reworkPackBean);
+
+                    DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"createDatetime"}, reworkPackBean);
+                    int count = reworkTaskRepository.findByHqlWhereCount(reworkPackBean);
+                    if (count > 0) {
+                        // 如果是批次还需要移库
+                        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(!model.isTransferFlg() && !Objects.equals(srcNo, destLocateNo)) {
+                            throw new ImppBusiException(String.format("【%s】该条码需要完成质检,再重新录入电子化检验", model.getSn()));
+                        }
+                    }
+
                     checkProduceSn(produceSn, model.getSn());
                     produceSn.setQcStatus(MesExtEnumUtil.PRODUCE_QC_STATUS.QUALIFIED.getValue());
                     ConvertBean.serviceModelInitialize(produceSn, AuthUtil.getSessionUser().getUserName());