From 3e36f73770677e756826df1b5824c8e89769659c Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期三, 23 七月 2025 15:27:10 +0800 Subject: [PATCH] 盘点功能优化 --- rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaCheckOrderServiceImpl.java | 75 +++++++++++++++++++++++++++++-------- 1 files changed, 58 insertions(+), 17 deletions(-) diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaCheckOrderServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaCheckOrderServiceImpl.java index 88a132a..1bfc472 100644 --- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaCheckOrderServiceImpl.java +++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaCheckOrderServiceImpl.java @@ -1,6 +1,7 @@ package com.vincent.rsf.server.api.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.vincent.rsf.framework.common.Cools; import com.vincent.rsf.framework.common.R; import com.vincent.rsf.framework.exception.CoolException; @@ -23,6 +24,7 @@ import java.util.Date; import java.util.List; +import java.util.Map; import java.util.Objects; @Service @@ -45,8 +47,7 @@ private DictDataService dictDataService; @Autowired private MatnrService matnrService; - @Autowired - private CheckOrderService checkOrderService; + @Override public R getCheckList(String code) { @@ -62,6 +63,7 @@ List<CheckDiffItem> checkDiffItems = checkDiffItemService.list(new LambdaQueryWrapper<CheckDiffItem>() .eq(CheckDiffItem::getBarcode, barcode) + .eq(CheckDiffItem::getExceStatus, CheckDiffExceStatus.CHECK_DIFF_EXCE_STATUS_INIT.val) .eq(CheckDiffItem::getOrderCode, checkCode) ); if (checkDiffItems.isEmpty()) { @@ -76,8 +78,6 @@ if (!task.getTaskStatus().equals(TaskStsType.AWAIT.id)) { return R.error("浠诲姟鐘舵�佷笉鏄瓑寰呯‘璁�"); } - - return R.ok(checkDiffItems); } @@ -103,11 +103,15 @@ if (null == task) { throw new CoolException("鏁版嵁閿欒锛屾湭鎵惧埌瀹瑰櫒鐮佸搴旂洏鐐逛换鍔�"); } - for (CheckDiffItem checkDiffItem : params.getCheckDiffItems()) { + for (CheckDiffItem ckDiffItem : params.getCheckDiffItems()) { CheckDiffItem diffItem = new CheckDiffItem(); - if (Objects.isNull(checkDiffItem.getId())) { - BeanUtils.copyProperties(checkDiffItem, diffItem); - diffItem.setCheckId(params.getCheckId()); + if (Objects.isNull(ckDiffItem.getId())) { + BeanUtils.copyProperties(ckDiffItem, diffItem); + diffItem.setCheckId(params.getCheckId()) + .setOrderCode(checkDiff.getOrderCode()) + .setTaskId(task.getId()) + .setBarcode(task.getBarcode()) + .setAnfme(ckDiffItem.getCheckQty()); Matnr matnr = matnrService.getOne(new LambdaQueryWrapper<Matnr>().eq(Matnr::getCode, diffItem.getMatnrCode())); if (Objects.isNull(matnr)) { @@ -122,8 +126,9 @@ BeanUtils.copyProperties(diffItem, diffItem); taskItem.setTaskId(task.getId()) .setOrderType(OrderType.ORDER_CHECK.type) + .setSourceCode(diffItem.getOrderCode()) .setWkType(Short.parseShort(OrderWorkType.ORDER_WORK_TYPE_STOCK_CHECK.type)) - .setAnfme(diffItem.getAnfme()) + .setAnfme(diffItem.getCheckQty()) .setWorkQty(0.0) .setBatch(diffItem.getBatch()) .setMaktx(matnr.getName()) @@ -145,22 +150,39 @@ if (!taskItemService.save(taskItem)) { throw new CoolException("鏂板鐩樼偣鏄庣粏淇濆瓨澶辫触锛侊紒"); } + + diffItem.setTaskItemId(taskItem.getId()).setExceStatus(CheckDiffExceStatus.CHECK_DIFF_EXCE_STATUS_HOLD.val); + + if (!checkDiffItemService.updateById(diffItem)) { + throw new CoolException("鏄庣粏淇敼澶辫触锛侊紒"); + } } else { - diffItem = checkDiffItemService.getById(checkDiffItem.getId()); + diffItem = checkDiffItemService.getById(ckDiffItem.getId()); if (null == diffItem) { return R.error("鏁版嵁閿欒锛屾湭鎵惧埌宸紓鍗曟槑缁�"); } - } + diffItem.setCheckQty(ckDiffItem.getCheckQty()).setReason(ckDiffItem.getReason()).setMemo(ckDiffItem.getMemo()); - checkDiffItem.setExceStatus(CheckDiffExceStatus.CHECK_DIFF_EXCE_STATUS_HOLD.val); - if (!checkDiffItemService.updateById(checkDiffItem)) { - throw new CoolException("鏇存柊宸紓鍗曟槑缁嗗け璐�"); + diffItem.setExceStatus(CheckDiffExceStatus.CHECK_DIFF_EXCE_STATUS_HOLD.val); + if (!checkDiffItemService.updateById(diffItem)) { + throw new CoolException("鏇存柊宸紓鍗曟槑缁嗗け璐�"); + } + + if (!taskItemService.update(new LambdaUpdateWrapper<TaskItem>() + .set(TaskItem::getAnfme, diffItem.getCheckQty()) + .eq(TaskItem::getId, diffItem.getTaskItemId()))) { + throw new CoolException("浠诲姟鏁伴噺淇敼澶辫触锛侊紒"); + } } - Double checkQty = Math.round((checkDiff.getCheckQty() + checkDiffItem.getCheckQty()) * 10000) / 10000.0; - checkDiff.setCheckQty(checkQty); } - checkDiff.setExceStatus(CheckDiffExceStatus.CHECK_DIFF_EXCE_STATUS_HOLD.val); + List<CheckDiffItem> diffItems = checkDiffItemService.list(new LambdaQueryWrapper<CheckDiffItem>() + .eq(CheckDiffItem::getCheckId, checkDiff.getId())); + if (diffItems.isEmpty()) { + throw new CoolException("鐩樼偣宸紓鍗曟槑缁嗕笉瀛樺湪锛侊紒"); + } + Double sum = diffItems.stream().mapToDouble(CheckDiffItem::getCheckQty).sum(); + checkDiff.setExceStatus(CheckDiffExceStatus.CHECK_DIFF_EXCE_STATUS_HOLD.val).setCheckQty(sum); if (!checkDiffService.updateById(checkDiff)) { throw new CoolException("鏇存柊宸紓鍗曞け璐�"); } @@ -173,4 +195,23 @@ } return R.ok("鐩樼偣瀹屾垚"); } + + @Override + public R selectAddMatnr(Map<String, String> map) { + String matnrCode = map.get("matnr"); + if (Cools.isEmpty(matnrCode)){ + return R.error("鐗╂枡鐮佷负绌�"); + } + Matnr matnr = matnrService.getOne(new LambdaQueryWrapper<Matnr>().eq(Matnr::getCode, matnrCode)); + if (null == matnr){ + return R.error("鏈壘鍒扮紪鐮佸搴旂殑鏄庣粏"); + } + CheckDiffItem checkDiffItem = new CheckDiffItem() + .setMatnrCode(matnr.getCode()) + .setMaktx(matnr.getName()) + .setAnfme(0D) + .setCheckQty(0D) + ; + return R.ok(checkDiffItem); + } } -- Gitblit v1.9.1