From 1ea84a23004ebcfaf86cb436d84164602ca9091d Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 08 八月 2025 17:03:36 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderServiceImpl.java | 46 +++++++++++++++++++++++-----------------------
1 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderServiceImpl.java
index 8096cb2..626d2d4 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderServiceImpl.java
@@ -85,13 +85,13 @@
if (Objects.isNull(params)) {
throw new CoolException("鏌ヨ鏉′欢涓嶈兘涓虹┖锛侊紒");
}
- List<AsnOrderItem> orderItems = asnOrderItemService.list(new LambdaQueryWrapper<AsnOrderItem>()
- .like(!Objects.isNull(params.get("maktx")), AsnOrderItem::getMaktx, params.get("maktx"))
- .eq(!Objects.isNull(params.get("matnrCode")), AsnOrderItem::getMatnrCode, params.get("matnrCode")));
+ List<WkOrderItem> orderItems = asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>()
+ .like(!Objects.isNull(params.get("maktx")), WkOrderItem::getMaktx, params.get("maktx"))
+ .eq(!Objects.isNull(params.get("matnrCode")), WkOrderItem::getMatnrCode, params.get("matnrCode")));
if (orderItems.isEmpty()) {
return new ArrayList<>();
}
- List<Long> longList = orderItems.stream().map(AsnOrderItem::getAsnId).collect(Collectors.toList());
+ List<Long> longList = orderItems.stream().map(WkOrderItem::getOrderId).collect(Collectors.toList());
return this.listByIds(longList);
}
@@ -166,8 +166,8 @@
public void svaeOrUpdateOrderItem(AsnOrderAndItemsParams params, Long loginUserId) throws Exception {
WkOrder orders = params.getOrders();
params.getItems().forEach(item -> {
- item.put("asnId", orders.getId());
- item.put("asnCode", orders.getCode());
+ item.put("orderId", orders.getId());
+ item.put("orderCode", orders.getCode());
item.put("poCode", orders.getPoCode());
item.put("createBy", loginUserId);
item.put("updateBy", loginUserId);
@@ -175,9 +175,9 @@
throw new CoolException("鏄庣粏淇濆瓨澶辫触锛侊紒");
}
});
- List<AsnOrderItem> orderItems = asnOrderItemService.list(new LambdaQueryWrapper<AsnOrderItem>()
- .eq(AsnOrderItem::getAsnId, params.getOrders().getId()));
- double sum = orderItems.stream().mapToDouble(AsnOrderItem::getAnfme).sum();
+ List<WkOrderItem> orderItems = asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>()
+ .eq(WkOrderItem::getOrderId, params.getOrders().getId()));
+ double sum = orderItems.stream().mapToDouble(WkOrderItem::getAnfme).sum();
orders.setAnfme(sum);
if (!this.updateById(orders)) {
throw new CoolException("璁″垝鏀惰揣鏁伴噺淇敼澶辫触锛侊紒");
@@ -276,9 +276,9 @@
if (!this.save(order)) {
throw new CoolException("ASN鍗曟嵁淇濆瓨澶辫触锛侊紒");
}
- List<AsnOrderItem> orderItems = new ArrayList<>();
+ List<WkOrderItem> orderItems = new ArrayList<>();
for (PurchaseItem item : itemList) {
- AsnOrderItem orderItem = new AsnOrderItem();
+ WkOrderItem orderItem = new WkOrderItem();
Matnr matnr = matnrService.getOne(new LambdaQueryWrapper<Matnr>().eq(Matnr::getCode, item.getMatnrCode()));
if (Objects.isNull(matnr)) {
throw new CoolException("鏁版嵁閿欒锛氬綋鍓嶇墿鏂欎笉瀛樺湪!!");
@@ -294,9 +294,9 @@
throw new CoolException("鏂板缓鍗曟嵁鏁伴噺涓嶈兘澶т簬璁″垝鏁伴噺锛侊紒");
}
orderItem.setAnfme(item.getAnfme())
- .setAsnId(order.getId())
+ .setOrderId(order.getId())
.setSplrName(item.getSplrName())
- .setAsnCode(code)
+ .setOrderCode(code)
.setSplrBatch(item.getSplrBatch())
.setSplrCode(item.getSplrCode())
.setPoDetlId(item.getId())
@@ -323,7 +323,7 @@
}
}
- double sum = orderItems.stream().mapToDouble(AsnOrderItem::getAnfme).sum();
+ double sum = orderItems.stream().mapToDouble(WkOrderItem::getAnfme).sum();
if (!asnOrderItemService.saveBatch(orderItems)) {
throw new CoolException(("Asn鍗曟嵁鏄庣粏淇濆瓨澶辫触锛侊紒"));
@@ -354,8 +354,8 @@
@Transactional(rollbackFor = Exception.class)
public R removeOrders(List<Long> ids) {
for (Long id : ids) {
- List<AsnOrderItem> list = asnOrderItemService.list(new LambdaQueryWrapper<AsnOrderItem>()
- .eq(AsnOrderItem::getAsnId, id));
+ List<WkOrderItem> list = asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>()
+ .eq(WkOrderItem::getOrderId, id));
if (list.isEmpty()) {
continue;
}
@@ -371,7 +371,7 @@
}
});
- double sum = list.stream().mapToDouble(AsnOrderItem::getAnfme).sum();
+ double sum = list.stream().mapToDouble(WkOrderItem::getAnfme).sum();
Purchase purchase = purchaseService.getOne(new LambdaQueryWrapper<Purchase>()
.eq(Purchase::getCode, list.stream().findFirst().get().getPoCode()));
@@ -393,8 +393,8 @@
}
- if (!asnOrderItemService.remove(new LambdaQueryWrapper<AsnOrderItem>()
- .in(AsnOrderItem::getAsnId, ids))) {
+ if (!asnOrderItemService.remove(new LambdaQueryWrapper<WkOrderItem>()
+ .in(WkOrderItem::getOrderId, ids))) {
// throw new CoolException("Details Delete Fail");
}
@@ -418,7 +418,7 @@
if (!this.updateById(asrder)) {
throw new CoolException("鍗曟嵁鍏抽棴澶辫触锛侊紒");
}
- List<AsnOrderItem> orderItems = asnOrderItemService.list(new LambdaQueryWrapper<AsnOrderItem>().eq(AsnOrderItem::getAsnId, asrder.getId()));
+ List<WkOrderItem> orderItems = asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>().eq(WkOrderItem::getOrderId, asrder.getId()));
if (orderItems.isEmpty()) {
throw new CoolException("鏀惰揣鏄庣粏涓虹┖锛侊紒");
}
@@ -440,20 +440,20 @@
throw new CoolException("涓诲崟鍘嗗彶妗ｆ坊鍔犲け璐ワ紒锛�");
}
List<AsnOrderItemLog> logs = new ArrayList<>();
- List<AsnOrderItem> items = asnOrderItemService.list(new LambdaQueryWrapper<AsnOrderItem>().eq(AsnOrderItem::getAsnId, order.getId()));
+ List<WkOrderItem> items = asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>().eq(WkOrderItem::getOrderId, order.getId()));
items.forEach(item -> {
AsnOrderItemLog itemLog = new AsnOrderItemLog();
BeanUtils.copyProperties(item, itemLog);
itemLog.setAsnItemId(itemLog.getId())
.setLogId(orderLog.getId())
- .setAsnId(item.getAsnId());
+ .setAsnId(item.getOrderId());
logs.add(itemLog);
});
if (!asnOrderItemLogService.saveBatch(logs)) {
throw new CoolException("閫氱煡鍗曟槑缁嗗巻鍙叉。淇濆瓨澶辫触锛侊紒");
}
- if (!asnOrderItemService.remove(new LambdaQueryWrapper<AsnOrderItem>().eq(AsnOrderItem::getAsnId, order.getId()))) {
+ if (!asnOrderItemService.remove(new LambdaQueryWrapper<WkOrderItem>().eq(WkOrderItem::getOrderId, order.getId()))) {
throw new CoolException("鍘熷崟鎹槑缁嗗垹闄ゅけ璐ワ紒锛�");
}
if (!this.removeById(asrder.getId())) {
--
Gitblit v1.9.1