mirror of
http://192.168.1.205:9980/cf_devdept2/cf_imes_server.git
synced 2026-08-13 05:12:07 +08:00
排单接口按新数据结构查询数据修改
This commit is contained in:
liuzhaotian
+27
-10
@@ -8,6 +8,7 @@ import com.cf.imes.framework.common.pojo.PageResult;
|
||||
import com.cf.imes.framework.mybatis.core.mapper.BaseMapperX;
|
||||
import com.cf.imes.framework.mybatis.core.query.LambdaQueryWrapperX;
|
||||
import com.cf.imes.module.executor.controller.admin.goods.vo.GoodsPageReqVO;
|
||||
import com.cf.imes.module.executor.controller.admin.plan.bo.OrderRoomBodyList;
|
||||
import com.cf.imes.module.executor.controller.admin.plan.saveOptimize.NotPlanGoodsRespVO;
|
||||
import com.cf.imes.module.executor.controller.admin.plan.vo.*;
|
||||
import com.cf.imes.module.executor.dal.dataobject.goods.GoodsDO;
|
||||
@@ -82,16 +83,6 @@ public interface GoodsMapper extends BaseMapperX<GoodsDO> {
|
||||
IPage<OrderGoodsResp> selectGoods(@Param("page") IPage page, @Param("goodsIds") List<Long> goodsIds, @Param("organId") Long organId);
|
||||
|
||||
|
||||
// default GoodsDO selectId(Long orderId, Long goodsId, Long organId) {
|
||||
// return selectOne(new LambdaQueryWrapperX<GoodsDO>()
|
||||
// }
|
||||
// default List<GoodsDO> selectGoodsPlateList(List<Long> goodIds, Long organId) {
|
||||
// return selectList(new LambdaQueryWrapperX<GoodsDO>()
|
||||
// .eq(GoodsDO::getOrganId, organId)
|
||||
// .inIfPresent(GoodsDO::getOrderId, goodIds)
|
||||
// .select(GoodsDO::getGoodsId,GoodsDO::getGoodsName, GoodsDO::getMaterial, GoodsDO::getColor, GoodsDO::getTexture,GoodsDO::getThickness, GoodsDO::getSpec));
|
||||
// }
|
||||
|
||||
|
||||
List<NotPlanGoodsRespVO> selectGoodsPlateList(@Param("goodIds") List<Long> goodIds,@Param("organId") Long organId);
|
||||
|
||||
@@ -187,4 +178,30 @@ public interface GoodsMapper extends BaseMapperX<GoodsDO> {
|
||||
|
||||
|
||||
IPage<OrderRespVOCopy> selectNoPlanOrderList(@Param("page") IPage page, @Param(Constants.WRAPPER) Wrapper<GoodsDO> wrapper);
|
||||
|
||||
|
||||
|
||||
default int deletePlanGoods(List<Long> ids, Long organId) {
|
||||
return update(new LambdaUpdateWrapper<GoodsDO>()
|
||||
.set(GoodsDO::getPlanId, 0)
|
||||
.eq(GoodsDO::getOrganId, organId)
|
||||
.in(GoodsDO::getPlanId, ids));
|
||||
}
|
||||
|
||||
|
||||
|
||||
default List<GoodsDO> selectPlanGoodsListByPlanIdList(List<Long> planIds, Long organId) {
|
||||
return selectList(new LambdaQueryWrapperX<GoodsDO>()
|
||||
.eq(GoodsDO::getOrganId, organId)
|
||||
.eq(GoodsDO::getDeleted, false)
|
||||
.in(GoodsDO::getPlanId,planIds)
|
||||
.select(GoodsDO::getGoodsId,GoodsDO::getId,GoodsDO::getOrderId));
|
||||
|
||||
}
|
||||
|
||||
|
||||
List<PlateResList> selectPlateListByPlanId(@Param("planIds") List<Long> planIds, @Param("organId") Long organId);
|
||||
|
||||
|
||||
List<OrderRoomBodyList> selectNoPlanRoomBody(@Param("orderIds") List<Long> orderIds, @Param("organId") Long organId);
|
||||
}
|
||||
+10
@@ -251,4 +251,14 @@ public interface OrderMapper extends BaseMapperX<OrderDO> {
|
||||
|
||||
List<OrderGoodsResp> selectGoodsListByGoodsId(@Param(Constants.WRAPPER) QueryWrapperX<OrderDO> queryWrapperX);
|
||||
|
||||
|
||||
|
||||
default List<OrderDO> selectNoPlanOrderList(Long organId, List<Integer> statusList) {
|
||||
return selectList(new LambdaQueryWrapperX<OrderDO>()
|
||||
.eqIfPresent(OrderDO::getOrganId, organId)
|
||||
.eq(OrderDO::getDeleted, false)
|
||||
.in(OrderDO::getStatus,statusList)
|
||||
.select(OrderDO::getId));
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
+2
-1
@@ -131,10 +131,11 @@ public interface OrderBodyMapper extends BaseMapperX<OrderBodyDO> {
|
||||
|
||||
|
||||
|
||||
default List<OrderBodyDO> selectOrderBodyList(List<Long> bodyIds, Long organId) {
|
||||
default List<OrderBodyDO> selectOrderBodyList(List<Long> bodyIds,List<Long> orderIds, Long organId) {
|
||||
return selectList(new LambdaQueryWrapperX<OrderBodyDO>()
|
||||
.eq(OrderBodyDO::getOrganId, organId)
|
||||
.eq(OrderBodyDO::getDeleted,false)
|
||||
.in(OrderBodyDO::getOrderId,orderIds)
|
||||
.in(OrderBodyDO::getId, bodyIds)
|
||||
.select(OrderBodyDO::getId,OrderBodyDO::getName,OrderBodyDO::getRoomName));
|
||||
}
|
||||
|
||||
-3
@@ -5,7 +5,6 @@ import com.cf.imes.framework.mybatis.core.mapper.BaseMapperX;
|
||||
import com.cf.imes.framework.mybatis.core.query.LambdaQueryWrapperX;
|
||||
import com.cf.imes.module.executor.controller.admin.order.vo.order.OrderPlatesDetailRespVO;
|
||||
import com.cf.imes.module.executor.controller.admin.orderParts.vo.OrderPartsRespVO;
|
||||
import com.cf.imes.module.executor.controller.admin.plan.bo.OrderRoomBodyList;
|
||||
import com.cf.imes.module.executor.controller.admin.plan.saveOptimize.PrintOrderPackReqVO;
|
||||
import com.cf.imes.module.executor.controller.admin.plan.vo.OrderRespVOCopy;
|
||||
import com.cf.imes.module.executor.controller.admin.plate.vo.PlateDetailReqVO;
|
||||
@@ -81,8 +80,6 @@ public interface OrderItemMapper extends BaseMapperX<OrderItemDO> {
|
||||
}
|
||||
|
||||
|
||||
List<OrderRoomBodyList> selectRoomBodyByOrderId( @Param("orderIds") List<Long> orderIds, @Param("organId") Long organId);
|
||||
|
||||
|
||||
|
||||
default List<OrderItemDO> selectPlateIdList(List<Long> plateIds, Long organId) {
|
||||
|
||||
-1
@@ -120,7 +120,6 @@ public interface PlateMapper extends BaseMapperX<PlateDO> {
|
||||
|
||||
List<Long> selectPlateIdListByBodyId(@Param("bodyId") Long bodyId, @Param("organId") Long organId);
|
||||
|
||||
List<PlateResList> selectPlateListByPlanId(@Param("planIds") List<Long> planIds, @Param("organId") Long organId);
|
||||
|
||||
// 根据需要删除的小板id查找具体信息
|
||||
List<PlateGoodsIdVO> selectPlateGoodsListByList(@Param("plates") List<Long> goodsIdList, @Param("orderId") Long orderId, @Param("organId") Long organId);
|
||||
|
||||
+9
@@ -62,5 +62,14 @@ public interface RemainPlateMapper extends BaseMapperX<RemainPlateDO> {
|
||||
List<RemainPlateDO> selectTestSQL(@Param("filed") String filed,@Param("planId") Long planId,@Param("organId") Long organId);
|
||||
|
||||
|
||||
|
||||
default int deletePlanRemainPlate(List<Long> ids, Long organId) {
|
||||
return update(new LambdaUpdateWrapper<RemainPlateDO>()
|
||||
.set(RemainPlateDO::getPlanId, 0)
|
||||
.eq(RemainPlateDO::getOrganId, organId)
|
||||
.in(RemainPlateDO::getPlanId, ids));
|
||||
}
|
||||
|
||||
|
||||
// List<RemainPlateDO> selectTestSQL(@Param("sql") String sql);
|
||||
}
|
||||
|
||||
+19
-19
@@ -743,25 +743,25 @@ public class OptimizePlanServiceImpl implements OptimizePlanService {
|
||||
batchSaveBoardModel(req.getOptimizeBoardModelDOS());
|
||||
|
||||
|
||||
// 保存余料板的数据
|
||||
if (CollectionUtil.isNotEmpty(req.getOptimizeRemainPlates())) {
|
||||
|
||||
List<RemainPlateDO> remainPlateDoS = BeanUtils.toBean(req.getOptimizeRemainPlates(), RemainPlateDO.class)
|
||||
.stream()
|
||||
.map(m -> m.setUseType(1))
|
||||
.map(m -> m.setOutLineJson("")).toList();
|
||||
|
||||
|
||||
List<RemainPlateDO> insertPlateDoS = remainPlateDoS.stream().filter(f -> f.getId() == null).toList();
|
||||
|
||||
List<RemainPlateDO> updatePlateDoS = remainPlateDoS.stream().filter(f -> f.getId() != null).toList();
|
||||
|
||||
Boolean aBoolean = insertPlateDoS.isEmpty() ? null : remainPlateMapper.insertBatch(insertPlateDoS);
|
||||
|
||||
Boolean bBoolean = updatePlateDoS.isEmpty() ? null : remainPlateMapper.updateBatch(updatePlateDoS);
|
||||
|
||||
|
||||
}
|
||||
// // 保存余料板的数据
|
||||
// if (CollectionUtil.isNotEmpty(req.getOptimizeRemainPlates())) {
|
||||
//
|
||||
// List<RemainPlateDO> remainPlateDoS = BeanUtils.toBean(req.getOptimizeRemainPlates(), RemainPlateDO.class)
|
||||
// .stream()
|
||||
// .map(m -> m.setUseType(1))
|
||||
// .map(m -> m.setOutLineJson("")).toList();
|
||||
//
|
||||
//
|
||||
// List<RemainPlateDO> insertPlateDoS = remainPlateDoS.stream().filter(f -> f.getId() == null).toList();
|
||||
//
|
||||
// List<RemainPlateDO> updatePlateDoS = remainPlateDoS.stream().filter(f -> f.getId() != null).toList();
|
||||
//
|
||||
// Boolean aBoolean = insertPlateDoS.isEmpty() ? null : remainPlateMapper.insertBatch(insertPlateDoS);
|
||||
//
|
||||
// Boolean bBoolean = updatePlateDoS.isEmpty() ? null : remainPlateMapper.updateBatch(updatePlateDoS);
|
||||
//
|
||||
//
|
||||
// }
|
||||
|
||||
|
||||
|
||||
|
||||
+52
-40
@@ -42,11 +42,11 @@ import com.cf.imes.module.executor.dal.mysql.orderItem.OrderItemMapper;
|
||||
import com.cf.imes.module.executor.dal.mysql.plan.PlanMapper;
|
||||
import com.cf.imes.module.executor.dal.mysql.planitem.PlanItemMapper;
|
||||
import com.cf.imes.module.executor.dal.mysql.plate.PlateMapper;
|
||||
import com.cf.imes.module.executor.dal.mysql.remainplaten.RemainPlateMapper;
|
||||
import com.cf.imes.module.executor.enums.OrderStatusEnum;
|
||||
import com.cf.imes.module.executor.service.optimizeplan.OptimizePlanService;
|
||||
import com.cf.imes.module.system.api.machine.MachineApi;
|
||||
import com.cf.imes.module.system.api.machine.dto.CuttingRespDTO;
|
||||
import com.github.yulichang.wrapper.MPJLambdaWrapper;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
@@ -55,7 +55,6 @@ import org.springframework.validation.annotation.Validated;
|
||||
import javax.annotation.Resource;
|
||||
import java.io.IOException;
|
||||
import java.math.BigDecimal;
|
||||
import java.math.RoundingMode;
|
||||
import java.util.*;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
@@ -104,6 +103,9 @@ public class PlanServiceImpl implements PlanService {
|
||||
@Resource
|
||||
private OrderBodyMapper orderBodyMapper;
|
||||
|
||||
@Resource
|
||||
private RemainPlateMapper remainPlateMapper;
|
||||
|
||||
@Resource
|
||||
private IdentifierGenerator identifierGenerator;
|
||||
|
||||
@@ -295,18 +297,23 @@ public class PlanServiceImpl implements PlanService {
|
||||
|
||||
}
|
||||
|
||||
// 删除排单信息，排单明细表信息，ES优化数据
|
||||
// 删除排单信息，商品表里的 planId ， ES优化数据，更新排单对应的余料板的排单ID为0
|
||||
planMapper.deleteBatchIds(ids);
|
||||
planItemMapper.delete(new LambdaQueryWrapperX<PlanItemDO>().in(PlanItemDO::getPlanId, ids));
|
||||
// planItemMapper.delete(new LambdaQueryWrapperX<PlanItemDO>().in(PlanItemDO::getPlanId, ids));
|
||||
goodsMapper.deletePlanGoods(ids,getUserOrganId());
|
||||
remainPlateMapper.deletePlanRemainPlate(ids,getUserOrganId());
|
||||
|
||||
|
||||
|
||||
// 排单对应的自增板的删除 todo 目前值解决了非混单的情况
|
||||
List<OptimizeBoardModelDO> boardModelDOS = buildBoardByPlanIds(ids, ORDER_REMAIN_PLATE_MODEL, ids.size());
|
||||
if(!boardModelDOS.isEmpty()) {
|
||||
|
||||
List<Long> goodsIds = boardModelDOS.stream().map(OptimizeBoardModelDO::getGoodsId).toList();
|
||||
// List<Long> goodsIds = boardModelDOS.stream().map(OptimizeBoardModelDO::getGoodsId).toList();
|
||||
|
||||
List<Long> goodsIdList = goodsMapper.selectListByGoodsIdList(goodsIds, orderIds, getUserOrganId()).stream().map(GoodsDO::getId).toList();
|
||||
// List<Long> goodsIdList = goodsMapper.selectListByGoodsIdList(goodsIds, orderIds, getUserOrganId()).stream().map(GoodsDO::getId).toList();
|
||||
|
||||
List<Long> goodsIdList = goodsMapper.selectPlanGoodsListByPlanIdList(ids, getUserOrganId()).stream().map(GoodsDO::getId).toList();
|
||||
|
||||
List<PlateDO> plateDOS = plateMapper.selectPlateIdList(goodsIdList, getUserOrganId());
|
||||
if(!plateDOS.isEmpty()) {
|
||||
@@ -386,34 +393,41 @@ public class PlanServiceImpl implements PlanService {
|
||||
|
||||
@Override
|
||||
public PlanRespVO getPlan(Long id) {
|
||||
PlanDO planDO = planMapper.selectById(id);
|
||||
MPJLambdaWrapper<OrderItemDO> wrapper = new MPJLambdaWrapperX<OrderItemDO>().select(OrderItemDO::getOrderId)
|
||||
.rightJoin(PlanItemDO.class, PlanItemDO::getItemId, OrderItemDO::getId)
|
||||
.isNotNull(OrderItemDO::getId);
|
||||
Set<Long> orderIds = orderItemMapper.selectJoinList(OrderItemDO.class, wrapper).stream().map(OrderItemDO::getOrderId).collect(Collectors.toSet());
|
||||
|
||||
/*Set<Long> orderIds = planOrderMapper.selectList(new LambdaQueryWrapperX<PlanOrderDO>().eq(PlanOrderDO::getPlanId, planDO.getPlanNo()))
|
||||
.stream()
|
||||
.map(e -> e.getOrderId())
|
||||
.collect(Collectors.toSet());*/
|
||||
PlanRespVO respVO = BeanUtils.toBean(planDO, PlanRespVO.class);
|
||||
List<GoodsDO> goodsDOS = goodsMapper.selectList(new LambdaQueryWrapperX<GoodsDO>()
|
||||
.eq(GoodsDO::getOrganId,getUserOrganId())
|
||||
.in(GoodsDO::getOrderId, orderIds));
|
||||
List<PlateDO> plateDOS = plateMapper.selectList(new LambdaQueryWrapperX<PlateDO>()
|
||||
.eq(PlateDO::getOrganId,getUserOrganId())
|
||||
.in(PlateDO::getGoodsId, goodsDOS.stream().map(GoodsDO::getGoodsId).collect(Collectors.toSet())));
|
||||
List<PlateInfoVO> plateInfoVOS = goodsDOS.stream().map(e -> PlateInfoVO.builder()
|
||||
.material(e.getMaterial())
|
||||
.width(e.getWidth())
|
||||
.height(e.getHeight())
|
||||
.thickness(e.getThickness())
|
||||
.area(e.getHeight().multiply(e.getWidth()).setScale(2, RoundingMode.HALF_UP))
|
||||
.count(plateDOS.stream().filter(f -> Objects.equals(f.getGoodsId(), e.getGoodsId())).collect(Collectors.toSet()).size())
|
||||
.build())
|
||||
.collect(Collectors.toList());
|
||||
respVO.setPlateInfoList(plateInfoVOS);
|
||||
return respVO;
|
||||
PlanDO planDO = planMapper.selectById(id);
|
||||
|
||||
if ( planDO== null) {
|
||||
throw exception(PLAN_NOT_EXISTS);
|
||||
}
|
||||
|
||||
return BeanUtils.toBean(planDO, PlanRespVO.class);
|
||||
|
||||
// MPJLambdaWrapper<OrderItemDO> wrapper = new MPJLambdaWrapperX<OrderItemDO>().select(OrderItemDO::getOrderId)
|
||||
// .rightJoin(PlanItemDO.class, PlanItemDO::getItemId, OrderItemDO::getId)
|
||||
// .isNotNull(OrderItemDO::getId);
|
||||
// Set<Long> orderIds = orderItemMapper.selectJoinList(OrderItemDO.class, wrapper).stream().map(OrderItemDO::getOrderId).collect(Collectors.toSet());
|
||||
//
|
||||
// /*Set<Long> orderIds = planOrderMapper.selectList(new LambdaQueryWrapperX<PlanOrderDO>().eq(PlanOrderDO::getPlanId, planDO.getPlanNo()))
|
||||
// .stream()
|
||||
// .map(e -> e.getOrderId())
|
||||
// .collect(Collectors.toSet());*/
|
||||
// List<GoodsDO> goodsDOS = goodsMapper.selectList(new LambdaQueryWrapperX<GoodsDO>()
|
||||
// .eq(GoodsDO::getOrganId,getUserOrganId())
|
||||
// .in(GoodsDO::getOrderId, orderIds));
|
||||
// List<PlateDO> plateDOS = plateMapper.selectList(new LambdaQueryWrapperX<PlateDO>()
|
||||
// .eq(PlateDO::getOrganId,getUserOrganId())
|
||||
// .in(PlateDO::getGoodsId, goodsDOS.stream().map(GoodsDO::getGoodsId).collect(Collectors.toSet())));
|
||||
// List<PlateInfoVO> plateInfoVOS = goodsDOS.stream().map(e -> PlateInfoVO.builder()
|
||||
// .material(e.getMaterial())
|
||||
// .width(e.getWidth())
|
||||
// .height(e.getHeight())
|
||||
// .thickness(e.getThickness())
|
||||
// .area(e.getHeight().multiply(e.getWidth()).setScale(2, RoundingMode.HALF_UP))
|
||||
// .count(plateDOS.stream().filter(f -> Objects.equals(f.getGoodsId(), e.getGoodsId())).collect(Collectors.toSet()).size())
|
||||
// .build())
|
||||
// .collect(Collectors.toList());
|
||||
// respVO.setPlateInfoList(plateInfoVOS);
|
||||
|
||||
}
|
||||
|
||||
|
||||
@@ -502,8 +516,8 @@ public class PlanServiceImpl implements PlanService {
|
||||
// 根据排单ID查询ES中的优化数据 todo 目前只解决无混单的情况，混单情况待解决
|
||||
List<OptimizeBoardModelDO> optimizeBoardModelDOS = buildBoardByPlanIds(planIds, ORDER_REMAIN_PLATE_MODEL, infoVOList.size());
|
||||
|
||||
for (OptimizeBoardModelDO optimizeBoardModelDO : optimizeBoardModelDOS) {
|
||||
}
|
||||
// for (OptimizeBoardModelDO optimizeBoardModelDO : optimizeBoardModelDOS) {
|
||||
// }
|
||||
|
||||
// 获取排单对应的生产单的信息
|
||||
List<PlanOrderRespVO> planOrderRespVOS = planItemMapper.selectOrderList(planIds, getUserOrganId());
|
||||
@@ -988,6 +1002,7 @@ public class PlanServiceImpl implements PlanService {
|
||||
MPJLambdaWrapperX<OrderDO> lambdaWrapperX = new MPJLambdaWrapperX<>();
|
||||
lambdaWrapperX.leftJoin(GoodsDO.class, GoodsDO::getOrderId, OrderDO::getId)
|
||||
.eq(GoodsDO::getOrganId,getUserOrganId())
|
||||
.eq(GoodsDO::getDeleted,false)
|
||||
.eq(GoodsDO::getPlanId, pageReqVO.getPlanId())
|
||||
.distinct();
|
||||
|
||||
@@ -1032,7 +1047,7 @@ public class PlanServiceImpl implements PlanService {
|
||||
public List<PlateResList> getPlateList(List<Long> planIds) {
|
||||
|
||||
|
||||
List<PlateResList> plateResLists = plateMapper.selectPlateListByPlanId(planIds, getUserOrganId());
|
||||
List<PlateResList> plateResLists = goodsMapper.selectPlateListByPlanId(planIds, getUserOrganId());
|
||||
|
||||
Set<Long> bodyIds = plateResLists.stream().map(PlateResList::getBodyId).collect(Collectors.toSet());
|
||||
if (CollectionUtil.isNotEmpty(bodyIds)) {
|
||||
@@ -1052,10 +1067,7 @@ public class PlanServiceImpl implements PlanService {
|
||||
public List<OrderRoomBodyList> getOrderRoomBody(List<Long> orderIds) {
|
||||
|
||||
|
||||
List<OrderRoomBodyList> orderRoomBodyLists = orderItemMapper.selectRoomBodyByOrderId(orderIds, getUserOrganId());
|
||||
|
||||
|
||||
return orderRoomBodyLists;
|
||||
return goodsMapper.selectNoPlanRoomBody(orderIds,getUserOrganId());
|
||||
|
||||
|
||||
}
|
||||
|
||||
+96
-3
@@ -231,7 +231,7 @@
|
||||
|
||||
from order_goods og
|
||||
|
||||
left join order_plate op on og.organ_id = op.organ_id and og.id = op.goods_id and og.deleted = op.deleted
|
||||
left join order_plate op on og.organ_id = op.organ_id and og.order_id = op.order_id and og.id = op.goods_id and og.deleted = op.deleted
|
||||
|
||||
where og.organ_id = #{organId}
|
||||
|
||||
@@ -288,8 +288,8 @@
|
||||
oi.body_id
|
||||
|
||||
from order_goods og
|
||||
left join order_plate op on og.organ_id = op.organ_id and og.id = op.goods_id and og.deleted = op.deleted
|
||||
left join order_item oi on op.organ_id = oi.organ_id and op.id = oi.plate_id
|
||||
left join order_plate op on og.organ_id = op.organ_id and og.order_id = op.order_id and og.id = op.goods_id and og.deleted = op.deleted
|
||||
left join order_item oi on op.organ_id = oi.organ_id and op.order_id = oi.order_id and op.id = oi.plate_id
|
||||
|
||||
${ew.customSqlSegment}
|
||||
|
||||
@@ -331,4 +331,97 @@
|
||||
</select>
|
||||
|
||||
|
||||
<select id="selectPlateListByPlanId"
|
||||
resultType="com.cf.imes.module.executor.controller.admin.plan.vo.PlateResList" parameterType="java.lang.Long">
|
||||
|
||||
|
||||
select distinct op.id as plateId,
|
||||
op.order_id,
|
||||
op.plate_no ,
|
||||
op.name as plateName,
|
||||
op.is_special_shaped,
|
||||
op.is_sculpt,
|
||||
op.area,
|
||||
op.seal_left,
|
||||
op.seal_right,
|
||||
op.seal_up,
|
||||
op.seal_down,
|
||||
og.material,
|
||||
og.color,
|
||||
op.width,
|
||||
op.height,
|
||||
op.thickness,
|
||||
oi.room_id,
|
||||
oi.body_id
|
||||
|
||||
from order_goods og
|
||||
left join order_plate op on og.organ_id = op.organ_id and og.order_id = op.order_id and og.id = op.goods_id and og.deleted = op.deleted
|
||||
left join order_item oi on op.organ_id = oi.organ_id and op.order_id = oi.order_id and op.id = oi.plate_id
|
||||
|
||||
where og.organ_id = #{organId}
|
||||
and og.plan_id in
|
||||
<foreach collection="planIds" item="planIds" open="(" close=")" separator=",">
|
||||
#{planIds}
|
||||
</foreach>
|
||||
|
||||
|
||||
</select>
|
||||
|
||||
|
||||
<resultMap id="RoomBodyListMap" type="com.cf.imes.module.executor.controller.admin.plan.bo.OrderRoomBodyList">
|
||||
|
||||
<result property="orderId" column="orderId"/>
|
||||
|
||||
<collection property="orderRoomIds" ofType="com.cf.imes.module.executor.controller.admin.plan.bo.OrderRoomIds" resultMap="OrderRoomIdsMap"/>
|
||||
|
||||
</resultMap>
|
||||
|
||||
|
||||
<resultMap id="OrderRoomIdsMap" type="com.cf.imes.module.executor.controller.admin.plan.bo.OrderRoomIds">
|
||||
|
||||
<result property="roomId" column="roomId"/>
|
||||
<result property="roomName" column="roomName"/>
|
||||
|
||||
<collection property="orderBodyIds" ofType="com.cf.imes.module.executor.controller.admin.plan.bo.OrderBodyIds" resultMap="OrderBodyIdsMap"/>
|
||||
|
||||
</resultMap>
|
||||
|
||||
|
||||
<resultMap id="OrderBodyIdsMap" type="com.cf.imes.module.executor.controller.admin.plan.bo.OrderBodyIds">
|
||||
|
||||
<result property="bodyId" column="bodyId"/>
|
||||
<result property="bodyName" column="bodyName"/>
|
||||
|
||||
</resultMap>
|
||||
|
||||
|
||||
<select id="selectNoPlanRoomBody"
|
||||
resultMap="RoomBodyListMap"
|
||||
parameterType="java.lang.Long">
|
||||
|
||||
|
||||
select distinct
|
||||
og.order_id as orderId,
|
||||
ob.id as bodyId,
|
||||
ob.name as bodyName,
|
||||
ob.room_id as roomId,
|
||||
ob.room_name as roomName
|
||||
from order_goods og
|
||||
left join order_plate op on og.organ_id = op.organ_id and og.order_id = op.order_id and og.id = op.goods_id
|
||||
left join order_item oi on op.organ_id = oi.organ_id and op.order_id = oi.order_id and op.id = oi.plate_id
|
||||
left join order_body ob on oi.organ_id = ob.organ_id and oi.order_id = ob.order_id and oi.body_id = ob.id
|
||||
|
||||
where og.organ_id = #{organId}
|
||||
and og.deleted = false
|
||||
and og.plan_id = 0
|
||||
and og.order_id in
|
||||
<foreach item="orderIds" collection="orderIds" open="(" separator="," close=")">
|
||||
#{orderIds}
|
||||
</foreach>
|
||||
|
||||
|
||||
|
||||
</select>
|
||||
|
||||
|
||||
</mapper>
|
||||
-57
@@ -181,11 +181,6 @@
|
||||
|
||||
</resultMap>
|
||||
|
||||
<!-- <resultMap id="TestMap" type="com.cf.imes.module.executor.controller.admin.plan.saveOptimize.PrintOrderPackReqVO">-->
|
||||
|
||||
<!-- <result property="plateId" column="plateId"/>-->
|
||||
|
||||
<!-- </resultMap>-->
|
||||
|
||||
|
||||
<select id="selectPackList"
|
||||
@@ -214,58 +209,6 @@
|
||||
|
||||
|
||||
|
||||
<resultMap id="RoomBodyListMap" type="com.cf.imes.module.executor.controller.admin.plan.bo.OrderRoomBodyList">
|
||||
|
||||
<result property="orderId" column="orderId"/>
|
||||
|
||||
<collection property="orderRoomIds" ofType="com.cf.imes.module.executor.controller.admin.plan.bo.OrderRoomIds" resultMap="OrderRoomIdsMap"/>
|
||||
|
||||
</resultMap>
|
||||
|
||||
|
||||
<resultMap id="OrderRoomIdsMap" type="com.cf.imes.module.executor.controller.admin.plan.bo.OrderRoomIds">
|
||||
|
||||
<result property="roomId" column="roomId"/>
|
||||
<result property="roomName" column="roomName"/>
|
||||
|
||||
<collection property="orderBodyIds" ofType="com.cf.imes.module.executor.controller.admin.plan.bo.OrderBodyIds" resultMap="OrderBodyIdsMap"/>
|
||||
|
||||
</resultMap>
|
||||
|
||||
|
||||
<resultMap id="OrderBodyIdsMap" type="com.cf.imes.module.executor.controller.admin.plan.bo.OrderBodyIds">
|
||||
|
||||
<result property="bodyId" column="bodyId"/>
|
||||
<result property="bodyName" column="bodyName"/>
|
||||
|
||||
</resultMap>
|
||||
|
||||
|
||||
<select id="selectRoomBodyByOrderId"
|
||||
resultMap="RoomBodyListMap"
|
||||
parameterType="java.lang.Long">
|
||||
|
||||
select distinct
|
||||
oi.order_id as orderId,
|
||||
ob.id as bodyId,
|
||||
ob.name as bodyName,
|
||||
ob.room_id as roomId,
|
||||
ob.room_name as roomName
|
||||
from order_item oi
|
||||
left join order_plan_item opi on oi.id = opi.item_id and oi.organ_id = opi.organ_id
|
||||
left join order_body ob on oi.body_id = ob.id and oi.organ_id = ob.organ_id
|
||||
|
||||
where oi.organ_id = #{organId} and opi.item_id is null and oi.order_id in
|
||||
|
||||
<foreach item="orderIds" collection="orderIds" open="(" separator="," close=")">
|
||||
#{orderIds}
|
||||
</foreach>
|
||||
|
||||
|
||||
</select>
|
||||
|
||||
|
||||
|
||||
|
||||
<select id="selectTestNum"
|
||||
resultType="com.cf.imes.module.executor.controller.admin.plan.vo.OrderRespVOCopy">
|
||||
|
||||
-21
@@ -432,27 +432,6 @@
|
||||
|
||||
</select>
|
||||
|
||||
<select id="selectPlateListByPlanId" resultType="com.cf.imes.module.executor.controller.admin.plan.vo.PlateResList"
|
||||
parameterType="java.lang.Long">
|
||||
|
||||
|
||||
select distinct a.id as plateId,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_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
|
||||
|
||||
<foreach collection="planIds" item="planIds" open="(" close=")" separator=",">
|
||||
#{planIds}
|
||||
</foreach>
|
||||
|
||||
order by a.order_id,plateName;
|
||||
|
||||
</select>
|
||||
|
||||
|
||||
<select id="selectPlateIdListByBodyId" resultType="java.lang.Long">
|
||||
SELECT plate_id FROM order_item
|
||||
|
||||
Reference in New Issue
Block a user