Merge branch 'refs/heads/feature/DM/nflg-bom-dq' into feature/DM/nflg-bom

This commit is contained in:
曹鹏飞 2024-05-09 09:35:18 +08:00
commit 74f01453e4
1 changed files with 5 additions and 2 deletions

View File

@ -6,7 +6,10 @@ import cn.hutool.core.util.StrUtil;
import cn.hutool.extra.spring.SpringUtil; import cn.hutool.extra.spring.SpringUtil;
import com.baomidou.mybatisplus.core.toolkit.IdWorker; import com.baomidou.mybatisplus.core.toolkit.IdWorker;
import com.nflg.product.base.core.conmon.util.SessionUtil; import com.nflg.product.base.core.conmon.util.SessionUtil;
import com.nflg.product.bomnew.constant.*; import com.nflg.product.bomnew.constant.EBomSourceEnum;
import com.nflg.product.bomnew.constant.EBomStatusEnum;
import com.nflg.product.bomnew.constant.ProjectTypeInputTypeEnum;
import com.nflg.product.bomnew.constant.VirtualPackageTypeEnum;
import com.nflg.product.bomnew.pojo.dto.AddVirtrualMaterialDTO; import com.nflg.product.bomnew.pojo.dto.AddVirtrualMaterialDTO;
import com.nflg.product.bomnew.pojo.entity.BomNewEbomChildEntity; import com.nflg.product.bomnew.pojo.entity.BomNewEbomChildEntity;
import com.nflg.product.bomnew.pojo.entity.BomNewEbomParentEntity; import com.nflg.product.bomnew.pojo.entity.BomNewEbomParentEntity;
@ -218,7 +221,7 @@ public abstract class VirtualPackageBase {
childEntity.setIdentityNo(parent.getRowId().toString()); childEntity.setIdentityNo(parent.getRowId().toString());
childEntity.setOrderNumber(orderNo); childEntity.setOrderNumber(orderNo);
childEntity.setNum(new BigDecimal(1)); childEntity.setNum(new BigDecimal(1));
childEntity.setEditStatus(EbomEditStatusEnum.HANDLER_CREATED.getValue()); childEntity.setEditStatus(parent.getEditStatus());
childEntity.setSource(EBomSourceEnum.FROM_MDM.getValue()); childEntity.setSource(EBomSourceEnum.FROM_MDM.getValue());
childEntity.setVirtualPartType(virtualPackageTypeEnum.getValue()); childEntity.setVirtualPartType(virtualPackageTypeEnum.getValue());
childEntity.setProjectType("L"); childEntity.setProjectType("L");