|
@@ -642,7 +642,10 @@ public class YongyouServiceImpl implements YongyouService {
|
|
|
longYanPurchaseDetailDTO.setLongYangPurchaseOrderId(id);
|
|
|
List<LongYanPurchaseDetailVO> detailVOS = longYanPurchaseDetailMapper.selectList(longYanPurchaseDetailDTO);
|
|
|
|
|
|
- addBom(list.get(0),detailVOS);
|
|
|
+ if (vo.getSbId()!=null) {
|
|
|
+ addBom(vo,detailVOS);
|
|
|
+
|
|
|
+ }
|
|
|
|
|
|
PuAppMain puAppMain = new PuAppMain();
|
|
|
|
|
@@ -650,8 +653,10 @@ public class YongyouServiceImpl implements YongyouService {
|
|
|
puAppMain.setCdepcode(vo.getCdepcode());
|
|
|
puAppMain.setCcode(vo.getPurchaseNo());
|
|
|
puAppMain.setCdefine1(DictCache.getLabelByValue("LONG_YAN_PURCHASE_TYPE",vo.getType()));
|
|
|
- SbInfo sbInfo = sbInfoMapper.selectByPrimaryKey(vo.getSbId());
|
|
|
- puAppMain.setCdefine2(sbInfo.getPositionNo()+"-"+sbInfo.getName());
|
|
|
+ if (vo.getSbId()!=null) {
|
|
|
+ SbInfo sbInfo = sbInfoMapper.selectByPrimaryKey(vo.getSbId());
|
|
|
+ puAppMain.setCdefine2(sbInfo.getPositionNo() + "-" + sbInfo.getName());
|
|
|
+ }
|
|
|
puAppMain.setCdefine11(vo.getRemark());
|
|
|
puAppMain.setCmaker(vo.getCreatedUserName());
|
|
|
puAppMain.setDdate(DateUtils.dateToString(vo.getCreatedTime()));
|