From 32d0aa7ac0034561d3b8b5a9d35a54ba1cace6a6 Mon Sep 17 00:00:00 2001 From: zjj <3272660260@qq.com> Date: 星期二, 06 五月 2025 17:00:08 +0800 Subject: [PATCH] #pda物料组托 --- rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java | 62 ------------------------------ 1 files changed, 1 insertions(+), 61 deletions(-) diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java index 4b139ae..a1617bd 100644 --- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java +++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java @@ -69,7 +69,7 @@ item.put("poCode", orders.getPoCode()); item.put("createBy", loginUserId); item.put("updateBy", loginUserId); - if (!asnOrderItemService.fieldsSave(item)) { + if (!asnOrderItemService.fieldsSave(item, loginUserId)) { throw new CoolException("鏄庣粏淇濆瓨澶辫触锛侊紒"); } }); @@ -82,66 +82,6 @@ } } - - /** - * @param - * @return - * @author Ryan - * @description 鍒犻櫎鍘熶富鍗曞強鏄庣粏锛屽姞鍏ュ巻鍙叉。 - * @time 2025/3/19 19:53 - */ - @Transactional(rollbackFor = Exception.class) - private void operateOrderLogs(AsnOrder asrder) throws Exception { - if (Objects.isNull(asrder) || Objects.isNull(asrder.getId())) { - throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒"); - } - asrder.setExceStatus(AsnExceStatus.ASN_EXCE_STATUS_TASK_CLOSE.val); - - if (!this.updateById(asrder)) { - throw new CoolException("鍗曟嵁鍏抽棴澶辫触锛侊紒"); - } - List<AsnOrderItem> orderItems = asnOrderItemService.list(new LambdaQueryWrapper<AsnOrderItem>().eq(AsnOrderItem::getAsnId, asrder.getId())); - if (orderItems.isEmpty()) { - throw new CoolException("鏀惰揣鏄庣粏涓虹┖锛侊紒"); - } -// if (Objects.isNull(asrder.getAnfme()) || asrder.getAnfme().compareTo(0.00) == 0) { -// throw new CoolException("鏀惰揣鏁伴噺涓嶈兘涓洪浂锛侊紒"); -// } - AsnOrder order = this.getById(asrder.getId()); - AsnOrderLog orderLog = new AsnOrderLog(); - order.setExceStatus(AsnExceStatus.ASN_EXCE_STATUS_TASK_DONE.val); - BeanUtils.copyProperties(order, orderLog); - orderLog.setId(null); - orderLog.setAsnId(order.getId()); - - if (!this.saveOrUpdate(order)) { - throw new CoolException("鐘舵�佷慨鏀瑰け璐ワ紒锛�"); - } - orderLog.setExceStatus(AsnExceStatus.ASN_EXCE_STATUS_TASK_CLOSE.val); - if (!asnOrderLogService.save(orderLog)) { - throw new CoolException("涓诲崟鍘嗗彶妗f坊鍔犲け璐ワ紒锛�"); - } - List<AsnOrderItemLog> logs = new ArrayList<>(); - List<AsnOrderItem> items = asnOrderItemService.list(new LambdaQueryWrapper<AsnOrderItem>().eq(AsnOrderItem::getAsnId, order.getId())); - items.forEach(item -> { - AsnOrderItemLog itemLog = new AsnOrderItemLog(); - BeanUtils.copyProperties(item, itemLog); - itemLog.setAsnItemId(itemLog.getId()) - .setLogId(orderLog.getId()) - .setAsnId(item.getAsnId()); - logs.add(itemLog); - }); - - if (!asnOrderItemLogService.saveBatch(logs)) { - throw new CoolException("閫氱煡鍗曟槑缁嗗巻鍙叉。淇濆瓨澶辫触锛侊紒"); - } - if (!asnOrderItemService.remove(new LambdaQueryWrapper<AsnOrderItem>().eq(AsnOrderItem::getAsnId, order.getId()))) { - throw new CoolException("鍘熷崟鎹槑缁嗗垹闄ゅけ璐ワ紒锛�"); - } - if (!this.removeById(asrder.getId())) { - throw new CoolException("鍘熷崟鎹垹闄ゅけ璐ワ紒锛�"); - } - } /** * @param -- Gitblit v1.9.1