From 9a0de47c0fa053b2ea99073858d1a5af6905133f Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Tue, 4 Jul 2023 18:21:56 +0800 Subject: [PATCH] =?UTF-8?q?1.=E8=8E=B7=E5=8F=96=E8=BF=90=E5=8D=95=E7=9A=84?= =?UTF-8?q?=E6=94=B6=E8=B4=A7=E5=8D=95=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../factory/pan/service/impl/PanFactoryDataServiceImpl.java | 3 ++- .../java/com/logpm/oldproject/mapper/AdvanceDetailMapper.xml | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/pan/service/impl/PanFactoryDataServiceImpl.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/pan/service/impl/PanFactoryDataServiceImpl.java index 65449f9cc..afea27c11 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/pan/service/impl/PanFactoryDataServiceImpl.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/pan/service/impl/PanFactoryDataServiceImpl.java @@ -344,6 +344,7 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService { Map supplyData = advanceDetailClient.getSupplyData(unitNo); String destinationWarehouse = supplyData.get("destinationWarehouse");//目的仓名称 + String takeCompany = supplyData.get("takeCompany"); BasicdataWarehouseEntity basicdataWarehouseEntity = basicdataWarehouseClient.findByName(destinationWarehouse); //判断新系统是否有这条订单数据 @@ -356,7 +357,7 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService { distributionStockArticleEntity = new DistributionStockArticleEntity(); distributionStockArticleEntity.setServiceNumber(advanceEntity.getServiceNum()); distributionStockArticleEntity.setOrderSelfNumbering(advanceEntity.getOrderSelfNum()); - distributionStockArticleEntity.setMallName(advanceEntity.getStoreName()); + distributionStockArticleEntity.setMallName(takeCompany); distributionStockArticleEntity.setDescriptionGoods(advanceEntity.getFirstPackName()); distributionStockArticleEntity.setWarehouse(destinationWarehouse); distributionStockArticleEntity.setWarehouseEntryTime(date); diff --git a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/AdvanceDetailMapper.xml b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/AdvanceDetailMapper.xml index 022d8af90..d3dac9858 100644 --- a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/AdvanceDetailMapper.xml +++ b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/AdvanceDetailMapper.xml @@ -79,7 +79,8 @@ SELECT wo.waybill_no logiBillNo, wb.warehouse_name destinationWarehouse, - cast (wb.warehouse_id as char) destinationWarehouseId + cast (wb.warehouse_id as char) destinationWarehouseId, + wb.take_company takeCompany FROM ht_advance_detail d left join ht_waybill_order wo on wo.advance_id = d.advance_id and wo.delete_time = 0 left join ht_way_bill wb on wb.id = wo.way_bill_id and wb.delete_time = 0