From 162072ac75b009a24cb84569ea7000a782c0fa34 Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期三, 14 五月 2025 16:00:48 +0800 Subject: [PATCH] 质检单问题修复 --- rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/QlyIsptItemServiceImpl.java | 49 ++++++++++++++++++++++++++++--------------------- 1 files changed, 28 insertions(+), 21 deletions(-) diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/QlyIsptItemServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/QlyIsptItemServiceImpl.java index d375c92..66440f7 100644 --- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/QlyIsptItemServiceImpl.java +++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/QlyIsptItemServiceImpl.java @@ -107,27 +107,28 @@ throw new CoolException("鍗曟嵁鏄庣粏鏁伴噺淇敼澶辫触锛侊紒"); } - WarehouseAreasItem orderItem = warehouseAreasItemService.getById(item.getRcptId()); - if (Objects.isNull(orderItem)) { - throw new CoolException("鏀惰揣鍗曟嵁涓嶅瓨鍦紒锛�"); - } +// WarehouseAreasItem orderItem = warehouseAreasItemService.getById(item.getRcptId()); +// if (Objects.isNull(orderItem)) { +// throw new CoolException("鏀惰揣鍗曟嵁涓嶅瓨鍦紒锛�"); +// } - Double disQty = Objects.isNull(item.getDisQty()) ? 0 : item.getDisQty(); - Double safeQty = Objects.isNull(item.getSafeQty()) ? 0 : item.getSafeQty(); - - Double sum = disQty + safeQty; - orderItem.setIsptQty(sum); - - if (sum.compareTo(0.0) > 0) { - if (!warehouseAreasItemService.updateById(orderItem)) { - throw new CoolException("鏀惰揣鍖哄簱瀛樹俊鎭洿鏂板け璐ワ紒锛�"); - } - - //鏂板缓璐ㄦ鍗曪紝璐ㄦ缁撴灉涓嶄細鏈夎川妫�缁撴灉 - if (Objects.isNull(orderItem.getIsptResult())) { - operateReceipt(item, orderItem); - } - } +// Double disQty = Objects.isNull(item.getDisQty()) ? 0 : item.getDisQty(); +// Double safeQty = Objects.isNull(item.getSafeQty()) ? 0 : item.getSafeQty(); +// +// Double sum = disQty + safeQty; +// orderItem.setIsptQty(sum); +// +// if (sum.compareTo(0.0) > 0) { +// if (!warehouseAreasItemService.updateById(orderItem)) { +// throw new CoolException("鏀惰揣鍖哄簱瀛樹俊鎭洿鏂板け璐ワ紒锛�"); +// } +// //鏂板缓璐ㄦ鍗曪紝涓嶄細鏈夎川妫�缁撴灉 +// confirmReceipt(item, orderItem); +// +//// if (Objects.isNull(orderItem.getIsptResult())) { +//// operateReceipt(item, orderItem); +//// } +// } } Set<Long> isptIds = isptItem.stream().map(QlyIsptItem::getIspectId).collect(Collectors.toSet()); @@ -150,7 +151,8 @@ * @description: 璐ㄦ鍚庝慨鏀规敹璐у尯瀛樹俊鎭� * @version 1.0 */ - private void operateReceipt(QlyIsptItem item, WarehouseAreasItem orderItem) { + @Transactional(rollbackFor = Exception.class) + public void confirmReceipt(QlyIsptItem item, WarehouseAreasItem orderItem) { Double disQty = Objects.isNull(item.getDisQty()) ? 0 : item.getDisQty(); Double safeQty = Objects.isNull(item.getSafeQty()) ? 0 : item.getSafeQty(); Double sum = disQty + safeQty; @@ -208,6 +210,11 @@ } } + @Override + public List<QlyIsptItem> selectIsptResult(LambdaQueryWrapper<QlyIsptItem> eq) { + return this.baseMapper.selectIsptResult(eq); + } + /** * @author Ryan * @date 2025/5/12 -- Gitblit v1.9.1