From e81a3446617207688cd60fe5b1717a18c5cb9e32 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 26 五月 2025 18:14: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/OutStockServiceImpl.java | 376 +++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 292 insertions(+), 84 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 421985e..657ab2d 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
@@ -6,28 +6,22 @@
import com.vincent.rsf.framework.common.Cools;
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.framework.exception.CoolException;
-import com.vincent.rsf.server.api.entity.dto.PoItemsDto;
-import com.vincent.rsf.server.api.service.ReceiveMsgService;
-import com.vincent.rsf.server.api.service.ReportMsgService;
+import com.vincent.rsf.server.manager.enums.OrderType;
import com.vincent.rsf.server.manager.controller.params.AsnOrderAndItemsParams;
-import com.vincent.rsf.server.manager.controller.params.BatchUpdateParam;
-import com.vincent.rsf.server.manager.entity.AsnOrder;
-import com.vincent.rsf.server.manager.entity.AsnOrderItem;
-import com.vincent.rsf.server.manager.entity.AsnOrderItemLog;
-import com.vincent.rsf.server.manager.entity.AsnOrderLog;
+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.*;
+import com.vincent.rsf.server.manager.utils.OptimalAlgorithmUtil;
import com.vincent.rsf.server.system.constant.SerialRuleCode;
-import com.vincent.rsf.server.system.mapper.SerialRuleMapper;
import com.vincent.rsf.server.system.utils.SerialRuleUtils;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import javax.annotation.Resource;
import java.util.*;
import java.util.stream.Collectors;
@@ -42,38 +36,40 @@
public class OutStockServiceImpl extends ServiceImpl<AsnOrderMapper, AsnOrder> implements OutStockService {
@Autowired
- private ReceiveMsgService receiveMsgService;
- @Autowired
- private ReportMsgService reportMsgService;
- @Resource
- private PurchaseMapper purchaseMapper;
- @Autowired
private AsnOrderItemService asnOrderItemService;
@Autowired
private AsnOrderLogService asnOrderLogService;
@Autowired
private AsnOrderItemLogService asnOrderItemLogService;
- @Resource
- private SerialRuleMapper serialRuleMapper;
+ @Autowired
+ private DeliveryItemService deliveryItemService;
+ @Autowired
+ private DeliveryService deliveryService;
+ @Autowired
+ private MatnrService matnrService;
+ @Autowired
+ private WaveService waveService;
+ @Autowired
+ private WaveItemService waveItemService;
+
/**
- * @author Ryan
- * @description 鏇存柊鎴栦繚瀛樻槑缁�
* @param
* @return
+ * @author Ryan
+ * @description 鏇存柊鎴栦繚瀛樻槑缁�
* @time 2025/4/7 13:28
*/
@Transactional(rollbackFor = Exception.class)
- private void svaeOrUpdateOrderItem(AsnOrderAndItemsParams params, Long loginUserId) throws Exception{
+ private void svaeOrUpdateOrderItem(AsnOrderAndItemsParams params, Long loginUserId) throws Exception {
AsnOrder orders = params.getOrders();
-
params.getItems().forEach(item -> {
item.put("asnId", orders.getId());
item.put("asnCode", orders.getCode());
item.put("poCode", orders.getPoCode());
item.put("createBy", loginUserId);
item.put("updateBy", loginUserId);
- if (!asnOrderItemService.fieldsSave(item)) {
+ if (!asnOrderItemService.fieldsSave(item, loginUserId)) {
throw new CoolException("鏄庣粏淇濆瓨澶辫触锛侊紒");
}
});
@@ -88,75 +84,16 @@
/**
- * @author Ryan
- * @description 鍒犻櫎鍘熶富鍗曞強鏄庣粏锛屽姞鍏ュ巻鍙叉。
* @param
* @return
- * @time 2025/3/19 19:53
- */
- @Transactional(rollbackFor = Exception.class)
- private void operateOrderLogs(AsnOrder asrder) throws Exception{
- if (Objects.isNull(asrder) || Objects.isNull(asrder.getId())) {
- throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
- }
- asrder.setExceStatus(AsnExceStatus.ASN_EXCE_STATUS_TASK_CLOSE.val);
-
- if (!this.updateById(asrder)) {
- throw new CoolException("鍗曟嵁鍏抽棴澶辫触锛侊紒");
- }
- List<AsnOrderItem> orderItems = asnOrderItemService.list(new LambdaQueryWrapper<AsnOrderItem>().eq(AsnOrderItem::getAsnId, asrder.getId()));
- if (orderItems.isEmpty()) {
- throw new CoolException("鏀惰揣鏄庣粏涓虹┖锛侊紒");
- }
-// if (Objects.isNull(asrder.getAnfme()) || asrder.getAnfme().compareTo(0.00) == 0) {
-// throw new CoolException("鏀惰揣鏁伴噺涓嶈兘涓洪浂锛侊紒");
-// }
- AsnOrder order = this.getById(asrder.getId());
- AsnOrderLog orderLog = new AsnOrderLog();
- order.setExceStatus(AsnExceStatus.ASN_EXCE_STATUS_TASK_DONE.val);
- BeanUtils.copyProperties(order, orderLog);
- orderLog.setId(null);
- orderLog.setAsnId(order.getId());
-
- if (!this.saveOrUpdate(order)) {
- throw new CoolException("鐘舵�佷慨鏀瑰け璐ワ紒锛�");
- }
- orderLog.setExceStatus(AsnExceStatus.ASN_EXCE_STATUS_TASK_CLOSE.val);
- if (!asnOrderLogService.save(orderLog)) {
- throw new CoolException("涓诲崟鍘嗗彶妗ｆ坊鍔犲け璐ワ紒锛�");
- }
- List<AsnOrderItemLog> logs = new ArrayList<>();
- List<AsnOrderItem> items = asnOrderItemService.list(new LambdaQueryWrapper<AsnOrderItem>().eq(AsnOrderItem::getAsnId, order.getId()));
- items.forEach(item -> {
- AsnOrderItemLog itemLog = new AsnOrderItemLog();
- BeanUtils.copyProperties(item, itemLog);
- itemLog.setAsnItemId(itemLog.getId())
- .setLogId(orderLog.getId())
- .setAsnId(item.getAsnId());
- logs.add(itemLog);
- });
-
- if (!asnOrderItemLogService.saveBatch(logs)) {
- throw new CoolException("閫氱煡鍗曟槑缁嗗巻鍙叉。淇濆瓨澶辫触锛侊紒");
- }
- if (!asnOrderItemService.remove(new LambdaQueryWrapper<AsnOrderItem>().eq(AsnOrderItem::getAsnId, order.getId()))) {
- throw new CoolException("鍘熷崟鎹槑缁嗗垹闄ゅけ璐ワ紒锛�");
- }
- if (!this.removeById(asrder.getId())) {
- throw new CoolException("鍘熷崟鎹垹闄ゅけ璐ワ紒锛�");
- }
- }
-
- /**
* @author Ryan
* @description 鍙栨秷鍑哄簱鍗曟嵁
- * @param
- * @return
* @time 2025/4/22 10:40
*/
@Override
@Transactional(rollbackFor = Exception.class)
public R cancelOutOrder(String id) {
+ //TODO 鍑哄簱鍗曞彇娑堟祦绋嬶紝QMS锛堝崟鎹彇娑堬級->DO鍗�->鍑哄簱鍗�->娉㈡->鍒ゆ柇鏄惁鍏ㄥ崟鎹�->鍏ㄥ崟鎹笅鍙戝彇娑堜换鍔¤嚦WCS,闈炲叏鍗曟暟鎹彇娑堝垹闄ゆ祦绋嬫墍鏈夊叧鑱旀暟鎹�
if (Cools.isEmpty(id)) {
throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
@@ -174,4 +111,275 @@
}
return R.ok("鎿嶄綔鎴愬姛");
}
+
+ /**
+ * @param
+ * @return
+ * @author Ryan
+ * @description 閫氳繃DO鍗曠敓鎴愬嚭搴撳崟
+ * @time 2025/4/23 16:24
+ */
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public R genOutStock(List<Long> ids) {
+ if (Objects.isNull(ids) || ids.isEmpty()) {
+ throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ List<DeliveryItem> items = deliveryItemService.list(new LambdaQueryWrapper<DeliveryItem>().in(DeliveryItem::getId, ids));
+ if (items.isEmpty()) {
+ throw new CoolException("鍗曟嵁涓嶅瓨鍦紒锛�");
+ }
+ Map<Long, List<DeliveryItem>> listMap = items.stream().collect(Collectors.groupingBy(DeliveryItem::getDeliveryId));
+ listMap.keySet().forEach(key -> {
+ //TODO 鍒ゆ柇鍗曟嵁鏄惁宸茬粡瀛樺湪锛屽瀛樺湪鍒欑疮鍔犱慨鏀瑰瓙琛紝涓嶅瓨鍦ㄦ墠鏂板缓
+ Delivery delivery = deliveryService.getById(key);
+ if (Objects.isNull(delivery)) {
+ throw new CoolException("鍗曟嵁涓嶅瓨鍦紒锛�");
+ }
+ AsnOrder order = new AsnOrder();
+ BeanUtils.copyProperties(delivery, order);
+ String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_OUT_STOCK_CODE, order);
+ if (Objects.isNull(ruleCode) || StringUtils.isBlank(ruleCode)) {
+ throw new CoolException("缂栫爜瑙勫垯閿欒锛氳妫�鏌� 銆孲YS_OUT_STOCK_CODE銆嶇紪鐮佹槸鍚﹁缃垚鍔�");
+ }
+ order.setExceStatus(AsnExceStatus.OUT_STOCK_STATUS_TASK_INIT.val)
+ .setCode(ruleCode)
+ .setPoId(delivery.getId())
+ .setId(null)
+ .setPoCode(delivery.getCode());
+ if (!this.save(order)) {
+ throw new CoolException("涓诲崟淇濆瓨澶辫触锛侊紒");
+ }
+ List<AsnOrderItem> orderItems = new ArrayList<>();
+ listMap.get(key).forEach(item -> {
+ AsnOrderItem orderItem = new AsnOrderItem();
+ BeanUtils.copyProperties(item, orderItem);
+ orderItem.setId(null)
+ .setPoCode(order.getPoCode())
+ .setMaktx(item.getMaktx())
+ .setMatnrCode(item.getMatnrCode())
+ .setFieldsIndex(item.getFieldsIndex())
+ .setAsnId(order.getId())
+ .setAsnCode(order.getCode())
+ .setPlatItemId(item.getPlatItemId())
+ .setPoDetlId(item.getId());
+ orderItems.add(orderItem);
+ });
+
+ double sum = orderItems.stream().mapToDouble(AsnOrderItem::getAnfme).sum();
+ //淇敼璁″垝鏁伴噺
+ order.setAnfme(sum);
+ if (!this.saveOrUpdate(order)) {
+ throw new CoolException("涓诲崟鏁伴噺淇敼澶辫触锛侊紒");
+ }
+ if (!asnOrderItemService.saveBatch(orderItems)) {
+ throw new CoolException("鏄庣粏淇濆瓨澶辫触锛侊紒");
+ }
+ });
+ 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.list(new LambdaQueryWrapper<AsnOrder>()
+ .in(AsnOrder::getId, ids)
+ .eq(AsnOrder::getExceStatus, AsnExceStatus.OUT_STOCK_STATUS_TASK_INIT.val));
+ 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<AsnOrderItem> orderItems = asnOrderItemService
+ .list(new LambdaQueryWrapper<AsnOrderItem>()
+ .in(AsnOrderItem::getAsnId, list));
+ if (orderItems.isEmpty()) {
+ throw new CoolException("鍗曟嵁涓嶅瓨鍦紒锛�");
+ }
+
+ List<WaveItem> waveItems = mergeWave(orderItems, wave);
+ if (!waveItemService.saveBatch(waveItems)) {
+ throw new CoolException("娉㈡鏄庣粏淇濆瓨澶辫触锛侊紒");
+ }
+ double sum1 = waveItems.stream().mapToDouble(WaveItem::getAnfme).sum();
+ wave.setAnfme(sum1);
+ if (!waveService.saveOrUpdate(wave)) {
+ throw new CoolException("涓诲崟淇敼澶辫触锛侊紒");
+ }
+
+ for (int i = 0; i < orderItems.size(); i++) {
+ orderItems.get(i).setWorkQty(orderItems.get(i).getAnfme());
+ }
+
+ if (!asnOrderItemService.saveOrUpdateBatch(orderItems)) {
+ throw new CoolException("鍑哄簱鍗曟墽琛屾暟閲忎慨鏀瑰け璐ワ紒锛�");
+ }
+
+ double sum2 = orderItems.stream().mapToDouble(AsnOrderItem::getWorkQty).sum();
+ if (!this.update(new LambdaUpdateWrapper<AsnOrder>()
+ .set(AsnOrder::getWaveId, wave.getId())
+ .set(AsnOrder::getWorkQty, sum2)
+ .set(AsnOrder::getExceStatus, AsnExceStatus.OUT_STOCK_STATUS_TASK_WAVE.val)
+ .in(AsnOrder::getId, ids))) {
+ throw new CoolException("鎵ц鐘舵�佷慨鏀逛慨鏀瑰け璐ワ紒锛�");
+ }
+ return R.ok("鎿嶄綔瀹屾垚锛侊紒");
+ }
+
+ /**
+ * @param
+ * @return
+ * @author Ryan
+ * @description 淇濆瓨鍑哄簱涓诲崟鍙婃槑缁�
+ * @time 2025/4/29 13:47
+ */
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public R saveOutStock(AsnOrderAndItemsParams params, Long loginUserId) {
+ if (Objects.isNull(params.getOrders())) {
+ throw new CoolException("涓诲崟淇℃伅涓嶈兘涓虹┖");
+ }
+ AsnOrder orders = params.getOrders();
+ if (Objects.isNull(orders)) {
+ throw new CoolException("鍗曟嵁涓嶈兘涓虹┖锛侊紒");
+ }
+ if (StringUtils.isBlank(orders.getWkType())) {
+ throw new CoolException("涓氬姟绫诲瀷涓嶈兘涓虹┖锛侊紒");
+ }
+
+ String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_OUT_STOCK_CODE, orders);
+ if (Objects.isNull(ruleCode) || StringUtils.isBlank(ruleCode)) {
+ throw new CoolException("缂栫爜瑙勫垯閿欒锛氳妫�鏌ャ�孲YS_OUT_STOCK_CODE銆嶆槸鍚﹁缃纭紒锛�");
+ }
+ orders.setCode(ruleCode)
+ .setType(OrderType.ORDER_OUT.type)
+ .setExceStatus(AsnExceStatus.OUT_STOCK_STATUS_TASK_INIT.val)
+ .setUpdateBy(loginUserId)
+ .setCreateBy(loginUserId);
+ if (!this.save(orders)) {
+ throw new CoolException("涓诲崟淇濆瓨澶辫触锛侊紒");
+ }
+ if (params.getItems().isEmpty()) {
+ throw new CoolException("鏀惰揣閫氱煡鍗曟槑缁嗕笉鑳戒负绌猴紒锛�");
+ }
+ params.setOrders(orders);
+ try {
+ svaeOrUpdateOrderItem(params, loginUserId);
+ } catch (Exception e) {
+ throw new CoolException(e.getMessage());
+ }
+
+ return R.ok();
+ }
+
+
+ /**
+ * @param
+ * @return
+ * @author Ryan
+ * @description 淇敼涓诲崟鍙婃槑缁�
+ * @time 2025/4/29 13:47
+ */
+ @Override
+ public R updateOrderItem(AsnOrderAndItemsParams params, Long loginUserId) {
+ AsnOrder orders = params.getOrders();
+ if (Objects.isNull(orders)) {
+ throw new CoolException("涓诲崟淇℃伅涓嶈兘涓虹┖锛侊紒");
+ }
+ if (Objects.isNull(orders.getId())) {
+ throw new CoolException("鏁版嵁閿欒锛氬崟鎹甀D涓嶈兘涓虹┖锛侊紒");
+ }
+ if (!this.updateById(orders)) {
+ throw new CoolException("涓诲崟淇敼澶辫触锛侊紒");
+ }
+ if (Objects.isNull(params.getItems()) || params.getItems().isEmpty()) {
+ return R.ok("鏄庣粏鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+
+ try {
+ svaeOrUpdateOrderItem(params, loginUserId);
+ } catch (Exception e) {
+ throw new CoolException(e.getMessage());
+ }
+
+ return null;
+ }
+
+ /**
+ * @param
+ * @param wave
+ * @return
+ * @author Ryan
+ * @description 鍚堝苟鐢熸垚娉㈡
+ * @time 2025/4/25 10:07
+ */
+ private List<WaveItem> mergeWave(List<AsnOrderItem> orderItems, Wave wave) {
+ List<WaveItem> items = new ArrayList<>();
+ orderItems.forEach(order -> {
+ WaveItem item = new WaveItem();
+ BeanUtils.copyProperties(order, item);
+ item.setOrderItemId(order.getId())
+ .setId(null)
+ .setOrderCode(order.getAsnCode())
+ .setOrderId(order.getAsnId())
+ .setMatnrId(order.getMatnrId())
+ .setMaktx(order.getMaktx())
+ .setWaveId(wave.getId())
+ .setWaveCode(wave.getCode());
+ items.add(item);
+ });
+ List<WaveItem> waveItems = OptimalAlgorithmUtil.groupAndMerge(items,
+ (p1, p2) -> new WaveItem(
+ p1.getWaveId(),
+ p1.getWaveCode(),
+ p1.getMatnrId(),
+ p1.getMaktx(),
+ p1.getMatnrCode(),
+ p1.getBatch(),
+ p1.getSplrBatch(),
+ p1.getOrderCode(),
+ p1.getOrderId(),
+ p1.getOrderItemId(),
+ p1.getUnit(),
+ p1.getTrackCode(),
+ p1.getFieldsIndex(),
+ p1.getAnfme() + p2.getAnfme(),
+ p1.getWorkQty(),
+ p1.getTenantId(),
+ p1.getStatus(),
+ p1.getDeleted(),
+ p1.getCreateTime(),
+ p1.getCreateBy(),
+ p1.getUpdateTime(),
+ p1.getUpdateBy(),
+ p1.getMemo()
+ ),
+ WaveItem::getSplrBatch, WaveItem::getMatnrCode, WaveItem::getFieldsIndex
+ );
+
+ return waveItems;
+ }
}
--
Gitblit v1.9.1