From 5c372e346df385e4ca4600e0bd3c3f2e143ead7e Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 28 七月 2025 15:55:34 +0800
Subject: [PATCH] 调拔单功能优化
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TransferServiceImpl.java | 51 +++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 47 insertions(+), 4 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 cf840e9..e31cddf 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,22 +1,25 @@
package com.vincent.rsf.server.manager.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
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.TransferItemParams;
-import com.vincent.rsf.server.manager.entity.TransferItem;
-import com.vincent.rsf.server.manager.entity.WkOrder;
-import com.vincent.rsf.server.manager.entity.WkOrderItem;
+import com.vincent.rsf.server.manager.entity.*;
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.mapper.TransferMapper;
-import com.vincent.rsf.server.manager.entity.Transfer;
import com.vincent.rsf.server.manager.service.AsnOrderItemService;
import com.vincent.rsf.server.manager.service.TransferItemService;
import com.vincent.rsf.server.manager.service.TransferService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.vincent.rsf.server.manager.service.WarehouseAreasService;
import com.vincent.rsf.server.system.constant.SerialRuleCode;
import com.vincent.rsf.server.system.utils.SerialRuleUtils;
import org.apache.commons.lang3.StringUtils;
@@ -24,6 +27,7 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import java.util.Date;
import java.util.List;
import java.util.Objects;
@@ -32,6 +36,9 @@
@Autowired
private TransferItemService transferItemService;
+
+ @Autowired
+ private WarehouseAreasService warehouseAreasService;
/**
* @author Ryan
@@ -54,9 +61,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)) {
@@ -128,4 +156,19 @@
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());
+ }
}
--
Gitblit v1.9.1