diff --git a/blade-service/logpm-basic/src/main/java/com/logpm/basic/service/impl/BasicMaterialServiceImpl.java b/blade-service/logpm-basic/src/main/java/com/logpm/basic/service/impl/BasicMaterialServiceImpl.java index 8a8db9aa4..73805b6a1 100644 --- a/blade-service/logpm-basic/src/main/java/com/logpm/basic/service/impl/BasicMaterialServiceImpl.java +++ b/blade-service/logpm-basic/src/main/java/com/logpm/basic/service/impl/BasicMaterialServiceImpl.java @@ -72,14 +72,15 @@ public class BasicMaterialServiceImpl extends BaseServiceImpl data) { - log.info("传入参数>>>>>>>>>>>>>>>>{},>>>>>>>>{}",data); + log.info("传入参数>>>>>>>>>>>>>>>>,>>>>>>>>{}",data); ArrayList arrayList = new ArrayList<>(); for (BasicMaterialExcel datum : data) { //去重 List basicMaterialEntities = baseMapper.selectList(new QueryWrapper().lambda().eq(BasicMaterialEntity::getProductCode,datum.getProductCode())); - if (basicMaterialEntities.size()>0){continue;} + if (!basicMaterialEntities.isEmpty()){continue;} BasicMaterialEntity copy = BeanUtil.copy(datum, BasicMaterialEntity.class); - copy.setHide(1); + assert copy != null; + copy.setHide(1); arrayList.add(copy); } // 根据对象的value属性进行去重 diff --git a/blade-service/logpm-basic/src/main/java/com/logpm/basic/service/impl/BasicPrintTemplateServiceImpl.java b/blade-service/logpm-basic/src/main/java/com/logpm/basic/service/impl/BasicPrintTemplateServiceImpl.java index c870dde50..2bcf2d66f 100644 --- a/blade-service/logpm-basic/src/main/java/com/logpm/basic/service/impl/BasicPrintTemplateServiceImpl.java +++ b/blade-service/logpm-basic/src/main/java/com/logpm/basic/service/impl/BasicPrintTemplateServiceImpl.java @@ -26,6 +26,7 @@ import com.logpm.basic.mapper.BasicPrintTemplateMapper; import com.logpm.basic.service.IBasicPrintTemplateService; import com.logpm.basic.vo.BasicPrintTemplateVO; import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; import org.springblade.core.mp.base.BaseServiceImpl; import org.springblade.core.secure.BladeUser; import org.springblade.core.secure.utils.AuthUtil; @@ -45,6 +46,7 @@ import java.util.List; */ @Service @AllArgsConstructor +@Slf4j public class BasicPrintTemplateServiceImpl extends BaseServiceImpl implements IBasicPrintTemplateService { private BasicPrintTemplateMapper printTemplateMapper; @@ -67,13 +69,13 @@ public class BasicPrintTemplateServiceImpl extends BaseServiceImpl>>> {}", basicPrintTemplateDTO); + return false; } + boolean result = false; BasicPrintTemplateEntity basicPrintTemplateEntity = new BasicPrintTemplateEntity(); - BeanUtils.copyProperties(basicPrintTemplateDTO,basicPrintTemplateEntity); + BeanUtils.copyProperties(basicPrintTemplateDTO, basicPrintTemplateEntity); BladeUser user = AuthUtil.getUser(); Date date = new Date(); basicPrintTemplateEntity.setTenantId(user.getTenantId()); @@ -92,12 +94,13 @@ public class BasicPrintTemplateServiceImpl extends BaseServiceImpl goodsAllocationVOIPage = goodsAllocationMapper.selectGoodsAllocationList(page, basicdataGoodsAllocation); - return goodsAllocationVOIPage; + return goodsAllocationMapper.selectGoodsAllocationList(page, basicdataGoodsAllocation); } @@ -203,7 +201,7 @@ public class BasicdataGoodsAllocationServiceImpl extends BaseServiceImpl 0 ? true : false; + return i > 0 ; } @Override diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java index 872e66124..095db6d6d 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java @@ -1731,7 +1731,8 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl stockArticleVOS = distributionDeliveryListMapper.getDeliveryDisuccStockArticleInfo(id); List stockArticleVOList = DistributionStockArticleWrapper.build().listVO(stockArticleVOS); @@ -1756,7 +1757,8 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl customList = distributionDeliveryInfoMapper.selectAppcustomListPage(page, distributionDeliveryList.getId()); for (DistributionAppReservationVO distributionAppReservationVO : customList) { //查询备货是否完成 - Integer aLong = distributionStockMapper.selectCount(new QueryWrapper().lambda() + int aLong = distributionStockMapper.selectCount(new QueryWrapper().lambda() .eq(DistributionStockEntity::getReservationId, distributionAppReservationVO.getId()) .eq(DistributionStockEntity::getType, 1) ).intValue(); @@ -1960,7 +1962,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl packageListInfo = s.getPackageListInfo(); AtomicInteger orderPackageNum = new AtomicInteger(); - if (packageListInfo.size() > 0) { + if (!packageListInfo.isEmpty()) { packageListInfo.forEach(p -> { orderPackageNum.getAndAdd(p.getQuantity()); DistributionReservationPackageEntity reservationPackageEntity = new DistributionReservationPackageEntity(); 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 f90613d77..8bbf80d27 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 @@ -66,8 +66,6 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService { private static final Logger logger = LoggerFactory.getLogger(PanFactoryDataServiceImpl.class); -// private final IFactoryAccountService factoryAccountService; -// private final IFactoryTokenService factoryTokenService; private final IPanFactoryOrderService factoryOrderService; private final IPanPackageInfoService packageInfoService; @@ -76,13 +74,10 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService { private final PanFactoryProperties panFactoryProperties; private final IOrderStatusLogService panOrderStatusLogService; private final IPanPackageInfoService panPackageInfoService; - private final IPanFactoryOrderService panFactoryOrderService; private final IAdvanceDetailClient advanceDetailClient; private final IWarehouseClient warehouseClient; - private final IOrderClient orderClient; private final IOrderDetailClient orderDetailClient; private final IAdvanceClient advanceClient; - // private final IMainlineWaybillClient mainlineWaybillClient; private final IWayBillClient wayBillClient; private final IDistributionParcelListClient distributionParcelListClient; @@ -375,7 +370,7 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService { //判断新系统是否有这条订单数据 DistributionStockArticleEntity distributionStockArticleEntity = distributionStockArticleClient.findByAdvanceId(advanceId); - Long id = null; + Long id; String waybillNoNum = advanceEntity.getWaybillNo(); if (Objects.isNull(distributionStockArticleEntity)) { @@ -391,8 +386,7 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService { // 其实是客户 distributionStockArticleEntity.setMallName(takeCompany); - distributionStockArticleEntity.setWarehouse(destinationWarehouse); - distributionStockArticleEntity.setWarehouseId(basicdataWarehouseEntity.getId()); + distributionStockArticleEntity.setWarehouseEntryTime(date); distributionStockArticleEntity.setTotalNumber(total); @@ -408,7 +402,7 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService { } else { distributionStockArticleEntity.setCompleteSet(0); } - logger.info("############basicdataWarehouseEntity}", basicdataWarehouseEntity); + logger.info("############basicdataWarehouseEntity {}", basicdataWarehouseEntity); if (!Objects.isNull(basicdataWarehouseEntity)) { distributionStockArticleEntity.setCreateDept(basicdataWarehouseEntity.getDepartment()); } @@ -421,7 +415,7 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService { distributionStockArticleEntity.setConsigneeAddress(wayBillEntity.getTakeAddress());//收货人地址 distributionStockArticleEntity.setConsigneeMobile(wayBillEntity.getTakePhone());//收货人电话 - // 根据老的运单上的仓库名称找寻新的仓库名称 + // 根据老运单上的仓库名称找寻新的仓库名称 // 发站 String warehouseName = wayBillEntity.getStartSite(); @@ -432,14 +426,16 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService { } //收货仓库 - warehouseName = wayBillEntity.getArriveSite(); + warehouseName = wayBillEntity.getWarehouseName(); t = basicdataWarehouseClient.findByName(warehouseName); if(ObjectUtils.isNotNull(t)){ distributionStockArticleEntity.setAcceptWarehouseName(t.getName()); distributionStockArticleEntity.setAcceptWarehouseId(t.getId()); - } - + // TODO 这里存在问题 后需要知道当前作业仓库 + distributionStockArticleEntity.setWarehouse(t.getName()); + distributionStockArticleEntity.setWarehouseId(t.getId()); + } } String customerName = wayBillEntity.getTakeCompany();//客户名称 @@ -455,9 +451,8 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService { distributionStockArticleEntity.setMallCode(basicdataClientEntity.getClientCode()); // todo 这里需要去查询门店 和新系统的门店ID 进行绑定 - String peisongType = getPeisongTypeByClientId(basicdataClientEntity.getId()); - logger.info("订单同步peisongType{} ", peisongType); + logger.info("订单同步peisongType {} ", peisongType); if (StringUtil.isNoneBlank(peisongType)) { distributionStockArticleEntity.setTypeService(peisongType); @@ -507,7 +502,7 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService { distributionStockArticleEntity.setWaybillNumber(waybillNumber); // 修改入库状态 - distributionStockArticleEntity.setHandQuantity(distributionStockArticleEntity.getHandQuantity().intValue()+1); + distributionStockArticleEntity.setHandQuantity(distributionStockArticleEntity.getHandQuantity() +1); String orderStatus = checkDistributionStockArticleOrderStatus(distributionStockArticleEntity); distributionStockArticleEntity.setOrderStatus(orderStatus); @@ -522,7 +517,7 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService { distributionStockArticleEntity.setWarehouseEntryTimeEnd(new Date()); distributionStockArticleClient.saveOrUpdate(distributionStockArticleEntity); -// //包件保存成功去修改订单的数量 +// 包件保存成功去修改订单的数量 // distributionStockArticleClient.addHandQuantity(id, 1); logger.info("#################handleDataToPlatform: 数据处理完成"); } else { @@ -533,8 +528,8 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService { /** * 根据订单的在库数联返回订单的状态 - * @param distributionStockArticleEntity - * @return + * @param distributionStockArticleEntity 订单对象 + * @return String 状态码值 */ private String checkDistributionStockArticleOrderStatus(DistributionStockArticleEntity distributionStockArticleEntity) { @@ -554,8 +549,8 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService { /** * 根据客户ID 查询客户的配送类型 * - * @param id - * @return + * @param id 客户ID + * @return String 客户的服务类型 */ private String getPeisongTypeByClientId(Long id) { BasicdataStoreBusinessEntity basicdataStoreBusinessEntity = basicdataStoreBusinessClient.findByClientIdAndTypeService(id, 3); @@ -570,10 +565,9 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService { /** * 保存包件信息 * - * @param unitNo - * @param distributionStockArticleEntity - * @param id - * @param basicdataWarehouseEntity + * @param unitNo 包条码 + * @param distributionStockArticleEntity 订单对象 + * @param basicdataWarehouseEntity 仓库对象 */ private void saveOrderPackage(String unitNo, DistributionStockArticleEntity distributionStockArticleEntity, BasicdataWarehouseEntity basicdataWarehouseEntity, String waybillNo) { DistributionParcelListEntityVO vo = advanceDetailClient.getByUnitNo(unitNo); @@ -740,8 +734,8 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService { /** * 构建订单的经销商信息和门店信息 * - * @param distributionStockArticleEntity - * @param advanceEntity + * @param distributionStockArticleEntity 订单对象 + * @param advanceEntity 老订单对象 */ private void buildDealerAndStore(DistributionStockArticleEntity distributionStockArticleEntity, AdvanceEntity advanceEntity) { @@ -757,14 +751,15 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService { distributionStockArticleEntity.setCustomerAddress(advanceEntity.getCustomerRoad()); distributionStockArticleEntity.setCustomerTelephone(advanceEntity.getCustomerPhone()); + // 服务号 distributionStockArticleEntity.setServiceNumber(advanceEntity.getServiceNum()); distributionStockArticleEntity.setDescriptionGoods(advanceEntity.getFirstPackName()); + // 品牌 distributionStockArticleEntity.setBrand(advanceEntity.getType()); distributionStockArticleEntity.setResource(advanceEntity.getType()); - } @@ -793,7 +788,7 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("order_no", orderNo); List one = factoryOrderService.list(queryWrapper); - if (!Objects.isNull(one) && one.size() > 0) { + if (!Objects.isNull(one) && !one.isEmpty()) { //如果订单已存在就去验证订单下面的包件信息 List order_attributes = factoryOrderDTO.getORDER_ATTRIBUTES(); QueryWrapper qw = new QueryWrapper<>(); @@ -811,7 +806,7 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService { } factoryOrderDTO.setORDER_ATTRIBUTES(order_attributes); - if (order_attributes.size() == 0) { + if (order_attributes.isEmpty()) { logger.info("###########saveData: 没有新增包件，不保存信息"); return null; } diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/receiver/DealWithDataHandler.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/receiver/DealWithDataHandler.java index 3d4710799..6e47739ae 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/receiver/DealWithDataHandler.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/receiver/DealWithDataHandler.java @@ -38,7 +38,6 @@ public class DealWithDataHandler { @RabbitHandler public void dealWithDataHandler(Map map, Message message, Channel channel) throws IOException { // 如果手动ACK,消息会被监听消费,但是消息在队列中依旧存在,如果 未配置 acknowledge-mode 默认是会在消费完毕后自动ACK掉 - final long deliveryTag = message.getMessageProperties().getDeliveryTag(); log.info("##################dealWithDataHandler: 处理在库订单数据到新系统"); OrderStatusDTO orderStatusDTO = (OrderStatusDTO) map.get("messageData"); String status = orderStatusDTO.getStatus(); diff --git a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/feign/AdvanceDetailClient.java b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/feign/AdvanceDetailClient.java index 8f58ca5f3..8adb375ee 100644 --- a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/feign/AdvanceDetailClient.java +++ b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/feign/AdvanceDetailClient.java @@ -64,8 +64,7 @@ public class AdvanceDetailClient implements IAdvanceDetailClient { @GetMapping(API_PREFIX + "/getSupplyData") public Map getSupplyData(String unitNo) { //查询补充数据 - Map map = advanceDetailService.getSupplyData(unitNo); - return map; + return advanceDetailService.getSupplyData(unitNo); } @Override diff --git a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/impl/AdvanceDetailServiceImpl.java b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/impl/AdvanceDetailServiceImpl.java index 78b549993..5dc59b3d8 100644 --- a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/impl/AdvanceDetailServiceImpl.java +++ b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/impl/AdvanceDetailServiceImpl.java @@ -54,8 +54,7 @@ public class AdvanceDetailServiceImpl implements IAdvanceDetailService { public Map getSupplyData(String unitNo) { //查询补充数据 //unitNo - Map map = advanceDetailMapper.getSupplyData(unitNo); - return map; + return advanceDetailMapper.getSupplyData(unitNo); } @Override diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayGoodsServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayGoodsServiceImpl.java index 5d2760db0..56a10ff72 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayGoodsServiceImpl.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayGoodsServiceImpl.java @@ -148,7 +148,7 @@ public class WarehouseTrayGoodsServiceImpl extends BaseServiceImpl>>>>>>>>>{}",e); + log.error("删除托盘所有关联表>>>>>>>>>> {}",e.getMessage()); return false; } return true; @@ -266,7 +266,7 @@ public class WarehouseTrayGoodsServiceImpl extends BaseServiceImpl().lambda() .eq(WarehouseTrayGoodsEntity::getTrayId, masterId) ); - return delete>0?true:false; + return delete > 0; } @Override diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java index 266306aed..2c6826bd1 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java @@ -1257,7 +1257,7 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl().lambda() .eq(WarehouseTrayTypeEntity::getTrayId,id) ); - return delete>0?true:false; + return delete > 0; } diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownGoodsServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownGoodsServiceImpl.java index 914fedaf0..fdbbb233b 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownGoodsServiceImpl.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownGoodsServiceImpl.java @@ -153,7 +153,7 @@ public class WarehouseUpdownGoodsServiceImpl extends BaseServiceImpl>>>>",i); + log.info("i>>>>> {}",i); return i; }