待入库 物流信息显示错误处理

hx-wms/pom.xml

@@ -25,6 +25,12 @@
             <groupId>com.fjhx</groupId>
             <artifactId>hx-item</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.ruoyi</groupId>
+            <artifactId>hx-kd100</artifactId>
+            <version>3.8.5</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
 

hx-wms/src/main/java/com/fjhx/wms/entity/stock/vo/StockWaitVo.java

@@ -77,4 +77,17 @@ public class StockWaitVo extends StockWait {
      */
     private Object purchaseBackInfo;
 
+    /**
+     * 物流公司code
+     */
+    private String logisticsCompanyCode;
+    /**
+     * 物流公司名称
+     */
+    private String logisticsCompanyName;
+    /**
+     * 物流单号
+     */
+    private String logisticsCode;
+
 }

hx-wms/src/main/java/com/fjhx/wms/service/stock/impl/StockWaitServiceImpl.java

@@ -13,6 +13,8 @@ import com.fjhx.common.utils.Assert;
 import com.fjhx.item.entity.product.po.ProductInfo;
 import com.fjhx.item.service.product.ProductInfoService;
 import com.fjhx.item.util.excel.util.ExcelUtil;
+import com.fjhx.kd100.entity.company.po.CompanyInfo;
+import com.fjhx.kd100.service.company.CompanyInfoService;
 import com.fjhx.wms.entity.ArrivalDetailPo;
 import com.fjhx.wms.entity.PurchaseDetailPo;
 import com.fjhx.wms.entity.arrival.po.ArrivalStockRecords;
@@ -84,6 +86,8 @@ public class StockWaitServiceImpl extends ServiceImpl<StockWaitMapper, StockWait
     private StockFrozenService stockFrozenService;
     @Autowired
     private PurService purService;
+    @Autowired
+    private CompanyInfoService companyInfoService;
 
     @Override
     public Page<StockWaitVo> getPage(StockWaitSelectDto dto) {
@@ -132,6 +136,15 @@ public class StockWaitServiceImpl extends ServiceImpl<StockWaitMapper, StockWait
         Page<StockWaitVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
 
         List<StockWaitVo> records = page.getRecords();
+        if(ObjectUtil.isEmpty(records)){
+            return page;
+        }
+
+        List<String> logisticsCompanyCodes = records.stream().map(StockWaitVo::getLogisticsCompanyCode).distinct().collect(Collectors.toList());
+        //物流公司名称map
+        Map<String, String> logisticsCompanyMap = companyInfoService.mapKV(CompanyInfo::getCode, CompanyInfo::getName,
+                q -> q.in(CompanyInfo::getCode, logisticsCompanyCodes));
+
         //赋值操作人
         UserUtil.assignmentNickName(records, StockWaitVo::getCreateUser, StockWaitVo::setOperatorName);
         //赋值仓库名称和id
@@ -159,6 +172,12 @@ public class StockWaitServiceImpl extends ServiceImpl<StockWaitMapper, StockWait
             }
             JSONObject json = JSONObject.parseObject(victoriatouristJson);
             json.put("receiptWarehouseName", warehousesMap.get(json.getLong("receiptWarehouseId")));
+
+            //重新赋值物流信息
+            json.put("logisticsCompanyName",logisticsCompanyMap.get(stockWaitVo.getLogisticsCompanyCode()));
+            json.put("logisticsCompanyCode",stockWaitVo.getLogisticsCompanyCode());
+            json.put("code",stockWaitVo.getLogisticsCode());
+
             stockWaitVo.setVictoriatouristJson(JSONObject.toJSONString(json, JSONWriter.Feature.WriteLongAsString));
         }
 

hx-wms/src/main/resources/mapper/stock/StockWaitMapper.xml

@@ -36,11 +36,14 @@
             sw.create_time,
             sw.update_user,
             sw.update_time,
-            sw.victoriatourist_json
+            sw.victoriatourist_json,
+            lis.logistics_company_code,
+            lis.`code` AS logisticsCode
         FROM
             stock_wait sw
                 LEFT JOIN stock_wait_details swd ON swd.stock_wait_id = sw.id
                 LEFT JOIN bytesailing_item.product_info pi ON swd.product_id = pi.id
+                LEFT JOIN bytesailing_victoriatourist.logistics_infos lis ON lis.business_id = CAST( json_unquote( sw.victoriatourist_json -> '$.deliverGoodsId' ) AS UNSIGNED )
             ${ew.customSqlSegment}
     </select>
     <select id="getStockWaitList" resultType="com.fjhx.wms.entity.stock.vo.StockWaitDetailsVo">