From 4e611c6dc6b3d20a294fb6a0ae70399f0c359667 Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" <123456> Date: Thu, 7 Sep 2023 22:14:44 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../feign/IWarehouseTaryAllocationClient.java | 2 +- .../IDistributionStockArticleService.java | 1 - .../DistrilbutionBillLadingWrapper.java | 3 +-- .../service/impl/AsyncDataServiceImpl.java | 23 +++++++------------ .../impl/MtPackageInfoServiceImpl.java | 11 ++++----- .../receiver/OpReceivingDataHandler.java | 5 +++- .../factory/receiver/UnloadCarComHandler.java | 15 +++++------- 7 files changed, 24 insertions(+), 36 deletions(-) diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseTaryAllocationClient.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseTaryAllocationClient.java index 036ad3511..0b05c8345 100644 --- a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseTaryAllocationClient.java +++ b/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 getAllocationId(@RequestParam Long allocationId); diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockArticleService.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockArticleService.java index 83b1a9523..b7f165b4b 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockArticleService.java +++ b/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; diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/wrapper/DistrilbutionBillLadingWrapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/wrapper/DistrilbutionBillLadingWrapper.java index 3a3eb53c1..8b2bf9497 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/wrapper/DistrilbutionBillLadingWrapper.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/wrapper/DistrilbutionBillLadingWrapper.java @@ -21,8 +21,7 @@ public class DistrilbutionBillLadingWrapper extends BaseEntityWrapper 0) { + if (!saveList.isEmpty()) { boolean flag = detailProductClient.addDetailProductList(saveList); UpdateWrapper 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 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 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()); // 顾客电话 diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/service/impl/MtPackageInfoServiceImpl.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/service/impl/MtPackageInfoServiceImpl.java index 56dc33719..81daa0d7e 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/service/impl/MtPackageInfoServiceImpl.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/service/impl/MtPackageInfoServiceImpl.java @@ -48,19 +48,16 @@ public class MtPackageInfoServiceImpl extends BaseServiceImpl 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) { - e.printStackTrace(); - } catch (NoSuchAlgorithmException e) { - e.printStackTrace(); + } catch (JsonProcessingException | NoSuchAlgorithmException e) { + log.error("beachPush 处理数据异常 {}", e.getMessage()); } - }); + }); return true; } diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/receiver/OpReceivingDataHandler.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/receiver/OpReceivingDataHandler.java index 85f7b3928..f189d6845 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/receiver/OpReceivingDataHandler.java +++ b/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()); + } } } diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/receiver/UnloadCarComHandler.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/receiver/UnloadCarComHandler.java index ec1749468..ae87b6573 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/receiver/UnloadCarComHandler.java +++ b/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(); - } catch (NoSuchAlgorithmException e) { - e.printStackTrace(); - } catch (JsonProcessingException e) { - e.printStackTrace(); + log.error("##################unloadCarComDataHandler 解析时间出错：{}", e.getMessage()); + } catch (NoSuchAlgorithmException | JsonProcessingException ignored) { + log.error("##################unloadCarComDataHandler 发送数据出错：{}", ignored.getMessage()); } - } - }catch (Exception e){ - e.printStackTrace(); + } catch (Exception e) { + 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 lambdaQueryChainWrapper = new QueryWrapper();