From c80847eb482ffdbf3fa7dc0e4ad6213c9aa792ea Mon Sep 17 00:00:00 2001 From: lym <1994302445@qq.com> Date: Wed, 3 Jul 2024 11:40:13 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E5=8D=95=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=E7=89=A9=E7=90=86=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../executor/dal/mysql/goods/GoodsMapper.java | 1 + .../dal/mysql/orderBody/OrderBodyMapper.java | 6 ++++ .../mysql/orderGroup/OrderGroupMapper.java | 5 +++ .../dal/mysql/orderItem/OrderItemMapper.java | 24 +++++++++----- .../mysql/orderParts/OrderPartsMapper.java | 1 + .../executor/dal/mysql/plate/PlateMapper.java | 1 + .../service/order/OrderServiceImpl.java | 33 +++++++++++-------- .../resources/mapper/goods/GoodsMapper.xml | 9 ++++- .../mapper/orderParts/OrderPartsMapper.xml | 9 ++++- .../resources/mapper/plate/PlateMapper.xml | 10 ++++++ 10 files changed, 75 insertions(+), 24 deletions(-) diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/goods/GoodsMapper.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/goods/GoodsMapper.java index 1934a12b9..94f81333b 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/goods/GoodsMapper.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/goods/GoodsMapper.java @@ -75,6 +75,7 @@ public interface GoodsMapper extends BaseMapperX { // 删板材，批量 void updateDeletedById(@Param("ids") List ids, @Param("deleted") Integer deleted, @Param("organId") Long organId); + void deletedById(@Param("ids") List ids, @Param("organId") Long organId); IPage selectGoods(@Param("page") IPage page,@Param("goodsIds") List goodsIds,@Param("organId") Long organId); diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/orderBody/OrderBodyMapper.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/orderBody/OrderBodyMapper.java index 906c652bc..a813a9199 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/orderBody/OrderBodyMapper.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/orderBody/OrderBodyMapper.java @@ -53,6 +53,12 @@ public interface OrderBodyMapper extends BaseMapperX { .eq(OrderBodyDO::getId, id) .eq(OrderBodyDO::getOrganId, organId)); } + default int deletedById(Long id, Long organId) { + return delete(new LambdaUpdateWrapper() + .eq(OrderBodyDO::getId, id) + .eq(OrderBodyDO::getOrganId, organId)); + } + // 控制是否删除，进行查询 default List selectList(Long orderId, Integer deleted, Long organId) { diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/orderGroup/OrderGroupMapper.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/orderGroup/OrderGroupMapper.java index 2d2f2be8a..b94f2bdd2 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/orderGroup/OrderGroupMapper.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/orderGroup/OrderGroupMapper.java @@ -43,4 +43,9 @@ public interface OrderGroupMapper extends BaseMapperX { .eq(OrderGroupDO::getBodyId, id) .eq(OrderGroupDO::getOrganId, organId)); } + default int deletedById(Long id, Long organId) { + return delete(new LambdaUpdateWrapper() + .eq(OrderGroupDO::getBodyId, id) + .eq(OrderGroupDO::getOrganId, organId)); + } } \ No newline at end of file diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/orderItem/OrderItemMapper.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/orderItem/OrderItemMapper.java index e1498c212..1a84cfe75 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/orderItem/OrderItemMapper.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/orderItem/OrderItemMapper.java @@ -27,13 +27,13 @@ import java.util.List; @Mapper public interface OrderItemMapper extends BaseMapperX { - List selectPlatesDetailByOrderId(@Param("orderId")Long orderId, @Param("roomId")Long roomId , - @Param("bodyId")Long bodyId , @Param("groupId")Long groupId , - @Param("groupName")String groupName, @Param("organId") Long organId, + List selectPlatesDetailByOrderId(@Param("orderId") Long orderId, @Param("roomId") Long roomId, + @Param("bodyId") Long bodyId, @Param("groupId") Long groupId, + @Param("groupName") String groupName, @Param("organId") Long organId, @Param("deleted") Integer deleted); - List selectPartsDetailByOrderId(@Param("orderId")Long orderId, @Param("roomId")Long roomId , - @Param("bodyId")Long bodyId , @Param("name")String name, + List selectPartsDetailByOrderId(@Param("orderId") Long orderId, @Param("roomId") Long roomId, + @Param("bodyId") Long bodyId, @Param("name") String name, @Param("organId") Long organId, @Param("deleted") Integer deleted); @@ -42,15 +42,21 @@ public interface OrderItemMapper extends BaseMapperX { @Param("deleted") Integer deleted); - List selectPlateList( @Param("reqVO") PlateDetailReqVO reqVO,@Param("organId") Long organId); + List selectPlateList(@Param("reqVO") PlateDetailReqVO reqVO, @Param("organId") Long organId); - PlateDetailRespVO selectPlateNumList(@Param("orderId") Long orderId,@Param("organId") Long organId); + PlateDetailRespVO selectPlateNumList(@Param("orderId") Long orderId, @Param("organId") Long organId); - void deleteByPlateId(@Param("deletePlateIds") List deletePlateIds); + void deleteByPlateId(@Param("deletePlateIds") List deletePlateIds); - List selectPackList(@Param("orderIds") List orderIds,@Param("organId") Long organId); + List selectPackList(@Param("orderIds") List orderIds, @Param("organId") Long organId); + + default int deleteByBodyId(Long bodyId, Long organId) { + return delete(new LambdaQueryWrapperX() + .eq(OrderItemDO::getBodyId, bodyId) + .eq(OrderItemDO::getOrganId, organId)); + } } \ No newline at end of file diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/orderParts/OrderPartsMapper.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/orderParts/OrderPartsMapper.java index 53d0baa94..0bfa72bfe 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/orderParts/OrderPartsMapper.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/orderParts/OrderPartsMapper.java @@ -64,6 +64,7 @@ public interface OrderPartsMapper extends BaseMapperX { } void updateDeletedById(@Param("partsIds") List partsIds, @Param("deleted") Integer deleted, @Param("organId") Long organId); + void deletedById(@Param("partsIds") List partsIds, @Param("organId") Long organId); List selectPartList( @Param("orderIds") List orderIds,@Param("organId") Long organId); diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/plate/PlateMapper.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/plate/PlateMapper.java index 06dbd7ee0..37004102a 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/plate/PlateMapper.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/plate/PlateMapper.java @@ -133,5 +133,6 @@ public interface PlateMapper extends BaseMapperX { List selectOrderIds(@Param("orderIds") List orderIds,@Param("organId") Long organId); + void deletedById(@Param("plateIds") List plateIds, @Param("organId") Long organId); } \ No newline at end of file diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderServiceImpl.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderServiceImpl.java index bb30be335..026b811aa 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderServiceImpl.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderServiceImpl.java @@ -219,11 +219,11 @@ public class OrderServiceImpl implements OrderService { orderProcessMapper.updateOrderDeleted(orderId, OrderDeletedEnum.NOT_DELETED.getStatus(), SecurityFrameworkUtils.getLoginUser().getOrganId()); processStepMapper.updateOrderDeleted(orderId, OrderDeletedEnum.NOT_DELETED.getStatus(), SecurityFrameworkUtils.getLoginUser().getOrganId()); - if (orderDO.getStatus() == OrderStatusEnum.EMPTY.getStatus()) { - if (orderBodyMapper.selectCountByOrderId(orderId, SecurityFrameworkUtils.getLoginUser().getOrganId(), OrderDeletedEnum.NOT_DELETED.getStatus()) == 0) { - orderMapper.updateOrderStatus(orderId, OrderStatusEnum.NEW_ORDER.getStatus(), SecurityFrameworkUtils.getLoginUser().getOrganId()); - } - } +// if (orderDO.getStatus() == OrderStatusEnum.EMPTY.getStatus()) { +// if (orderBodyMapper.selectCountByOrderId(orderId, SecurityFrameworkUtils.getLoginUser().getOrganId(), OrderDeletedEnum.NOT_DELETED.getStatus()) == 0) { +// orderMapper.updateOrderStatus(orderId, OrderStatusEnum.NEW_ORDER.getStatus(), SecurityFrameworkUtils.getLoginUser().getOrganId()); +// } +// } } @@ -344,14 +344,16 @@ public class OrderServiceImpl implements OrderService { bodyIds.forEach(bodyId -> { // 校验存在 validateOrderBodyExists(orderId, bodyId, SecurityFrameworkUtils.getLoginUser().getOrganId()); - // 删除 - // orderBodyMapper.deleteAllByOrderId(orderId, bodyId); 物理删除 - orderBodyMapper.updateDeletedById(bodyId, OrderDeletedEnum.DELETED.getStatus(), SecurityFrameworkUtils.getLoginUser().getOrganId()); - orderGroupMapper.updateDeletedById(bodyId, OrderDeletedEnum.DELETED.getStatus(), SecurityFrameworkUtils.getLoginUser().getOrganId()); + // 物理删除 +// orderBodyMapper.updateDeletedById(bodyId, OrderDeletedEnum.DELETED.getStatus(), SecurityFrameworkUtils.getLoginUser().getOrganId()); + orderBodyMapper.deletedById(bodyId, SecurityFrameworkUtils.getLoginUser().getOrganId()); // 柜体 +// orderGroupMapper.updateDeletedById(bodyId, OrderDeletedEnum.DELETED.getStatus(), SecurityFrameworkUtils.getLoginUser().getOrganId()); + orderGroupMapper.deletedById(bodyId, SecurityFrameworkUtils.getLoginUser().getOrganId()); // 加工组 + // 先查再改 List plateDOList = plateMapper.selectPlateIdListByBodyId(bodyId, SecurityFrameworkUtils.getLoginUser().getOrganId()); - // 删除小板 + // (删除小板) 小板变为删除状态 plateMapper.updateDeletedById(plateDOList, OrderDeletedEnum.DELETED.getStatus(), SecurityFrameworkUtils.getLoginUser().getOrganId()); // 删除大板 List goodsIdList = plateMapper.selectPlateGoodsListByList(plateDOList, orderId, SecurityFrameworkUtils.getLoginUser().getOrganId()); @@ -366,10 +368,15 @@ public class OrderServiceImpl implements OrderService { goodsIdDeleted.add(k); }); if (goodsIdDeleted.size() > 0) { - goodsMapper.updateDeletedById(goodsIdDeleted, OrderDeletedEnum.DELETED.getStatus(), SecurityFrameworkUtils.getLoginUser().getOrganId()); +// goodsMapper.updateDeletedById(goodsIdDeleted, OrderDeletedEnum.DELETED.getStatus(), SecurityFrameworkUtils.getLoginUser().getOrganId()); + goodsMapper.deletedById(goodsIdDeleted, SecurityFrameworkUtils.getLoginUser().getOrganId()); + } - List partsList = orderPartsMapper.selectPartsIdListByBodyId(bodyId, SecurityFrameworkUtils.getLoginUser().getOrganId()); - orderPartsMapper.updateDeletedById(partsList, OrderDeletedEnum.DELETED.getStatus(), SecurityFrameworkUtils.getLoginUser().getOrganId()); + List partsList = orderPartsMapper.selectPartsIdListByBodyId(bodyId, SecurityFrameworkUtils.getLoginUser().getOrganId()); // 配件 +// orderPartsMapper.updateDeletedById(partsList, OrderDeletedEnum.DELETED.getStatus(), SecurityFrameworkUtils.getLoginUser().getOrganId()); + orderPartsMapper.deletedById(partsList, SecurityFrameworkUtils.getLoginUser().getOrganId()); + plateMapper.deletedById(plateDOList, SecurityFrameworkUtils.getLoginUser().getOrganId()); + orderItemMapper.deleteByBodyId(bodyId, SecurityFrameworkUtils.getLoginUser().getOrganId()); }); } // 生产单柜体数量判断 diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/goods/GoodsMapper.xml b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/goods/GoodsMapper.xml index ccf31d04b..215cf82f0 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/goods/GoodsMapper.xml +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/goods/GoodsMapper.xml @@ -52,7 +52,14 @@ AND organ_id = #{organId} - + + DELETE FROM order_goods + WHERE id IN + + #{id} + + AND organ_id = #{organId} + diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/plate/PlateMapper.xml b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/plate/PlateMapper.xml index 92dd8b47e..fbfd6acba 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/plate/PlateMapper.xml +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/plate/PlateMapper.xml @@ -278,6 +278,16 @@ AND organ_id = #{organId} + + + DELETE FROM order_plate + WHERE id IN + + #{plateId} + + AND organ_id = #{organId} + +