待入库_维多利亚bug

hx-purchase/src/main/java/com/fjhx/purchase/service/arrival/impl/ArrivalServiceImpl.java

@@ -168,12 +168,14 @@ public class ArrivalServiceImpl extends ServiceImpl<ArrivalMapper, Arrival> impl
         Subscribe byId1 = subscribeService.getById(byId.getSubscribeId());
         String victoriatouristJson1 = byId1.getVictoriatouristJson();
         if(ObjectUtil.isNotEmpty(victoriatouristJson1)){
+            //去申购单取仓库id
             JSONObject json1 = JSONObject.parseObject(victoriatouristJson1);
             Long receiptWarehouseId = json1.getLong("receiptWarehouseId");
             json.put("receiptWarehouseId",receiptWarehouseId);
-            CompanyInfo logisticsCompanyCode = companyInfoService.getOne(q -> q.eq(CompanyInfo::getCode, json.getString("logisticsCompanyCode")));
-            json.put("logisticsCompanyName",logisticsCompanyCode.getName());
         }
+        //赋值物流公司名称
+        CompanyInfo logisticsCompanyCode = companyInfoService.getOne(q -> q.eq(CompanyInfo::getCode, json.getString("logisticsCompanyCode")));
+        json.put("logisticsCompanyName",logisticsCompanyCode.getName());
         //修改发货记录的状态为到货
         Long deliverGoodsId = json.getLong("deliverGoodsId");
         wdlyService.updateDeliverGoodsStatus(deliverGoodsId);