From 5f9fdf4cff803f8f5af8250398f8b5e72ac61f80 Mon Sep 17 00:00:00 2001 From: 10001392 <1055202292@qq.com> Date: Mon, 9 Dec 2024 10:52:32 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=B7=A5=E8=89=BA=E8=B7=AF=E7=BA=BF?= =?UTF-8?q?=E3=80=91=E8=8E=B7=E5=8F=96PBOM=E5=88=97=E8=A1=A8=EF=BC=8CSAP?= =?UTF-8?q?=E6=8E=92=E5=BA=8F=E5=AD=97=E7=AC=A6=E4=B8=B2=E5=92=8C=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E7=B1=BB=E5=88=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../technology/pojo/vo/BomNewPBomVO.java | 9 ++ .../service/ProcessRouteTaskService.java | 5 +- .../nflg/product/technology/util/BomUtil.java | 85 +++++++++++++++++++ 3 files changed, 98 insertions(+), 1 deletion(-) create mode 100644 nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/util/BomUtil.java diff --git a/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/pojo/vo/BomNewPBomVO.java b/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/pojo/vo/BomNewPBomVO.java index 793a59f2..dea5950a 100644 --- a/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/pojo/vo/BomNewPBomVO.java +++ b/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/pojo/vo/BomNewPBomVO.java @@ -113,4 +113,13 @@ public class BomNewPBomVO extends BaseMaterialVO { private String parentMaterialDesc; + @ApiModelProperty(value = "SAP排序字符串") + private String sapOrderNum = "0040"; + + /** + * 是否有BOM: 0-否 1-是 + */ + @ApiModelProperty(value = "是否有BOM: 0-否 1-是") + private Integer bomExist = 0; + } diff --git a/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/service/ProcessRouteTaskService.java b/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/service/ProcessRouteTaskService.java index 42ee924b..13216319 100644 --- a/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/service/ProcessRouteTaskService.java +++ b/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/service/ProcessRouteTaskService.java @@ -22,6 +22,7 @@ import com.nflg.product.technology.mapper.master.ProcessRouteTaskProcessesMapper import com.nflg.product.technology.pojo.entity.*; import com.nflg.product.technology.pojo.query.ProcessRouteTaskQuery; import com.nflg.product.technology.pojo.vo.*; +import com.nflg.product.technology.util.BomUtil; import nflg.product.common.constant.STATE; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.stereotype.Service; @@ -305,7 +306,7 @@ public class ProcessRouteTaskService extends ServiceImpl bomList = bomDetailAndParent(rootParent); - materialMainService.intiMaterialInfo(bomList, ""); + materialMainService.intiMaterialInfo(bomList, "projectType"); List convertBomList = Convert.convert(new TypeReference>() { }, bomList); @@ -323,6 +324,8 @@ public class ProcessRouteTaskService extends ServiceImpl 6) { + categoryCode = categoryCode.substring(0, 6); + } + if (StrUtil.equals(categoryCode, "100101")) { + orderNum = "0010"; + } + if (StrUtil.equals(categoryCode, "102101")) { + orderNum = "0020"; + } + if (StrUtil.isNotBlank(categoryCode)) { + if (Integer.parseInt(categoryCode) >= 100102 && Integer.parseInt(categoryCode) <= 100104) { + orderNum = "0020"; + } + } + if (StrUtil.equals(categoryCode, "100301") && StrUtil.equals(factoryCode, "1010")) { + orderNum = "0050"; + } + if (bomExist == 1) { + orderNum = "0040"; + } + } + return orderNum; + } + +}