From af4ee90ad6ced67bc1d60f45b599fe79875fd8a2 Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Thu, 19 Oct 2023 14:38:24 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=90=8C=E6=AD=A5=E6=95=B0=E6=8D=AE=E9=80=BB?= =?UTF-8?q?=E8=BE=91=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/InventoryDetailMapper.xml | 2 ++ .../logpm/oldproject/mapper/OrderMapper.xml | 3 +-- .../jobhandle/SyncOrderInfoToPlatform.java | 18 +++++++++++++----- .../service/impl/SyncOrderInfoServiceImpl.java | 17 +++++++++++++---- 4 files changed, 29 insertions(+), 11 deletions(-) diff --git a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/InventoryDetailMapper.xml b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/InventoryDetailMapper.xml index a77908182..0c4f47036 100644 --- a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/InventoryDetailMapper.xml +++ b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/InventoryDetailMapper.xml @@ -30,6 +30,8 @@ where inventory_id in (185,187,188,189) and tray_id != 0 and unitNo != '10215486=027916' + and status = 2 + and delete_time = 0 group by unitNo, tray_id diff --git a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/OrderMapper.xml b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/OrderMapper.xml index 814a09968..297d02a7f 100644 --- a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/OrderMapper.xml +++ b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/OrderMapper.xml @@ -33,8 +33,7 @@ `ht_order_count` `i` INNER JOIN `ht_order` `order` ON `order`.`selfnumber` = `i`.`orderSelfNum` WHERE - `i`.`history_type` = 0 - AND `i`.`status` <> 11 + `i`.`status` <> 11 AND `i`.`delete_time` = '0' AND ( ( `i`.`in_num` + `i`.`delives_num` ) > 0 ) AND `i`.`goods_type` = '1' diff --git a/blade-service/logpm-patch/src/main/java/com/logpm/patch/jobhandle/SyncOrderInfoToPlatform.java b/blade-service/logpm-patch/src/main/java/com/logpm/patch/jobhandle/SyncOrderInfoToPlatform.java index 84ce318b5..9150c70af 100644 --- a/blade-service/logpm-patch/src/main/java/com/logpm/patch/jobhandle/SyncOrderInfoToPlatform.java +++ b/blade-service/logpm-patch/src/main/java/com/logpm/patch/jobhandle/SyncOrderInfoToPlatform.java @@ -231,14 +231,22 @@ public class SyncOrderInfoToPlatform { //查询需要同步的仓库 List warehouseMappingDataEntityList = warehouseMappingDataService.getWarehouseMapping(); if(warehouseMappingDataEntityList.isEmpty()){ - log.warn("###############syncZeroOrderInfo: 当前没有配置需要同步的仓库信息"); + log.warn("###############syncTrayType: 当前没有配置需要同步的仓库信息"); return ReturnT.FAIL; } - for (WarehouseMappingDataEntity entity:warehouseMappingDataEntityList){ - Integer oldWarehouseId = entity.getOldWarehouseId(); - Long newWarehouseId = entity.getNewWarehouseId(); + try{ + for (WarehouseMappingDataEntity entity:warehouseMappingDataEntityList){ + Integer oldWarehouseId = entity.getOldWarehouseId(); + Long newWarehouseId = entity.getNewWarehouseId(); - syncOrderInfoService.syncTrayType(oldWarehouseId,newWarehouseId); + syncOrderInfoService.syncTrayType(oldWarehouseId,newWarehouseId); + } + }catch (CustomerException e){ + log.error(e.message,e); + return ReturnT.FAIL; + }catch (Exception e){ + log.error("#############syncTrayType: 同步数据失败",e); + return ReturnT.FAIL; } return ReturnT.SUCCESS; diff --git a/blade-service/logpm-patch/src/main/java/com/logpm/patch/service/impl/SyncOrderInfoServiceImpl.java b/blade-service/logpm-patch/src/main/java/com/logpm/patch/service/impl/SyncOrderInfoServiceImpl.java index 0db411df3..d52e02fd1 100644 --- a/blade-service/logpm-patch/src/main/java/com/logpm/patch/service/impl/SyncOrderInfoServiceImpl.java +++ b/blade-service/logpm-patch/src/main/java/com/logpm/patch/service/impl/SyncOrderInfoServiceImpl.java @@ -775,6 +775,11 @@ public class SyncOrderInfoServiceImpl implements ISyncOrderInfoService { log.info("###########saveOrderPackage: 包条不在盘点任务中存在，不同步 unitNo={}",unitNo); continue; } + DistributionParcelListEntity parcelListEntity = distributionParcelListClient.findByPacketBarCode(unitNo); + if(!Objects.isNull(parcelListEntity)){ + log.info("###########saveOrderPackage: 包条已存在，不同步 unitNo={}",unitNo); + continue; + } Integer status = orderDetailEntity.getStatus(); Integer carsType = orderDetailEntity.getCarsType(); @@ -1013,16 +1018,20 @@ public class SyncOrderInfoServiceImpl implements ISyncOrderInfoService { String unitNo = entity.getUnitNo();//包条码 TrayScanDesEntity trayScanDesEntity = trayScanDesClient.findScanTypeId(trayId,unitNo,oldWarehouseId); - Integer trayScanId = trayScanDesEntity.getTrayScanId(); + Integer type = 0; + if(!Objects.isNull(trayScanDesEntity)){ + Integer trayScanId = trayScanDesEntity.getTrayScanId(); + //查询打托方式信息 + TrayScanEntity trayScanEntity = trayScanClient.getEntityByTrayScanId(trayScanId); + type = trayScanEntity.getType(); + } + InventoryDetailEntity inventoryDetailEntity = inventoryDetailClient.findUnitNoIsExist(unitNo); if(Objects.isNull(inventoryDetailEntity)){ log.info("###########saveTrayTypeInfoPackage: 包条不在盘点任务中存在，不同步 unitNo={}",unitNo); continue; } - //查询打托方式信息 - TrayScanEntity trayScanEntity = trayScanClient.getEntityByTrayScanId(trayScanId); - Integer type = trayScanEntity.getType(); //方式：1=仓，2=商场，3=客户，4=其他,5=服务号，6=合同号 //方式：60=仓，30=商场，50=客户，100=其他,10=服务号，20=合同号