|
|
@@ -207,7 +207,6 @@ public class PurchaseTenderServiceImpl implements PurchaseTenderService {
|
|
|
tender.setStatus("待投标");
|
|
|
PurchaseTenderInfo tenderInfo = new PurchaseTenderInfo();
|
|
|
BeanUtils.copyProperties(tender, tenderInfo, PurchaseTenderInfo.class);
|
|
|
-// tenderInfo = purchaseTenderInfoDao.save(tenderInfo);
|
|
|
Set<PurchaseTenderProd> tenderProds = tender.getPurchaseTenderProds();
|
|
|
Long currentEnUU = SystemSession.getUser().getEnterprise().getUu();
|
|
|
if (!CollectionUtils.isEmpty(tenderProds)) {
|
|
|
@@ -232,7 +231,6 @@ public class PurchaseTenderServiceImpl implements PurchaseTenderService {
|
|
|
tender.setStatus("待发布");
|
|
|
PurchaseTenderInfo tenderInfo = new PurchaseTenderInfo();
|
|
|
BeanUtils.copyProperties(tender, tenderInfo, PurchaseTenderInfo.class);
|
|
|
- //tenderInfo = purchaseTenderInfoDao.save(tenderInfo);
|
|
|
Set<PurchaseTenderProd> tenderProds = tenderInfo.getPurchaseTenderProds();
|
|
|
if (!CollectionUtils.isEmpty(tenderProds)) {
|
|
|
for (PurchaseTenderProd tenderProd : tenderProds) {
|
|
|
@@ -281,9 +279,10 @@ public class PurchaseTenderServiceImpl implements PurchaseTenderService {
|
|
|
ProductUtils.updateOne(newProduct);
|
|
|
}
|
|
|
PurchaseTenderSave purchaseTenderSave = new PurchaseTenderSave();
|
|
|
- BeanUtils.copyProperties(tender,purchaseTenderSave);
|
|
|
+ BeanUtils.copyProperties(tender, purchaseTenderSave);
|
|
|
tenderProd.setTender(purchaseTenderSave);
|
|
|
- purchaseTenderProdDao.save(tenderProd);
|
|
|
+ tenderProd = purchaseTenderProdDao.save(tenderProd);
|
|
|
+ tender.setId(tenderProd.getTender().getId());
|
|
|
addSaleTender(tender, contactInfos, tenderProd);
|
|
|
}
|
|
|
}
|
|
|
@@ -477,19 +476,12 @@ public class PurchaseTenderServiceImpl implements PurchaseTenderService {
|
|
|
enBaseInfo = new EnterpriseBaseInfo(enterprise.getUu(), enterprise.getEnBussinessCode(), enterprise.getEnName(), enterprise.getEnAddress());
|
|
|
enterpriseBaseInfoDao.save(enBaseInfo);
|
|
|
}
|
|
|
- //SaleTenderItem tenderItem = new SaleTenderItem();
|
|
|
SaleTenderItemSave saleTenderItemSave = new SaleTenderItemSave();
|
|
|
// 找不到投标单主表才新建一个
|
|
|
if (tender.getEnUU() != null && tender.getCode() != null) {
|
|
|
SaleTender saleTender = saleTenderDao.findByEnUUAndVendUUAndCode(tender.getEnUU(), vendUU, tender.getCode());
|
|
|
SaleTenderSave saleTenderSave = saleTenderSaveDao.findByEnUUAndVendUUAndCode(tender.getEnUU(), vendUU, tender.getCode());
|
|
|
if (null == saleTender) { // 不存在投标单说明未转投标单,进行新增投标单操作
|
|
|
- /*saleTender = new SaleTender(tender);
|
|
|
- saleTender.setUseruu(SystemSession.getUser().getUserUU());
|
|
|
- saleTender.setUser(SystemSession.getUser().getUserName());
|
|
|
- saleTender.setUserTel(SystemSession.getUser().getUserTel());
|
|
|
- saleTender.setUserEmail(SystemSession.getUser().getUserEmail());
|
|
|
- saleTender.setVendUU(vendUU);*/
|
|
|
saleTenderSave = new SaleTenderSave(tender);
|
|
|
saleTenderSave.setUseruu(SystemSession.getUser().getUserUU());
|
|
|
saleTenderSave.setUser(SystemSession.getUser().getUserName());
|
|
|
@@ -498,9 +490,6 @@ public class PurchaseTenderServiceImpl implements PurchaseTenderService {
|
|
|
saleTenderSave.setVendUU(vendUU);
|
|
|
saleTenderSaveDao.save(saleTenderSave);
|
|
|
}
|
|
|
- //tenderItem.setSaleTender(saleTender);
|
|
|
- //tenderItem.setTenderProd(tenderProd);
|
|
|
- //saleTenderItemDao.save(tenderItem);
|
|
|
saleTenderItemSave.setSaleTender(saleTenderSave);
|
|
|
saleTenderItemSave.setTenderProd(tenderProd);
|
|
|
saleTenderItemSaveDao.save(saleTenderItemSave);
|