diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataClientServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataClientServiceImpl.java index 2b221fa25..416530e6a 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataClientServiceImpl.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataClientServiceImpl.java @@ -27,11 +27,9 @@ import com.logpm.basicdata.excel.BasicdataClientExcel; import com.logpm.basicdata.mapper.BasicdataClientMapper; import com.logpm.basicdata.service.*; import com.logpm.basicdata.vo.BasicdataClientVO; -import com.sun.xml.internal.ws.developer.ServerSideException; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springblade.common.constant.DictBizConstant; -import org.springblade.core.log.exception.ServiceException; import org.springblade.core.mp.base.BaseServiceImpl; import org.springblade.core.secure.utils.AuthUtil; import org.springblade.core.tool.api.R; diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/pan/service/impl/PanFactoryDataServiceImpl.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/pan/service/impl/PanFactoryDataServiceImpl.java index d7ffd480e..d72ab3dd6 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/pan/service/impl/PanFactoryDataServiceImpl.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/pan/service/impl/PanFactoryDataServiceImpl.java @@ -447,6 +447,8 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService { // todo 这里需要去查询门店 和新系统的门店ID 进行绑定 String peisongType = getPeisongTypeByClientId(basicdataClientEntity.getId()); + logger.info("订单同步peisongType{} ", peisongType); + if (StringUtil.isNoneBlank(peisongType)) { distributionStockArticleEntity.setTypeService(peisongType); } @@ -596,9 +598,12 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService { } //通过运单号先去查询新系统是否存在这个运单号 WarehouseWaybillEntity warehouseWaybill = warehouseWaybillClient.findByWaybillNo(waybillNo); + logger.info("#################handleDataToPlatform.warehouseWaybill: {}", warehouseWaybill); + if (Objects.isNull(warehouseWaybill)) { //如果新系统中不存在这个运单,那么就去查询老系统的运单数据 WayBillEntity wayBillEntity = wayBillClient.getByWaybillNo(waybillNo); + logger.info("#################handleDataToPlatform.wayBillEntity: {}", wayBillEntity); if (Objects.isNull(wayBillEntity)) { logger.warn("##############saveWaybillEntity: 老系统中未找到对应运单waybillNo={}", waybillNo); throw new CustomerException("老系统中未找到对应运单");