licq/heli-mes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

订单跟踪查询条件修改

Browse Source
This commit is contained in:
Ledo 2025-01-27 09:10:09 +08:00
parent 71697bcd0a
commit c654259f6e
3 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/processdesign/ProcessDesignMapper.java
View File

@ -46,7 +46,7 @@ public interface ProcessDesignMapper extends BaseMapperX<ProcessDesignDO> {
.leftJoin("system_users u5 on u5.id = b.three_dim_owner") .leftJoin("system_users u5 on u5.id = b.three_dim_owner")
.leftJoin("(select progress,process_design_id,blueprint_link FROM pro_process_design_progress where id in (select max(id) FROM pro_process_design_progress GROUP BY process_design_id) ) z on z.process_design_id = t.id") .leftJoin("(select progress,process_design_id,blueprint_link FROM pro_process_design_progress where id in (select max(id) FROM pro_process_design_progress GROUP BY process_design_id) ) z on z.process_design_id = t.id")
.disableSubLogicDel(); .disableSubLogicDel();
if(reqVO.getPgType() == 0){ if(reqVO.getPgType()!=null && reqVO.getPgType() == 0){
query.orderByAsc(ProjectOrderDO::getCode); query.orderByAsc(ProjectOrderDO::getCode);
}else { }else {
query.orderByDesc(ProjectOrderDO::getCode); query.orderByDesc(ProjectOrderDO::getCode);

8
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/track/TrackMapper.java
View File

@ -49,18 +49,12 @@ public interface TrackMapper extends BaseMapperX<TrackDO> {
.leftJoin(PlanSubDO.class,"ps",PlanSubDO::getProjectSubId,ProjectOrderSubDO::getId) .leftJoin(PlanSubDO.class,"ps",PlanSubDO::getProjectSubId,ProjectOrderSubDO::getId)
.leftJoin(PlanDO.class,"pl",PlanDO::getId,PlanSubDO::getProjectPlanId) .leftJoin(PlanDO.class,"pl",PlanDO::getId,PlanSubDO::getProjectPlanId)
.leftJoin(DeliverOrderSubDO.class,"dos",DeliverOrderSubDO::getSaleOrderSubId,ProjectOrderSubDO::getId) .leftJoin(DeliverOrderSubDO.class,"dos",DeliverOrderSubDO::getSaleOrderSubId,ProjectOrderSubDO::getId)
.eq(DeliverOrderSubDO::getCategory,"DELIVER_LIST") // .ne(DeliverOrderSubDO::getCategory,"OTHER_LIST")
.selectSum(DeliverOrderSubDO::getAmount,"totalReportAmount")//总共发货数量 .selectSum(DeliverOrderSubDO::getAmount,"totalReportAmount")//总共发货数量
// .leftJoin(AdminUserDO.class,"u",AdminUserDO::getId,TaskDispatchDetailDO::getOwner)
// .leftJoin(ProcessBomDO.class,"pb",ProcessBomDO::getProjectSubId,TaskDispatchDO::getProjectSubId)
// .ne(ProcessBomDO::getBomStatus,3)
// .selectSum(TaskReportDO::getAmount,"totalReportAmount").selectSum(TaskReportDO::getWorkTime,"totalWorkTime")
.eq(ProjectOrderDO::getOrderStatus,32) //已启动 .eq(ProjectOrderDO::getOrderStatus,32) //已启动
.ne(ProjectOrderDO::getDeliveryStatus,3) //不为全部发货 .ne(ProjectOrderDO::getDeliveryStatus,3) //不为全部发货
.orderByDesc(ProjectOrderDO::getProjectEndTime) .orderByDesc(ProjectOrderDO::getProjectEndTime)
.isNotNull(DeliverOrderSubDO::getSaleOrderSubId)
.groupBy(ProjectOrderSubDO::getId); .groupBy(ProjectOrderSubDO::getId);
// .getSelectDistinct();
if (reqVO.getProjectCode()!=null&&!reqVO.getProjectCode().trim().equals("")){ if (reqVO.getProjectCode()!=null&&!reqVO.getProjectCode().trim().equals("")){
query.like(ProjectOrderDO::getCode,reqVO.getProjectCode()); query.like(ProjectOrderDO::getCode,reqVO.getProjectCode());
} }

4
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/track/TrackServiceImpl.java
View File

@ -106,7 +106,9 @@ public class TrackServiceImpl implements TrackService {
for (ProjectOrderSubDO to : list) { for (ProjectOrderSubDO to : list) {
// 计算两个时间之间的天数差异 // 计算两个时间之间的天数差异
long daysBetween = ChronoUnit.DAYS.between(currentTime, to.getProjectEndTime()); long daysBetween = ChronoUnit.DAYS.between(currentTime, to.getProjectEndTime());
if(to.getTotalReportAmount() == null){
to.setTotalReportAmount(0);
}
// 四舍五入到最接近的整数 // 四舍五入到最接近的整数
BigDecimal daysDifference = BigDecimal.valueOf(daysBetween).setScale(0, RoundingMode.HALF_UP); BigDecimal daysDifference = BigDecimal.valueOf(daysBetween).setScale(0, RoundingMode.HALF_UP);
TrackDO trackDO = new TrackDO(); TrackDO trackDO = new TrackDO();