rakor
/
wms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor(controller): 优化收货确认功能的代码结构 

- 移除重复的 wmsQrCodeMasterService 注入，统一使用 qrCodeMasterService
- 为收货确认接口添加事务注解确保数据一致性
- 修复数字比较逻辑，使用 compareTo 方法替代 equals 方法
- 统一所有二维码服务调用，全部使用 qrCodeMasterService 实例
- 优化代码可读性并减少服务实例的冗余引用
This commit is contained in:
曹鹏飞 2026-06-14 21:28:33 +08:00
parent 725e88d59c
commit 085cc87ffa
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalPGIController.java
View File

@ -99,9 +99,6 @@ public class NormalPGIController extends BaseController {
@Resource
private IWmsPackageItemService wmsPackageItemService;
@Resource
private IWmsQrCodeMasterService wmsQrCodeMasterService;
@Resource
private IWmsQrCodeMasterService qrCodeMasterService;
@ -641,6 +638,7 @@ public class NormalPGIController extends BaseController {
* @return
*/
//收货确认
@Transactional
@PostMapping("PDA/takeDelivery")
@ApiMark(moduleName = "送货单管理", apiName = "收货确认")
public ApiResult<Void> takeDelivery(@Valid @RequestBody List<SrmMaterialReceiptQO> request) {
@ -679,7 +677,7 @@ public class NormalPGIController extends BaseController {
for (SrmMaterialReceiptQO item : request) {
if (item.getReceiptNum().equals(BigDecimal.ZERO))
if (item.getReceiptNum().compareTo(BigDecimal.ZERO)==0)
continue;
// 处理二维码
List<PDAScanCodeQO> autoFindChildCodes = Lists.newArrayList();
@ -726,7 +724,7 @@ public class NormalPGIController extends BaseController {
setQcMaterialSyncDto(qcMaterialSyncDTOS, item, order, codes, materialInfoInOrder, wmsQcReceiveItems, wmsQcReceive.getId(), orderItemId);
for (PDAScanCodeQO code : item.getScanCodes()) {
// 处理条码
WmsQrCodeMaster qrCodeMaster = wmsQrCodeMasterService.lambdaQuery()
WmsQrCodeMaster qrCodeMaster = qrCodeMasterService.lambdaQuery()
.eq(WmsQrCodeMaster::getBarcodeCode, code.getCodeId())
.one();
VUtil.trueThrowBusinessError(Objects.isNull(qrCodeMaster)).throwMessage("无效码【" + code.getCodeId() + "】");
@ -745,7 +743,7 @@ public class NormalPGIController extends BaseController {
setPoReceive(item, wmsPoReceiptItems, wmsPoReceipt.getId(), materialInfoInOrder, orderItemId);
for (PDAScanCodeQO code : item.getScanCodes()) {
// 处理条码
WmsQrCodeMaster qrCodeMaster = wmsQrCodeMasterService.lambdaQuery()
WmsQrCodeMaster qrCodeMaster = qrCodeMasterService.lambdaQuery()
.eq(WmsQrCodeMaster::getBarcodeCode, code.getCodeId())
.one();
VUtil.trueThrowBusinessError(Objects.isNull(qrCodeMaster)).throwMessage("无效码【" + code.getCodeId() + "】");
@ -1656,7 +1654,7 @@ public class NormalPGIController extends BaseController {
if (CollectionUtil.isNotEmpty(scanCode)) {
scanCode.forEach(code -> {
WmsQrCodeMaster qrCodeMaster = wmsQrCodeMasterService.getByCode(code.getCodeId());
WmsQrCodeMaster qrCodeMaster = qrCodeMasterService.getByCode(code.getCodeId());
VUtil.trueThrowBusinessError(Objects.isNull(qrCodeMaster)).throwMessage("条码不存在:" + code.getCodeId());
// 库存
InventoryInDTO inventoryDTO = inventories.stream()
@ -2016,7 +2014,7 @@ public class NormalPGIController extends BaseController {
.map(WmsPackageItemDetailDTO::getBarcodeId).collect(Collectors.toList());
if (CollectionUtil.isNotEmpty(parentIds)) {
List<WmsQrCodeMaster> childMasters = wmsQrCodeMasterService.lambdaQuery()
List<WmsQrCodeMaster> childMasters = qrCodeMasterService.lambdaQuery()
.in(WmsQrCodeMaster::getParentBarcodeId, parentIds).list();
childMasters.forEach(child -> {
WmsPackageItemDetailDTO dto = new WmsPackageItemDetailDTO();
@ -2136,7 +2134,7 @@ public class NormalPGIController extends BaseController {
setQcMaterialSyncDto(qcMaterialSyncDTOS, item, order, codes, materialInfoInOrder, wmsQcReceiveItems, wmsQcReceive.getId(), orderItemId);
for (PDAScanCodeQO code : item.getScanCodes()) {
// 处理条码
WmsQrCodeMaster qrCodeMaster = wmsQrCodeMasterService.lambdaQuery()
WmsQrCodeMaster qrCodeMaster = qrCodeMasterService.lambdaQuery()
.eq(WmsQrCodeMaster::getBarcodeCode, code.getCodeId())
.one();
VUtil.trueThrowBusinessError(Objects.isNull(qrCodeMaster)).throwMessage("无效码【" + code.getCodeId() + "】");
@ -2155,7 +2153,7 @@ public class NormalPGIController extends BaseController {
setPoReceive(item, wmsPoReceiptItems, wmsPoReceipt.getId(), materialInfoInOrder, orderItemId);
for (PDAScanCodeQO code : item.getScanCodes()) {
// 处理条码
WmsQrCodeMaster qrCodeMaster = wmsQrCodeMasterService.lambdaQuery()
WmsQrCodeMaster qrCodeMaster = qrCodeMasterService.lambdaQuery()
.eq(WmsQrCodeMaster::getBarcodeCode, code.getCodeId())
.one();
VUtil.trueThrowBusinessError(Objects.isNull(qrCodeMaster)).throwMessage("无效码【" + code.getCodeId() + "】");