From 161cdb87ddb09d99ef5af4b55e7e7b18c5084615 Mon Sep 17 00:00:00 2001 From: zjj <3272660260@qq.com> Date: 星期四, 08 五月 2025 15:27:04 +0800 Subject: [PATCH] # --- rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinServiceImpl.java | 333 +++++++++++++++++++++++++++++++++++-------------------- 1 files changed, 213 insertions(+), 120 deletions(-) diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinServiceImpl.java index 7687195..0fde5f0 100644 --- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinServiceImpl.java +++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinServiceImpl.java @@ -2,6 +2,9 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +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; import com.vincent.rsf.server.manager.controller.params.PakinItem; import com.vincent.rsf.server.manager.controller.params.WaitPakinParam; @@ -37,18 +40,23 @@ private WarehouseAreasItemService warehouseAreasItemService; @Autowired private LocService locService; + @Autowired + private TaskService taskService; + @Autowired + private TaskItemService taskItemService; + /** * @param * @param userId * @return * @author Ryan - * @description 缁勬嫋 + * @description 缁勬墭 * @time 2025/3/29 14:42 */ @Override @Transactional(rollbackFor = Exception.class) - public WaitPakin mergeItems(WaitPakinParam waitPakin, Long userId) { + public synchronized WaitPakin mergeItems(WaitPakinParam waitPakin, Long userId) { if (Objects.isNull(waitPakin.getItems()) || waitPakin.getItems().isEmpty()) { throw new CoolException("鍙傛暟閿欒锛氱墿鏂欒窡韪爜涓虹┖锛�"); } @@ -56,169 +64,254 @@ throw new CoolException("鍙傛暟閿欒锛氭墭鐩樼爜涓虹┖锛侊紒"); } List<Short> asList = Arrays.asList(Short.valueOf(PakinIOStatus.PAKIN_IO_STATUS_DONE.val), Short.valueOf(PakinIOStatus.PAKIN_IO_STATUS_DONE.val)); - WaitPakin list = waitPakinService.getOne(new LambdaQueryWrapper<WaitPakin>() - .notIn(WaitPakin::getIoStatus, asList) + WaitPakin pakin = waitPakinService.getOne(new LambdaQueryWrapper<WaitPakin>() .eq(WaitPakin::getBarcode, waitPakin.getBarcode())); - if (!Objects.isNull(list)) { - throw new CoolException("鎷栫洏鐮侊細" + waitPakin.getBarcode() + "宸茶缁勬嫋鍗曪細" + list.getCode() + "浣跨敤锛侊紒"); + if (!Objects.isNull(pakin)) { + throw new CoolException("鎵樼洏鐮侊細" + waitPakin.getBarcode() + "宸茶缁勬墭鍗曪細" + pakin.getCode() + "浣跨敤锛侊紒"); } List<Loc> locs = locService.list(new LambdaQueryWrapper<Loc>().eq(Loc::getBarcode, waitPakin.getBarcode())); if (!locs.isEmpty()) { List<String> locCodes = locs.stream().map(Loc::getCode).collect(Collectors.toList()); String join = StringUtils.join(locCodes, ","); - throw new CoolException("鎷栫洏鐮侊細" + waitPakin.getBarcode() + "宸茶搴撲綅锛�" + join + "浣跨敤锛侊紒"); + throw new CoolException("鎵樼洏鐮侊細" + waitPakin.getBarcode() + "宸茶搴撲綅锛�" + join + "浣跨敤锛侊紒"); } double sum = waitPakin.getItems().stream().mapToDouble(PakinItem::getReceiptQty).sum(); WaitPakin waitPakin1 = new WaitPakin(); - WaitPakin pakin = waitPakinService.getOne(new LambdaQueryWrapper<WaitPakin>() - .in(WaitPakin::getIoStatus, asList) - .eq(WaitPakin::getBarcode, waitPakin.getBarcode())); - if (Objects.isNull(pakin)) { - String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_WAIT_PAKIN_CODE, null); - if (StringUtils.isBlank(ruleCode)) { - throw new CoolException("缂栫爜瑙勫垯閿欒锛� 缂栫爜瑙勫垯銆孲YS_WAIT_PAKIN_CODE銆嶈鍒欐槸涓嶅瓨鍦�"); - } - waitPakin1.setCode(ruleCode) - //鐘舵�佷慨鏀逛负鍏ュ簱涓� - .setIoStatus(Short.parseShort(PakinIOStatus.PAKIN_IO_STATUS_DONE.val)) - .setAnfme(sum) - .setUpdateBy(userId) - .setCreateBy(userId) - .setBarcode(waitPakin.getBarcode()); - if (!this.save(waitPakin1)) { - throw new CoolException("涓诲崟淇濆瓨澶辫触锛侊紒"); - } - } else { - BeanUtils.copyProperties(pakin, waitPakin1); - waitPakin1.setAnfme(sum); - if (!this.saveOrUpdate(waitPakin1)) { - throw new CoolException("涓诲崟淇敼澶辫触锛侊紒"); - } + String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_WAIT_PAKIN_CODE, null); + if (StringUtils.isBlank(ruleCode)) { + throw new CoolException("缂栫爜瑙勫垯閿欒锛� 缂栫爜瑙勫垯銆孲YS_WAIT_PAKIN_CODE銆嶈鍒欐槸涓嶅瓨鍦�"); } - /**鐗╂枡璺熻釜鐮�*/ - List<String> tracks = waitPakin.getItems().stream().map(PakinItem::getTrackCode).collect(Collectors.toList()); - List<WaitPakinItem> pakinItems = waitPakinItemService.list(new LambdaQueryWrapper<WaitPakinItem>() - .eq(WaitPakinItem::getPakinId, waitPakin1.getId()) - .in(WaitPakinItem::getTrackCode, tracks)); - if (!pakinItems.isEmpty()) { - if (!waitPakinItemService.remove(new LambdaQueryWrapper<WaitPakinItem>() - .eq(WaitPakinItem::getPakinId, waitPakin1.getId()) - .in(WaitPakinItem::getTrackCode, tracks))) { - throw new CoolException("鍘熷崟鎹竻闄ゅけ璐ワ紒锛�"); - } + waitPakin1.setCode(ruleCode) + //鐘舵�佷慨鏀逛负鍏ュ簱涓� + .setIoStatus(Short.parseShort(PakinIOStatus.PAKIN_IO_STATUS_DONE.val)) + .setAnfme(sum) + .setUpdateBy(userId) + .setCreateBy(userId) + .setBarcode(waitPakin.getBarcode()); + if (!this.save(waitPakin1)) { + throw new CoolException("涓诲崟淇濆瓨澶辫触锛侊紒"); } +// /**鐗╂枡璺熻釜鐮�*/ +// List<WaitPakinItem> pakinItems = waitPakinItemService.list(new LambdaQueryWrapper<WaitPakinItem>() +// .eq(WaitPakinItem::getPakinId, waitPakin1.getId())) +// ; +// if (!pakinItems.isEmpty()) { +// if (!waitPakinItemService.remove(new LambdaQueryWrapper<WaitPakinItem>() +// .eq(WaitPakinItem::getPakinId, waitPakin1.getId()) +// )) { +// throw new CoolException("鍘熷崟鎹竻闄ゅけ璐ワ紒锛�"); +// } +// } List<WaitPakinItem> items = new ArrayList<>(); - if (!Objects.isNull(waitPakin.getType()) && waitPakin.getType().equals("defective")) { - List<AsnOrderItem> orderItems = asnOrderItemService.list(new LambdaQueryWrapper<AsnOrderItem>().in(AsnOrderItem::getTrackCode, tracks)); - if (Objects.isNull(orderItems) || orderItems.isEmpty()) { - throw new CoolException("鍗曟嵁涓嶅瓨鍦紒锛�"); - } - for (AsnOrderItem item : orderItems) { - WaitPakinItem pakinItem = new WaitPakinItem(); - pakinItem.setAnfme(item.getAnfme()) - .setPakinId(waitPakin1.getId()) - .setAsnId(item.getAsnId()) - .setAsnCode(item.getAsnCode()) - .setAsnItemId(item.getId()) - .setBatch(item.getSplrBatch()) - .setUnit(item.getStockUnit()) - .setFieldsIndex(item.getFieldsIndex()) - .setMatnrId(item.getMatnrId()) - .setMaktx(item.getMaktx()) - .setUpdateBy(userId) - .setCreateBy(userId) - .setMatnrCode(item.getMatnrCode()); - for (PakinItem waitPakinItem : waitPakin.getItems()) { - if (waitPakinItem.getTrackCode().equals(item.getTrackCode())) { - if (waitPakinItem.getReceiptQty() > item.getAnfme() || waitPakinItem.getReceiptQty().compareTo(0.0) >= 0) { - throw new CoolException("缁勬嫋鏁伴噺涓嶈兘澶т簬鏀惰揣鏁伴噺锛侊紒"); - } - pakinItem.setAnfme(waitPakinItem.getReceiptQty()).setTrackCode(waitPakinItem.getTrackCode()); - } - } - items.add(pakinItem); - } - } else { - LambdaQueryWrapper<WarehouseAreasItem> queryWrapper = new QueryWrapper<WarehouseAreasItem>() - .select("SUM(anfme) as anfme, track_code, asn_code, id, splr_batch, ispt_result, plat_item_id, batch, qty, work_qty, matnr_code, matnr_id, maktx") - .lambda() - .in(WarehouseAreasItem::getTrackCode, tracks) - .groupBy(WarehouseAreasItem::getSplrBatch, - WarehouseAreasItem::getTrackCode); - List<WarehouseAreasItem> warehouseAreasItems = warehouseAreasItemService.list(queryWrapper); - if (Objects.isNull(warehouseAreasItems) || warehouseAreasItems.isEmpty()) { + for (PakinItem pakinItem1 : waitPakin.getItems()) { + //涓嶈壇鏍囩缁勬墭 + WarehouseAreasItem warehouseAreasItems = warehouseAreasItemService.getById(pakinItem1.getId()); + if (null == warehouseAreasItems) { throw new CoolException("鐗╂枡鏈�佽嚦鏀惰揣鍖猴紒锛�"); } - for (WarehouseAreasItem item : warehouseAreasItems) { - WaitPakinItem pakinItem = new WaitPakinItem(); - pakinItem.setAnfme(item.getAnfme()) - .setPakinId(waitPakin1.getId()) - .setAsnId(item.getAsnId()) - .setAsnCode(item.getAsnCode()) - .setAsnItemId(item.getId()) - .setBatch(item.getSplrBatch()) - .setUnit(item.getStockUnit()) - .setFieldsIndex(item.getFieldsIndex()) - .setMatnrId(item.getMatnrId()) - .setMaktx(item.getMaktx()) - .setUpdateBy(userId) - .setCreateBy(userId) - .setMatnrCode(item.getMatnrCode()); - for (PakinItem waitPakinItem : waitPakin.getItems()) { - if (waitPakinItem.getTrackCode().equals(item.getTrackCode())) { - if (waitPakinItem.getReceiptQty() > item.getAnfme() || waitPakinItem.getReceiptQty().compareTo(0.0) <= 0) { - throw new CoolException("缁勬嫋鏁伴噺涓嶈兘澶т簬鏀惰揣鏁伴噺涓斾笉鑳藉皬浜庨浂锛侊紒"); - } - pakinItem.setAnfme(waitPakinItem.getReceiptQty()).setTrackCode(waitPakinItem.getTrackCode()); + WaitPakinItem pakinItem = new WaitPakinItem(); + pakinItem.setAnfme(warehouseAreasItems.getAnfme()) + .setPakinId(waitPakin1.getId()) + .setSource(warehouseAreasItems.getId()) + .setAsnId(warehouseAreasItems.getAsnId()) + .setAsnCode(warehouseAreasItems.getAsnCode()) + .setAsnItemId(warehouseAreasItems.getAsnItemId()) + .setIsptResult(warehouseAreasItems.getIsptResult()) + .setBatch(warehouseAreasItems.getSplrBatch()) + .setUnit(warehouseAreasItems.getStockUnit()) + .setFieldsIndex(warehouseAreasItems.getFieldsIndex()) + .setMatnrId(warehouseAreasItems.getMatnrId()) + .setMaktx(warehouseAreasItems.getMaktx()) + .setUpdateBy(userId) + .setCreateBy(userId) + .setMatnrCode(warehouseAreasItems.getMatnrCode()); + AsnOrder order = asnOrderService.getById(warehouseAreasItems.getAsnId()); + if (!Objects.isNull(order)) { + pakinItem.setType(null == order.getType() ? null : order.getType()) + .setWkType(null == order.getWkType() ? null : Short.parseShort(order.getWkType())); + } + + for (PakinItem waitPakinItem : waitPakin.getItems()) { + if (waitPakinItem.getId().equals(warehouseAreasItems.getId())) { + if (waitPakinItem.getReceiptQty() > warehouseAreasItems.getAnfme() || waitPakinItem.getReceiptQty().compareTo(0.0) <= 0) { + throw new CoolException("缁勬墭鏁伴噺涓嶈兘澶т簬鏀惰揣鏁伴噺涓斾笉鑳藉皬浜庨浂锛侊紒"); } + pakinItem.setAnfme(waitPakinItem.getReceiptQty()) + .setTrackCode(waitPakinItem.getTrackCode()); } - items.add(pakinItem); + } + items.add(pakinItem); + + } + + double sum1 = items.stream().mapToDouble(WaitPakinItem::getAnfme).sum(); + + if (!waitPakinItemService.saveBatch(items)) { + throw new CoolException("缁勬墭鏄庣粏淇濆瓨澶辫触锛侊紒"); + } + + for (WaitPakinItem pakinItem : items) { + WarehouseAreasItem one = warehouseAreasItemService.getOne(new LambdaQueryWrapper<WarehouseAreasItem>() + .eq(WarehouseAreasItem::getId, pakinItem.getSource())); + if (Objects.isNull(one)) { + throw new CoolException("鏀惰揣鍖烘暟鎹敊璇紒锛�"); + } +// one.setAnfme(one.getAnfme() - pakinItem.getAnfme()) + one.setWorkQty(one.getWorkQty() + pakinItem.getAnfme() + one.getQty()); + if (one.getWorkQty() > one.getAnfme()) { + throw new CoolException("缁勬墭鏁伴噺涓嶈兘澶т簬鏀惰揣鏁伴噺锛侊紒"); + } + if (!warehouseAreasItemService.saveOrUpdate(one)) { + throw new CoolException("鏀惰揣鍖烘墽琛屾暟閲忎慨鏀瑰け璐ワ紒锛�"); } } - double sum1 = items.stream().mapToDouble(WaitPakinItem::getAnfme).sum(); - if (!waitPakinItemService.saveBatch(items)) { - throw new CoolException("缁勬嫋鏄庣粏淇濆瓨澶辫触锛侊紒"); - } + waitPakin1.setAnfme(sum1); if (!this.updateById(waitPakin1)) { - throw new CoolException("缁勬嫋鏁伴噺淇敼澶辫触锛侊紒"); + throw new CoolException("缁勬墭鏁伴噺淇敼澶辫触锛侊紒"); } + + //TODO 缁勬墭瀹屾垚鍚庯紝鎵e噺鏀惰揣鍖哄簱瀛� + return pakin; } /** - * @author Ryan - * @description 缁勬嫋瑙g粦 * @param * @return + * @author Ryan + * @description 缁勬墭瑙g粦 * @time 2025/3/29 14:42 */ @Override - public WaitPakin unBind(WaitPakinParam param) { + @Transactional(rollbackFor = Exception.class) + public synchronized WaitPakin unBind(WaitPakinParam param) { String barcode = param.getBarcode(); if (StringUtils.isNotBlank(barcode)) { - WaitPakin waitPakins = waitPakinService.getOne(new LambdaQueryWrapper<WaitPakin>().eq(WaitPakin::getBarcode, barcode), false); + WaitPakin waitPakins = waitPakinService.getOne(new LambdaQueryWrapper<WaitPakin>().eq(WaitPakin::getBarcode, barcode)); if (Objects.isNull(waitPakins)) { - throw new CoolException("缁勬嫋涓嶅瓨鍦紒锛�"); + throw new CoolException("缁勬墭涓嶅瓨鍦紒锛�"); } List<PakinItem> paramItems = param.getItems(); + if (Objects.isNull(paramItems) || paramItems.isEmpty()) { throw new CoolException("瑙g粦鐗╂枡涓嶈兘涓虹┖锛侊紒"); } - List<Long> list = paramItems.stream().map(PakinItem::getMatnrId).collect(Collectors.toList()); + List<Long> list = paramItems.stream().map(PakinItem::getId).collect(Collectors.toList()); List<WaitPakinItem> pakinItems = waitPakinItemService.list(new LambdaQueryWrapper<WaitPakinItem>() - .eq(WaitPakinItem::getPakinId, waitPakins.getId()) - .in(WaitPakinItem::getMatnrId, list)); + .in(WaitPakinItem::getId, list) + ); if (pakinItems.isEmpty()) { - throw new CoolException("鏁版嵁閿欒锛氱粍鎷栨槑缁嗕笉瀛樺湪锛侊紒"); + throw new CoolException("鏁版嵁閿欒锛氱粍鎵樻槑缁嗕笉瀛樺湪锛侊紒"); } - List<Long> ids = pakinItems.stream().map(WaitPakinItem::getId).collect(Collectors.toList()); - if (!waitPakinItemService.removeByIds(ids)) { - throw new CoolException("缁勬嫋鏄庣粏瑙g粦澶辫触锛侊紒"); +// List<Long> ids = pakinItems.stream().map(WaitPakinItem::getId).collect(Collectors.toList()); +// if (!waitPakinItemService.removeByIds(ids)) { +// throw new CoolException("缁勬墭鏄庣粏瑙g粦澶辫触锛侊紒"); +// } + List<Long> list2 = pakinItems.stream().map(WaitPakinItem::getSource).collect(Collectors.toList()); + List<WarehouseAreasItem> warehouseAreasItems = warehouseAreasItemService.listByIds(list2); + for (int i1 = 0; i1 < pakinItems.size(); i1++) { + for (PakinItem item : paramItems) { + if (item.getId().equals(pakinItems.get(i1).getId())) { + if (pakinItems.get(i1).getAnfme().compareTo(item.getReceiptQty()) > 0) { + if (item.getReceiptQty().compareTo(0.00) == 0) { + throw new CoolException("瑙g粦鏁伴噺涓嶈兘涓洪浂锛侊紒"); + } + if (item.getReceiptQty().compareTo(pakinItems.get(i1).getAnfme() - pakinItems.get(i1).getWorkQty() - pakinItems.get(i1).getQty()) > 0) { + throw new CoolException("瑙g粦鏁伴噺涓嶈兘澶т簬鍓╀綑鍙墽琛屾暟锛侊紒"); + } + pakinItems.get(i1).setAnfme(pakinItems.get(i1).getAnfme() - item.getReceiptQty()); + if (!waitPakinItemService.updateById(pakinItems.get(i1))) { + throw new CoolException("缁勬墭鏄庣粏鏁伴噺淇敼澶辫触锛侊紒"); + } + } else { + if (!waitPakinItemService.removeById(pakinItems.get(i1).getId())) { + throw new CoolException("缁勬墭鏄庣粏鍒犻櫎澶辫触锛侊紒"); + } + } + for (int i = 0; i < warehouseAreasItems.size(); i++) { + if (warehouseAreasItems.get(i).getId().equals(pakinItems.get(i1).getSource())) { + double v = warehouseAreasItems.get(i).getWorkQty() - item.getReceiptQty(); + warehouseAreasItems.get(i).setWorkQty(v); + if (!warehouseAreasItemService.updateById(warehouseAreasItems.get(i))) { + throw new CoolException("鏀惰揣鍖烘暟閲忎慨鏀瑰け璐ワ紒锛�"); + } + } + } + } + } + } + + double anfmes = paramItems.stream().mapToDouble(PakinItem::getReceiptQty).sum(); +// double anfmes = warehouseAreasItems.stream().mapToDouble(WarehouseAreasItem::getAnfme).sum(); + if (waitPakins.getAnfme().compareTo(anfmes) <= 0) { + if (!waitPakinService.removeById(waitPakins.getId())) { + throw new CoolException("缁勬墭鍒犻櫎澶辫触锛侊紒"); + } + } else { + waitPakins.setAnfme(waitPakins.getAnfme() - anfmes); + if (!waitPakinService.updateById(waitPakins)) { + throw new CoolException("缁勬墭鏁版嵁淇敼澶辫触锛侊紒"); + } } return waitPakins; } return new WaitPakin(); } + + /** + * @author Ryan + * @date 2025/5/7 + * @description: 鍒犻櫎缁勬嫋淇℃伅 + * @version 1.0 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public R removePakin(List<Long> pakinIds) { + List<WaitPakinItem> pakinItems = waitPakinItemService.list(new LambdaQueryWrapper<WaitPakinItem>() + .in(WaitPakinItem::getPakinId, pakinIds)); + if (!pakinItems.isEmpty()) { + List<Long> list = pakinItems.stream().map(WaitPakinItem::getId).collect(Collectors.toList()); + List<TaskItem> taskItems = taskItemService.list(new LambdaQueryWrapper<TaskItem>().in(TaskItem::getSource, list)); + if (!taskItems.isEmpty()) { + return R.error("缁勬嫋妗f湁鏄庣粏浠诲姟"); + } + + Set<Long> sourceIds = pakinItems.stream().map(WaitPakinItem::getSource).collect(Collectors.toSet()); + + List<WarehouseAreasItem> areasItems = warehouseAreasItemService.list(new LambdaQueryWrapper<WarehouseAreasItem>() + .in(WarehouseAreasItem::getId, sourceIds)); + + if (areasItems.isEmpty()) { + return R.error("鏀惰揣鍖烘暟鎹笉瀛樺湪锛侊紒"); + } + + Map<Long, List<WaitPakinItem>> listMap = pakinItems.stream().collect(Collectors.groupingBy(WaitPakinItem::getSource)); + for (WarehouseAreasItem item : areasItems) { + List<WaitPakinItem> pakin = listMap.get(item.getId()); + if (Objects.isNull(pakin)) { + continue; + } + double sum = pakin.stream().mapToDouble(WaitPakinItem::getAnfme).sum(); + item.setWorkQty(item.getWorkQty() - sum) + .setAnfme(item.getAnfme() + sum); + if (!warehouseAreasItemService.updateById(item)) { + throw new CoolException("鏀惰揣鍖烘暟鎹洖婊氬け璐ワ紒锛�"); + } + } + + Set<Long> pakinItemIds = pakinItems.stream().map(WaitPakinItem::getId).collect(Collectors.toSet()); + + if (!waitPakinItemService.removeByIds(pakinItemIds)) { + throw new CoolException("鏄庣粏鍒犻櫎澶辫触锛侊紒"); + } + } + + if (!waitPakinService.removeByIds(pakinIds)) { + return R.error("Delete Fail"); + } + + return R.ok("Delete Success").add(pakinIds); + } } -- Gitblit v1.9.1