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

Merge branch 'feature/DM/nflg-bom' of http://112.74.186.154:3000/nflj/nflg_project into feature/DM/nflg-bom

This commit is contained in:
jing's 2024-01-26 22:13:15 +08:00
parent 31227e8094 b1fd8eaca4
commit e0531ca0e9
5 changed files with 15 additions and 3 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/api/user/EbomApi.java
View File

@ -128,7 +128,7 @@ public class EbomApi extends BaseApi {
public ResultVO<Boolean> generateVirtualPackage(@RequestBody VirtualPackageParamDto paramDto) { public ResultVO<Boolean> generateVirtualPackage(@RequestBody VirtualPackageParamDto paramDto) {
VUtils.isTure(CollUtil.isEmpty(paramDto.getVirtualPackageValue())).throwMessage("请选择要生成的虚拟包"); VUtils.isTure(CollUtil.isEmpty(paramDto.getVirtualPackageValue())).throwMessage("请选择要生成的虚拟包");
//检查-是否已
bomNewEbomParentService.generateVirtualPackage(paramDto); bomNewEbomParentService.generateVirtualPackage(paramDto);
return ResultVO.success(true); return ResultVO.success(true);
} }

2
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/constant/PBomStatusEnum.java
View File

@ -7,7 +7,7 @@ import lombok.Getter;
@AllArgsConstructor @AllArgsConstructor
public enum PBomStatusEnum implements ValueEnum<Integer>{ public enum PBomStatusEnum implements ValueEnum<Integer>{
//1=待发布 2=待分配工厂 3=已分配工厂 4=已发布
WAIT_PUBLISH(1,"待发布"), WAIT_PUBLISH(1,"待发布"),
BORROWED_PARTS(2, "借用件"), BORROWED_PARTS(2, "借用件"),
PUBLISH(4,"已发布"), PUBLISH(4,"已发布"),

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

@ -752,6 +752,9 @@ public class BomNewPbomParentService extends ServiceImpl<BomNewPbomParentMapper,
BomNewPbomParentEntity rootParent = this.getById(bomRowId); BomNewPbomParentEntity rootParent = this.getById(bomRowId);
List<BomNewPbomParentVO> allChild = getAllBom(bomRowId, 0); List<BomNewPbomParentVO> allChild = getAllBom(bomRowId, 0);
//检查物料是否被冻结
materialMainService.checkMaterialFreeze(allChild);
// if (StrUtil.isBlank(rootParent.getOrderNo())) { // if (StrUtil.isBlank(rootParent.getOrderNo())) {
// String orderNo = crmService.getOrderNo(rootParent.getMaterialNo()); // String orderNo = crmService.getOrderNo(rootParent.getMaterialNo());
// rootParent.setOrderNo(orderNo); // rootParent.setOrderNo(orderNo);
@ -828,6 +831,10 @@ public class BomNewPbomParentService extends ServiceImpl<BomNewPbomParentMapper,
BomNewPbomParentEntity parent = this.getById(bomRowId); BomNewPbomParentEntity parent = this.getById(bomRowId);
try { try {
List<BomNewPbomParentVO> allBom = getAllBom(bomRowId, 0); List<BomNewPbomParentVO> allBom = getAllBom(bomRowId, 0);
//检查物料是否被冻结
materialMainService.checkMaterialFreeze(allBom);
List<Long> bomRowIds = allBom.stream().filter(u -> PBomStatusEnum.WAIT_PUBLISH.equalsValue(u.getStatus()) && u.getBomRowId() > 0).map(u -> u.getBomRowId()).collect(Collectors.toList()); List<Long> bomRowIds = allBom.stream().filter(u -> PBomStatusEnum.WAIT_PUBLISH.equalsValue(u.getStatus()) && u.getBomRowId() > 0).map(u -> u.getBomRowId()).collect(Collectors.toList());
Integer state = (parent.getMaterialNo().startsWith("31") && parent.getFacCode().equals(EBomConstant.MAIN_FACTORY_CODE_1010)) ? PBomStatusEnum.WAIT_FACTORY.getValue() : PBomStatusEnum.PUBLISH.getValue(); Integer state = (parent.getMaterialNo().startsWith("31") && parent.getFacCode().equals(EBomConstant.MAIN_FACTORY_CODE_1010)) ? PBomStatusEnum.WAIT_FACTORY.getValue() : PBomStatusEnum.PUBLISH.getValue();
bomRowIds.add(bomRowId); bomRowIds.add(bomRowId);

2
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPBom.java
View File

@ -11,6 +11,7 @@ import com.google.common.collect.Sets;
import com.nflg.product.base.core.conmon.util.SessionUtil; import com.nflg.product.base.core.conmon.util.SessionUtil;
import com.nflg.product.bomnew.constant.EBomExceptionStatusEnum; import com.nflg.product.bomnew.constant.EBomExceptionStatusEnum;
import com.nflg.product.bomnew.constant.EBomStatusEnum; import com.nflg.product.bomnew.constant.EBomStatusEnum;
import com.nflg.product.bomnew.constant.PBomStatusEnum;
import com.nflg.product.bomnew.constant.VirtualPackageTypeEnum; import com.nflg.product.bomnew.constant.VirtualPackageTypeEnum;
import com.nflg.product.bomnew.pojo.entity.*; import com.nflg.product.bomnew.pojo.entity.*;
import com.nflg.product.bomnew.pojo.vo.BomNewEbomParentVO; import com.nflg.product.bomnew.pojo.vo.BomNewEbomParentVO;
@ -162,6 +163,7 @@ public class EBomToPBom {
BomNewPbomParentEntity pBomParent = new BomNewPbomParentEntity(); BomNewPbomParentEntity pBomParent = new BomNewPbomParentEntity();
BeanUtil.copyProperties(parentVo, pBomParent); BeanUtil.copyProperties(parentVo, pBomParent);
pBomParent.setRowId(IdWorker.getId()); pBomParent.setRowId(IdWorker.getId());
pBomParent.setStatus(PBomStatusEnum.WAIT_PUBLISH.getValue());
pBomParent.setLastVersionIs(1); pBomParent.setLastVersionIs(1);
pBomParent.setFacCode(facCode); pBomParent.setFacCode(facCode);
pBomParent.setTechnologyUserCode(SessionUtil.getUserCode()); pBomParent.setTechnologyUserCode(SessionUtil.getUserCode());

5
nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewPbomParentMapper.xml
View File

@ -99,7 +99,10 @@
<!--获取已发布列表--> <!--获取已发布列表-->
<select id="releaseListByPage" resultType="com.nflg.product.bomnew.pojo.vo.BomNewPbomParentVO"> <select id="releaseListByPage" resultType="com.nflg.product.bomnew.pojo.vo.BomNewPbomParentVO">
select * , row_id as bomRowId select * , row_id as bomRowId
from t_bom_new_pbom_parent where root_is=1 and status &gt;= 4 from t_bom_new_pbom_parent where status &gt;= 4 and last_version_is=1
<if test=" (query.materialNo== null || query.materialNo=='' ) and (query.drawingNo== null || query.drawingNo=='')">
and root_is=1
</if>
<if test="query.startDate== null"> <if test="query.startDate== null">
and release_time > DATE_SUB(release_time, INTERVAL 4 DAY) and release_time > DATE_SUB(release_time, INTERVAL 4 DAY)
</if> </if>