|
|
@@ -346,26 +346,28 @@ public class PurchaseTenderServiceImpl implements PurchaseTenderService {
|
|
|
Long vendUU = SystemSession.getUser().getEnterprise().getUu();
|
|
|
EnterpriseBaseInfo enBaseInfo = enterpriseBaseInfoDao.findOne(vendUU);
|
|
|
Enterprise enterprise = enterpriseDao.findOne(vendUU);
|
|
|
- if (null == enBaseInfo) {
|
|
|
- enBaseInfo = new EnterpriseBaseInfo(enterprise.getUu(), enterprise.getEnBussinessCode(), enterprise.getEnName(), enterprise.getEnAddress());
|
|
|
- enterpriseBaseInfoDao.save(enBaseInfo);
|
|
|
- }
|
|
|
- SaleTenderItem tenderItem = new SaleTenderItem();
|
|
|
- // 找不到投标单主表才新建一个
|
|
|
- if (tender.getEnUU() != null && tender.getCode() != null) {
|
|
|
- SaleTender saleTender = saleTenderDao.findByEnUUAndVendUUAndCode(tender.getEnUU(), vendUU, tender.getCode());
|
|
|
- if (null == saleTender) { // 不存在投标单说明未转投标单,进行新增投标单操作
|
|
|
- saleTender = new SaleTender(tender);
|
|
|
- // 直接转的,投标单联系人取企业管理员
|
|
|
- saleTender.setUser(enterprise.getAdmin().getUserName());
|
|
|
- saleTender.setUserTel(enterprise.getAdmin().getUserTel());
|
|
|
- saleTender.setVendUU(vendUU);
|
|
|
+ if (null != enterprise) {
|
|
|
+ if (null == enBaseInfo) {
|
|
|
+ enBaseInfo = new EnterpriseBaseInfo(enterprise.getUu(), enterprise.getEnBussinessCode(), enterprise.getEnName(), enterprise.getEnAddress());
|
|
|
+ enterpriseBaseInfoDao.save(enBaseInfo);
|
|
|
+ }
|
|
|
+ SaleTenderItem tenderItem = new SaleTenderItem();
|
|
|
+ // 找不到投标单主表才新建一个
|
|
|
+ if (tender.getEnUU() != null && tender.getCode() != null) {
|
|
|
+ SaleTender saleTender = saleTenderDao.findByEnUUAndVendUUAndCode(tender.getEnUU(), vendUU, tender.getCode());
|
|
|
+ if (null == saleTender) { // 不存在投标单说明未转投标单,进行新增投标单操作
|
|
|
+ saleTender = new SaleTender(tender);
|
|
|
+ // 直接转的,投标单联系人取企业管理员
|
|
|
+ saleTender.setUser(enterprise.getAdmin().getUserName());
|
|
|
+ saleTender.setUserTel(enterprise.getAdmin().getUserTel());
|
|
|
+ saleTender.setVendUU(vendUU);
|
|
|
// saleTender.setEnterpriseBaseInfo(enBaseInfo); // 投标单主表构造完毕
|
|
|
- saleTenderDao.save(saleTender);
|
|
|
+ saleTenderDao.save(saleTender);
|
|
|
+ }
|
|
|
+ tenderItem.setSaleTender(saleTender);
|
|
|
+ tenderItem.setTenderProd(tenderProd);
|
|
|
+ saleTenderItemDao.save(tenderItem);
|
|
|
}
|
|
|
- tenderItem.setSaleTender(saleTender);
|
|
|
- tenderItem.setTenderProd(tenderProd);
|
|
|
- saleTenderItemDao.save(tenderItem);
|
|
|
}
|
|
|
}
|
|
|
tender.setModified(new Date());
|