From ba65a8ba87c236d97dec1da5fd59c0f16fdee320 Mon Sep 17 00:00:00 2001 From: cuilei <ray_tsu1@163.com> Date: 星期四, 12 六月 2025 10:38:50 +0800 Subject: [PATCH] 工具管理-修复使用MapStruct做属性复制存在的问题 --- lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/OutboundOrderServiceImpl.java | 21 ++++++++++++--------- 1 files changed, 12 insertions(+), 9 deletions(-) diff --git a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/OutboundOrderServiceImpl.java b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/OutboundOrderServiceImpl.java index f236aa3..3befbbf 100644 --- a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/OutboundOrderServiceImpl.java +++ b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/OutboundOrderServiceImpl.java @@ -83,6 +83,8 @@ private OutboundOrderMapper outboundOrderMapper; @Autowired private OutboundDetailMapper outboundDetailMapper; + @Autowired + private OutboundOrderConvert outboundOrderConvert; @Override @Transactional(rollbackFor = Exception.class) @@ -103,7 +105,7 @@ @Override @Transactional(rollbackFor = Exception.class) public void addTotal(OutboundOrderAndDetailDto outboundOrder) { - OutboundOrder order = OutboundOrderConvert.INSTANCE.convert(outboundOrder); + OutboundOrder order = outboundOrderConvert.convert(outboundOrder); order.setHandler(Objects.requireNonNull(getCurrentUser()).getId()); order.setOutNum(businessCodeRuleService.generateBusinessCodeSeq("outBoundOrder")); order.setOrderStatus(OutBillStatus.DRAFT.getValue()); @@ -155,7 +157,7 @@ //鍒犻櫎鎵�鏈夋槑缁� outboundDetailService.remove(new LambdaQueryWrapper<OutboundDetail>() .eq(OutboundDetail::getOutStorehouseId, outboundOrder.getId())); - OutboundOrder outboundOrderUpdate = OutboundOrderConvert.INSTANCE.convert(outboundOrder); + OutboundOrder outboundOrderUpdate = outboundOrderConvert.convert(outboundOrder); outboundOrderMapper.updateById(outboundOrderUpdate); List<OutboundDetail> detailList = CollectionUtil.newArrayList(); outboundOrder.getOutboundDetailList().forEach(item->{ @@ -175,13 +177,14 @@ if (!Objects.equals(outboundOrder.getOrderStatus(), OutBillStatus.DRAFT.getValue())) { throw new JeecgBootException("鏃犳硶鎻愪氦闈炶崏绋跨姸鎬佺殑鍑哄簱鐢宠鍗曪紒"); } - //閿佸畾鐢宠鍗曟槑缁嗕腑宸ュ叿搴撳瓨 - if (lockOutboundStock(id)) { - //鍚姩娴佺▼ - if (triggerProcess(outboundOrder)) { - outboundOrder.setOrderStatus(OutBillStatus.SUBMITTED.getValue()); - updateById(outboundOrder); - } + if (!OutStorehouseType.PREPARATION_OUTBOUND.getValue().equals(outboundOrder.getOutStorehouseType())) { + //涓嶆槸浠庡噯澶囧崟杞叆鐨勫嚭搴撶敵璇凤紝鎵ц閿佸簱 + lockOutboundStock(id); + } + //鍚姩娴佺▼ + if (triggerProcess(outboundOrder)) { + outboundOrder.setOrderStatus(OutBillStatus.SUBMITTED.getValue()); + updateById(outboundOrder); } } -- Gitblit v1.9.3