|
@@ -3452,11 +3452,11 @@ public class KwtAcceptCarriageOrderService {
|
|
|
if (Objects.isNull(ent)) {
|
|
if (Objects.isNull(ent)) {
|
|
|
throw new BusinessException("企业:" + orderDTO.getConsignCompany() + "的一级企业信息不存在!");
|
|
throw new BusinessException("企业:" + orderDTO.getConsignCompany() + "的一级企业信息不存在!");
|
|
|
}
|
|
}
|
|
|
- consignUnit.setContactsId(orderDTO.getConsignContactsId());
|
|
|
|
|
|
|
+ consignUnit.setContactsId(ent.getContactsId());
|
|
|
consignUnit.setTopEntId(ent.getId());
|
|
consignUnit.setTopEntId(ent.getId());
|
|
|
consignUnit.setFirmName(ent.getFirmName());
|
|
consignUnit.setFirmName(ent.getFirmName());
|
|
|
- consignUnit.setContacts(orderDTO.getConsignContacts());
|
|
|
|
|
- consignUnit.setPhone(orderDTO.getConsignContactPhone());
|
|
|
|
|
|
|
+ consignUnit.setContacts(ent.getContacts());
|
|
|
|
|
+ consignUnit.setPhone(ent.getPhone());
|
|
|
// consignUnit.setRemark(orderDTO.getRemark());
|
|
// consignUnit.setRemark(orderDTO.getRemark());
|
|
|
consignUnit.setStatus(NumberConstant.ZERO);
|
|
consignUnit.setStatus(NumberConstant.ZERO);
|
|
|
consignUnit.setCreateBy(orderDTO.getUserId());
|
|
consignUnit.setCreateBy(orderDTO.getUserId());
|
|
@@ -3474,11 +3474,11 @@ public class KwtAcceptCarriageOrderService {
|
|
|
if (Objects.isNull(ent1)) {
|
|
if (Objects.isNull(ent1)) {
|
|
|
throw new BusinessException("企业:" + x.getAcceptCompany() + "的一级企业信息不存在!");
|
|
throw new BusinessException("企业:" + x.getAcceptCompany() + "的一级企业信息不存在!");
|
|
|
}
|
|
}
|
|
|
- unit.setContactsId(x.getAcceptContactsId());
|
|
|
|
|
|
|
+ unit.setContactsId(ent1.getContactsId());
|
|
|
unit.setTopEntId(ent1.getId());
|
|
unit.setTopEntId(ent1.getId());
|
|
|
unit.setFirmName(ent1.getFirmName());
|
|
unit.setFirmName(ent1.getFirmName());
|
|
|
- unit.setContacts(x.getAcceptContacts());
|
|
|
|
|
- unit.setPhone(x.getAcceptContactPhone());
|
|
|
|
|
|
|
+ unit.setContacts(ent1.getContacts());
|
|
|
|
|
+ unit.setPhone(ent1.getPhone());
|
|
|
// unit.setRemark(orderDTO.getRemark());
|
|
// unit.setRemark(orderDTO.getRemark());
|
|
|
unit.setStatus(NumberConstant.ZERO);
|
|
unit.setStatus(NumberConstant.ZERO);
|
|
|
unit.setCreateBy(orderDTO.getUserId());
|
|
unit.setCreateBy(orderDTO.getUserId());
|
|
@@ -3496,11 +3496,11 @@ public class KwtAcceptCarriageOrderService {
|
|
|
if (Objects.isNull(ent2)) {
|
|
if (Objects.isNull(ent2)) {
|
|
|
throw new BusinessException("企业:" + orderDTO.getNonConsignCompany() + "的一级企业信息不存在!");
|
|
throw new BusinessException("企业:" + orderDTO.getNonConsignCompany() + "的一级企业信息不存在!");
|
|
|
}
|
|
}
|
|
|
- notifyUnit.setContactsId(orderDTO.getNonConsignContactsId());
|
|
|
|
|
|
|
+ notifyUnit.setContactsId(ent2.getContactsId());
|
|
|
notifyUnit.setTopEntId(ent2.getId());
|
|
notifyUnit.setTopEntId(ent2.getId());
|
|
|
notifyUnit.setFirmName(ent2.getFirmName());
|
|
notifyUnit.setFirmName(ent2.getFirmName());
|
|
|
- notifyUnit.setContacts(orderDTO.getNonConsignContacts());
|
|
|
|
|
- notifyUnit.setPhone(orderDTO.getNonConsignContactPhone());
|
|
|
|
|
|
|
+ notifyUnit.setContacts(ent2.getContacts());
|
|
|
|
|
+ notifyUnit.setPhone(ent2.getPhone());
|
|
|
// unit.setRemark(orderDTO.getRemark());
|
|
// unit.setRemark(orderDTO.getRemark());
|
|
|
notifyUnit.setStatus(NumberConstant.ZERO);
|
|
notifyUnit.setStatus(NumberConstant.ZERO);
|
|
|
notifyUnit.setCreateBy(orderDTO.getUserId());
|
|
notifyUnit.setCreateBy(orderDTO.getUserId());
|