From bcf39531dcfaea85297312405fbecc7eebccf7d0 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 25 四月 2025 09:33:21 +0800
Subject: [PATCH] #新增 1. 新增波次列表及详情 2. 新增立库站点绑定
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java | 63 ++++++++++++++++++++++++++++++-
1 files changed, 60 insertions(+), 3 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 3b19c58..af8c2d1 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
@@ -13,6 +13,7 @@
import com.vincent.rsf.server.manager.controller.params.BatchUpdateParam;
import com.vincent.rsf.server.manager.entity.*;
import com.vincent.rsf.server.manager.enums.AsnExceStatus;
+import com.vincent.rsf.server.manager.enums.WaveExceStatus;
import com.vincent.rsf.server.manager.mapper.AsnOrderMapper;
import com.vincent.rsf.server.manager.mapper.PurchaseMapper;
import com.vincent.rsf.server.manager.service.*;
@@ -45,15 +46,16 @@
private AsnOrderLogService asnOrderLogService;
@Autowired
private AsnOrderItemLogService asnOrderItemLogService;
-
@Autowired
private DeliveryItemService deliveryItemService;
-
@Autowired
private DeliveryService deliveryService;
@Autowired
private MatnrService matnrService;
-
+ @Autowired
+ private WaveService waveService;
+ @Autowired
+ private WaveItemService waveItemService;
/**
@@ -157,6 +159,7 @@
@Override
@Transactional(rollbackFor = Exception.class)
public R cancelOutOrder(String id) {
+ //TODO 鍑哄簱鍗曞彇娑堟祦绋嬶紝QMS锛堝崟鎹彇娑堬級->DO鍗�->鍑哄簱鍗�->娉㈡->鍒ゆ柇鏄惁鍏ㄥ崟鎹�->鍏ㄥ崟鎹笅鍙戝彇娑堜换鍔¤嚦WCS,闈炲叏鍗曟暟鎹彇娑堝垹闄ゆ祦绋嬫墍鏈夊叧鑱旀暟鎹�
if (Cools.isEmpty(id)) {
throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
@@ -238,4 +241,58 @@
});
return R.ok();
}
+
+ /**
+ * @param
+ * @return
+ * @author Ryan
+ * @description 鐢熸垚娉㈡
+ * @time 2025/4/24 15:04
+ */
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public R generateWaves(List<Long> ids) {
+ if (Objects.isNull(ids) || ids.isEmpty()) {
+ throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ List<AsnOrder> orders = this.listByIds(ids);
+ if (orders.isEmpty()) {
+ throw new CoolException("鍗曟嵁涓嶅瓨鍦紒锛�");
+ }
+ double sum = orders.stream().mapToDouble(AsnOrder::getAnfme).sum();
+ Wave wave = new Wave();
+ String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_WAVE_TYPE, null);
+ if (Objects.isNull(ruleCode) || StringUtils.isBlank(ruleCode)) {
+ throw new CoolException("缂栫爜瑙勫垯閿欒锛氳瑕佹煡鐪嬨�孲YS_WAVE_TYPE銆嶆槸鍚﹁缃垚鍔燂紒锛�");
+ }
+ wave.setOrderNum(ids.size())
+ .setType(Short.parseShort("1"))
+ .setCode(ruleCode)
+ .setExceStatus(WaveExceStatus.WAVE_EXCE_STATUS_INIT.val)
+ .setAnfme(sum);
+ if (!waveService.save(wave)) {
+ throw new CoolException("娉㈡淇濆瓨澶辫触锛侊紒");
+ }
+ List<Long> list = orders.stream().map(AsnOrder::getId).collect(Collectors.toList());
+ List<WaveItem> items = new ArrayList<>();
+ List<AsnOrderItem> orderItems = asnOrderItemService
+ .list(new LambdaQueryWrapper<AsnOrderItem>()
+ .in(AsnOrderItem::getAsnId, list));
+
+
+ for (AsnOrderItem item : orderItems) {
+ WaveItem waveItem = new WaveItem();
+ BeanUtils.copyProperties(item, waveItem);
+ waveItem.setWaveId(wave.getId())
+ .setWaveCode(wave.getCode())
+ .setOrderId(item.getAsnId())
+ .setOrderCode(item.getAsnCode())
+ .setOrderItemId(item.getId());
+ items.add(waveItem);
+ }
+ if (!waveItemService.saveBatch(items)) {
+ throw new CoolException("娉㈡鏄庣粏淇濆瓨澶辫触锛侊紒");
+ }
+ return R.ok("鎿嶄綔瀹屾垚锛侊紒");
+ }
}
--
Gitblit v1.9.1