From 9cf47e2bc4667097f46600328f3dcc6218a9b0ca Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 30 七月 2025 17:02:40 +0800
Subject: [PATCH] 调拔单功能优化
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TransferServiceImpl.java | 323 +++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 294 insertions(+), 29 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 fa85fe3..0720676 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,30 +1,56 @@
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.WkOrder;
-import com.vincent.rsf.server.manager.entity.WkOrderItem;
-import com.vincent.rsf.server.manager.enums.AsnExceStatus;
-import com.vincent.rsf.server.manager.enums.CheckExceStatus;
-import com.vincent.rsf.server.manager.enums.OrderSourceType;
-import com.vincent.rsf.server.manager.enums.OrderType;
+import com.vincent.rsf.server.manager.entity.*;
+import com.vincent.rsf.server.manager.enums.*;
import com.vincent.rsf.server.manager.mapper.TransferMapper;
-import com.vincent.rsf.server.manager.entity.Transfer;
-import com.vincent.rsf.server.manager.service.TransferService;
+import com.vincent.rsf.server.manager.service.*;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.vincent.rsf.server.system.constant.SerialRuleCode;
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 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 {
+
+ @Autowired
+ private TransferItemService transferItemService;
+ @Autowired
+ private WarehouseAreasService warehouseAreasService;
+ @Autowired
+ private OutStockService outStockService;
+ @Autowired
+ 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
@@ -47,9 +73,30 @@
if (StringUtils.isBlank(ruleCode)) {
throw new CoolException("缂栫爜瑙勫垯閿欒锛氳妫�鏌ャ�孲YS_TRANSFER_ORDER_CODE銆嶆槸鍚﹁缃纭紒锛�");
}
+
+ WarehouseAreas orgWarehosue = warehouseAreasService.getById(transfer.getOrgAreaId());
+ if (Objects.isNull(orgWarehosue)) {
+ throw new CoolException("鎵�閫夊師搴撳尯涓嶅瓨鍦紒锛�");
+ }
+
+ WarehouseAreas tarWarehouse = warehouseAreasService.getById(transfer.getTarAreaId());
+ if (Objects.isNull(tarWarehouse)) {
+ throw new CoolException("鎵�閫夌洰鏍囧簱鍖轰笉瀛樺湪锛侊紒");
+ }
+
transfer.setCode(ruleCode)
.setExceStatus(CheckExceStatus.CHECK_ORDER_STATUS_UN_EXCE.val)
.setSource(OrderSourceType.ORDER_SOURCE_TYPE_SYSTEM.val)
+ .setOrgAreaId(orgWarehosue.getId())
+ .setOrgAreaName(orgWarehosue.getName())
+ .setOrgWareId(orgWarehosue.getWarehouseId())
+ .setOrgWareName(orgWarehosue.getWarehouseId$())
+ .setTarAreaId(tarWarehouse.getId())
+ .setTarWareId(tarWarehouse.getWarehouseId())
+ .setTarAreaName(tarWarehouse.getName())
+ .setTarWareName(tarWarehouse.getWarehouseId$())
+ .setUpdateTime(new Date())
+ .setCreateTime(new Date())
.setUpdateBy(loginUserId)
.setCreateBy(loginUserId);
if (!this.save(transfer)) {
@@ -64,29 +111,37 @@
} catch (Exception e) {
throw new CoolException(e.getMessage());
}
+
+ /***淇濆瓨鎴愬姛锛岃嚜鍔ㄧ敓鎴愬嚭搴撳崟*/
+ genOutStock(transfer, loginUserId);
+
return R.ok();
}
+ /**
+ * @author Ryan
+ * @date 2025/7/28
+ * @description: 璋冩嫈鍗曟嵁淇敼
+ * @version 1.0
+ */
private void svaeOrUpdateOrderItem(TransferItemParams params, Long loginUserId) {
-// Transfer orders = params.getTransfer();
-// params.getItems().forEach(item -> {
-// item.put("orderId", orders.getId());
-// item.put("orderCode", orders.getCode());
-// item.put("poCode", orders.getPoCode());
-// item.put("createBy", loginUserId);
-// item.put("updateBy", loginUserId);
-// if (!asnOrderItemService.fieldsSave(item, loginUserId)) {
-// throw new CoolException("鏄庣粏淇濆瓨澶辫触锛侊紒");
-// }
-// });
-// List<WkOrderItem> orderItems = checkOrderItemService.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("璁″垝鏀惰揣鏁伴噺淇敼澶辫触锛侊紒");
-// }
+ Transfer orders = params.getTransfer();
+ params.getItems().forEach(item -> {
+ item.put("transferId", orders.getId());
+ item.put("transferCode", orders.getCode());
+ item.put("createBy", loginUserId);
+ item.put("updateBy", loginUserId);
+ if (!transferItemService.fieldsSave(item, loginUserId)) {
+ throw new CoolException("鏄庣粏淇濆瓨澶辫触锛侊紒");
+ }
+ });
+// List<TransferItem> orderItems = transferItemService.list(new LambdaQueryWrapper<TransferItem>()
+// .eq(TransferItem::getTransferId, params.getTransfer().getId()));
+// Double sum = orderItems.stream().mapToDouble(TransferItem::getAnfme).sum();
+ if (!this.updateById(orders)) {
+ throw new CoolException("璁″垝鏀惰揣鏁伴噺淇敼澶辫触锛侊紒");
+ }
}
@@ -98,6 +153,216 @@
*/
@Override
public R updateTransfer(TransferItemParams params, Long loginUserId) {
- return null;
+ Transfer orders = params.getTransfer();
+ 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("鏄庣粏鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+
+ svaeOrUpdateOrderItem(params, loginUserId);
+
+ return R.ok("淇敼瀹屾垚锛侊紒");
+
+ }
+
+ /**
+ * @author Ryan
+ * @date 2025/7/28
+ * @description: 鑾峰彇璋冩嫈鍗曞叧鑱旇鍗�
+ * @version 1.0
+ */
+ @Override
+ public IPage<WkOrder> transfersPage(PageParam<Transfer, BaseParam> pageParam, QueryWrapper<Transfer> transferQueryWrapper) {
+ Transfer one = this.getOne(transferQueryWrapper);
+ if (Objects.isNull(one)) {
+ throw new CoolException("鍗曟嵁涓嶅瓨鍦紒锛�");
+ }
+ return this.baseMapper.transfersPage(pageParam, one.getId());
+ }
+
+ /**
+ * @author Ryan
+ * @date 2025/7/28
+ * @description: 璋冩嫈鍗曠敓鎴愬嚭搴撳崟
+ * @version 1.0
+ */
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public Transfer genOutStock(Transfer param, Long loginUserId) {
+ Transfer transfer = this.getById(param.getId());
+ if (Objects.isNull(transfer)) {
+ throw new CoolException("鏁版嵁閿欒锛氬崟鎹笉瀛樺湪锛侊紒");
+ }
+ List<TransferItem> items = transferItemService.list(new LambdaQueryWrapper<TransferItem>().eq(TransferItem::getTransferId, transfer.getId()));
+ if (items.isEmpty()) {
+ throw new CoolException("鏁版嵁閿欒锛氳皟鎷斿崟鏄庣粏涓嶅瓨鍦紒锛�");
+ }
+ WkOrder wkOrder = new WkOrder();
+ String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_OUT_STOCK_CODE, transfer);
+ if (StringUtils.isBlank(ruleCode)) {
+ throw new CoolException("鍑哄簱鍗曠敓鎴愬け璐ワ紒锛�");
+ }
+
+ Double anfmes = items.stream().mapToDouble(TransferItem::getAnfme).sum();
+ wkOrder.setCode(ruleCode)
+ .setAnfme(anfmes)
+ .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)
+ .setCreateTime(new Date())
+ .setUpdateTime(new Date())
+ .setPoCode(transfer.getCode())
+ .setPoId(transfer.getId());
+ if (!outStockService.saveOrUpdate(wkOrder)) {
+ throw new CoolException("鍑哄簱鍗曚繚瀛樺け璐ワ紒锛�");
+ }
+
+ List<WkOrderItem> orderItems = new ArrayList<>();
+ items.forEach(item -> {
+ WkOrderItem orderItem = new WkOrderItem();
+ BeanUtils.copyProperties(item, orderItem);
+ orderItem.setOrderCode(wkOrder.getCode())
+ .setSplrBatch(item.getBatch())
+ .setSplrCode(item.getSplrCode())
+ .setSplrName(item.getSplrName())
+ .setOrderId(wkOrder.getId());
+ orderItems.add(orderItem);
+ });
+
+ if (!outStockItemService.saveBatch(orderItems)) {
+ throw new CoolException("鍑哄簱鍗曟槑缁嗕繚瀛樺け璐ワ紒锛�");
+ }
+
+ transfer.setExceStatus(CheckExceStatus.CHECK_ORDER_STATUS_EXCE_ING.val);
+
+ if (!this.updateById(transfer)) {
+ throw new CoolException("璋冩嫈鍗曟洿鏂板け璐ワ紒锛�");
+ }
+
+ TransferOrder transferOrder = new TransferOrder();
+ 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(!Objects.isNull(params.getOrgAreaId()), Loc::getAreaId, params.getOrgAreaId()));
+
+ 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 ")
+ .lambda()
+ .eq(StringUtils.isNotBlank(params.getMatnrCode()), LocItem::getMatnrCode, params.getMatnrCode())
+ .like(StringUtils.isNotBlank(params.getMaktx()), LocItem::getMaktx, params.getMaktx());
+ if (!locs.isEmpty()) {
+ Set<Long> locIds = locs.stream().map(Loc::getId).collect(Collectors.toSet());
+ wrapper.lambda().in(LocItem::getLocId, locIds)
+ .groupBy(LocItem::getBatch, LocItem::getFieldsIndex, LocItem::getMatnrCode);
+ return locItemService.page(page, wrapper);
+ } else {
+ return locItemService.page(page, wrapper);
+ }
}
}
--
Gitblit v1.9.1