1.优化代码

blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseTaryAllocationClient.java

@@ -22,7 +22,7 @@ public interface IWarehouseTaryAllocationClient {
 	 * 查询货位上的托盘
 	 * @param allocationId
 	 * @return
-	 */
+     */
 	@PostMapping(GETALLOCATIONID)
 	List<WarehouseTaryAllocationEntity> getAllocationId(@RequestParam Long allocationId);
 

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockArticleService.java

@@ -17,7 +17,6 @@
 package com.logpm.distribution.service;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.logpm.distribution.dto.DistributionStockArticleDTO;
 import com.logpm.distribution.entity.DistributionStockArticleEntity;

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/wrapper/DistrilbutionBillLadingWrapper.java

@@ -21,8 +21,7 @@ public class DistrilbutionBillLadingWrapper extends BaseEntityWrapper<Distrilbut
 
 	@Override
 	public DistrilbutionBillLadingVO entityVO(DistrilbutionBillLadingEntity entity) {
-		DistrilbutionBillLadingVO distrilbutionBillLadingVO = Objects.requireNonNull(BeanUtil.copy(entity, DistrilbutionBillLadingVO.class));
 
-		return distrilbutionBillLadingVO;
+        return Objects.requireNonNull(BeanUtil.copy(entity, DistrilbutionBillLadingVO.class));
 	}
 }

blade-service/logpm-factory/src/main/java/com/logpm/factory/comfac/service/impl/AsyncDataServiceImpl.java

@@ -255,7 +255,7 @@ public class AsyncDataServiceImpl implements IAsyncDataService {
 					detailProductEntity.setCreateTime(LocalDate.now());
 					saveList.add(detailProductEntity);
 				}
-				if (saveList.size() > 0) {
+				if (!saveList.isEmpty()) {
 					boolean flag = detailProductClient.addDetailProductList(saveList);
 					UpdateWrapper<PanPackageList> listUpdateWrapper = new UpdateWrapper<>();
 					if (!flag) {
@@ -322,7 +322,6 @@ public class AsyncDataServiceImpl implements IAsyncDataService {
 		for (MtFactoryOrder mtFactoryOrder : mtFactoryOrders) {
 			Long orderId = mtFactoryOrder.getId();
 			Integer advanceId = null;
-
 			log.info("#########handlerMtDataToHt: 当前处理的订单id={}", orderId);
 			//添加订单信息
 			advanceId = addAdvanceEntity(mtFactoryOrderMain, mtFactoryOrder);
@@ -345,15 +344,15 @@ public class AsyncDataServiceImpl implements IAsyncDataService {
 				serviceNum = new ServiceNumEntity();
 				serviceNum.setServiceNum(StringUtil.isBlank(mtFactoryOrder.getMainOrderCode()) ? "" : mtFactoryOrder.getMainOrderCode()); //服务号
 				serviceNum.setTotal("1"); //订单数量
-				serviceNum.setDetailTotal(Objects.isNull(mtFactoryOrder.getQuantity()) ? "" : mtFactoryOrder.getQuantity() + ""); // 包数量
+				serviceNum.setDetailTotal(Objects.isNull(mtFactoryOrder.getQuantity()) ? "" : mtFactoryOrder.getQuantity() ); // 包数量
 				serviceNum.setStoreName(StringUtil.isBlank(mtFactoryOrder.getExclusiveName()) ? "" : mtFactoryOrder.getExclusiveName()); //商场名
 				serviceNum.setStoreNo(StringUtil.isBlank(mtFactoryOrder.getExclusiveCode()) ? "" : mtFactoryOrder.getExclusiveCode()); // 商场编号
 				serviceNum.setCustomerName(StringUtil.isBlank(mtFactoryOrder.getCustomName()) ? "" : mtFactoryOrder.getCustomName());//顾客姓名
 				serviceNum.setCustomerPhone(StringUtil.isBlank(mtFactoryOrder.getCustomPhone()) ? "" : mtFactoryOrder.getCustomPhone()); //顾客电话
 				serviceNum.setCustomerRoad(StringUtil.isBlank(mtFactoryOrder.getCustomAddress()) ? "" : mtFactoryOrder.getCustomAddress()); //顾客地址
 
-				/**
+				/*
-				 * 如过是中心仓 是干仓配 如是转运车 非干干脆 0
+				 * 是否干仓配 1=干仓配，0=非干仓配
 				 */
 				if ("中心仓".equals(mtFactoryOrderMain.getWarehouseType())) {
 					serviceNum.setIsOpai(1); //是否干仓配
@@ -453,9 +452,7 @@ public class AsyncDataServiceImpl implements IAsyncDataService {
 				}
 				advanceEntity.setId(advanceId);
 			} else {
-				// 更新数据 对这个 advanceEntity 这个进行属性设置 调用对象的更新方法
+				//todo 更新数据 对这个 advanceEntity 这个进行属性设置 调用对象的更新方法
-
-
 			}
 
 			factoryOrderEntity.setTurnStatus(1);
@@ -463,12 +460,8 @@ public class AsyncDataServiceImpl implements IAsyncDataService {
 			// 处理订单下面的包件数据
 			List<FactoryPackageEntity> list = factoryPackageService.lambdaQuery().eq(FactoryPackageEntity::getOrderId, factoryOrderEntity.getId()).eq(FactoryPackageEntity::getTurnStatus, 0).list();
 			for (FactoryPackageEntity factoryPackageEntity : list) {
-
 				addAdvanceDetailEntityByOuPai(factoryPackageEntity, factoryOrderEntity, advanceEntity);
-
 			}
-
-
 		}
 		factoryOrderService.updateBatchById(factoryOrderEntities);
 
@@ -625,7 +618,7 @@ public class AsyncDataServiceImpl implements IAsyncDataService {
 			serviceNumEntity = new ServiceNumEntity();
 			serviceNumEntity.setServiceNum(sn); //服务号
 			serviceNumEntity.setTotal("1"); //订单数量
-			serviceNumEntity.setDetailTotal(Objects.isNull(serviceCount) ? "" : serviceCount + ""); // 包数量
+			serviceNumEntity.setDetailTotal(Objects.isNull(serviceCount) ? "" : serviceCount ); // 包数量
 			serviceNumEntity.setStoreName(StringUtil.isBlank(storeName) ? "" : storeName); //商场名
 			serviceNumEntity.setStoreNo(StringUtil.isBlank(storeNo) ? "" : storeNo); // 商场编号
 			serviceNumEntity.setCustomerName(StringUtil.isBlank(customerName) ? "" : customerName);//顾客姓名
@@ -670,7 +663,7 @@ public class AsyncDataServiceImpl implements IAsyncDataService {
 			saveList.add(detailProductEntity);
 		}
 
-		if (saveList.size() > 0) {
+		if (!saveList.isEmpty()) {
 			boolean flag = detailProductClient.addDetailProductList(saveList);
 			UpdateWrapper<ZbPackageInfoEntity> listUpdateWrapper = new UpdateWrapper<>();
 			if (!flag) {
@@ -872,7 +865,7 @@ public class AsyncDataServiceImpl implements IAsyncDataService {
 		advanceEntity.setDealerCode(StringUtil.isBlank(serviceNumEntity.getCustomerCode()) ? "" : serviceNumEntity.getCustomerCode()); //商场编码
 		advanceEntity.setDueDate(""); // 交期
 		advanceEntity.setIsOpai(0); //是否干仓配
-		advanceEntity.setOrderNum("");//MSCS订单号 可以为空
+		advanceEntity.setOrderNum("");//MSC订单号 可以为空
 		advanceEntity.setCarrierName(zbReceiptEntity.getVendorName());//承运商 可以为空
 		advanceEntity.setCustomerName(StringUtil.isBlank(serviceNumEntity.getReceiverName()) ? "" : serviceNumEntity.getReceiverName()); //顾客名称
 		advanceEntity.setCustomerPhone(StringUtil.isBlank(serviceNumEntity.getReceiverMobile()) ? "" : serviceNumEntity.getReceiverMobile()); // 顾客电话

blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/service/impl/MtPackageInfoServiceImpl.java

@@ -48,19 +48,16 @@ public class MtPackageInfoServiceImpl extends BaseServiceImpl<MtPackageInfoMappe
 
 	@Override
 	public Boolean beachPush(List<Long> toLongList, String data) {
-		log.info("beachPush toLongList{],data={}", toLongList, data);
+		log.info("beachPush toLongList{},data={}", toLongList, data);
-
 		toLongList.forEach(t -> {
 			OrderStatusDTO orderStatusDTO = buildOrderStatusDTO(t, data);
 			try {
 				mtFactoryDataService.handleStatusData(orderStatusDTO);
-			} catch (JsonProcessingException e) {
+			} catch (JsonProcessingException | NoSuchAlgorithmException e) {
-				e.printStackTrace();
+				log.error("beachPush 处理数据异常 {}", e.getMessage());
-			} catch (NoSuchAlgorithmException e) {
-				e.printStackTrace();
 			}
 
-		});
+        });
 		return true;
 	}
 

blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/receiver/OpReceivingDataHandler.java

@@ -63,7 +63,10 @@ public class OpReceivingDataHandler {
 					try {
 						panFactoryDataService.handleDataToPlatform(orderPackageCode, receivingTime);
 					} catch (Exception e) {
-						e.printStackTrace();
+						log.error("##################opReceivingDataHandler: 处理欧派收货数据到新系统,packageStatus:{},orderPackageCode:{},receivingTime{}",
+								packageStatus,orderPackageCode,receivingTime);
+						log.error(e.getMessage());
+
 					}
 				}
 			}

blade-service/logpm-factory/src/main/java/com/logpm/factory/receiver/UnloadCarComHandler.java

@@ -97,16 +97,13 @@ public class UnloadCarComHandler {
 						sendDataCarNum(carNum, unloadCarDTO.getCompleteDate());
 					}
 				} catch (ParseException e) {
-					e.printStackTrace();
+					log.error("##################unloadCarComDataHandler 解析时间出错：{}", e.getMessage());
-				} catch (NoSuchAlgorithmException e) {
+				} catch (NoSuchAlgorithmException | JsonProcessingException ignored) {
-					e.printStackTrace();
+					log.error("##################unloadCarComDataHandler 发送数据出错：{}", ignored.getMessage());
-				} catch (JsonProcessingException e) {
-					e.printStackTrace();
 				}
-
 			}
-		}catch (Exception e){
+		} catch (Exception e) {
-			e.printStackTrace();
+			log.error("##################unloadCarComDataHandler 解析数据出错：{}", e.getMessage());
 		}
 
 
@@ -122,7 +119,7 @@ public class UnloadCarComHandler {
 	 * @throws JsonProcessingException
 	 */
 	private void sendDataCarNum(String carNum, String completeDate) throws ParseException, NoSuchAlgorithmException, JsonProcessingException {
-		log.info("##################sendDataCarNum carNum：{},completeDate{}", carNum,completeDate);
+		log.info("##################sendDataCarNum carNum：{},completeDate{}", carNum, completeDate);
 
 		// 需要判断这个发货单编号是否推送过
 		QueryWrapper<MtPushData> lambdaQueryChainWrapper = new QueryWrapper<MtPushData>();