From 534aab846886a2a4286b85e238ac43d3808b84d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Fri, 15 Mar 2024 09:55:12 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/domain/OriginalBom/OriginalBomDetailTask.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/OriginalBomDetailTask.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/OriginalBomDetailTask.java index 2ed33bf4..9e28a1b8 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/OriginalBomDetailTask.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/OriginalBomDetailTask.java @@ -3,8 +3,6 @@ package com.nflg.product.bomnew.service.domain.OriginalBom; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.extra.spring.SpringUtil; -import com.google.common.collect.ImmutableList; -import com.nflg.product.base.core.conmon.util.SessionUtil; import com.nflg.product.bomnew.constant.OriginalStatusEnum; import com.nflg.product.bomnew.pojo.entity.BomNewOriginalParentEntity; import com.nflg.product.bomnew.pojo.vo.BomOriginalListVO; @@ -63,10 +61,10 @@ public class OriginalBomDetailTask extends RecursiveTask detailVO.setBomRowId(bomNewOriginalParentEntity.getRowId()); detailVO.setBatchNo(bomNewOriginalParentEntity.getBatchNo()); if(OriginalStatusEnum.OVER_CONVERT.equalsValue(bomNewOriginalParentEntity.getStatus())){ + //已转换的为借用件 detailVO.setStatus(OriginalStatusEnum.BORROWED_PARTS.getValue()); - } - //非本人则为借用件 - if (!bomNewOriginalParentEntity.getCreatedBy().equals(detailVO.getCreatedBy()) && OriginalStatusEnum.UN_CONVERT.equalsValue(bomNewOriginalParentEntity.getStatus())) { + }else if (!bomNewOriginalParentEntity.getCreatedBy().equals(detailVO.getCreatedBy()) && OriginalStatusEnum.UN_CONVERT.equalsValue(bomNewOriginalParentEntity.getStatus())) { + //非本人创建且未转换的为引用件 detailVO.setStatus(OriginalStatusEnum.REFERENCE.getValue()); }