更新

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/BiInfoController.java

@@ -96,7 +96,23 @@ public class BiInfoController {
             for (int i = 0; i < tranTaskInfos.size(); i++) {
                 TranTaskInfo tranTaskInfo = tranTaskInfos.get(i);
                 if (StringUtils.isNotBlank(tranTaskInfo.getReceiveWarehouse())) {
-                    if ("1".equals(tranTaskInfo.getWarehouseType())) {
+                    if ("1".equals(tranTaskInfo.getTaskTypeKey())) {
+
+                        BiViewInfo biViewInfo = new BiViewInfo();
+                        WarehouseBaseInfo warehouseBaseInfo = warehouseBaseInfoService.selectOne(new EntityWrapper<WarehouseBaseInfo>()
+                                .eq("comp_id", AuthSecurityUtils.getCurrentUserInfo().getCompId())
+                                .eq("warehouse_name", tranTaskInfo.getSendWarehouse()));
+                        ContractManagementInfo contractManagementInfo = contractManagementInfoService.selectOne(new EntityWrapper<ContractManagementInfo>()
+                                .eq("contract_no", tranTaskInfo.getContractNo())
+                                .eq("comp_id", AuthSecurityUtils.getCurrentUserInfo().getCompId()));
+                        if (warehouseBaseInfo != null && contractManagementInfo != null) {
+                            biViewInfo.setStartPlace(warehouseBaseInfo.getWarehousePositioning());
+                            biViewInfo.setEndPlace(contractManagementInfo.getDeliveryLocation());
+                            biViewInfo.setName(warehouseBaseInfo.getWarehouseName()+" → "+contractManagementInfo.getPlaceDelivery()+"  在途");
+                            biViewInfoList.add(biViewInfo);
+                        }
+
+                    } else if ("4".equals(tranTaskInfo.getTaskTypeKey())) {
                         BiViewInfo biViewInfo = new BiViewInfo();
                         WarehouseBaseInfo warehouseBaseInfo = warehouseBaseInfoService.selectOne(new EntityWrapper<WarehouseBaseInfo>()
                                 .eq("comp_id", AuthSecurityUtils.getCurrentUserInfo().getCompId())
@@ -110,18 +126,6 @@ public class BiInfoController {
                             biViewInfo.setName(warehouseBaseInfo.getWarehouseName()+" → "+warehouseBaseInfo1.getWarehouseName()+"  在途");
                             biViewInfoList.add(biViewInfo);
                         }
-
-                    } else if ("2".equals(tranTaskInfo.getWarehouseType())) {
-                        BiViewInfo biViewInfo = new BiViewInfo();
-                        ContractManagementInfo contractManagementInfo = contractManagementInfoService.selectOne(new EntityWrapper<ContractManagementInfo>()
-                                .eq("contract_no", tranTaskInfo.getSendWarehouse())
-                                .eq("comp_id", AuthSecurityUtils.getCurrentUserInfo().getCompId()));
-                        if (contractManagementInfo != null) {
-                            biViewInfo.setStartPlace(contractManagementInfo.getSourceLocation());
-                            biViewInfo.setEndPlace(contractManagementInfo.getDeliveryLocation());
-                            biViewInfo.setName(contractManagementInfo.getSourceCity()+" → "+contractManagementInfo.getDeliveryCity()+"  在途");
-                            biViewInfoList.add(biViewInfo);
-                        }
                     }
 
                 }