|
@@ -1127,6 +1127,7 @@ public class YongyouServiceImpl implements YongyouService {
|
|
addBom(vo,detailVOS);
|
|
addBom(vo,detailVOS);
|
|
}
|
|
}
|
|
// puAppMain.setCpersoncode(vo.getCreatedUserName());
|
|
// puAppMain.setCpersoncode(vo.getCreatedUserName());
|
|
|
|
+ SbInfo sbInfo = null;
|
|
if (puAppMain.getCdefine1()==null) {
|
|
if (puAppMain.getCdefine1()==null) {
|
|
puAppMain.setCbustype(vo.getCbustype());
|
|
puAppMain.setCbustype(vo.getCbustype());
|
|
puAppMain.setCdepcode(vo.getCdepcode());
|
|
puAppMain.setCdepcode(vo.getCdepcode());
|
|
@@ -1150,7 +1151,7 @@ public class YongyouServiceImpl implements YongyouService {
|
|
}
|
|
}
|
|
}
|
|
}
|
|
if (vo.getSbId() != null) {
|
|
if (vo.getSbId() != null) {
|
|
- SbInfo sbInfo = sbInfoMapper.selectByPrimaryKey(vo.getSbId());
|
|
|
|
|
|
+ sbInfo = sbInfoMapper.selectByPrimaryKey(vo.getSbId());
|
|
puAppMain.setCdefine11(sbInfo.getPositionNo() + "-" + sbInfo.getName());
|
|
puAppMain.setCdefine11(sbInfo.getPositionNo() + "-" + sbInfo.getName());
|
|
}
|
|
}
|
|
puAppMain.setCmemo(vo.getRemark());
|
|
puAppMain.setCmemo(vo.getRemark());
|
|
@@ -1170,7 +1171,12 @@ public class YongyouServiceImpl implements YongyouService {
|
|
}
|
|
}
|
|
for (LongYanPurchaseDetailVO orderVO:detailVOS){
|
|
for (LongYanPurchaseDetailVO orderVO:detailVOS){
|
|
PuAppDetail detail = new PuAppDetail();
|
|
PuAppDetail detail = new PuAppDetail();
|
|
- detail.setCdefine30(vo.getPositionNo());
|
|
|
|
|
|
+ if (sbInfo!=null){
|
|
|
|
+ detail.setCdefine30(vo.getPositionNo()+"-"+sbInfo.getName());
|
|
|
|
+ }else {
|
|
|
|
+ detail.setCdefine30(vo.getPositionNo());
|
|
|
|
+ }
|
|
|
|
+
|
|
detail.setCdefine22(orderVO.getCdefine22());
|
|
detail.setCdefine22(orderVO.getCdefine22());
|
|
detail.setCdefine28(orderVO.getCdefine28());
|
|
detail.setCdefine28(orderVO.getCdefine28());
|
|
detail.setCdefine29(dept);
|
|
detail.setCdefine29(dept);
|