From 46586e4f4926cf0f599edf181d06b52a402cbb6e Mon Sep 17 00:00:00 2001 From: zjj <3272660260@qq.com> Date: 星期二, 06 五月 2025 10:27:29 +0800 Subject: [PATCH] #pda其他收货 质检结果 --- rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java | 24 ++++++++++++++++-------- 1 files changed, 16 insertions(+), 8 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 beae2ad..49dad1b 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 @@ -358,7 +358,9 @@ } List<AsnOrderItem> asnOrderItem = asnOrderItemMapper.selectList(new LambdaQueryWrapper<AsnOrderItem>() .eq(AsnOrderItem::getAsnCode, params.getAsnCode()) - .eq(!Objects.isNull(params.getTrackCode()), AsnOrderItem::getTrackCode, params.getTrackCode())); + .eq(!Objects.isNull(params.getTrackCode()), AsnOrderItem::getTrackCode, params.getTrackCode()) + .eq(!Cools.isEmpty(params.getMatnrCode()), AsnOrderItem::getMatnrCode, params.getMatnrCode()) + ); if (Objects.isNull(asnOrderItem)) { throw new CoolException("鍗曟嵁鏄庣粏涓嶅瓨鍦紒锛�"); @@ -808,6 +810,9 @@ */ @Override public R getItemByContainer(Map<String, Object> params) { + if (Objects.isNull(params.get("code"))) { + throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒"); + } //鑾峰彇缁勬嫋鏈敓鎴愪换鍔$殑缁勬嫋妗� List<Short> asList = Arrays.asList(Short.valueOf(PakinIOStatus.PAKIN_IO_STATUS_DONE.val), Short.valueOf(PakinIOStatus.PAKIN_IO_STATUS_DONE.val)); Short flagDefect = 0; @@ -944,7 +949,10 @@ .setPoCode(asnOrderItem.getPoCode()) .setAnfme(asnOrderItem.getAnfme()) .setPurQty(asnOrderItem.getPurQty()) - .setSplrBatch(asnOrderItem.getSplrBatch()); + .setSplrBatch(asnOrderItem.getSplrBatch()) + .setMatnr(asnOrderItem.getMatnrCode()) + .setInspect(asnOrderItem.getIsptResult$()) //璐ㄦ缁撴灉 + ; Matnr matnr = matnrMapper.selectById(asnOrderItem.getMatnrId()); if (Objects.isNull(matnr)) { @@ -953,12 +961,12 @@ //SET 鐗╂枡鏈�澶у瓨鏀炬暟閲� detlsDto.setMaxQty(matnr.getMaxQty()) .setMatnrId(matnr.getId()); - QlyInspect inspect = qlyInspectMapper.selectOne(new LambdaQueryWrapper<QlyInspect>() - .eq(QlyInspect::getAsnId, asnOrderItem.getAsnId())); - if (!Objects.isNull(inspect)) { - //set 璐ㄦ缁撴灉 - detlsDto.setInspect(inspect.getStatus$()); - } +// QlyInspect inspect = qlyInspectMapper.selectOne(new LambdaQueryWrapper<QlyInspect>() +// .eq(QlyInspect::getAsnId, asnOrderItem.getAsnId())); +// if (!Objects.isNull(inspect)) { +// //set 璐ㄦ缁撴灉 +// detlsDto.setInspect(inspect.getStatus$()); +// } //鑾峰彇褰撳墠搴撳瓨淇℃伅 LocItem stockItem = locItemService.getOne(new LambdaQueryWrapper<LocItem>() // .eq(LocItem::getOrderItemId, asnOrderItem.getId()) -- Gitblit v1.9.1