From b4a4b4becf8515563305a372961a265a0dcec89c Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Thu, 19 Oct 2023 10:10:27 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=90=8C=E6=AD=A5=E8=AE=A2=E5=8D=95=EF=BC=8C?= =?UTF-8?q?=E9=9B=B6=E6=8B=85=E8=AE=A2=E5=8D=95=E6=95=B0=E6=8D=AEbug?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SyncOrderInfoServiceImpl.java | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) 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 9e6e2715d..8f51ff71d 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 @@ -129,6 +129,12 @@ public class SyncOrderInfoServiceImpl implements ISyncOrderInfoService { for (TrayScanDesEntity trayScanDesEntity:list){ Integer trayScanId = trayScanDesEntity.getTrayScanId(); String unitNo = trayScanDesEntity.getUnitNo();//包条码 + + InventoryDetailEntity inventoryDetailEntity = inventoryDetailClient.findUnitNoIsExist(unitNo); + if(Objects.isNull(inventoryDetailEntity)){ + log.info("###########saveTrayTypeInfoPackage: 包条不在盘点任务中存在，不同步 unitNo={}",unitNo); + continue; + } //查询打托方式信息 TrayScanEntity trayScanEntity = trayScanClient.getEntityByTrayScanId(trayScanId); Integer type = trayScanEntity.getType(); @@ -278,7 +284,6 @@ public class SyncOrderInfoServiceImpl implements ISyncOrderInfoService { distributionStockArticleEntity.setWaybillId(warehouseWaybill.getId()); distributionStockArticleEntity.setWarehouseId(basicdataWarehouseEntity.getId()); distributionStockArticleEntity.setMallName(consignee); - distributionStockArticleEntity.setMallCode(clientEntity.getClientCode()); distributionStockArticleEntity.setMallId(warehouseWaybill.getConsigneeId()); distributionStockArticleEntity.setDescriptionGoods(warehouseWaybill.getGoodsName()); distributionStockArticleEntity.setWarehouse(basicdataWarehouseEntity.getName()); @@ -286,7 +291,11 @@ public class SyncOrderInfoServiceImpl implements ISyncOrderInfoService { distributionStockArticleEntity.setTotalNumber(totalCount); distributionStockArticleEntity.setHandQuantity(stockCount); distributionStockArticleEntity.setDealerName(consignee); - distributionStockArticleEntity.setDealerCode(clientEntity.getClientCode()); + + if(!Objects.isNull(clientEntity)){ + distributionStockArticleEntity.setMallCode(clientEntity.getClientCode()); + distributionStockArticleEntity.setDealerCode(clientEntity.getClientCode()); + } //零担订单默认齐套 distributionStockArticleEntity.setCompleteSet(1);