From c3bd7262ff89c7594ec368f76ea910e6212769af Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 29 四月 2025 13:53:03 +0800
Subject: [PATCH] 1. 出库单新增修改优化
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java | 65 +++++++++++++++++++++-----------
1 files changed, 43 insertions(+), 22 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java
index ced10eb..d4b4f22 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java
@@ -2,11 +2,13 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.vincent.rsf.framework.common.Cools;
import com.vincent.rsf.server.api.entity.enums.OrderType;
import com.vincent.rsf.server.api.entity.enums.TaskStsType;
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.framework.exception.CoolException;
import com.vincent.rsf.server.api.entity.enums.TaskType;
+import com.vincent.rsf.server.api.utils.LocUtils;
import com.vincent.rsf.server.manager.controller.params.GenerateTaskParams;
import com.vincent.rsf.server.manager.entity.*;
import com.vincent.rsf.server.manager.enums.PakinIOStatus;
@@ -62,6 +64,11 @@
@Autowired
private LocItemService locItemService;
+ @Autowired
+ private DeviceBindService deviceBindService;
+ @Autowired
+ private WarehouseAreasService warehouseAreasService;
+
/**
* @param
@@ -82,6 +89,20 @@
if (Objects.isNull(deviceSite)) {
throw new CoolException("绔欑偣涓嶅瓨鍦紒锛�");
}
+ DeviceBind deviceBind = deviceBindService.getById(LocUtils.getAreaType(Integer.valueOf(deviceSite.getSite())));
+ if (Cools.isEmpty(deviceBind)) {
+ throw new CoolException("搴撲綅瑙勫垯鏈煡");
+ }
+ WarehouseAreas warehouseArea = warehouseAreasService.getById(deviceBind.getTypeId());
+ if (Cools.isEmpty(warehouseArea)) {
+ throw new CoolException("鏈壘鍒版墍灞炲簱鍖轰俊鎭�");
+ }
+
+ /**鑾峰彇搴撲綅*/
+ String targetLoc = LocManageUtil.getTargetLoc(warehouseArea.getId());
+ if (Cools.isEmpty(targetLoc)) {
+ throw new CoolException("璇ョ珯鐐瑰搴斿簱鍖烘湭鎵惧埌搴撲綅");
+ }
/**鑾峰彇缁勬嫋*/
List<Long> ids = waitPakin.getWaitPakins().stream().map(WaitPakin::getId).collect(Collectors.toList());
List<WaitPakin> waitPakins = waitPakinService.list(new LambdaQueryWrapper<WaitPakin>()
@@ -100,28 +121,28 @@
task.setTaskCode(ruleCode)
.setTaskStatus(TaskStsType.GENERATE_IN.id.shortValue())
.setTaskType(TaskType.TASK_TYPE_IN.type.shortValue())
- .setTargLoc(LocManageUtil.getTargetLoc())
+ .setTargLoc(targetLoc)
.setBarcode(pakin.getBarcode())
- .setTargSite(deviceSite.getDeviceCode())
+ .setOrgSite(deviceSite.getSite())
+ .setTargSite(deviceSite.getDeviceSite())
.setCreateBy(loginUserId)
.setUpdateBy(loginUserId);
-
- if (!Objects.isNull(waitPakin.getSiteId()) && waitPakin.getSiteId() > 0) {
- DeviceSite site = deviceSiteService.getById(waitPakin.getSiteId());
- task.setTargSite(site.getSite() + "");
- } else {
- task.setTargSite(LocManageUtil.getTargetSite());
- }
- if (!Objects.isNull(waitPakin.getLocCode()) && StringUtils.isNotBlank(waitPakin.getLocCode())) {
- List<Loc> locs = locService.list(new LambdaQueryWrapper<Loc>().eq(Loc::getCode, waitPakin.getLocCode()));
-// if (!locs.isEmpty()) {
-// throw new CoolException("搴撲綅閿欒锛氱浉鍚屽簱浣嶅簲鍙竴鏉�")
-// }
- Loc loc = locs.stream().findFirst().get();
- task.setTargSite(loc.getCode());
- } else {
- task.setTargSite(LocManageUtil.getTargetSite());
- }
+// if (!Objects.isNull(waitPakin.getSiteId()) && waitPakin.getSiteId() > 0) {
+// DeviceSite site = deviceSiteService.getById(waitPakin.getSiteId());
+// task.setTargSite(site.getSite() + "");
+// } else {
+// task.setTargSite(LocManageUtil.getTargetSite());
+// }
+// if (!Objects.isNull(waitPakin.getLocCode()) && StringUtils.isNotBlank(waitPakin.getLocCode())) {
+// List<Loc> locs = locService.list(new LambdaQueryWrapper<Loc>().eq(Loc::getCode, waitPakin.getLocCode()));
+//// if (!locs.isEmpty()) {
+//// throw new CoolException("搴撲綅閿欒锛氱浉鍚屽簱浣嶅簲鍙竴鏉�")
+//// }
+// Loc loc = locs.stream().findFirst().get();
+// task.setTargSite(loc.getCode());
+// } else {
+// task.setTargSite(LocManageUtil.getTargetSite());
+// }
if (!this.save(task)) {
throw new CoolException("浠诲姟淇濆瓨澶辫触锛侊紒");
@@ -218,7 +239,7 @@
if (!locService.update(new LambdaUpdateWrapper<Loc>().set(Loc::getUseStatus, LocStsType.LOC_STS_TYPE_F.type).in(Loc::getCode, locCodes))) {
throw new CoolException("搴撲綅鐘舵�佷慨鏀瑰け璐ワ紒锛�");
}
- if (!this.update(new LambdaUpdateWrapper<Task>().set(Task::getTaskStatus, TaskStsType.UPDATED_IN.id))) {
+ if (!this.update(new LambdaUpdateWrapper<Task>().in(Task::getId, list).set(Task::getTaskStatus, TaskStsType.UPDATED_IN.id))) {
throw new CoolException("浠诲姟鐘舵�佷慨鏀瑰け璐ワ紒锛�");
}
}
@@ -231,7 +252,7 @@
* @time 2025/4/15 15:28
*/
@Transactional(rollbackFor = Exception.class)
- void saveLocItem(List<TaskItem> items, Long taskId) throws Exception {
+ public void saveLocItem(List<TaskItem> items, Long taskId) throws Exception {
Task task = this.getById(taskId);
if (Objects.isNull(task)) {
throw new CoolException("浠诲姟涓嶅瓨鍦�!!");
@@ -255,7 +276,7 @@
* @return
*/
@Transactional(rollbackFor = Exception.class)
- void saveStockItems(List<TaskItem> items, WaitPakinItem order) throws Exception {
+ public void saveStockItems(List<TaskItem> items, WaitPakinItem order) throws Exception {
Stock stock = new Stock();
// if (!Objects.isNull(order.getPoCode()) && StringUtils.isNotBlank(order.getPoCode())) {
// Purchase purchase = purchaseService.getOne(new LambdaQueryWrapper<Purchase>().eq(Purchase::getCode, order.getPoCode()));
--
Gitblit v1.9.1