mirror of
http://192.168.1.205:9980/cf_devdept2/cf_imes_server.git
synced 2026-08-12 21:02:08 +08:00
order version统计数量和状态修改错误修复
This commit is contained in:
+5
-5
@@ -49,8 +49,8 @@ public class OrderInfoVersionControlServiceImpl implements OrderInfoVersionContr
|
||||
public void updateOrderPlateNumAndArea(OrderDO orderDO, Boolean delete) {
|
||||
Long orderId = orderDO.getId();
|
||||
// 重新计算订单数量
|
||||
// 统计每个orders下的未排单面积,更新到orders中
|
||||
OrderPlateNumAndAreaDO orderPlateNumAndAreaDO = orderMapper.selectPlateNumAndArea(orderId, delete);
|
||||
// 统计每个orders下的板件数量和面积,更新到orders中
|
||||
OrderPlateNumAndAreaDO orderPlateNumAndAreaDO = orderMapper.selectPlateNumAndArea(orderId, !delete);
|
||||
|
||||
// 当前订单下排单的板件数量
|
||||
Integer num = orderPlateNumAndAreaDO.getNum();
|
||||
@@ -60,7 +60,7 @@ public class OrderInfoVersionControlServiceImpl implements OrderInfoVersionContr
|
||||
.eq(OrderDO::getId, orderId)
|
||||
.eq(OrderDO::getVersion, version)
|
||||
.setIfPresent(OrderDO::getStatus, num == 0 ? OrderStatusEnum.EMPTY.getStatus() : OrderStatusEnum.NEW_ORDER.getStatus())
|
||||
.set(OrderDO::getPlannedPlateArea, orderPlateNumAndAreaDO.getArea())
|
||||
.set(OrderDO::getArea, orderPlateNumAndAreaDO.getArea())
|
||||
.set(OrderDO::getPlannedPlateNum, num)
|
||||
.set(OrderDO::getVersion, version + 1);
|
||||
int update = orderMapper.update(updateWrapper);
|
||||
@@ -77,7 +77,7 @@ public class OrderInfoVersionControlServiceImpl implements OrderInfoVersionContr
|
||||
.collect(Collectors.toMap(OrderBodyDO::getId, Function.identity()));
|
||||
|
||||
// 统计删除涉及的柜体下的数量和面积、更新到order_body
|
||||
Map<Long, OrderBodyPlateNumDO> bodyStatMap = orderBodyMapper.selectPlateNumAndArea(orderBodyIds, delete)
|
||||
Map<Long, OrderBodyPlateNumDO> bodyStatMap = orderBodyMapper.selectPlateNumAndArea(orderBodyIds, !delete)
|
||||
.stream()
|
||||
.collect(Collectors.toMap(
|
||||
OrderBodyPlateNumDO::getOrderBodyId,
|
||||
@@ -114,7 +114,7 @@ public class OrderInfoVersionControlServiceImpl implements OrderInfoVersionContr
|
||||
|
||||
// 统计删除涉及的order_goods下的数量和面积、更新到order_goods
|
||||
Map<Long, OrderGoodsPlateNumAndAreaDO> goodStatMap =
|
||||
goodsMapper.selectPlateNumAndArea(orderGoodsIds, delete)
|
||||
goodsMapper.selectPlateNumAndArea(orderGoodsIds, !delete)
|
||||
.stream()
|
||||
.collect(Collectors.toMap(
|
||||
OrderGoodsPlateNumAndAreaDO::getOrderGoodsId,
|
||||
|
||||
-1
@@ -1035,7 +1035,6 @@
|
||||
from orders o
|
||||
join order_plate op on o.organ_id = op.organ_id and o.id = op.order_id
|
||||
where o.id = #{orderId}
|
||||
and op.plan_id = 0
|
||||
and op.deleted = #{delete}
|
||||
and o.deleted = false
|
||||
</select>
|
||||
|
||||
Reference in New Issue
Block a user