rakor
/
nflg_project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ebom 工作表

This commit is contained in:
luoliming 2024-01-14 16:54:54 +08:00
parent 3a5c231d40
commit b197d757c4
4 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BomNewEbomParentVO.java
View File

@ -146,7 +146,7 @@ public class BomNewEbomParentVO extends BaseMaterialVO implements Serializable {
/** /**
* 1=待复核、2=已复核、3=已退回、4=定版（已发布PBOM） * 1=待复核、2=已复核、3=已退回、4=定版（已发布PBOM）
*/ */
@ApiModelProperty(value = "1=待复核、2=已复核、3=已退回、4=定版（已发布PBOM）") @ApiModelProperty(value = "1=待复核、2=已复核、3=已退回、4=定版（已发布PBOM）99=借用件 100=引用件")
private Integer status; private Integer status;
/** /**

8
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java
View File

@ -302,8 +302,12 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
child.setVirtualPackageIs(parentEntity.getVirtualPackageIs()); child.setVirtualPackageIs(parentEntity.getVirtualPackageIs());
if (parentEntity.getStatus().equals(EBomStatusEnum.PUBLISHED.getValue())) { if (parentEntity.getStatus().equals(EBomStatusEnum.PUBLISHED.getValue()) && EBomStatusEnum.PUBLISHED.getValue()>parentEntity.getStatus()) {
child.setStatus(OriginalStatusEnum.BORROWED_PARTS.getValue()); child.setStatus(EBomStatusEnum.BORROWED_PARTS.getValue());
}
//非本人则为借用件
if (!parentEntity.getCreatedBy().equals(child.getCreatedBy()) && EBomStatusEnum.PUBLISHED.getValue()>parentEntity.getStatus()) {
child.setStatus(EBomStatusEnum.REFERENCE.getValue());
} }
} else { //无BOM-版本时 确定版本号 } else { //无BOM-版本时 确定版本号

11
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java
View File

@ -5,6 +5,7 @@ import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.convert.Convert; import cn.hutool.core.convert.Convert;
import cn.hutool.core.lang.TypeReference; import cn.hutool.core.lang.TypeReference;
import cn.hutool.core.util.NumberUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
@ -522,7 +523,7 @@ public class BomNewPbomParentService extends ServiceImpl<BomNewPbomParentMapper,
VUtils.isTure(StrUtil.isBlank(params.getRuleGroupCode())).throwMessage("规则编码不能为空"); VUtils.isTure(StrUtil.isBlank(params.getRuleGroupCode())).throwMessage("规则编码不能为空");
List<BomNewPbomParentVO> childrenVO = getAllBom(params.getBomRowId(), 0); List<BomNewPbomParentVO> childrenVO = getAllBom(params.getBomRowId(), 1);
materialMainService.intiMaterialInfo(childrenVO, EBomConstant.EBOM_IGNORED_FIELDS_INIT_MATERIAL_DEFAULT); materialMainService.intiMaterialInfo(childrenVO, EBomConstant.EBOM_IGNORED_FIELDS_INIT_MATERIAL_DEFAULT);
List<BomFactorySplitRuleEntity> relList = bomFactorySplitRuleService.lambdaQuery().eq(BomFactorySplitRuleEntity::getRuleGroupCode, params.getRuleGroupCode()).list(); List<BomFactorySplitRuleEntity> relList = bomFactorySplitRuleService.lambdaQuery().eq(BomFactorySplitRuleEntity::getRuleGroupCode, params.getRuleGroupCode()).list();
StringBuilder relPattern = new StringBuilder(); StringBuilder relPattern = new StringBuilder();
@ -576,6 +577,14 @@ public class BomNewPbomParentService extends ServiceImpl<BomNewPbomParentMapper,
return true; return true;
} }
//处理Q下子级分工厂
// private void intiQFac(BomNewPbomParentVO parentVO, List<BomNewPbomParentVO> child){
//
// String zero ="1"+ StrUtil.padAfter("0", parentVO.getLevelNum().toString().split(".")[1].length(), "0");
//
// int i = parentVO.getlev() + (1 / NumberUtil.parseInt(zero));
// child.stream().filter(u->u.getLevelNum()>parentVO.getLevelNum() && )
// }
public void reConvertToMBom(Long bomRowId, List<Long> backRowId) { public void reConvertToMBom(Long bomRowId, List<Long> backRowId) {

4
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/MaterialService.java
View File

@ -311,7 +311,7 @@ public class MaterialService {
material.put("MREMA", u.getMaterialDesc()); material.put("MREMA", u.getMaterialDesc());
material.put("MMANU", u.getMaterialBrand()); material.put("MMANU", u.getMaterialBrand());
material.put("ATTYP", relCategoryCode); material.put("ATTYP", relCategoryCode);
material.put("ERNAM", "qhr11072925"); material.put("ERNAM", SessionUtil.getUserCode());
material.put("MEINS", u.getMaterialUnit()); material.put("MEINS", u.getMaterialUnit());
material.put("DUPLICATEITEMS", u.getReuseOfOnceState().equals(1) ? "2" : "1");// 是否一次性使用物料 0:否1：是 material.put("DUPLICATEITEMS", u.getReuseOfOnceState().equals(1) ? "2" : "1");// 是否一次性使用物料 0:否1：是
material.put("categoryTreeName", u.getCategoryNameTree()); material.put("categoryTreeName", u.getCategoryNameTree());
@ -349,7 +349,7 @@ public class MaterialService {
public Map<String, Object> getHttpMap() { public Map<String, Object> getHttpMap() {
Map<String, Object> result = new LinkedHashMap<>(); Map<String, Object> result = new LinkedHashMap<>();
result.put("userid", "qhr11072925"); result.put("userid", SessionUtil.getUserCode());
result.put("summary", NacosConfig.getNacosConfig().getSummary()); result.put("summary", NacosConfig.getNacosConfig().getSummary());
return result; return result;
} }