From cfe049492f81d2c650a2b17348593edbc5054498 Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期三, 18 三月 2026 07:52:44 +0800
Subject: [PATCH] #3.5
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TransferServiceImpl.java | 25 ++++++++++++-------------
1 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TransferServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TransferServiceImpl.java
index 45bd115..2f42587 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TransferServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TransferServiceImpl.java
@@ -42,8 +42,6 @@
@Autowired
private TransferOrderService transferOrderService;
@Autowired
- private TransferService transferService;
- @Autowired
private AsnOrderService asnOrderService;
@Autowired
private AsnOrderItemService asnOrderItemService;
@@ -243,7 +241,7 @@
throw new CoolException("鍑哄簱鍗曟槑缁嗕繚瀛樺け璐ワ紒锛�");
}
- transfer.setExceStatus(CheckExceStatus.CHECK_ORDER_STATUS_EXCE_ING.val);
+ transfer.setExceStatus(AsnExceStatus.ASN_EXCE_STATUS_EXCE_ING.val);
if (!this.updateById(transfer)) {
throw new CoolException("璋冩嫈鍗曟洿鏂板け璐ワ紒锛�");
@@ -334,7 +332,7 @@
transferOrderService.remove(new LambdaQueryWrapper<TransferOrder>().in(TransferOrder::getTransferId, list));
}
- transferService.removeByIds(list);
+ this.removeByIds(list);
transferItemService.remove(new LambdaQueryWrapper<TransferItem>().in(TransferItem::getTransferId, list));
return true;
}
@@ -348,21 +346,22 @@
@Override
public IPage<LocItem> getLocsItems(OrgLocParams params, Long loginUserId) {
List<Loc> locs = locService.list(new LambdaQueryWrapper<Loc>()
+ .eq(Loc::getUseStatus, LocStsType.LOC_STS_TYPE_F.type)
.eq(!Objects.isNull(params.getOrgAreaId()), Loc::getAreaId, params.getOrgAreaId()));
-
- Page<LocItem> page = new Page<>(params.getCurrent(), params.getPageSize());
- QueryWrapper<LocItem> wrapper = new QueryWrapper<>();
- wrapper.select("id, matnr_id, maktx, matnr_code, anfme, work_qty, qty, batch, unit, fields_index, model, spec, loc_id ")
- .lambda()
- .eq(StringUtils.isNotBlank(params.getMatnrCode()), LocItem::getMatnrCode, params.getMatnrCode())
- .like(StringUtils.isNotBlank(params.getMaktx()), LocItem::getMaktx, params.getMaktx());
if (!locs.isEmpty()) {
+ Page<LocItem> page = new Page<>(params.getCurrent(), params.getPageSize());
+ QueryWrapper<LocItem> wrapper = new QueryWrapper<>();
+ wrapper.select("id, matnr_id, maktx, matnr_code, SUM(anfme) anfme, SUM(work_qty) work_qty, SUM(qty) qty, batch, unit, fields_index, model, spec")
+ .lambda()
+ .eq(StringUtils.isNotBlank(params.getMatnrCode()), LocItem::getMatnrCode, params.getMatnrCode())
+ .like(StringUtils.isNotBlank(params.getMaktx()), LocItem::getMaktx, params.getMaktx());
Set<Long> locIds = locs.stream().map(Loc::getId).collect(Collectors.toSet());
wrapper.lambda().in(LocItem::getLocId, locIds)
- .groupBy(LocItem::getBatch, LocItem::getFieldsIndex, LocItem::getMatnrCode);
+ .groupBy(LocItem::getBatch, LocItem::getMatnrId);
return locItemService.page(page, wrapper);
} else {
- return locItemService.page(page, wrapper);
+ IPage<LocItem> page = new Page<>(params.getCurrent(), params.getPageSize());
+ return page;
}
}
}
--
Gitblit v1.9.1