From 9fe1ec3afe8696c628d076d1f76686c4efc3012e Mon Sep 17 00:00:00 2001
From: zc <zyzc>
Date: 星期二, 21 十月 2025 10:49:55 +0800
Subject: [PATCH] 容器初始化功能优化
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TransferServiceImpl.java | 143 ++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 133 insertions(+), 10 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TransferServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TransferServiceImpl.java
index 9455749..0e9c566 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TransferServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TransferServiceImpl.java
@@ -1,13 +1,16 @@
package com.vincent.rsf.server.manager.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.Query;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.framework.exception.CoolException;
import com.vincent.rsf.server.common.domain.BaseParam;
import com.vincent.rsf.server.common.domain.PageParam;
import com.vincent.rsf.server.common.domain.PageResult;
+import com.vincent.rsf.server.manager.controller.params.OrgLocParams;
import com.vincent.rsf.server.manager.controller.params.TransferItemParams;
import com.vincent.rsf.server.manager.entity.*;
import com.vincent.rsf.server.manager.enums.*;
@@ -22,10 +25,8 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
+import java.util.stream.Collectors;
@Service("transferService")
public class TransferServiceImpl extends ServiceImpl<TransferMapper, Transfer> implements TransferService {
@@ -40,6 +41,16 @@
private OutStockItemService outStockItemService;
@Autowired
private TransferOrderService transferOrderService;
+ @Autowired
+ private TransferService transferService;
+ @Autowired
+ private AsnOrderService asnOrderService;
+ @Autowired
+ private AsnOrderItemService asnOrderItemService;
+ @Autowired
+ private LocItemService locItemService;
+ @Autowired
+ private LocService locService;
/**
* @author Ryan
@@ -100,6 +111,10 @@
} catch (Exception e) {
throw new CoolException(e.getMessage());
}
+
+ /***淇濆瓨鎴愬姛锛岃嚜鍔ㄧ敓鎴愬嚭搴撳崟*/
+ genOutStock(transfer, loginUserId);
+
return R.ok();
}
@@ -191,16 +206,16 @@
throw new CoolException("鏁版嵁閿欒锛氳皟鎷斿崟鏄庣粏涓嶅瓨鍦紒锛�");
}
WkOrder wkOrder = new WkOrder();
- String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_TRANSFER_ORDER_CODE, transfer);
+ String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_OUT_STOCK_CODE, transfer);
if (StringUtils.isBlank(ruleCode)) {
- throw new CoolException("璋冩嫈鍗曞彿鐢熸垚澶辫触锛侊紒");
+ throw new CoolException("鍑哄簱鍗曠敓鎴愬け璐ワ紒锛�");
}
Double anfmes = items.stream().mapToDouble(TransferItem::getAnfme).sum();
wkOrder.setCode(ruleCode)
.setAnfme(anfmes)
- .setExceStatus(AsnExceStatus.ASN_EXCE_STATUS_UN_EXCE.val)
- .setType(OrderType.ORDER_TRANSFER.type)
+ .setExceStatus(AsnExceStatus.OUT_STOCK_STATUS_TASK_INIT.val)
+ .setType(OrderType.ORDER_OUT.type)
.setWkType(OrderWorkType.ORDER_WORK_TYPE_STOCK_TERANSFER.type)
.setCreateBy(loginUserId)
.setUpdateBy(loginUserId)
@@ -228,19 +243,127 @@
throw new CoolException("鍑哄簱鍗曟槑缁嗕繚瀛樺け璐ワ紒锛�");
}
- transfer.setExceStatus(WaveExceStatus.WAVE_EXCE_STATUS_EXCING.val);
+ transfer.setExceStatus(AsnExceStatus.ASN_EXCE_STATUS_EXCE_ING.val);
if (!this.updateById(transfer)) {
throw new CoolException("璋冩嫈鍗曟洿鏂板け璐ワ紒锛�");
}
TransferOrder transferOrder = new TransferOrder();
- transferOrder.setTransferId(transfer.getId()).setOrderId(wkOrder.getId()).setExceStatus(1);
+ transferOrder.setTransferId(transfer.getId())
+ .setOrderId(wkOrder.getId())
+ .setType(OrderType.ORDER_OUT.type);
if (!transferOrderService.save(transferOrder)) {
throw new CoolException("鍗曟嵁鍏宠仈澶辫触锛侊紒");
}
+ try {
+ /**鐢熸垚鍏ュ簱鍗曟嵁淇℃伅*/
+ genInStock(wkOrder, orderItems);
+ } catch (Exception e) {
+ throw new CoolException(e.getMessage());
+ }
+
return transfer;
}
+
+ /**
+ * @author Ryan
+ * @date 2025/7/29
+ * @description: TODO
+ * @version 1.0
+ */
+ @Transactional(rollbackFor = Exception.class)
+ public void genInStock(WkOrder wkOrder, List<WkOrderItem> orderItems) throws Exception {
+ WkOrder order = new WkOrder();
+ BeanUtils.copyProperties(wkOrder, order);
+ order.setType(OrderType.ORDER_IN.type)
+ .setWkType(OrderWorkType.ORDER_WORK_TYPE_OTHER_TERANSFER.type)
+ .setExceStatus(AsnExceStatus.ASN_EXCE_STATUS_UN_EXCE.val)
+ .setId(null);
+ String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_ASN_ORDER, order);
+ if (StringUtils.isBlank(ruleCode)) {
+ throw new CoolException("鍏ュ簱鍗曞彿鐢熸垚澶辫触锛侊紒");
+ }
+ order.setCode(ruleCode);
+
+ if (!asnOrderService.save(order)) {
+ throw new CoolException("鍗曟嵁淇濆瓨澶辫触锛侊紒");
+ }
+
+ orderItems.forEach(item -> {
+ item.setOrderId(order.getId())
+ .setOrderCode(order.getCode())
+ .setId(null);
+
+ if (!asnOrderItemService.save(item)) {
+ throw new CoolException("鍏ュ簱鍗曟槑缁嗕繚瀛樺け璐ワ紒锛�");
+ }
+ });
+
+ TransferOrder transferOrder = new TransferOrder();
+ transferOrder.setTransferId(wkOrder.getPoId())
+ .setOrderId(order.getId())
+ .setType(OrderType.ORDER_IN.type);
+
+ if (!transferOrderService.save(transferOrder)) {
+ throw new CoolException("鍗曟嵁鍏宠仈澶辫触锛侊紒");
+ }
+
+ }
+
+ /**
+ * @author Ryan
+ * @date 2025/7/29
+ * @description: 鍒犻櫎璋冩嫈鍗�
+ * @version 1.0
+ */
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public boolean removeTransfer(List<Long> list) {
+ List<WkOrder> wkOrders = outStockService.list(new LambdaQueryWrapper<WkOrder>().in(WkOrder::getPoId, list));
+ if (!wkOrders.isEmpty()) {
+ Set<Long> longs = wkOrders.stream().map(WkOrder::getId).collect(Collectors.toSet());
+ if (!outStockService.remove(new LambdaQueryWrapper<WkOrder>()
+ .in(WkOrder::getId, longs)
+ .eq(WkOrder::getExceStatus, AsnExceStatus.OUT_STOCK_STATUS_TASK_INIT.val))) {
+ throw new CoolException("褰撳墠鍑哄簱鍗曞凡鎵ц锛屼笉鏀寔鍒犻櫎锛侊紒");
+ }
+ outStockItemService.remove(new LambdaQueryWrapper<WkOrderItem>().in(WkOrderItem::getOrderId, longs));
+ transferOrderService.remove(new LambdaQueryWrapper<TransferOrder>().in(TransferOrder::getTransferId, list));
+ }
+
+ transferService.removeByIds(list);
+ transferItemService.remove(new LambdaQueryWrapper<TransferItem>().in(TransferItem::getTransferId, list));
+ return true;
+ }
+
+ /**
+ * @author Ryan
+ * @date 2025/7/29
+ * @description: 鑾峰彇鍘熷簱鍖虹墿鏂欎俊鎭�
+ * @version 1.0
+ */
+ @Override
+ public IPage<LocItem> getLocsItems(OrgLocParams params, Long loginUserId) {
+ List<Loc> locs = locService.list(new LambdaQueryWrapper<Loc>()
+ .eq(Loc::getUseStatus, LocStsType.LOC_STS_TYPE_F.type)
+ .eq(!Objects.isNull(params.getOrgAreaId()), Loc::getAreaId, params.getOrgAreaId()));
+ if (!locs.isEmpty()) {
+ Page<LocItem> page = new Page<>(params.getCurrent(), params.getPageSize());
+ QueryWrapper<LocItem> wrapper = new QueryWrapper<>();
+ wrapper.select("id, matnr_id, maktx, matnr_code, SUM(anfme) anfme, SUM(work_qty) work_qty, SUM(qty) qty, batch, unit, fields_index, model, spec, loc_id, loc_code ")
+ .lambda()
+ .eq(StringUtils.isNotBlank(params.getMatnrCode()), LocItem::getMatnrCode, params.getMatnrCode())
+ .like(StringUtils.isNotBlank(params.getMaktx()), LocItem::getMaktx, params.getMaktx());
+ Set<Long> locIds = locs.stream().map(Loc::getId).collect(Collectors.toSet());
+ wrapper.lambda().in(LocItem::getLocId, locIds)
+ .groupBy(LocItem::getBatch, LocItem::getMatnrId);
+ return locItemService.page(page, wrapper);
+ } else {
+ IPage<LocItem> page = new Page<>(params.getCurrent(), params.getPageSize());
+ return page;
+ }
+ }
}
--
Gitblit v1.9.1