From 85d11604e29a2fd27ec013e27a5b4387660e510a Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期六, 07 六月 2025 15:35:16 +0800
Subject: [PATCH] #单据出库
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java | 259 ++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 221 insertions(+), 38 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 fe0f865..f0caa13 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
@@ -7,6 +7,7 @@
import com.vincent.rsf.server.api.entity.dto.InTaskMsgDto;
import com.vincent.rsf.server.api.service.WcsService;
import com.vincent.rsf.server.common.constant.Constants;
+import com.vincent.rsf.server.manager.controller.params.LocToTaskParams;
import com.vincent.rsf.server.manager.enums.*;
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.framework.exception.CoolException;
@@ -206,8 +207,8 @@
if (!locService.update(new LambdaUpdateWrapper<Loc>()
.eq(Loc::getCode, task.getTargLoc())
.set(Loc::getUseStatus, LocStsType.LOC_STS_TYPE_S.type)
- .set(Loc::getUpdateBy, loginUserId)
- .set(Loc::getUpdateTime, new Date())
+ .set(Loc::getUpdateBy, loginUserId)
+ .set(Loc::getUpdateTime, new Date())
.set(Loc::getBarcode, pakin.getBarcode()))) {
throw new CoolException("搴撲綅棰勭害澶辫触锛侊紒");
}
@@ -410,6 +411,138 @@
}
}
+ /**
+ * 浠诲姟缃《
+ *
+ * @param id
+ * @param loginUserId
+ * @return
+ */
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public Task taskToTop(Long id, Long loginUserId) throws Exception {
+ List<Integer> longs = Arrays.asList(TaskStsType.GENERATE_IN.id, TaskStsType.GENERATE_OUT.id);
+ Task tasks = taskService.getOne(new LambdaQueryWrapper<Task>().eq(Task::getId, id).in(Task::getTaskStatus, longs));
+ if (Objects.isNull(tasks)) {
+ throw new CoolException("浠诲姟宸插鎵ц鐘舵�佷笉鍙竴閿疆椤讹紒锛�");
+ }
+ //鍒ゆ柇娴呭簱浣嶄换鍔★紝淇敼浠诲姟浼樺厛绾�
+ modiftyTaskSort(tasks, loginUserId);
+
+ if (!taskService.updateById(tasks)) {
+ throw new CoolException("缃《澶辫触锛侊紒");
+ }
+ return null;
+ }
+
+ /**
+ * 鎵嬪姩瀹屾垚浠诲姟
+ *
+ * @param id
+ * @param loginUserId
+ * @return
+ */
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public Task operateComplete(Long id, Long loginUserId) {
+ List<Integer> longs = Arrays.asList(TaskStsType.GENERATE_IN.id, TaskStsType.GENERATE_OUT.id);
+ Task task = taskService.getOne(new LambdaQueryWrapper<Task>()
+ .eq(Task::getId, id)
+ .in(Task::getTaskStatus, longs));
+
+ if (Objects.isNull(task)) {
+ throw new CoolException("褰撳墠浠诲姟姝ｅ湪鎵ц涓紝涓嶅彲鍙栨秷锛侊紒");
+ }
+
+ modiftyTaskSort(task, loginUserId);
+ //
+// if (task.getTaskType().equals(TaskType.TASK_TYPE_LOC_MOVE.type)) {
+// task.setTaskStatus(TaskStsType.COMPLETE_OUT.id);
+// } else {
+ task.setTaskStatus(task.getTaskType() < 100 ? TaskStsType.COMPLETE_IN.id : TaskStsType.COMPLETE_OUT.id);
+// }
+ if (!this.updateById(task)) {
+ throw new CoolException("瀹屾垚浠诲姟澶辫触");
+ }
+ return task;
+ }
+
+ /**
+ * 淇敼浠诲姟浼樺厛绾�
+ *
+ * @param task
+ * @param loginUserId
+ */
+ private Task modiftyTaskSort(Task task, Long loginUserId) {
+ String curLoc;
+ if (task.getTaskType().equals(TaskType.TASK_TYPE_IN.type)) {
+ curLoc = task.getTargLoc();
+ } else {
+ curLoc = task.getOrgLoc();
+ }
+ //娣卞簱浣嶅厛鍑烘儏鍐�
+ if (!LocUtils.isShallowLoc(curLoc)) {
+ //娣卞簱浣�
+ String shallowLoc = LocUtils.getShallowLoc(curLoc);
+ if (StringUtils.isBlank(shallowLoc)) {
+ throw new CoolException("鏁版嵁寮傚父锛岃鑱旂郴绠＄悊鍛橈紒");
+ }
+ Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getCode, shallowLoc));
+ if (Objects.isNull(loc)) {
+ throw new CoolException("鏁版嵁閿欒锛屽簱浣嶄笉瀛樺湪锛侊紒");
+ }
+ if (loc.getUseStatus().equals(LocStsType.LOC_STS_TYPE_S.type) || loc.getUseStatus().equals(LocStsType.LOC_STS_TYPE_R.type)) {
+ Task serviceOne = taskService.getOne(new LambdaQueryWrapper<Task>()
+ .eq(Task::getOrgLoc, loc.getCode())
+ .or()
+ .eq(Task::getTargLoc, loc.getCode()));
+ if (Objects.isNull(serviceOne)) {
+ task.setSort(Constants.TASK_SORT_MAX_VALUE);
+ } else {
+ int i = serviceOne.getSort() - 1;
+ task.setSort(i);
+ }
+ }
+// else if (loc.getUseStatus().equals(LocStsType.LOC_STS_TYPE_F.type)) {
+// //濡傛灉涓哄湪搴撶姸鎬侊紝鐢熸垚绉诲簱浠诲姟
+// LocToTaskParams params = new LocToTaskParams();
+// params.setOrgLoc(curLoc);
+// //鐢熸垚绉绘繁搴撲綅浠诲姟
+// Task moveTask = locItemService.genMoveTask(params, loginUserId);
+// moveTask.setTaskType(task.getSort() + 1);
+//
+// return moveTask;
+// }
+ }
+ return task;
+ }
+
+ /**
+ * 浠诲姟瀹屾垚鍚庯紝鍒ゆ柇娣卞簱浣嶆槸鍚︿负绌猴紝濡傛灉涓虹┖鐢熸垚绉诲簱浠诲姟
+ * @param loginUserId
+ * @param curLoc
+ */
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void moveToDeep(Long loginUserId, String curLoc) throws Exception {
+ //娴呭簱浣嶏紝鍒ゆ柇娣卞搴旀繁搴撲綅鏄惁涓虹┖锛屽鏋滀负绌虹敓鎴愪竴涓Щ搴撲换鍔★紝灏嗘墭鐩橀�佸叆娣卞簱浣�
+ String deepLoc = LocUtils.getDeepLoc(curLoc);
+ if (StringUtils.isBlank(deepLoc)) {
+ throw new CoolException("鏁版嵁寮傚父锛岃鑱旂郴绠＄悊鍛橈紒");
+ }
+ Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getCode, deepLoc));
+ if (Objects.isNull(loc)) {
+ throw new CoolException("鏁版嵁閿欒锛屽簱浣嶄笉瀛樺湪锛侊紒");
+ }
+ //鍒ゆ柇娣卞簱浣嶆槸鍚︿负绌�
+ if (loc.getUseStatus().equals(LocStsType.LOC_STS_TYPE_O.type)) {
+ LocToTaskParams params = new LocToTaskParams();
+ params.setOrgLoc(curLoc).setTarLoc(deepLoc);
+ //鐢熸垚绉绘繁搴撲綅浠诲姟
+ locItemService.genMoveTask(params, loginUserId);
+ }
+ }
+
@Transactional(rollbackFor = Exception.class)
public void moveInStock(Task task, Long loginUserId) {
if (Objects.isNull(task)) {
@@ -448,31 +581,30 @@
if (!locItemService.remove(new LambdaQueryWrapper<LocItem>().eq(LocItem::getLocCode, task.getOrgLoc()))) {
throw new CoolException("婧愬簱浣嶆槑缁嗗垹闄ゅけ璐ワ紒");
}
-
}
/**淇敼搴撲綅鐘舵�佷负F.鍦ㄥ簱*/
if (!locService.update(new LambdaUpdateWrapper<Loc>()
- .set(Loc::getBarcode, task.getBarcode())
- .set(Loc::getUseStatus, LocStsType.LOC_STS_TYPE_F.type)
- .set(Loc::getUpdateBy, loginUserId)
- .set(Loc::getUpdateTime, new Date())
- .eq(Loc::getCode, task.getTargLoc()))) {
+ .set(Loc::getBarcode, task.getBarcode())
+ .set(Loc::getUseStatus, LocStsType.LOC_STS_TYPE_F.type)
+ .set(Loc::getUpdateBy, loginUserId)
+ .set(Loc::getUpdateTime, new Date())
+ .eq(Loc::getCode, task.getTargLoc()))) {
throw new CoolException("搴撲綅鐘舵�佷慨鏀瑰け璐ワ紒锛�");
}
if (!locService.update(new LambdaUpdateWrapper<Loc>()
- .set(Loc::getBarcode, null)
- .set(Loc::getUpdateBy, loginUserId)
- .set(Loc::getUpdateTime, new Date())
- .set(Loc::getUseStatus, LocStsType.LOC_STS_TYPE_O.type)
+ .set(Loc::getBarcode, null)
+ .set(Loc::getUpdateBy, loginUserId)
+ .set(Loc::getUpdateTime, new Date())
+ .set(Loc::getUseStatus, LocStsType.LOC_STS_TYPE_O.type)
.eq(Loc::getCode, task.getOrgLoc()))) {
throw new CoolException("搴撲綅鐘舵�佷慨鏀瑰け璐ワ紒锛�");
}
if (!this.update(new LambdaUpdateWrapper<Task>().eq(Task::getId, task.getId())
- .set(Task::getUpdateBy, loginUserId)
- .set(Task::getUpdateTime, new Date())
+ .set(Task::getUpdateBy, loginUserId)
+ .set(Task::getUpdateTime, new Date())
.set(Task::getTaskStatus, TaskStsType.UPDATED_IN.id))) {
throw new CoolException("浠诲姟鐘舵�佷慨鏀瑰け璐ワ紒锛�");
}
@@ -579,13 +711,16 @@
* 浠诲姟鍙栨秷
*
* @param ids
+ * @param loginUserId
* @return
*/
@Override
@Transactional(rollbackFor = Exception.class)
- public R removeTask(Long[] ids) {
+ public R removeTask(Long[] ids, Long loginUserId) {
List<Integer> longs = Arrays.asList(TaskStsType.GENERATE_IN.id, TaskStsType.GENERATE_OUT.id);
- List<Integer> list = Arrays.asList(TaskType.TASK_TYPE_IN.type, TaskType.TASK_TYPE_OUT.type, TaskType.TASK_TYPE_EMPITY_IN.type, TaskType.TASK_TYPE_EMPITY_OUT.type, TaskType.TASK_TYPE_MERGE_OUT.type);
+ List<Integer> list = Arrays.asList(TaskType.TASK_TYPE_IN.type, TaskType.TASK_TYPE_OUT.type, TaskType.TASK_TYPE_PICK_AGAIN_OUT.type,
+ TaskType.TASK_TYPE_CHECK_OUT.type, TaskType.TASK_TYPE_EMPITY_IN.type, TaskType.TASK_TYPE_LOC_MOVE.type,
+ TaskType.TASK_TYPE_EMPITY_OUT.type, TaskType.TASK_TYPE_MERGE_OUT.type);
List<Task> tasks = this.list(new LambdaQueryWrapper<Task>()
.in(Task::getTaskType, list)
.in(Task::getId, ids).in(Task::getTaskStatus, longs));
@@ -593,24 +728,34 @@
throw new CoolException("浠诲姟宸插鎵ц鐘舵�佷笉鍙彇娑堬紒锛�");
}
for (Task task : tasks) {
- //鎭㈠缁勬墭鐘舵��
- WaitPakin waitPakin = waitPakinService.getOne(new LambdaQueryWrapper<WaitPakin>()
- .eq(WaitPakin::getBarcode, task.getBarcode())
- );
- if (null != waitPakin) {
- waitPakin.setIoStatus(PakinIOStatus.PAKIN_IO_STATUS_DONE.val);
- if (!waitPakinService.updateById(waitPakin)) {
- throw new CoolException("鏇存柊缁勬墭鐘舵�佸け璐ワ紒锛�");
+ //鍙栨秷绉诲簱浠诲姟
+ if (task.getTaskType().equals(TaskType.TASK_TYPE_LOC_MOVE.type) && task.getTaskStatus().equals(TaskStsType.GENERATE_IN.id)) {
+ if (!locService.update(new LambdaUpdateWrapper<Loc>()
+ .eq(Loc::getCode, task.getOrgLoc())
+ .set(Loc::getUseStatus, LocStsType.LOC_STS_TYPE_F.type))) {
+ throw new CoolException("婧愬簱浣嶇姸鎬佷慨鏀瑰け璐ワ紒锛�");
+ }
+ if (!locService.update(new LambdaUpdateWrapper<Loc>().eq(Loc::getCode, task.getTargLoc()).set(Loc::getUseStatus, LocStsType.LOC_STS_TYPE_O.type))) {
+ throw new CoolException("绉诲簱鐩爣搴撲綅鐘舵�佷慨鏀瑰け璐ワ紒锛�");
+ }
+
+ Task outTask = taskService.getById(task.getParentId());
+ if (!Objects.isNull(outTask)) {
+ LocToTaskParams params = new LocToTaskParams();
+ params.setOrgLoc(task.getOrgLoc()).setSiteNo(task.getOrgSite());
+ //鐢熸垚绉绘繁搴撲綅浠诲姟
+ Task moveTask = locItemService.genMoveTask(params, loginUserId);
+ moveTask.setSort(task.getSort() + 1).setParentId(outTask.getId());
+ if (!this.updateById(moveTask)) {
+ throw new CoolException("浠诲姟淇℃伅淇敼澶辫触锛侊紒");
+ }
+ outTask.setParentId(moveTask.getId());
+ if (!this.updateById(outTask)) {
+ throw new CoolException("浠诲姟淇℃伅淇敼澶辫触锛侊紒");
+ }
}
}
- Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getCode, task.getTaskType() < TaskStsType.UPDATED_IN.id ? task.getTargLoc() : task.getOrgLoc()));
- if (null != loc && (loc.getUseStatus().equals(LocStsType.LOC_STS_TYPE_S.type) || loc.getUseStatus().equals(LocStsType.LOC_STS_TYPE_R.type))) {
- loc.setUseStatus(LocStsType.LOC_STS_TYPE_O.type);
- if (!locService.updateById(loc)) {
- throw new CoolException("鏇存柊搴撲綅鐘舵�佸け璐ワ紒锛�");
- }
- }
if (!Objects.isNull(task.getWarehType()) && task.getWarehType().equals(WarehType.WAREHOUSE_TYPE_AGV.val)) {
BasStation basStation = null;
if (task.getTaskType().equals(TaskType.TASK_TYPE_IN.type) || task.getTaskType().equals(TaskType.TASK_TYPE_EMPITY_IN.type)) {
@@ -622,8 +767,7 @@
|| task.getTaskType().equals(TaskType.TASK_TYPE_PICK_AGAIN_OUT.type)
|| task.getTaskType().equals(TaskType.TASK_TYPE_MERGE_OUT.type)
|| task.getTaskType().equals(TaskType.TASK_TYPE_CHECK_OUT.type)
- || task.getTaskType().equals(TaskType.TASK_TYPE_EMPITY_OUT.type)
- ) {
+ || task.getTaskType().equals(TaskType.TASK_TYPE_EMPITY_OUT.type)) {
basStation = basStationService.getOne(new LambdaQueryWrapper<BasStation>()
.eq(BasStation::getStationName, task.getTargLoc())
.eq(BasStation::getUseStatus, LocStsType.LOC_STS_TYPE_R.type));
@@ -637,8 +781,47 @@
}
}
- if (!taskItemService.remove(new LambdaQueryWrapper<TaskItem>().eq(TaskItem::getTaskId, task.getId()))) {
- throw new CoolException("浠诲姟鏄庣粏鍒犻櫎澶辫触锛侊紒");
+ List<TaskItem> taskItems = taskItemService.list(new LambdaQueryWrapper<TaskItem>().eq(TaskItem::getTaskId, task.getId()));
+ if (!taskItems.isEmpty()) {
+ for (TaskItem item : taskItems) {
+ if (item.getOrderType().equals(OrderType.ORDER_OUT.type)) {
+ //鍑哄簱
+ if (item.getWkType().equals(Short.parseShort(OrderWorkType.ORDER_WORK_TYPE_STOCK_OUT.type))) {
+ //搴撳瓨鍑哄簱
+ Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getId, item.getSourceId()));
+ if (Objects.isNull(loc)) {
+ throw new CoolException("鏁版嵁閿欒锛氬簱浣嶄俊鎭笉瀛樺湪锛侊紒");
+ }
+
+ loc.setUseStatus(LocStsType.LOC_STS_TYPE_F.type).setBarcode(task.getBarcode()).setUpdateBy(loginUserId).setUpdateTime(new Date());
+ if (!locService.updateById(loc)) {
+ throw new CoolException("搴撲綅淇℃伅淇敼澶辫触锛侊紒");
+ }
+ }
+ } else {
+ //鍏ュ簱
+ //鎭㈠缁勬墭鐘舵��
+ WaitPakin waitPakin = waitPakinService.getOne(new LambdaQueryWrapper<WaitPakin>()
+ .eq(WaitPakin::getBarcode, task.getBarcode()));
+ if (null != waitPakin) {
+ waitPakin.setIoStatus(PakinIOStatus.PAKIN_IO_STATUS_DONE.val);
+ if (!waitPakinService.updateById(waitPakin)) {
+ throw new CoolException("鏇存柊缁勬墭鐘舵�佸け璐ワ紒锛�");
+ }
+ }
+
+ Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getCode, task.getTaskType() < TaskStsType.UPDATED_IN.id ? task.getTargLoc() : task.getOrgLoc()));
+ if (null != loc && (loc.getUseStatus().equals(LocStsType.LOC_STS_TYPE_S.type) || loc.getUseStatus().equals(LocStsType.LOC_STS_TYPE_R.type))) {
+ loc.setUseStatus(LocStsType.LOC_STS_TYPE_O.type);
+ if (!locService.updateById(loc)) {
+ throw new CoolException("鏇存柊搴撲綅鐘舵�佸け璐ワ紒锛�");
+ }
+ }
+ }
+ }
+ if (!taskItemService.remove(new LambdaQueryWrapper<TaskItem>().eq(TaskItem::getTaskId, task.getId()))) {
+ throw new CoolException("浠诲姟鏄庣粏鍒犻櫎澶辫触锛侊紒");
+ }
}
}
if (!this.removeByIds(Arrays.asList(ids))) {
@@ -835,8 +1018,8 @@
if (!locService.update(new LambdaUpdateWrapper<Loc>()
.set(Loc::getUseStatus, LocStsType.LOC_STS_TYPE_O.type)
.set(Loc::getBarcode, null)
- .set(Loc::getUpdateBy, loginUserId)
- .set(Loc::getUpdateTime, new Date())
+ .set(Loc::getUpdateBy, loginUserId)
+ .set(Loc::getUpdateTime, new Date())
.eq(Loc::getId, loc.getId()))) {
throw new CoolException("搴撲綅鐘舵�佷慨鏀瑰け璐ワ紒锛�");
}
@@ -1006,7 +1189,7 @@
if (!waitPakinService.update(new LambdaUpdateWrapper<WaitPakin>()
.set(WaitPakin::getIoStatus, PakinIOStatus.PAKIN_IO_STATUS_TASK_DONE.val)
- .set(WaitPakin::getUpdateBy, loginUserId)
+ .set(WaitPakin::getUpdateBy, loginUserId)
.eq(WaitPakin::getId, pakinItem.getPakinId()))) {
throw new CoolException("缁勬嫋鐘舵�佷慨鏀瑰け璐ワ紒锛�");
}
--
Gitblit v1.9.1