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-12 21:02:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

优化排单-生产单数据参数修改

Browse Source
This commit is contained in:
liuzhaotian
2024-05-18 10:01:04 +08:00
parent 7553f1d2d7
commit f7971c7209
4 changed files with 12 additions and 3 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/dal/mysql/plan/PlanMapper.java
+7
View File
@@ -67,4 +67,11 @@ public interface PlanMapper extends BaseMapperX<PlanDO> {
OptimizeParamRespVO getOptimizePlanParam(Long planId);
default PlanDO selectByOrderId(Long orderId) {
return selectOne(new MPJLambdaWrapperX<PlanDO>()
.eqIfPresent(PlanDO::getOrderNos, orderId));
}
}
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/plate/PlateMapper.java
+1 -1
View File
@@ -95,5 +95,5 @@ public interface PlateMapper extends BaseMapperX<PlateDO> {
List<PlateDetialRespVO> selectPlateDetialList(@Param("orderId") Long orderId);
List<PlateDetialRespVO> selectPlateDetialListByIds(@Param("orderIds") Set<Long> orderIds);
List<PlateDetialRespVO> selectPlateDetialListByIds(@Param("orderIds") List<Long> orderIds);
}
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/optimizeplan/OptimizePlanServiceImpl.java
+3 -1
View File
@@ -304,10 +304,12 @@ public class OptimizePlanServiceImpl implements OptimizePlanService {
List<GoodsDO> goodsDOS = goodsMapper.selectList(new LambdaQueryWrapperX<GoodsDO>()
.eq(GoodsDO::getOrderId, orderId)
);
PlanDO planDO = planMapper.selectByOrderId(orderId);
List<PlateDetialRespVO> plateDOS = plateMapper.selectPlateDetialList(orderId);
List<OrderModelDO> orderModelDOS = buildRespByOrderId(orderId, ORDER_PLATE_MODEL);
orderSource.setPlan(planDO);
orderSource.setOrderList(Collections.singletonList(orderDO));
orderSource.setPlateList(plateDOS);
orderSource.setGoodsList(goodsDOS);
@@ -330,7 +332,7 @@ public class OptimizePlanServiceImpl implements OptimizePlanService {
.eq(PlanItemDO::getPlanId, planId)
.isNotNull(OrderItemDO::getId);
List<OrderItemDO> orderItemDOS = orderItemMapper.selectJoinList(OrderItemDO.class, wrapper);
Set<Long> orderIds = orderItemDOS.stream().map(OrderItemDO::getOrderId).collect(Collectors.toSet());
List<Long> orderIds = orderItemDOS.stream().map(OrderItemDO::getOrderId).collect(Collectors.toList());
List<OrderDO> orderDOS = orderMapper.selectBatchIds(orderIds);
List<GoodsDO> goodsDOS = goodsMapper.selectList(new LambdaQueryWrapperX<GoodsDO>().in(GoodsDO::getOrderId, orderIds));
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/plate/PlateMapper.xml
+1 -1
View File
@@ -153,7 +153,7 @@
join order_body ob on oi.body_id = ob.id
left join order_group og on oi.group_id = og.id
where op.order_id in
<foreach collection="id" item="orderIds" open="(" close=")" separator=",">
<foreach collection="orderIds" item="id" open="(" close=")" separator=",">
#{id}
</foreach>