Browse Source

1.修改新增客户为7

dev
zhenghaoyu 3 days ago
parent
commit
60d6485960
  1. 16
      blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java

16
blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java

@ -636,7 +636,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
//如果发货单位没有id值,则把发货单位信息自动添加到client中
BasicdataClientEntity clientEntity = basicdataClientClient.findByName(shipper);
if(Objects.isNull(clientEntity)){
shipperId = saveNewClient(openOrderDTO.getShipper(), openOrderDTO.getShipperName(), openOrderDTO.getShipperMobile(), openOrderDTO.getShipperAddress(), "6");
shipperId = saveNewClient(openOrderDTO.getShipper(), openOrderDTO.getShipperName(), openOrderDTO.getShipperMobile(), openOrderDTO.getShipperAddress(), "7");
}else{
shipperId = clientEntity.getId();
}
@ -654,7 +654,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
//如果收货单位没有id值,则把收货单位信息自动添加到client中
BasicdataClientEntity clientEntity = basicdataClientClient.findByName(consignee);
if(Objects.isNull(clientEntity)){
consigneeId = saveNewClient(openOrderDTO.getConsignee(), openOrderDTO.getConsigneeName(), openOrderDTO.getConsigneeMobile(), openOrderDTO.getConsigneeAddress(), "2");
consigneeId = saveNewClient(openOrderDTO.getConsignee(), openOrderDTO.getConsigneeName(), openOrderDTO.getConsigneeMobile(), openOrderDTO.getConsigneeAddress(), "7");
}else{
consigneeId = clientEntity.getId();
}
@ -1010,7 +1010,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
//如果发货单位没有id值,则把发货单位信息自动添加到client中
BasicdataClientEntity clientEntity = basicdataClientClient.findByName(shipper);
if(Objects.isNull(clientEntity)){
shipperId = saveNewClient(openOrderDTO.getShipper(), openOrderDTO.getShipperName(), openOrderDTO.getShipperMobile(), openOrderDTO.getShipperAddress(), "6");
shipperId = saveNewClient(openOrderDTO.getShipper(), openOrderDTO.getShipperName(), openOrderDTO.getShipperMobile(), openOrderDTO.getShipperAddress(), "7");
}else{
shipperId = clientEntity.getId();
}
@ -1028,7 +1028,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
//如果收货单位没有id值,则把收货单位信息自动添加到client中
BasicdataClientEntity clientEntity = basicdataClientClient.findByName(consignee);
if(Objects.isNull(clientEntity)){
consigneeId = saveNewClient(openOrderDTO.getConsignee(), openOrderDTO.getConsigneeName(), openOrderDTO.getConsigneeMobile(), openOrderDTO.getConsigneeAddress(), "2");
consigneeId = saveNewClient(openOrderDTO.getConsignee(), openOrderDTO.getConsigneeName(), openOrderDTO.getConsigneeMobile(), openOrderDTO.getConsigneeAddress(), "7");
}else{
consigneeId = clientEntity.getId();
}
@ -4037,7 +4037,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
Long shipperId = openOrderDTO.getShipperId();
if (Objects.isNull(shipperId)) {
//如果发货单位没有id值,则把发货单位信息自动添加到client中
shipperId = saveNewClient(openOrderDTO.getShipper(), openOrderDTO.getShipperName(), openOrderDTO.getShipperMobile(), openOrderDTO.getShipperAddress(), "6");
shipperId = saveNewClient(openOrderDTO.getShipper(), openOrderDTO.getShipperName(), openOrderDTO.getShipperMobile(), openOrderDTO.getShipperAddress(), "7");
}
waybillEntity.setShipperId(shipperId);
waybillEntity.setShipper(openOrderDTO.getShipper());
@ -4048,7 +4048,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
Long consigneeId = openOrderDTO.getConsigneeId();//收货单位id
if (Objects.isNull(consigneeId)) {
//如果收货单位没有id值,则把收货单位信息自动添加到client中
consigneeId = saveNewClient(openOrderDTO.getConsignee(), openOrderDTO.getConsigneeName(), openOrderDTO.getConsigneeMobile(), openOrderDTO.getConsigneeAddress(), "2");
consigneeId = saveNewClient(openOrderDTO.getConsignee(), openOrderDTO.getConsigneeName(), openOrderDTO.getConsigneeMobile(), openOrderDTO.getConsigneeAddress(), "7");
}
waybillEntity.setConsigneeId(consigneeId);
waybillEntity.setConsignee(openOrderDTO.getConsignee());
@ -5491,7 +5491,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
if(Objects.isNull(newShipperId)){
BasicdataClientEntity clientEntity = basicdataClientClient.findByName(newShipper);
if(Objects.isNull(clientEntity)){
newShipperId = saveNewClient(openOrderDTO.getShipper(), openOrderDTO.getShipperName(), openOrderDTO.getShipperMobile(), openOrderDTO.getShipperAddress(), "6");
newShipperId = saveNewClient(openOrderDTO.getShipper(), openOrderDTO.getShipperName(), openOrderDTO.getShipperMobile(), openOrderDTO.getShipperAddress(), "7");
}else{
newShipperId = clientEntity.getId();
}
@ -5531,7 +5531,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
waybillEntity.setServiceType(1);
BasicdataClientEntity clientEntity = basicdataClientClient.findByName(newConsignee);
if(Objects.isNull(clientEntity)){
newConsigneeId = saveNewClient(openOrderDTO.getConsignee(), openOrderDTO.getConsigneeName(), openOrderDTO.getConsigneeMobile(), openOrderDTO.getConsigneeAddress(), "2");
newConsigneeId = saveNewClient(openOrderDTO.getConsignee(), openOrderDTO.getConsigneeName(), openOrderDTO.getConsigneeMobile(), openOrderDTO.getConsigneeAddress(), "7");
}else{
newConsigneeId = clientEntity.getId();
waybillEntity.setServiceType(clientEntity.getTypeService());

Loading…
Cancel
Save