楚江erp：冻结功能逻辑调整

@@ -164,6 +164,11 @@ public class DraftRequestCarTicket extends BaseEntity implements BaseDto {
     private boolean freeze;
     private boolean freeze;
 
 
     /**
     /**
+     * 冻结次数
+     */
+    private Integer freezeCount;
+
+    /**
      * 是否展示审核按钮
      * 是否展示审核按钮
      */
      */
     @TableField(exist = false)
     @TableField(exist = false)

@@ -275,6 +275,11 @@ public class PurchaseOrderInfo extends BaseEntity implements BaseDto {
     private boolean freeze;
     private boolean freeze;
 
 
     /**
     /**
+     * 冻结次数
+     */
+    private Integer freezeCount;
+
+    /**
      * 下单人(非持久化字段)
      * 下单人(非持久化字段)
      */
      */
     @TableField(exist = false)
     @TableField(exist = false)

@@ -832,7 +832,7 @@ public class ReceiptLedgerInfoServiceImpl extends BaseMpServiceImpl<ReceiptLedge
         for (PurchaseOrderInfo orderInfo : orderInfoList) {
         for (PurchaseOrderInfo orderInfo : orderInfoList) {
             String orderingUnit = orderInfo.getOrderingUnit();
             String orderingUnit = orderInfo.getOrderingUnit();
             List<String> list = orderInfoMap.computeIfAbsent(orderingUnit, k -> new ArrayList<>());
             List<String> list = orderInfoMap.computeIfAbsent(orderingUnit, k -> new ArrayList<>());
-            if ("PRODUCTION".equals(orderInfo.getType())) {
+            if ("PRODUCTION".equals(orderInfo.getType()) && orderInfo.getFreezeCount() == 0) {
                 list.add(orderInfo.getId());
                 list.add(orderInfo.getId());
             }
             }
         }
         }

@@ -635,6 +635,7 @@ public class PurchaseOrderInfoServiceImpl extends BaseMpServiceImpl<PurchaseOrde
         }
         }
         LambdaUpdateWrapper<PurchaseOrderInfo> updateWrapper = Wrappers.lambdaUpdate(PurchaseOrderInfo.class);
         LambdaUpdateWrapper<PurchaseOrderInfo> updateWrapper = Wrappers.lambdaUpdate(PurchaseOrderInfo.class);
         updateWrapper.set(PurchaseOrderInfo::isFreeze, Boolean.TRUE)
         updateWrapper.set(PurchaseOrderInfo::isFreeze, Boolean.TRUE)
+                .setSql("freeze_count = freeze_count + 1")
                 .in(PurchaseOrderInfo::getId, ids);
                 .in(PurchaseOrderInfo::getId, ids);
         getBaseMapper().update(updateWrapper);
         getBaseMapper().update(updateWrapper);
     }
     }

@@ -277,8 +277,12 @@ public class DraftRequestCarTicketServiceImpl extends BaseMpServiceImpl<DraftReq
 
 
     @Override
     @Override
     public void freezeOrDeblocking(Boolean flag, List<String> orderIds) {
     public void freezeOrDeblocking(Boolean flag, List<String> orderIds) {
+        if (CollectionUtils.isEmpty(orderIds)) {
+            return;
+        }
         LambdaUpdateWrapper<DraftRequestCarTicket> updateWrapper = Wrappers.lambdaUpdate(DraftRequestCarTicket.class);
         LambdaUpdateWrapper<DraftRequestCarTicket> updateWrapper = Wrappers.lambdaUpdate(DraftRequestCarTicket.class);
         updateWrapper.set(DraftRequestCarTicket::isFreeze, flag)
         updateWrapper.set(DraftRequestCarTicket::isFreeze, flag)
+                .setSql("freeze_count = freeze_count + 1")
                 .in(DraftRequestCarTicket::getPurchaseOrderId, orderIds);
                 .in(DraftRequestCarTicket::getPurchaseOrderId, orderIds);
         getBaseMapper().update(updateWrapper);
         getBaseMapper().update(updateWrapper);
     }
     }