1.优化代码1.4

blade-service/logpm-basic/src/main/java/com/logpm/basic/service/impl/BasicMaterialServiceImpl.java

@@ -72,14 +72,15 @@ public class BasicMaterialServiceImpl extends BaseServiceImpl<BasicMaterialMappe
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public void importMaterial(List<BasicMaterialExcel> data) {
-		log.info("传入参数>>>>>>>>>>>>>>>>{},>>>>>>>>{}",data);
+		log.info("传入参数>>>>>>>>>>>>>>>>,>>>>>>>>{}",data);
 		ArrayList<BasicMaterialEntity> arrayList = new ArrayList<>();
 		for (BasicMaterialExcel datum : data) {
 			//去重
 			List<BasicMaterialEntity> basicMaterialEntities = baseMapper.selectList(new QueryWrapper<BasicMaterialEntity>().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属性进行去重

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<BasicPrintTemplateMapper, BasicPrintTemplateEntity> implements IBasicPrintTemplateService {
 
 	private BasicPrintTemplateMapper printTemplateMapper;
@@ -67,13 +69,13 @@ public class BasicPrintTemplateServiceImpl extends BaseServiceImpl<BasicPrintTem
 
 	@Override
 	public boolean insertPrintTemplate(BasicPrintTemplateDTO basicPrintTemplateDTO) {
-		boolean result = false;
-		if (Func.isEmpty(basicPrintTemplateDTO)){
-			log.error("参数异常:{}"+basicPrintTemplateDTO);
-			return result;
+		if (Func.isEmpty(basicPrintTemplateDTO)) {
+			log.info(">>>> {}", 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<BasicPrintTem
 	@Override
 	public BasicPrintTemplateEntity selectTemplateLink(String templateId) {
 		BasicPrintTemplateEntity basicPrintTemplateEntity = baseMapper.selectById(templateId);
+
 		return basicPrintTemplateEntity;
 	}
 
 	@Override
 	public boolean save(BasicPrintTemplateEntity entity) {
-		if (Func.isEmpty(entity)){
+		if (Func.isEmpty(entity)) {
 			return false;
 		}
 		BladeUser user = AuthUtil.getUser();

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataWarehouseController.java

@@ -199,7 +199,7 @@ public class BasicdataWarehouseController extends BladeController {
 	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
 		boolean result = warehouseService.removeWarehouse(ids);
 		if (result) {
-			return R.status(result);
+			return R.status(true);
 		} else {
 			return R.fail("请先删除该仓库下所有资源!!!");
 		}

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsAllocationServiceImpl.java

@@ -159,7 +159,7 @@ public class BasicdataGoodsAllocationServiceImpl extends BaseServiceImpl<Basicda
 	public boolean insertGoodsAllocation(BasicdataGoodsAllocationDTO basicdataGoodsAllocationDto) {
 		BasicdataGoodsAllocationEntity basicdataGoodsAllocationEntity = new BasicdataGoodsAllocationEntity();
 		if (Func.isEmpty(basicdataGoodsAllocationDto)) {
-			log.error("参数不合法：{}" + basicdataGoodsAllocationDto);
+			log.error("参数不合法：{}" , basicdataGoodsAllocationDto);
 			return false;
 		}
 		BeanUtils.copyProperties(basicdataGoodsAllocationDto, basicdataGoodsAllocationEntity);
@@ -180,8 +180,7 @@ public class BasicdataGoodsAllocationServiceImpl extends BaseServiceImpl<Basicda
 		String code = tenantCodeClient.shelfCode(user.getTenantId(), "5");
 		String allocationCode = code + "-" + basicdataGoodsAllocationEntity.getColumnNum() + "-" + basicdataGoodsAllocationEntity.getLayerNum() + "-" + basicdataGoodsAllocationEntity.getGoodsAllocationName();
 		basicdataGoodsAllocationEntity.setQrCode(allocationCode);
-		boolean result = SqlHelper.retBool(goodsAllocationMapper.insert(basicdataGoodsAllocationEntity));
-		return result;
+        return SqlHelper.retBool(goodsAllocationMapper.insert(basicdataGoodsAllocationEntity));
 	}
 
 	@Override
@@ -194,8 +193,7 @@ public class BasicdataGoodsAllocationServiceImpl extends BaseServiceImpl<Basicda
 			.map(BasicdataWarehouseEntity::getId)
 			.collect(Collectors.toList());
 		basicdataGoodsAllocation.put("warehouseList",collect);
-		IPage<BasicdataGoodsAllocationVO> goodsAllocationVOIPage = goodsAllocationMapper.selectGoodsAllocationList(page, basicdataGoodsAllocation);
-		return goodsAllocationVOIPage;
+        return goodsAllocationMapper.selectGoodsAllocationList(page, basicdataGoodsAllocation);
 
 	}
 
@@ -203,7 +201,7 @@ public class BasicdataGoodsAllocationServiceImpl extends BaseServiceImpl<Basicda
 	public boolean updateGoodsAllocation(BasicdataGoodsAllocationDTO basicdataGoodsAllocationDto) {
 		boolean result = false;
 		if (Func.isEmpty(basicdataGoodsAllocationDto)) {
-			log.error("参数不合法：{}" + basicdataGoodsAllocationDto);
+			log.error("参数不合法：{}" , basicdataGoodsAllocationDto);
 			return result;
 		}
 		BasicdataGoodsAllocationEntity basicdataGoodsAllocationEntity = new BasicdataGoodsAllocationEntity();

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataShopServiceImpl.java

@@ -105,7 +105,7 @@ public class BasicdataShopServiceImpl extends BaseServiceImpl<BasicdataShopMappe
 //			}
 				return false;
 		}catch (Exception e){
-			log.info("报错信息",e.getMessage());
+			log.info("报错信息 {}",e.getMessage());
 			TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
 			return false;
 		}

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataStoreContactServiceImpl.java

@@ -71,7 +71,7 @@ public class BasicdataStoreContactServiceImpl extends BaseServiceImpl<BasicdataS
 			});
 			return true;
 		}catch (Exception e){
-			log.info("报错信息：",e.getMessage());
+			log.info("报错信息：{}",e.getMessage());
 			return false;
 		}
 

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java

@@ -150,7 +150,7 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService {
 		distributionStock.setId(id);
 		distributionStock.setConditions("3");
 		int i = distributionStockService.updateById(distributionStock);
-		return  i > 0 ? true : false;
+		return  i > 0 ;
 	}
 
 	@Override

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java

@@ -1731,7 +1731,8 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 		//这里对于同一个配送任务下的预约信息是一致的，这里进行去重的操作，
 		DistributionReservationVO reservationVOS = distributionReservationMapper.getReservationInfo(id);
 		if (Func.isNotEmpty(reservationVOS)) {
-			deliveryListVO.setReservationInfo(reservationVOS);
+            assert deliveryListVO != null;
+            deliveryListVO.setReservationInfo(reservationVOS);
 			//1、查询出订单信息
 			List<DistributionStockArticleEntity> stockArticleVOS = distributionDeliveryListMapper.getDeliveryDisuccStockArticleInfo(id);
 			List<DistributionStockArticleVO> stockArticleVOList = DistributionStockArticleWrapper.build().listVO(stockArticleVOS);
@@ -1756,7 +1757,8 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 		//2、查询出备货信息
 		DistributionStockupVO stockupEntity = distributionStockupMapper.getDeliveryStockupInfo(id);
 		if (Func.isNotEmpty(stockupEntity)) {
-			deliveryListVO.setStockupInfo(stockupEntity);
+            assert deliveryListVO != null;
+            deliveryListVO.setStockupInfo(stockupEntity);
 			//3、查询司机信息
 			if (deliveryListEntity.getKind().equals(ServiceConstant.DELIVERLIST_KIND_SELF)) {
 				//自主配送
@@ -1778,7 +1780,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 		List<DistributionAppReservationVO> customList = distributionDeliveryInfoMapper.selectAppcustomListPage(page, distributionDeliveryList.getId());
 		for (DistributionAppReservationVO distributionAppReservationVO : customList) {
 			//查询备货是否完成
-			Integer aLong = distributionStockMapper.selectCount(new QueryWrapper<DistributionStockEntity>().lambda()
+			int aLong = distributionStockMapper.selectCount(new QueryWrapper<DistributionStockEntity>().lambda()
 				.eq(DistributionStockEntity::getReservationId, distributionAppReservationVO.getId())
 				.eq(DistributionStockEntity::getType, 1)
 			).intValue();
@@ -1960,7 +1962,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 					//现在前端进行订单提交必然会携带包件信息
 					List<DistributionParcelListEntity> 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();

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<PanFactoryOrder> queryWrapper = new QueryWrapper<>();
 		queryWrapper.eq("order_no", orderNo);
 		List<PanFactoryOrder> one = factoryOrderService.list(queryWrapper);
-		if (!Objects.isNull(one) && one.size() > 0) {
+		if (!Objects.isNull(one) && !one.isEmpty()) {
 			//如果订单已存在就去验证订单下面的包件信息
 			List<PanPackageInfoDTO> order_attributes = factoryOrderDTO.getORDER_ATTRIBUTES();
 			QueryWrapper<PanPackageInfo> 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;
 			}

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();

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<String, String> getSupplyData(String unitNo) {
 		//查询补充数据
-		Map<String,String> map = advanceDetailService.getSupplyData(unitNo);
-		return map;
+        return advanceDetailService.getSupplyData(unitNo);
 	}
 
 	@Override

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<String, String> getSupplyData(String unitNo) {
 		//查询补充数据
 		//unitNo
-		Map<String,String> map = advanceDetailMapper.getSupplyData(unitNo);
-		return map;
+        return advanceDetailMapper.getSupplyData(unitNo);
 	}
 
 	@Override

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayGoodsServiceImpl.java

@@ -148,7 +148,7 @@ public class WarehouseTrayGoodsServiceImpl extends BaseServiceImpl<WarehouseTray
 			//修改状态
 			basicdataTrayClient.updateTrayStatus(id,1);
 		}catch (Exception e){
-			log.error("删除托盘所有关联表>>>>>>>>>>{}",e);
+			log.error("删除托盘所有关联表>>>>>>>>>> {}",e.getMessage());
 			return false;
 		}
 		return true;
@@ -266,7 +266,7 @@ public class WarehouseTrayGoodsServiceImpl extends BaseServiceImpl<WarehouseTray
 		int delete = baseMapper.delete(new QueryWrapper<WarehouseTrayGoodsEntity>().lambda()
 			.eq(WarehouseTrayGoodsEntity::getTrayId, masterId)
 		);
-		return delete>0?true:false;
+		return delete > 0;
 	}
 
 	@Override

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java

@@ -1257,7 +1257,7 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl<WarehouseTrayT
 		int delete = baseMapper.delete(new QueryWrapper<WarehouseTrayTypeEntity>().lambda()
 			.eq(WarehouseTrayTypeEntity::getTrayId,id)
 		);
-		return delete>0?true:false;
+		return delete > 0;
 	}
 
 

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownGoodsServiceImpl.java

@@ -153,7 +153,7 @@ public class WarehouseUpdownGoodsServiceImpl extends BaseServiceImpl<WarehouseUp
 			.eq(WarehouseUpdownGoodsEntity::getIsDeleted, 0)
 			.in(WarehouseUpdownGoodsEntity::getAreaId, ids)
 		).intValue();
-		log.info("i>>>>>",i);
+		log.info("i>>>>> {}",i);
 		return i;
 	}