|
|
|
|
@ -533,7 +533,7 @@ public class YieldOrderServiceImpl extends BaseServiceImpl<YieldOrderMapper, Yie |
|
|
|
|
if(CollectionUtils.isNotEmpty(subPartList)){ |
|
|
|
|
for(DsPartEntity subPart : subPartList){ |
|
|
|
|
if(DsPartConstant.SIN_TER_TYPE_SMM == subPart.getSinTerType() && subPart.getQuota() != 0){ |
|
|
|
|
MoldDemand moldDemand = moldDemandMapper.selectOne(Wrappers.<MoldDemand>lambdaQuery().eq(MoldDemand::getPartCode,subPart.getPartCode()).eq(MoldDemand::getMafStatus,MoldDemandEnum.MAF_STATUS_CREATE.getCode())); |
|
|
|
|
MoldDemand moldDemand = moldDemandMapper.selectOne(Wrappers.<MoldDemand>lambdaQuery().eq(MoldDemand::getToolCode,subPart.getPartCode()).eq(MoldDemand::getMafStatus,MoldDemandEnum.MAF_STATUS_CREATE.getCode())); |
|
|
|
|
if(moldDemand == null){ |
|
|
|
|
moldDemand = new MoldDemand(); |
|
|
|
|
moldDemand.setMoCode(null); |
|
|
|
|
@ -567,7 +567,7 @@ public class YieldOrderServiceImpl extends BaseServiceImpl<YieldOrderMapper, Yie |
|
|
|
|
List<DsProcessMoldToolEntity> processMoldToolList = dsPartService.getClassCakeWork(yieldOrder.getPartCode(),yieldOrder.getRoamNo(),yieldOrder.getPartVersion()); |
|
|
|
|
if(CollectionUtils.isNotEmpty(processMoldToolList)){ |
|
|
|
|
for (DsProcessMoldToolEntity dsProcessMoldToolEntity : processMoldToolList) { |
|
|
|
|
MoldDemand moldDemand = moldDemandMapper.selectOne(Wrappers.<MoldDemand>lambdaQuery().eq(MoldDemand::getPartCode,dsProcessMoldToolEntity.getMoldCode()).eq(MoldDemand::getMafStatus,MoldDemandEnum.MAF_STATUS_CREATE.getCode())); |
|
|
|
|
MoldDemand moldDemand = moldDemandMapper.selectOne(Wrappers.<MoldDemand>lambdaQuery().eq(MoldDemand::getToolCode,dsProcessMoldToolEntity.getMoldCode()).eq(MoldDemand::getMafStatus,MoldDemandEnum.MAF_STATUS_CREATE.getCode())); |
|
|
|
|
if(moldDemand == null){ |
|
|
|
|
moldDemand = new MoldDemand(); |
|
|
|
|
moldDemand.setMoCode(null); |
|
|
|
|
@ -598,7 +598,7 @@ public class YieldOrderServiceImpl extends BaseServiceImpl<YieldOrderMapper, Yie |
|
|
|
|
List<DsPartEntity> subPartList = dsPartService.getPartSubList(yieldOrder.getPartCode(),yieldOrder.getPartVersion()); |
|
|
|
|
if(CollectionUtils.isNotEmpty(subPartList)){ |
|
|
|
|
for(DsPartEntity subPart : subPartList){ |
|
|
|
|
MoldDemand moldDemand = moldDemandMapper.selectOne(Wrappers.<MoldDemand>lambdaQuery().eq(MoldDemand::getPartCode,subPart.getPartCode()).eq(MoldDemand::getMafStatus,MoldDemandEnum.MAF_STATUS_CREATE.getCode())); |
|
|
|
|
MoldDemand moldDemand = moldDemandMapper.selectOne(Wrappers.<MoldDemand>lambdaQuery().eq(MoldDemand::getToolCode,subPart.getPartCode()).eq(MoldDemand::getMafStatus,MoldDemandEnum.MAF_STATUS_CREATE.getCode())); |
|
|
|
|
if(moldDemand == null){ |
|
|
|
|
moldDemand = new MoldDemand(); |
|
|
|
|
moldDemand.setMoCode(null); |
|
|
|
|
|