Commit bd99f69f8354682b686bf72eea2ea320a8f069c4

Authored by yeqianyong
1 parent 3765f7f1

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

... ... @@ -164,6 +164,11 @@ public class DraftRequestCarTicket extends BaseEntity implements BaseDto {
164 164 private boolean freeze;
165 165
166 166 /**
  167 + * 冻结次数
  168 + */
  169 + private Integer freezeCount;
  170 +
  171 + /**
167 172 * 是否展示审核按钮
168 173 */
169 174 @TableField(exist = false)
... ...
... ... @@ -275,6 +275,11 @@ public class PurchaseOrderInfo extends BaseEntity implements BaseDto {
275 275 private boolean freeze;
276 276
277 277 /**
  278 + * 冻结次数
  279 + */
  280 + private Integer freezeCount;
  281 +
  282 + /**
278 283 * 下单人(非持久化字段)
279 284 */
280 285 @TableField(exist = false)
... ...
... ... @@ -832,7 +832,7 @@ public class ReceiptLedgerInfoServiceImpl extends BaseMpServiceImpl<ReceiptLedge
832 832 for (PurchaseOrderInfo orderInfo : orderInfoList) {
833 833 String orderingUnit = orderInfo.getOrderingUnit();
834 834 List<String> list = orderInfoMap.computeIfAbsent(orderingUnit, k -> new ArrayList<>());
835   - if ("PRODUCTION".equals(orderInfo.getType())) {
  835 + if ("PRODUCTION".equals(orderInfo.getType()) && orderInfo.getFreezeCount() == 0) {
836 836 list.add(orderInfo.getId());
837 837 }
838 838 }
... ...
... ... @@ -635,6 +635,7 @@ public class PurchaseOrderInfoServiceImpl extends BaseMpServiceImpl<PurchaseOrde
635 635 }
636 636 LambdaUpdateWrapper<PurchaseOrderInfo> updateWrapper = Wrappers.lambdaUpdate(PurchaseOrderInfo.class);
637 637 updateWrapper.set(PurchaseOrderInfo::isFreeze, Boolean.TRUE)
  638 + .setSql("freeze_count = freeze_count + 1")
638 639 .in(PurchaseOrderInfo::getId, ids);
639 640 getBaseMapper().update(updateWrapper);
640 641 }
... ...
... ... @@ -277,8 +277,12 @@ public class DraftRequestCarTicketServiceImpl extends BaseMpServiceImpl<DraftReq
277 277
278 278 @Override
279 279 public void freezeOrDeblocking(Boolean flag, List<String> orderIds) {
  280 + if (CollectionUtils.isEmpty(orderIds)) {
  281 + return;
  282 + }
280 283 LambdaUpdateWrapper<DraftRequestCarTicket> updateWrapper = Wrappers.lambdaUpdate(DraftRequestCarTicket.class);
281 284 updateWrapper.set(DraftRequestCarTicket::isFreeze, flag)
  285 + .setSql("freeze_count = freeze_count + 1")
282 286 .in(DraftRequestCarTicket::getPurchaseOrderId, orderIds);
283 287 getBaseMapper().update(updateWrapper);
284 288 }
... ...