判断可疑

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

@@ -133,6 +133,9 @@ public class MesReworkTaskServiceImpl implements IMesReworkTaskService {
     @Autowired
     private MesQmsScrapRepository mesQmsScrapRepository;
 
+    @Autowired
+    private MesProductVersionRepository productVersionRepository;
+
     @Override
     public ListPager<MesReworkTask> queryReworkTask(MesReworkTask mesReworkTask, Pager pager) {
         String organizeCode = !StringUtils.isEmpty(mesReworkTask.getOrganizeCode())?mesReworkTask.getOrganizeCode():AuthUtil.getOrganizeCode();
@@ -282,6 +285,23 @@ public class MesReworkTaskServiceImpl implements IMesReworkTaskService {
         if (MesExtEnumUtil.PART_INSPECTION_SOURCE_TYPE.LOT.getValue() == mesReworkTask.getType()) {
             mesReworkTask.setReworkedQty(requestModel.getReworkedQty());
             mesReworkTask.setScrapQty(requestModel.getScrapQty());
+            // 如果是批次还需要移库
+            DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
+            DdlPreparedPack.getStringEqualPack(requestModel.getPartNo(), "partNo", ddlPackBean);
+
+            MesProductVersion version = productVersionRepository.getByProperty(ddlPackBean);
+            String  target = mesConfigService.getCfgValue(requestModel.getOrganizeCode(), "LGORT");
+            if (version != null) {
+                target = version.getReceiveInventoryPoint();
+            }
+            String workCenterCode = "";
+            // 获取替换条码信息列表
+
+            if (mesPartInspection != null) {
+                workCenterCode = mesPartInspection.getWorkCenterCode();
+            }
+            doCreateReworkMove(requestModel,getDestLocateNo(requestModel.getOrganizeCode(), mesPartInspection.getId()),target,workCenterCode,mesReworkTask.getPartNo(), mesPartInspection.getId());
+
         } else {
             //拆解
             if(!CollectionUtils.isEmpty(requestModel.getAssemblyModelList())){
@@ -782,6 +802,14 @@ public class MesReworkTaskServiceImpl implements IMesReworkTaskService {
                 userName, organizeCode, 1).getResultList().get(0).toString();
     }
 
+    private String getDestLocateNo(String organizeCode, Long partInspectionId) {
+        DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode);
+        DdlPreparedPack.getNumEqualPack(partInspectionId, "partInspectionId", packBean);
+        DdlPreparedPack.getOrderBy(null, null, packBean);
+        MesMove mesMove = moveRepository.getByProperty(packBean);
+        return Objects.isNull(mesMove) ? null : mesMove.getUmlgo();
+    }
+
     private String getDestLocateNo(String organizeCode, String productSn) {
         DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode);
         DdlPreparedPack.getStringEqualPack(productSn, "productSn", packBean);
@@ -789,8 +817,6 @@ public class MesReworkTaskServiceImpl implements IMesReworkTaskService {
         MesMove mesMove = moveRepository.getByProperty(packBean);
         return Objects.isNull(mesMove) ? null : mesMove.getUmlgo();
     }
-
-
     private MesPartInspection getMesPartInspection(MesReworkTask mesReworkTask) {
         DdlPackBean packBean = DdlPackBean.getDdlPackBean(mesReworkTask.getOrganizeCode());
         DdlPreparedPack.getStringEqualPack(mesReworkTask.getSn(), "sn", packBean);
@@ -916,4 +942,25 @@ public class MesReworkTaskServiceImpl implements IMesReworkTaskService {
         ConvertBean.serviceModelInitialize(move, requestModel.getUserName());
         moveRepository.insert(move);
     }
+
+
+    private void doCreateReworkMove(MesReworkTaskRequestModel requestModel,String srcLocate, String destLocate,String workCenterCode,String partNo,Long partInspectionId) {
+        MesPartSap mesPartSap = mesPartService.getMesPartSapByPartNo(partNo, requestModel.getOrganizeCode());
+        MesMove move = new MesMove();
+        move.setMatnr(mesPartSap.getPartNo());
+        move.setOrganizeCode(requestModel.getOrganizeCode());
+        move.setFactoryCode(requestModel.getOrganizeCode());
+        move.setLgort(srcLocate);
+        move.setUmlgo(destLocate);
+        move.setPartInspectionId(partInspectionId);
+        move.setMenge(1d);
+        move.setMeins(mesPartSap.getUnit());
+        move.setPostDate(TimeTool.getToday());
+        move.setPostTime(TimeTool.getTimeShortWithColon());
+        move.setMoveType(MesExtEnumUtil.MOVE_TYPE.RETURN_MOVE.getValue());
+        move.setProductSn(requestModel.getSn());
+        move.setWorkCenter(workCenterCode);
+        ConvertBean.serviceModelInitialize(move, requestModel.getUserName());
+        moveRepository.insert(move);
+    }
 }

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

@@ -224,11 +224,20 @@ public class MesInputDefectRecordService implements IMesInputDefectRecordService
             //返工单返修完成，需可疑品移正常库
 
             if (model.isTransferFlg() && model.getSourceType() == MesExtEnumUtil.PART_INSPECTION_SOURCE_TYPE.SINGLE.getValue()) {
-                //移库
+                //电子化检验
-                if (model.getOptType() != 2) {
+                String  target = configService.getCfgValue(org, "LGORT");
-                    MesMove move = createMove(model, getDestLocateNo(model, org), configService.getCfgValue(org, "LGORT"), org, null == produceSn ? model.getWorkCenterCode() : produceSn.getWorkCenterCode());
+
-                    moveRepository.save(move);
+                DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
+                DdlPreparedPack.getStringEqualPack(model.getPartNo(), "partNo", ddlPackBean);
+
+                MesProductVersion version = productVersionRepository.getByProperty(ddlPackBean);
+                if (version != null) {
+                    target = version.getReceiveInventoryPoint();
                 }
+
+                MesMove move = createMove(model, getDestLocateNo(model, org), target, org, null == produceSn ? model.getWorkCenterCode() : produceSn.getWorkCenterCode());
+                moveRepository.save(move);
+
             }
 
             //判断首次合格还是 多次检验最终为合格品
@@ -365,7 +374,8 @@ public class MesInputDefectRecordService implements IMesInputDefectRecordService
                     ConvertBean.serviceModelInitialize(produceSn, AuthUtil.getSessionUser().getUserName());
                     produceSnExtService.update(produceSn);
                     //查询条码所在库位
-                    srcLocateNo = getDestLocateNo(model, org);
+                    // 20241010不找当前所在库位，先找生产版本库位，再找2000
+                   // srcLocateNo = getDestLocateNo(model, org);
                 }
                 if (Objects.isNull(srcLocateNo)) {
                     srcLocateNo = configService.getCfgValue(org, "LGORT");

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

@@ -376,7 +376,7 @@ public class MesNcProcessingService implements IMesNcProcessingService {
 
             MesProductVersion version = productVersionRepository.getByProperty(ddlPackBean);
             if (version != null) {
-                target = version.getShipInventoryPoint();
+                target = version.getReceiveInventoryPoint();
             }
 
             //移库 转正常、放行：8000移至2000
@@ -517,8 +517,17 @@ public class MesNcProcessingService implements IMesNcProcessingService {
             }
             partInspectionRepository.save(model.getPartInspection());
 
+            String target = configService.getCfgValue(org, "LGORT");
+            DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
+            DdlPreparedPack.getStringEqualPack(model.getPart().getPartNo(), "partNo", ddlPackBean);
+
+            MesProductVersion version = productVersionRepository.getByProperty(ddlPackBean);
+            if (version != null) {
+                target = version.getReceiveInventoryPoint();
+            }
+
             //移库 转正常、放行：8000移至2000
-            MesMove move = createMove(model, sourceValue, configService.getCfgValue(org, "LGORT"), org, null == sn ? workCenterCode : sn.getWorkCenterCode(), MesExtEnumUtil.MOVE_TYPE.NORMAL_MOVE);
+            MesMove move = createMove(model, sourceValue, target, org, null == sn ? workCenterCode : sn.getWorkCenterCode(), MesExtEnumUtil.MOVE_TYPE.NORMAL_MOVE);
             ConvertBean.serviceModelInitialize(move,model.getUserName());
             moveRepository.save(move);