Public/cf_imes_server
6
0
Fork 0
mirror of http://192.168.1.205:9980/cf_devdept2/cf_imes_server.git synced 2026-08-13 21:32:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

基础配置权限修改，禅道-模糊，工序Bug修改

Browse Source
This commit is contained in:
liuzhaotian
2024-06-26 14:56:15 +08:00
parent 5b9ead86d1
commit 8e5d71bf4b
14 changed files with 112 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plan/PlanServiceImpl.java
+14 -2
View File
@@ -2,6 +2,7 @@ package com.cf.imes.module.executor.service.plan;
import cn.hutool.core.collection.CollectionUtil;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.incrementer.IdentifierGenerator;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -320,7 +321,7 @@ public class PlanServiceImpl implements PlanService {
queryWrapperX
.eq("a.organ_id",getUserOrganId())
.eq("a.status",OrderStatusEnum.NO_SORT.getStatus())
.eqIfPresent("a.id", pageReqVO.getOrderId())
.likeIfPresent("a.id", "%"+pageReqVO.getOrderId()+"%")
.isNull("opi.item_id")
.eqIfPresent("a.customer", pageReqVO.getConsignee())
.eqIfPresent("a.custom_order_no", pageReqVO.getDefaultId())
@@ -450,6 +451,7 @@ public class PlanServiceImpl implements PlanService {
.betweenIfPresent("a.height", new BigDecimal[]{vo.getLongMinRang(), vo.getLongMaxRang()})
.inIfPresent("a.filter_type", filterTypes)
.betweenIfPresent("f.delivery_date", new Date[]{vo.getBeginDate(), vo.getEndDate()})
.orderByDesc("a.order_id")
.orderByDesc("a.name");
PageDTO<PlateResList> page = new PageDTO<>(vo.getPageNo(), vo.getPageSize());
IPage<PlateResList> pageResult = plateMapper.selectPlateByPlanId(page, queryWrapperX);
@@ -513,8 +515,18 @@ public class PlanServiceImpl implements PlanService {
public List<PlateResList> getPlateList(List<Long> planIds) {
return plateMapper.selectPlateListByPlanId(planIds,getUserOrganId());
List<PlateResList> plateResLists = plateMapper.selectPlateListByPlanId(planIds, getUserOrganId());
Set<Long> bodyIds = plateResLists.stream().map(PlateResList::getBodyId).collect(Collectors.toSet());
if (CollectionUtil.isNotEmpty(bodyIds)) {
List<OrderBodyDO> orderBodyDOS = orderBodyMapper.selectBatchIds(bodyIds);
for (PlateResList resList :plateResLists) {
resList.setBodyName(orderBodyDOS.stream().filter(e -> Objects.equals(e.getId(), resList.getBodyId())).map(OrderBodyDO::getName).findAny().orElse(null));
resList.setRoomName(orderBodyDOS.stream().filter(e -> Objects.equals(e.getRoomId(), resList.getRoomId())).map(OrderBodyDO::getRoomName).findAny().orElse(null));
}
}
return plateResLists;
}
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/plate/PlateMapper.xml
+4 -4
View File
@@ -296,10 +296,10 @@
select distinct a.order_id, a.plate_no , a.name as plateName,a.is_special_shaped,a.is_sculpt,a.area,a.seal_left,a.seal_right,a.seal_up,a.seal_down, e.material, e.color, a.width, a.height, a.thickness, b.room_id, b.body_id
from order_plan_item p
left join order_item b on p.item_id = b.id and b.organ_id = p.organ_id
left join order_plate a on b.plate_id = a.id and b.order_id = a.order_id and b.organ_id = a.organ_id
left join order_goods e on a.goods_id = e.id and a.order_id = e.order_id and a.organ_id = e.organ_id
from order_plate a
LEFT JOIN order_item b ON a.id = b.plate_id AND a.order_id = b.order_id and a.organ_id = b.organ_id
LEFT JOIN order_goods e ON e.id = a.goods_id AND e.order_id = a.order_id and e.organ_id = a.organ_id
LEFT JOIN order_plan_item p ON b.id = p.item_id and b.organ_id = p.organ_id
where p.organ_id = #{organId}
and p.plan_id in