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