From b0409a8bac61d91d6db8755b15d4e2b9c4e3973c Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 05 六月 2025 15:56:11 +0800
Subject: [PATCH] 出库单取消功能优化
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java | 75 ++++++++++++++++++++++++++++++++++---
1 files changed, 68 insertions(+), 7 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java
index 0b6967a..70e07a5 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java
@@ -10,6 +10,7 @@
import com.vincent.rsf.server.manager.controller.params.AsnOrderAndItemsParams;
import com.vincent.rsf.server.manager.entity.*;
import com.vincent.rsf.server.manager.enums.AsnExceStatus;
+import com.vincent.rsf.server.manager.enums.POExceStatus;
import com.vincent.rsf.server.manager.enums.WaveExceStatus;
import com.vincent.rsf.server.manager.mapper.AsnOrderMapper;
import com.vincent.rsf.server.manager.service.*;
@@ -51,6 +52,10 @@
private WaveService waveService;
@Autowired
private WaveItemService waveItemService;
+ @Autowired
+ private OutStockItemService outStockItemService;
+ @Autowired
+ private OutStockService outStockService;
/**
@@ -61,7 +66,7 @@
* @time 2025/4/7 13:28
*/
@Transactional(rollbackFor = Exception.class)
- private void svaeOrUpdateOrderItem(AsnOrderAndItemsParams params, Long loginUserId) throws Exception {
+ public void svaeOrUpdateOrderItem(AsnOrderAndItemsParams params, Long loginUserId) throws Exception {
AsnOrder orders = params.getOrders();
params.getItems().forEach(item -> {
item.put("asnId", orders.getId());
@@ -101,19 +106,50 @@
if (Objects.isNull(order)) {
throw new CoolException("鍗曟嵁涓嶅瓨鍦紒锛�");
}
- if (!order.getExceStatus().equals(AsnExceStatus.ASN_EXCE_STATUS_UN_EXCE.val)) {
+ if (!order.getExceStatus().equals(AsnExceStatus.OUT_STOCK_STATUS_TASK_INIT.val)) {
throw new CoolException("褰撳墠鍗曟嵁鐘舵�佷负" + AsnExceStatus.getExceStatus(order.getExceStatus()) + "锛� 涓嶅彲鎵ц鍙栨秷鎿嶄綔锛侊紒");
}
- order.setExceStatus(AsnExceStatus.ASN_EXCE_STATUS_TASK_CANCEL.val).setStatus(0);
- if (!this.saveOrUpdate(order)) {
- throw new CoolException("鍗曟嵁鍙栨秷澶辫触锛侊紒");
+ List<AsnOrderItem> orderItems = outStockItemService.list(new LambdaQueryWrapper<AsnOrderItem>().eq(AsnOrderItem::getAsnId, id));
+ if (!orderItems.isEmpty()) {
+ for (AsnOrderItem orderItem : orderItems) {
+ if (!Objects.isNull(orderItem.getPoDetlId())) {
+ DeliveryItem deliveryItem = deliveryItemService.getById(orderItem.getPoDetlId());
+ Double workQty = Math.round((deliveryItem.getWorkQty() - orderItem.getAnfme()) * 10000) / 10000.0;
+ deliveryItem.setWorkQty(workQty.compareTo(0.0) >= 0 ? workQty : 0);
+ if (!deliveryItemService.updateById(deliveryItem)) {
+ throw new CoolException("DO鍗曟槑缁嗘洿鏂板け璐ワ紒锛�");
+ }
+ }
+ }
}
+
+ if (!Objects.isNull(order.getPoId())) {
+ Delivery delivery = deliveryService.getById(order.getPoId());
+ if (!Objects.isNull(delivery)) {
+ Double sum = orderItems.stream().mapToDouble(AsnOrderItem::getAnfme).sum();
+ Double workQty = Math.round((delivery.getWorkQty() - sum) * 10000) / 10000.0;
+ delivery.setWorkQty(workQty.compareTo(0.0) >= 0 ? workQty : 0).setExceStatus(POExceStatus.PO_EXCE_STATUS_UN_EXCE.val);
+ if (!deliveryService.updateById(delivery)) {
+ throw new CoolException("DO鍗曟嵁淇敼澶辫触锛侊紒");
+ }
+ }
+ }
+ if (!this.remove(new LambdaQueryWrapper<AsnOrder>().eq(AsnOrder::getId, id))) {
+ throw new CoolException("涓诲崟鍒犻櫎澶辫触锛侊紒");
+ }
+ if (!outStockItemService.remove(new LambdaQueryWrapper<AsnOrderItem>().eq(AsnOrderItem::getAsnId, id))) {
+ throw new CoolException("鍗曟嵁鏄庣粏鍒犻櫎澶辫触锛侊紒");
+ }
+// if (!this.saveOrUpdate(order)) {
+// throw new CoolException("鍗曟嵁鍙栨秷澶辫触锛侊紒");
+// }
return R.ok("鎿嶄綔鎴愬姛");
}
/**
* @param
+ * @param loginUserId
* @return
* @author Ryan
* @description 閫氳繃DO鍗曠敓鎴愬嚭搴撳崟
@@ -121,7 +157,7 @@
*/
@Override
@Transactional(rollbackFor = Exception.class)
- public R genOutStock(List<Long> ids) {
+ public R genOutStock(List<Long> ids, Long loginUserId) {
if (Objects.isNull(ids) || ids.isEmpty()) {
throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
@@ -143,9 +179,13 @@
throw new CoolException("缂栫爜瑙勫垯閿欒锛氳妫�鏌� 銆孲YS_OUT_STOCK_CODE銆嶇紪鐮佹槸鍚﹁缃垚鍔�");
}
order.setExceStatus(AsnExceStatus.OUT_STOCK_STATUS_TASK_INIT.val)
+ .setType(delivery.getType())
+ .setWkType(delivery.getWkType())
.setCode(ruleCode)
.setPoId(delivery.getId())
.setId(null)
+ .setUpdateBy(loginUserId)
+ .setCreateBy(loginUserId)
.setPoCode(delivery.getCode());
if (!this.save(order)) {
throw new CoolException("涓诲崟淇濆瓨澶辫触锛侊紒");
@@ -161,12 +201,25 @@
.setFieldsIndex(item.getFieldsIndex())
.setAsnId(order.getId())
.setAsnCode(order.getCode())
+ .setStockUnit(item.getUnit())
+ .setPurUnit(item.getUnit())
+ .setPlatWorkCode(item.getPlatWorkCode())
+ .setPlatOrderCode(item.getPlatOrderCode())
+ .setProjectCode(item.getProjectCode())
.setPlatItemId(item.getPlatItemId())
+ .setUpdateBy(loginUserId)
+ .setCreateBy(loginUserId)
.setPoDetlId(item.getId());
orderItems.add(orderItem);
+
+ if (!deliveryItemService.update(new LambdaUpdateWrapper<DeliveryItem>()
+ .set(DeliveryItem::getWorkQty, item.getAnfme())
+ .eq(DeliveryItem::getId, item.getId()))) {
+ throw new CoolException("DO鍗曟槑缁嗕慨鏀瑰け璐ワ紒锛�");
+ }
});
- double sum = orderItems.stream().mapToDouble(AsnOrderItem::getAnfme).sum();
+ Double sum = orderItems.stream().mapToDouble(AsnOrderItem::getAnfme).sum();
//淇敼璁″垝鏁伴噺
order.setAnfme(sum);
if (!this.saveOrUpdate(order)) {
@@ -175,6 +228,14 @@
if (!asnOrderItemService.saveBatch(orderItems)) {
throw new CoolException("鏄庣粏淇濆瓨澶辫触锛侊紒");
}
+
+ if (!deliveryService.update(new LambdaUpdateWrapper<Delivery>()
+ .set(Delivery::getExceStatus, POExceStatus.PO_EXCE_STATUS_EXCE_ING.val)
+ .set(Delivery::getWorkQty, sum)
+ .eq(Delivery::getId, key))) {
+ throw new CoolException("涓诲崟淇敼澶辫触锛侊紒");
+ }
+
});
return R.ok();
}
--
Gitblit v1.9.1