生产单删除改为物理删除

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<GoodsDO> {
 
     // 删板材，批量
     void updateDeletedById(@Param("ids") List<Long> ids, @Param("deleted") Integer deleted, @Param("organId") Long organId);
+    void deletedById(@Param("ids") List<Long> ids, @Param("organId") Long organId);
 
 
     IPage<OrderGoodsResp> selectGoods(@Param("page") IPage page,@Param("goodsIds")  List<Long>  goodsIds,@Param("organId") Long organId);

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<OrderBodyDO> {
                 .eq(OrderBodyDO::getId, id)
                 .eq(OrderBodyDO::getOrganId, organId));
     }
+    default int deletedById(Long id, Long organId) {
+        return delete(new LambdaUpdateWrapper<OrderBodyDO>()
+                .eq(OrderBodyDO::getId, id)
+                .eq(OrderBodyDO::getOrganId, organId));
+    }
+
 
     // 控制是否删除，进行查询
     default List<OrderBodyDO> selectList(Long orderId, Integer deleted, Long organId) {

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<OrderGroupDO> {
                 .eq(OrderGroupDO::getBodyId, id)
                 .eq(OrderGroupDO::getOrganId, organId));
     }
+    default int deletedById(Long id, Long organId) {
+        return delete(new LambdaUpdateWrapper<OrderGroupDO>()
+                .eq(OrderGroupDO::getBodyId, id)
+                .eq(OrderGroupDO::getOrganId, organId));
+    }
 }

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<OrderItemDO> {
 
-    List<PlateRespVO> selectPlatesDetailByOrderId(@Param("orderId")Long orderId, @Param("roomId")Long roomId ,
+    List<PlateRespVO> selectPlatesDetailByOrderId(@Param("orderId") Long orderId, @Param("roomId") Long roomId,
-                                                  @Param("bodyId")Long bodyId , @Param("groupId")Long groupId ,
+                                                  @Param("bodyId") Long bodyId, @Param("groupId") Long groupId,
-                                                  @Param("groupName")String groupName, @Param("organId") Long organId,
+                                                  @Param("groupName") String groupName, @Param("organId") Long organId,
                                                   @Param("deleted") Integer deleted);
 
-    List<OrderPartsRespVO> selectPartsDetailByOrderId(@Param("orderId")Long orderId, @Param("roomId")Long roomId ,
+    List<OrderPartsRespVO> selectPartsDetailByOrderId(@Param("orderId") Long orderId, @Param("roomId") Long roomId,
-                                                      @Param("bodyId")Long bodyId , @Param("name")String name,
+                                                      @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<OrderItemDO> {
                                                        @Param("deleted") Integer deleted);
 
 
-    List<PlateRespVO> selectPlateList( @Param("reqVO") PlateDetailReqVO reqVO,@Param("organId") Long organId);
+    List<PlateRespVO> 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<Long> deletePlateIds);
+    void deleteByPlateId(@Param("deletePlateIds") List<Long> deletePlateIds);
 
 
-    List<PrintOrderPackReqVO> selectPackList(@Param("orderIds") List<Long> orderIds,@Param("organId") Long organId);
+    List<PrintOrderPackReqVO> selectPackList(@Param("orderIds") List<Long> orderIds, @Param("organId") Long organId);
 
+
+    default int deleteByBodyId(Long bodyId, Long organId) {
+        return delete(new LambdaQueryWrapperX<OrderItemDO>()
+                .eq(OrderItemDO::getBodyId, bodyId)
+                .eq(OrderItemDO::getOrganId, organId));
+    }
 }

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<OrderPartsDO> {
     }
 
     void updateDeletedById(@Param("partsIds") List<Long> partsIds, @Param("deleted") Integer deleted, @Param("organId") Long organId);
+    void deletedById(@Param("partsIds") List<Long> partsIds, @Param("organId") Long organId);
 
     List<PrintOrderPartsRespVO> selectPartList( @Param("orderIds") List<Long> orderIds,@Param("organId") Long organId);
 

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<PlateDO> {
     List<OrderIds> selectOrderIds(@Param("orderIds") List<Long> orderIds,@Param("organId") Long organId);
 
 
+    void deletedById(@Param("plateIds") List<Long> plateIds, @Param("organId") Long organId);
 
 }

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 (orderDO.getStatus() == OrderStatusEnum.EMPTY.getStatus()) {
-            if (orderBodyMapper.selectCountByOrderId(orderId, SecurityFrameworkUtils.getLoginUser().getOrganId(), OrderDeletedEnum.NOT_DELETED.getStatus()) == 0) {
+//            if (orderBodyMapper.selectCountByOrderId(orderId, SecurityFrameworkUtils.getLoginUser().getOrganId(), OrderDeletedEnum.NOT_DELETED.getStatus()) == 0) {
-                orderMapper.updateOrderStatus(orderId, OrderStatusEnum.NEW_ORDER.getStatus(), SecurityFrameworkUtils.getLoginUser().getOrganId());
+//                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());
-                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.updateDeletedById(bodyId, OrderDeletedEnum.DELETED.getStatus(), SecurityFrameworkUtils.getLoginUser().getOrganId());
+                orderGroupMapper.deletedById(bodyId, SecurityFrameworkUtils.getLoginUser().getOrganId()); // 加工组
+
 
                 // 先查再改
                 List<Long> plateDOList = plateMapper.selectPlateIdListByBodyId(bodyId, SecurityFrameworkUtils.getLoginUser().getOrganId());
-                // 删除小板
+                // (删除小板) 小板变为删除状态
                 plateMapper.updateDeletedById(plateDOList, OrderDeletedEnum.DELETED.getStatus(), SecurityFrameworkUtils.getLoginUser().getOrganId());
                 // 删除大板
                 List<PlateGoodsIdVO> 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<Long> partsList = orderPartsMapper.selectPartsIdListByBodyId(bodyId, SecurityFrameworkUtils.getLoginUser().getOrganId());
+                List<Long> partsList = orderPartsMapper.selectPartsIdListByBodyId(bodyId, SecurityFrameworkUtils.getLoginUser().getOrganId()); // 配件
-                orderPartsMapper.updateDeletedById(partsList, OrderDeletedEnum.DELETED.getStatus(), 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());
             });
         }
         // 生产单柜体数量判断

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/goods/GoodsMapper.xml

@@ -52,7 +52,14 @@
         </foreach>
           AND organ_id = #{organId}
     </update>
-
+    <delete id="deletedById">
+        DELETE FROM order_goods
+        WHERE id IN
+        <foreach item="id" collection="ids" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+        AND organ_id = #{organId}
+    </delete>
 
 
     <select id="selectGoods" resultType="com.cf.imes.module.executor.controller.admin.plan.vo.OrderGoodsResp" parameterType="map">

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/orderParts/OrderPartsMapper.xml

@@ -75,7 +75,14 @@
                 #{partsId}
               </foreach>AND organ_id = #{organId}
     </update>
-
+    <delete id="deletedById">
+        DELETE FROM order_parts
+        WHERE id IN
+        <foreach collection="partsIds" item="partsId" open="(" separator="," close=")">
+            #{partsId}
+        </foreach>
+            AND organ_id = #{organId}
+    </delete>
 
     <select id="selectPartList"
             resultType="com.cf.imes.module.executor.controller.admin.plan.saveOptimize.PrintOrderPartsRespVO">

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/plate/PlateMapper.xml

@@ -278,6 +278,16 @@
         </foreach>
           AND organ_id = #{organId}
     </update>
+
+    <delete id="deletedById">
+        DELETE FROM order_plate
+        WHERE id IN
+        <foreach collection="plateIds" item="plateId" open="(" separator="," close=")">
+            #{plateId}
+        </foreach>
+        AND organ_id = #{organId}
+    </delete>
+
     <select id="countPlateByOrderId" resultType="java.lang.Integer">
         SELECT count(*) FROM order_plate
         WHERE order_id = #{orderId} AND organ_id = #{organId} AND deleted = #{deleted}