1.获取运单的收货单位

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

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