From b9faebb0ae35fb0317ae63d2ed94d27f7112c670 Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期二, 01 四月 2025 16:34:55 +0800 Subject: [PATCH] 新增历史质检上报记录 新增质检接口 --- rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 46 insertions(+), 0 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 a43f68a..f970056 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 @@ -6,6 +6,8 @@ import com.vincent.rsf.framework.exception.CoolException; import com.vincent.rsf.server.api.controller.params.OtherReceiptParams; import com.vincent.rsf.server.api.controller.params.ReceiptParams; +import com.vincent.rsf.server.api.entity.dto.InspectDetlDto; +import com.vincent.rsf.server.api.entity.dto.InspectItemDto; import com.vincent.rsf.server.api.entity.dto.ReceiptDetlsDto; import com.vincent.rsf.server.api.entity.enums.OrderWorkType; import com.vincent.rsf.server.api.service.MobileService; @@ -82,6 +84,8 @@ private PurchaseItemMapper purchaseItemMapper; @Resource private FieldsMapper fieldsMapper; + @Autowired + private IsptHistoriesMapper isptHistoriesMapper; @Autowired private AsnOrderLogService asnOrderLogService; @@ -421,6 +425,47 @@ } /** + * 鎶ユ鍔熻兘 + * @param code + * @param loginUserId + * @return + */ + @Override + public R inspect(String code, Long loginUserId) { + AsnOrder asnOrders = asnOrderMapper.selectOne(new LambdaQueryWrapper<AsnOrder>().eq(AsnOrder::getCode, code)); + if (Objects.isNull(asnOrders)) { + throw new CoolException("鍗曟嵁涓嶅瓨鍦紒锛�"); + } + InspectDetlDto detlDto = new InspectDetlDto(); + detlDto.setCode(asnOrders.getCode()).setPoCode(asnOrders.getPoCode()); + List<AsnOrderItem> orderItems = asnOrderItemMapper.selectList(new LambdaQueryWrapper<AsnOrderItem>().eq(AsnOrderItem::getAsnCode, code)); + if (orderItems.isEmpty()) { + detlDto.setItems(new ArrayList<>()); + } else { + List<InspectItemDto> itemDtos = new ArrayList<>(); + orderItems.forEach(dto -> { + InspectItemDto itemDto = new InspectItemDto(); + if (!Objects.isNull(dto.getMatnrCode())) { + Matnr matnr = matnrMapper.selectOne(new LambdaQueryWrapper<Matnr>().eq(Matnr::getCode, dto.getMatnrCode())); + itemDto.setGroup(matnr.getGroupCode()); + } + itemDto.setMaktx(dto.getMaktx()) + .setMatnrCode(dto.getMatnrCode()) + .setPurUnit(dto.getPurUnit()) + .setSuplierCode(dto.getSplrCode()) + .setSuplierName(dto.getSplrName()) + .setPurQty(dto.getPurQty()); + itemDtos.add(itemDto); + }); + detlDto.setItems(itemDtos); + } + + List<IsptHistories> histories = isptHistoriesMapper.selectList(new LambdaQueryWrapper<IsptHistories>().eq(IsptHistories::getAsnId, asnOrders.getId())); + detlDto.setHistories(histories); + return R.ok(detlDto); + } + + /** * 鑾峰彇ReceiptDetlsDtos */ private R getAsnOrderItem(List<AsnOrderItem> items) { @@ -431,6 +476,7 @@ detlsDto.setAsnCode(asnOrderItem.getAsnCode()) .setMaktx(asnOrderItem.getMaktx()) .setBarcode(asnOrderItem.getTrackCode()) + .setQty(asnOrderItem.getQty()) .setPoCode(asnOrderItem.getPoCode()) .setAnfme(asnOrderItem.getAnfme()) .setPurQty(asnOrderItem.getPurQty()) -- Gitblit v1.9.1