From 028ef9e952135505871d7a05d9c3af3a8fbcce79 Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期日, 11 五月 2025 15:18:59 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/devlop' into devlop --- rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java | 43 +++++++++++++++---------------------------- 1 files changed, 15 insertions(+), 28 deletions(-) diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java index 4538f27..d97176c 100644 --- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java +++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java @@ -612,15 +612,15 @@ .setId(isptItem.getId()) .setMatnrCode(isptItem.getMatnrCode()) .setMaktx(isptItem.getMaktx()) - .setDisQty(isptItem.getDisQty()) +// .setDisQty(isptItem.getDisQty()) .setDlyQty(isptItem.getDlyQty()) .setRcptQty(isptItem.getRcptQty()) .setIsptResult(isptItem.getIsptResult()) .setSplrBatch(isptItem.getSplrBatch()) .setSplrName(isptItem.getSplrName()) .setPicPath(isptItem.getPicPath()) - .setMemo(isptItem.getMemo()) - .setSafeQty(isptItem.getSafeQty()); + .setMemo(isptItem.getMemo()); +// .setSafeQty(isptItem.getSafeQty()); dtos.add(objDto); }); return R.ok(dtos); @@ -656,35 +656,22 @@ @Override public R operateToStock(OpStockParams params) { if (org.apache.commons.lang3.StringUtils.isBlank(params.getBarcode())) { - throw new CoolException("鎷栫洏鐮佷笉鑳戒负绌猴紒锛�"); + throw new CoolException("鎵樼洏鐮佷笉鑳戒负绌猴紒锛�"); } - if (StringUtils.isBlank(params.getAsnCode())) { - throw new CoolException("鍗曟嵁涓嶈兘涓虹┖锛侊紒"); + WaitPakin waitPakin = waitPakinService.getOne(new LambdaQueryWrapper<WaitPakin>() + .eq(WaitPakin::getBarcode, params.getBarcode()) + .eq(WaitPakin::getIoStatus,PakinIOStatus.PAKIN_IO_STATUS_DONE.val) + ); + if (Cools.isEmpty(waitPakin)){ + throw new CoolException("鏈壘鍒扮粍鎵樻暟鎹�,璇锋鏌ョ姸鎬�"); } - if (StringUtils.isBlank(params.getMatnrCode())) { - throw new CoolException("鐗╂枡缂栫爜涓嶈兘涓虹┖锛侊紒"); + List<WaitPakinItem> waitPakinItems = waitPakinItemService.list(new LambdaQueryWrapper<WaitPakinItem>().eq(WaitPakinItem::getPakinId, waitPakin.getId())); + if (Cools.isEmpty(waitPakinItems)){ + throw new CoolException("鏁版嵁閿欒锛屾湭鎵惧埌缁勬墭鏄庣粏"); } - AsnOrder asnOrders = asnOrderMapper.getOne(new LambdaQueryWrapper<AsnOrder>().eq(AsnOrder::getCode, params.getAsnCode())); - if (Objects.isNull(asnOrders)) { - throw new CoolException("鍗曟嵁涓嶅瓨鍦紒锛�"); - } - List<Loc> locs = locService.list(new LambdaQueryWrapper<Loc>().eq(Loc::getBarcode, params.getBarcode())); - if (!locs.isEmpty()) { - throw new CoolException("鎷栫洏宸蹭娇鐢�"); - } - List<WaitPakin> waitPakins = waitPakinService.list(new LambdaQueryWrapper<WaitPakin>().eq(WaitPakin::getBarcode, params.getBarcode())); - if (!waitPakins.isEmpty()) { - throw new CoolException("鎷栫洏宸蹭娇鐢�!!"); - } - AsnOrderItem orderItems = asnOrderItemMapper.selectOne(new LambdaQueryWrapper<AsnOrderItem>() - .eq(AsnOrderItem::getAsnId, asnOrders.getId()) - .eq(AsnOrderItem::getMatnrCode, params.getMatnrCode())); - if (Objects.isNull(orderItems)) { - return R.ok(null); - } - orderItems.setBarcode(params.getBarcode()); - return R.ok(orderItems); + + return R.ok(waitPakinItems); } /** -- Gitblit v1.9.1