From d1511d2d12b4223882fcfdabd3ba6b59c038edc4 Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期三, 08 一月 2025 21:29:46 +0800 Subject: [PATCH] #拣货单功能开发 --- zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/PickSheetServiceImpl.java | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 60 insertions(+), 0 deletions(-) diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/PickSheetServiceImpl.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/PickSheetServiceImpl.java index 11d1800..5f2a4cf 100644 --- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/PickSheetServiceImpl.java +++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/PickSheetServiceImpl.java @@ -1,12 +1,72 @@ package com.zy.asrs.wms.asrs.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.zy.asrs.wms.asrs.entity.PickSheet; +import com.zy.asrs.wms.asrs.entity.PickSheetDetl; +import com.zy.asrs.wms.asrs.entity.param.PageRequest; +import com.zy.asrs.wms.asrs.mapper.ManPickSheetDetlMapper; import com.zy.asrs.wms.asrs.mapper.ManPickSheetMapper; import com.zy.asrs.wms.asrs.service.PickSheetService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Objects; @Service public class PickSheetServiceImpl extends ServiceImpl<ManPickSheetMapper, PickSheet> implements PickSheetService { + @Autowired + private ManPickSheetDetlMapper pickSheetDetlMapper; + + /** + * 鑾峰彇鎷h揣鍗曞垪琛� + * @param params + * @return + */ + @Override + public IPage<PickSheet> getOutFlatSheet(PageRequest params) { + LambdaQueryWrapper<PickSheet> lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.eq(PickSheet::getDeleted, 0).eq(PickSheet::getStatus, 1); + if (!Objects.isNull(params.getParams())) { + lambdaQueryWrapper.eq(!Objects.isNull(params.getParams().get("pickNo")),PickSheet::getPickNo, params.getParams().get("pickNo")) + .eq(!Objects.isNull(params.getParams().get("id")), PickSheet::getId, params.getParams().get("id")) + .eq(!Objects.isNull(params.getParams().get("waveNo")), PickSheet::getWaveNo, params.getParams().get("waveNo")); + } + return this.baseMapper.selectMapsPage(params.getPage(), lambdaQueryWrapper); + } + + /** + * 鑾峰彇鎷h揣鍗曟槑缁� + * @param pageRequest + * @return + */ + @Override + public IPage<PickSheetDetl> getSheetDetl(PageRequest pageRequest) { + LambdaQueryWrapper<PickSheetDetl> lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.eq(PickSheetDetl::getDeleted, 0).eq(PickSheetDetl::getStatus, 1); + if (!Objects.isNull(pageRequest.getParams())) { + lambdaQueryWrapper.eq(!Objects.isNull(pageRequest.getParams().get("maktx")),PickSheetDetl::getMaktx, pageRequest.getParams().get("maktx")) + .eq(!Objects.isNull(pageRequest.getParams().get("batch")), PickSheetDetl::getBatch, pageRequest.getParams().get("batch")) + .eq(!Objects.isNull(pageRequest.getParams().get("mantr")), PickSheetDetl::getMatnr, pageRequest.getParams().get("mantr")) + .eq(!Objects.isNull(pageRequest.getParams().get("locNo")), PickSheetDetl::getLocNo, pageRequest.getParams().get("locNo")) + .eq(!Objects.isNull(pageRequest.getParams().get("pickId")), PickSheetDetl::getPickId, pageRequest.getParams().get("pickId")) + .eq(!Objects.isNull(pageRequest.getParams().get("barcode")), PickSheetDetl::getBarcode, pageRequest.getParams().get("barcode")); + } + return pickSheetDetlMapper.selectMapsPage(pageRequest.getPage(), lambdaQueryWrapper); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public int removePickSheet(Long id) { + if (this.update(new LambdaUpdateWrapper<PickSheet>().eq(PickSheet::getId, id).set(PickSheet::getDeleted, 1))) { + return pickSheetDetlMapper.update(new LambdaUpdateWrapper<PickSheetDetl>().eq(PickSheetDetl::getPickId, id).set(PickSheetDetl::getDeleted, 1)); + } + return 0; + } + + } -- Gitblit v1.9.1