Browse Source

fix:修改大屏的查询,这里的查询方式存在问题,需要考虑走fengin的方式 直接带上数据库名称查询方式不太可取。

fix-sign
pref_mail@163.com 3 months ago
parent
commit
9d1fd693b9
  1. 2
      blade-biz-common/src/main/java/org/springblade/common/constant/ModuleNameConstant.java
  2. 54
      blade-service-api/logpm-data-sharing-api/src/main/java/com/logpm/datasharing/vo/NodeInfoVO.java
  3. 5
      blade-service-api/logpm-data-sharing-api/src/main/java/com/logpm/datasharing/vo/WaybillInfoVO.java
  4. 28
      blade-service/logpm-data-sharing/src/main/java/com/logpm/datasharing/service/impl/LogpmDataSearchServiceImpl.java

2
blade-biz-common/src/main/java/org/springblade/common/constant/ModuleNameConstant.java

@ -9,7 +9,7 @@ public interface ModuleNameConstant {
/**
* 如果不需要 ""
*/
public static final String DEVAUTH ="";
public static final String DEVAUTH ="-pref";
/**
* 工厂对接服务名称

54
blade-service-api/logpm-data-sharing-api/src/main/java/com/logpm/datasharing/vo/NodeInfoVO.java

@ -0,0 +1,54 @@
package com.logpm.datasharing.vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
@Data
public class NodeInfoVO implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 操作节点 入库-干线发车-干线到达-目的仓配送装车-目的仓配送签收
*/
@ApiModelProperty(value = "操作节点")
private String operateName;
/**
* 操作网点
*/
@ApiModelProperty(value = "操作网点")
private String operateWarehouseName;
/**
* 操作时间
*/
@ApiModelProperty(value = "操作时间")
private Date operateTime;
/**
* 操作件数
*/
@ApiModelProperty(value = "操作件数")
private String operateNumber;
/**
* 操作车次号
*/
@ApiModelProperty(value = "操作车次号")
private String operateCarNumber;
/**
* 操作计划时间
*/
@ApiModelProperty(value = "操作计划时间")
private Date operatePlanTime;
}

5
blade-service-api/logpm-data-sharing-api/src/main/java/com/logpm/datasharing/vo/WaybillInfoVO.java

@ -83,7 +83,7 @@ public class WaybillInfoVO implements Serializable {
/**
* 在途数量
*/
@ApiModelProperty(value = "总数")
@ApiModelProperty(value = "在途数量")
private Integer onWayCount;
@ -131,6 +131,9 @@ public class WaybillInfoVO implements Serializable {
@ApiModelProperty(value = "签收数量")
private Integer signNum;
@ApiModelProperty(value = "节点信息")
private List<NodeInfoVO> nodeInfoVOList;

28
blade-service/logpm-data-sharing/src/main/java/com/logpm/datasharing/service/impl/LogpmDataSearchServiceImpl.java

@ -1,6 +1,7 @@
package com.logpm.datasharing.service.impl;
import com.logpm.datasharing.service.ILogpmDataSearchService;
import com.logpm.datasharing.vo.NodeInfoVO;
import com.logpm.datasharing.vo.WarehouseNumberVO;
import com.logpm.datasharing.vo.WaybillInfoVO;
import com.logpm.distribution.entity.DistributionParcelListEntity;
@ -118,10 +119,37 @@ public class LogpmDataSearchServiceImpl implements ILogpmDataSearchService {
result.setOnWayCount(result.getTotalCount()-temp);
// 增加节点信息
List<NodeInfoVO> nodeInfoVOList = new ArrayList<>();;
// 入库
NodeInfoVO nodeInfoVO =buildFristRuKu(groupedByWarehouse,result.getDepartureWarehouseName(),result.getTotalCount());
nodeInfoVOList.add(nodeInfoVO);
return result;
}
private NodeInfoVO buildFristRuKu(Map<String, List<DistributionParcelListEntity>> groupedByWarehouse, String departureWarehouseName,Integer totalCount) {
NodeInfoVO nodeInfoVO = new NodeInfoVO();
nodeInfoVO.setOperateName("入库");
nodeInfoVO.setOperateWarehouseName(departureWarehouseName);
List<DistributionParcelListEntity> distributionParcelListEntities = groupedByWarehouse.get(departureWarehouseName);
// 获取第一个时间
nodeInfoVO.setOperateTime(distributionParcelListEntities.get(0).getCreateTime());
nodeInfoVO.setOperateNumber(distributionParcelListEntities.size()+"/"+totalCount);
return nodeInfoVO;
}
private String changeStatusName(String waybillStatus) {
if(waybillStatus==null){

Loading…
Cancel
Save