From 60d648596010e9ef6b79c08e13fee2c2a19c21a5 Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Thu, 16 Jan 2025 11:43:39 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E6=96=B0=E5=A2=9E=E5=AE=A2?= =?UTF-8?q?=E6=88=B7=E4=B8=BA7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/OpenOrderServiceImpl.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java index 777075b10..1bc8508a8 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java +++ b/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());