From a0c27ec444c85326efe3bacf3205dfecbd66451d Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 22 四月 2025 09:28:39 +0800
Subject: [PATCH] #新增 1. 新增出库单明细 2. 编码规则bug修改
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java | 68 ++++++++++++++++++++++------------
1 files changed, 44 insertions(+), 24 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java
index 5657acc..39a5d8a 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java
@@ -104,8 +104,25 @@
.setBarcode(pakin.getBarcode())
.setTargSite(deviceSite.getDeviceCode())
.setCreateBy(loginUserId)
- .setUpdateBy(loginUserId)
- .setTargSite(LocManageUtil.getTargetSite());
+ .setUpdateBy(loginUserId);
+
+ if (!Objects.isNull(waitPakin.getSiteId()) && waitPakin.getSiteId() > 0) {
+ DeviceSite site = deviceSiteService.getById(waitPakin.getSiteId());
+ task.setTargSite(site.getSite() + "");
+ } else {
+ task.setTargSite(LocManageUtil.getTargetSite());
+ }
+ if (!Objects.isNull(waitPakin.getLocCode()) && StringUtils.isNotBlank(waitPakin.getLocCode())) {
+ List<Loc> locs = locService.list(new LambdaQueryWrapper<Loc>().eq(Loc::getCode, waitPakin.getLocCode()));
+// if (!locs.isEmpty()) {
+// throw new CoolException("搴撲綅閿欒锛氱浉鍚屽簱浣嶅簲鍙竴鏉�")
+// }
+ Loc loc = locs.stream().findFirst().get();
+ task.setTargSite(loc.getCode());
+ } else {
+ task.setTargSite(LocManageUtil.getTargetSite());
+ }
+
if (!this.save(task)) {
throw new CoolException("浠诲姟淇濆瓨澶辫触锛侊紒");
}
@@ -121,13 +138,12 @@
waitPakinItems.forEach(item -> {
TaskItem taskItem = new TaskItem();
BeanUtils.copyProperties(item, taskItem);
- AsnOrder order = asnOrderService.getOne(new LambdaQueryWrapper<AsnOrder>().eq(AsnOrder::getId, item.getAsnId()));
- if (Objects.isNull(order)) {
- throw new CoolException("鍗曟嵁涓嶅瓨鍦紒锛�");
- }
+// AsnOrder order = asnOrderService.getOne(new LambdaQueryWrapper<AsnOrder>().eq(AsnOrder::getId, item.getAsnId()));
+// if (Objects.isNull(order)) {
+// throw new CoolException("鏁版嵁閿欒: 鍗曟嵁涓嶅瓨鍦紒锛�");
+// }
taskItem.setTaskId(task.getId())
.setOrderType(OrderType.ORDER_RECEIPT.type)
- .setWkType(Short.parseShort(order.getWkType()))
.setSource(item.getId())
.setTrackCode(item.getTrackCode())
.setCreateBy(loginUserId)
@@ -163,7 +179,7 @@
return;
}
List<Long> list = tasks.stream().map(Task::getId).collect(Collectors.toList());
- List<TaskItem> taskItems = taskItemService.list(new LambdaQueryWrapper<TaskItem>().eq(TaskItem::getTaskId, list));
+ List<TaskItem> taskItems = taskItemService.list(new LambdaQueryWrapper<TaskItem>().in(TaskItem::getTaskId, list));
if (taskItems.isEmpty()) {
throw new CoolException("浠诲姟鏄庣粏涓嶅瓨鍦紒锛�");
}
@@ -181,15 +197,19 @@
});
/**瀵逛换鍔℃槑缁嗘寜璁㈠崟杩涜鍒嗙粍*/
- Map<Long, List<TaskItem>> orderMap = taskItems.stream().collect(Collectors.groupingBy(TaskItem::getOrderId));
+ Map<Long, List<TaskItem>> orderMap = taskItems.stream().collect(Collectors.groupingBy(TaskItem::getSource));
orderMap.keySet().forEach(key -> {
- AsnOrder order = asnOrderService.getOne(new LambdaQueryWrapper<AsnOrder>()
- .eq(AsnOrder::getId, key)
- .select(AsnOrder::getId, AsnOrder::getPoCode, AsnOrder::getCode));
+ WaitPakinItem pakinItem = waitPakinItemService.getById(key);
+// AsnOrder order = asnOrderService.getOne(new LambdaQueryWrapper<AsnOrder>()
+// .eq(AsnOrder::getId, key)
+// .select(AsnOrder::getId, AsnOrder::getPoCode, AsnOrder::getCode));
+ if (null == pakinItem) {
+ throw new CoolException("鏁版嵁閿欒锛氱粍鎷栨暟鎹笉瀛樺湪锛岃鑱旂郴绠＄悊鍛橈紒锛�");
+ }
List<TaskItem> items = orderMap.get(key);
//淇濆瓨搴撳瓨鏄庣粏
try {
- saveStockItems(items, order);
+ saveStockItems(items, pakinItem);
} catch (Exception e) {
throw new CoolException("搴撳瓨绠＄悊淇濆瓨鏇存柊澶辫触锛侊紒");
}
@@ -211,14 +231,14 @@
* @time 2025/4/15 15:28
*/
@Transactional(rollbackFor = Exception.class)
- private void saveLocItem(List<TaskItem> items, Long taskId) throws Exception {
+ void saveLocItem(List<TaskItem> items, Long taskId) throws Exception {
Task task = this.getById(taskId);
if (Objects.isNull(task)) {
throw new CoolException("浠诲姟涓嶅瓨鍦�!!");
}
List<LocItem> locItems = new ArrayList<>();
items.forEach(taskItem -> {
- Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getCode, task.getTargLoc()));
+ Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getCode, task.getTargLoc()), false);
LocItem item = new LocItem();
BeanUtils.copyProperties(taskItem, item);
item.setLocId(loc.getId()).setType(taskItem.getOrderType());
@@ -235,7 +255,7 @@
* @return
*/
@Transactional(rollbackFor = Exception.class)
- private void saveStockItems(List<TaskItem> items, AsnOrder order) throws Exception {
+ void saveStockItems(List<TaskItem> items, WaitPakinItem order) throws Exception {
Stock stock = new Stock();
// if (!Objects.isNull(order.getPoCode()) && StringUtils.isNotBlank(order.getPoCode())) {
// Purchase purchase = purchaseService.getOne(new LambdaQueryWrapper<Purchase>().eq(Purchase::getCode, order.getPoCode()));
@@ -250,9 +270,9 @@
double sum = items.stream().mapToDouble(TaskItem::getAnfme).sum();
stock.setSourceId(order.getId())
.setCode(ruleCode)
- .setSourceCode(order.getCode())
+ .setSourceCode(order.getAsnCode())
.setAnfme(sum)
- .setWkType(Short.parseShort(order.getWkType()))
+ .setWkType(order.getWkType())
.setType(order.getType());
if (!stockService.save(stock)) {
throw new CoolException("搴撳瓨淇濆瓨澶辫触锛侊紒");
@@ -261,15 +281,15 @@
List<StockItem> stockItems = new ArrayList<>();
for (TaskItem item : items) {
/**閫氳繃浠诲姟鏄庣粏涓殑taskId鏌ヨ,鑾峰彇TASK鐨勭洰鏍囧簱浣嶄俊鎭�*/
- AsnOrderItem orderItem = asnOrderItemService.getOne(new LambdaQueryWrapper<AsnOrderItem>().eq(AsnOrderItem::getId, item.getOrderItemId()));
- if (Objects.isNull(orderItem)) {
- throw new CoolException("鍗曟嵁鏄庣粏涓嶅瓨鍦紒锛�");
- }
+// AsnOrderItem orderItem = asnOrderItemService.getOne(new LambdaQueryWrapper<AsnOrderItem>().eq(AsnOrderItem::getId, item.getOrderItemId()));
+// if (Objects.isNull(orderItem)) {
+// throw new CoolException("鍗曟嵁鏄庣粏涓嶅瓨鍦紒锛�");
+// }
StockItem stockItem = new StockItem();
- BeanUtils.copyProperties(orderItem, stockItem);
+ BeanUtils.copyProperties(item, stockItem);
stockItem.setSourceItemId(item.getOrderItemId())
.setStockCode(stock.getCode())
- .setSourceItemId(orderItem.getId())
+ .setSourceItemId(item.getOrderItemId())
.setId(null)
.setStockId(stock.getId());
stockItems.add(stockItem);
--
Gitblit v1.9.1