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; + } + +}