From 2cf6f25ee51dea59dbd1e2183a06796961bb8644 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 23 十二月 2024 19:38:09 +0800
Subject: [PATCH] 添加出库流程
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/services/Impl/WcsApiServiceImpl.java | 192 +++++++++++++++++++++++++++++-------------------
1 files changed, 116 insertions(+), 76 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/services/Impl/WcsApiServiceImpl.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/services/Impl/WcsApiServiceImpl.java
index 5d9e718..1113821 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/services/Impl/WcsApiServiceImpl.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/services/Impl/WcsApiServiceImpl.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.zy.asrs.framework.common.R;
+import com.zy.asrs.framework.exception.CoolException;
import com.zy.asrs.wms.apis.wcs.entity.domain.EssTaskStatus;
import com.zy.asrs.wms.apis.wcs.entity.request.*;
import com.zy.asrs.wms.apis.wcs.entity.response.CommonReponse;
@@ -14,6 +15,7 @@
import com.zy.asrs.wms.asrs.service.WaitPakinService;
import com.zy.asrs.wms.asrs.service.WorkService;
import io.jsonwebtoken.lang.Collections;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -23,6 +25,7 @@
import java.util.Map;
import java.util.stream.Collectors;
+@Slf4j
@Service
public class WcsApiServiceImpl implements WcsApiService {
@@ -33,104 +36,141 @@
@Autowired
private TaskService taskService;
- @Override
- public CommonReponse publishTaskOfCarry() {
- //鑾峰彇缁勬嫋閫氱煡妗ｄ腑锛岀姸鎬佷负姝ｅ父锛岀粍鎵樼姸鎬佷负寰呭叆搴撲笖鏈垹闄ょ殑WaitPakins
- List<WaitPakin> list = waitPakinService.list(new LambdaQueryWrapper<WaitPakin>()
- .eq(WaitPakin::getStatus, 1)
- .eq(WaitPakin::getIoStatus, 0)
- .eq(WaitPakin::getDeleted, 0));
- if (!list.isEmpty()) {
- return publishTaskOfCarry(list);
- }
- return new CommonReponse();
- }
-
- /**
- * 涓嬪彂鏂欑锛堝鍣級婊氬姩鑷虫壂鐮佸尯
- * //TODO 宸茶垂寮�
- *
- * @param pakins
- * @return
- */
- @Override
- public CommonReponse publishTaskOfCarry(List<WaitPakin> pakins) {
- PublishTasksParam tasksParam = new PublishTasksParam();
- tasksParam.setTaskType("carry");
- List<TaskParam> tasks = new ArrayList<>();
- Map<String, List<WaitPakin>> barcodes = pakins.stream().collect(Collectors.groupingBy(WaitPakin::getBarcode));
- /**
- * 褰撳墠闂锛�
- * //TODO 1. 鐩墠浠诲姟涓嬪彂鎺ュ彛娌熼�氫笅鏉ワ紝鏄渶瑕佺洰鏍囦綅缃殑锛岃繖閲屾垜浠彧鏄垰缁勬嫋瀹屾垚锛屽苟涓嶆槸閫氱煡娴佸姩锛屾病鏈夌洰鏍囦綅缃�
- * //TODO 2. 鏂囨。涓婄殑鎼繍浠诲姟涓嬪彂鎸囩殑閮芥槸澶氫换鍔★紝澶氬鍣ㄦ惉杩愶紝鑰屼笉鏄垜浠渶瑕佺墿鏂欎俊鎭悓姝ュ姛鑳�
- * //TODO 3. 娴佺▼璧颁笉閫氭殏鏃跺厛璺宠繃锛岀‘璁ゆ槸鍚﹂渶瑕乄MS瑙﹀彂鏂欑婊氬姩鑷虫壂鐮佸尯
- * */
- barcodes.keySet().forEach(actionKey -> {
- List<TaskDescribe> taskDescribes = new ArrayList<>();
- barcodes.get(actionKey).forEach(action -> {
- TaskDescribe taskDescribe = new TaskDescribe();
- taskDescribe.setContainerCode(action.getBarcode());
- taskDescribes.add(taskDescribe);
- });
- });
-
- if (!pakins.isEmpty()) {
- pakins.forEach(waitPakin -> {
-
- });
- }
- tasksParam.setTasks(tasks);
-
- return null;
- }
/**
* 瀹瑰櫒鍒拌揪鎺ユ敹
* 鏍规嵁ESS杩斿洖鐨勫鍣ㄧ紪鐮佷慨鏀逛换鍔℃。涓殑杈撻�佺嚎璧峰浣嶇疆鑺傜偣锛屽強浠诲姟妗ｆ墽琛岀姸鎬�
+ * * 褰撳墠闂锛�
+ * * //TODO 1. 鐩墠浠诲姟涓嬪彂鎺ュ彛娌熼�氫笅鏉ワ紝鏄渶瑕佺洰鏍囦綅缃殑锛岃繖閲屾垜浠彧鏄垰缁勬嫋瀹屾垚锛屽苟涓嶆槸閫氱煡娴佸姩锛屾病鏈夌洰鏍囦綅缃�
+ * * //TODO 2. 鏂囨。涓婄殑鎼繍浠诲姟涓嬪彂鎸囩殑閮芥槸澶氫换鍔★紝澶氬鍣ㄦ惉杩愶紝鑰屼笉鏄垜浠渶瑕佺墿鏂欎俊鎭悓姝ュ姛鑳�
+ * * //TODO 3. 娴佺▼璧颁笉閫氭殏鏃跺厛璺宠繃锛岀‘璁ゆ槸鍚﹂渶瑕乄MS瑙﹀彂鏂欑婊氬姩鑷虫壂鐮佸尯
* @param arrivedParam
* @return
*/
@Override
- @Transactional
- public R containerArrivedNotify(ContainerArrivedParam arrivedParam) {
+ @Transactional(rollbackFor = Exception.class)
+ public R containerArrivedNotify(ContainerArrivedParam arrivedParam, String taskType) {
List<Task> tasks = taskService.list(new LambdaQueryWrapper<Task>().eq(Task::getBarcode, arrivedParam.getContainerCode()));
if (Collections.isEmpty(tasks)) {
return R.error("浠诲姟涓嶅瓨鍦紒锛�");
-// throw new CoolException("浠诲姟涓嶅瓨鍦紒锛�");
}
- //DONE 鏍规嵁ESS杩斿洖鐨勫鍣ㄧ紪鐮佷慨鏀逛换鍔℃。涓殑杈撻�佺嚎璧峰浣嶇疆鑺傜偣锛屽強浠诲姟妗ｅ鍣ㄥ埌杈剧姸鎬�
- taskService.update(new LambdaUpdateWrapper<Task>()
- .set(Task::getTaskSts, TaskStsType.WCS_CONTAINER_RECEIVE.id)
- .set(Task::getOriginLoc, arrivedParam.getSlotCode())
- .eq(Task::getBarcode, arrivedParam.getContainerCode()));
+ if (taskType.equals("inStock")) {
+ //DONE 鏍规嵁ESS杩斿洖鐨勫鍣ㄧ紪鐮佷慨鏀逛换鍔℃。涓殑杈撻�佺嚎璧峰浣嶇疆鑺傜偣锛屽強浠诲姟妗ｅ鍣ㄥ埌杈剧姸鎬�
+ taskService.update(new LambdaUpdateWrapper<Task>()
+ .set(Task::getTaskSts, TaskStsType.WCS_CONTAINER_RECEIVE.id)
+ .set(Task::getOriginLoc, arrivedParam.getSlotCode())
+ .eq(Task::getBarcode, arrivedParam.getContainerCode()));
+ } else {
+ taskService.update(new LambdaUpdateWrapper<Task>()
+ .set(Task::getTaskSts, TaskStsType.WCS_EXECUTE_OUT_ARRIVED.id)
+ .set(Task::getOriginLoc, arrivedParam.getSlotCode())
+ .eq(Task::getBarcode, arrivedParam.getContainerCode()));
+ }
return R.success("success");
}
@Override
@Transactional(rollbackFor = Exception.class)
- public boolean receiveTaskStatus(TasksStatusCallbackParam callbackParam) {
- TaskStsType taskStsType = TaskStsType.WCS_CONTAINER_RECEIVE;
-
- if (callbackParam.getEventType().equals(EssTaskStatus.TASK_EVENT_TOTE_LOAD.event)) { //涓婃姤鍙栫鐘舵��
- taskStsType = TaskStsType.WCS_TOTE_LOAD;
- } else if (callbackParam.getEventType().equals(EssTaskStatus.TASK_EVENT_TOTE_UNLOAD.event)) { //涓婃姤鏀剧鐘舵��
- taskStsType = TaskStsType.WCS_TOTE_UNLOAD;
- } else if (callbackParam.getEventType().equals(EssTaskStatus.TASK_EVENT_STATUS.event)) { //TODO 闇�纭涓婃姤浠诲姟涓紝浠诲姟瀹屾垚鏄摢涓簨浠讹紝鐩墠鏆傚畾task浜嬩欢
- taskStsType = TaskStsType.WCS_PUTAWAY_SUCESS;
- }
-
- return taskService.update(new LambdaUpdateWrapper<Task>()
- .set(Task::getRobotCode, callbackParam.getRobotCode())
- .set(Task::getSysTaskCode, callbackParam.getSysTaskCode())
- .set(Task::getTaskSts, taskStsType.id)
- .set(Task::getExcudeStatus, callbackParam.getStatus())
- .set(Task::getTaskDesc, callbackParam.getMessage())
+ public void receiveTaskStatus(TasksStatusCallbackParam callbackParam, String stockType) {
+ Long type = 1L;
+ if (stockType.equals("outStock")) { //鍑哄簱浠诲姟
+ type = 101L;
+ }
+ List<Task> list = taskService.list(new LambdaQueryWrapper<Task>()
.eq(Task::getBarcode, callbackParam.getContainerCode())
+ .eq(Task::getTaskType, type)
.eq(Task::getTaskNo, callbackParam.getTaskCode()));
- }
+ if (!Collections.isEmpty(list)) {
+ Long finalType = type;
+ list.forEach(task -> {
+ TaskStsType taskStsType = null;
+ if (stockType.equals("inStock")) { //鍏ュ簱浠诲姟
+ if (callbackParam.getEventType().equals(EssTaskStatus.TASK_EVENT_TOTE_LOAD.event)) { //涓婃姤鍙栫鐘舵��
+ if (task.getTaskType() == TaskStsType.WCS_CONTAINER_RECEIVE.id) {
+ taskStsType = TaskStsType.WCS_TOTE_LOAD;
+ } else {
+ String errMsg = "浠诲姟缂栧彿锛�" + task.getTaskNo() + "鐘舵�佷负涓嶅尮閰嶏紝" + "涓嶈兘鎵ц锛�" + TaskStsType.WCS_TOTE_LOAD.desc + "浠诲姟";
+ log.error(errMsg);
+ throw new CoolException(errMsg);
+ }
+ } else if (callbackParam.getEventType().equals(EssTaskStatus.TASK_EVENT_TOTE_UNLOAD.event)) { //涓婃姤鏀剧鐘舵��
+ if (task.getTaskType() == TaskStsType.WCS_TOTE_LOAD.id) {
+ taskStsType = TaskStsType.WCS_TOTE_UNLOAD;
+ } else {
+ String errMsg = "浠诲姟缂栧彿锛�" + task.getTaskNo() + "鐘舵�佷负涓嶅尮閰嶏紝" + "涓嶈兘鎵ц锛�" + TaskStsType.WCS_TOTE_UNLOAD.desc + "浠诲姟";
+ log.error(errMsg);
+ throw new CoolException(errMsg);
+ }
+ } else if (callbackParam.getEventType().equals(EssTaskStatus.TASK_EVENT_STATUS.event)) { //TODO 闇�纭涓婃姤浠诲姟涓紝浠诲姟瀹屾垚鏄摢涓簨浠讹紝鐩墠鏆傚畾task浜嬩欢
+ if (task.getTaskType() == TaskStsType.WCS_TOTE_UNLOAD.id) {
+ taskStsType = TaskStsType.WCS_PUTAWAY_SUCESS;
+ } else {
+ String errMsg = "浠诲姟缂栧彿锛�" + task.getTaskNo() + "鐘舵�佷负涓嶅尮閰嶏紝" + "涓嶈兘鎵ц锛�" + TaskStsType.WCS_PUTAWAY_SUCESS.desc + "浠诲姟";
+ log.error(errMsg);
+ throw new CoolException(errMsg);
+ }
+ }
+ boolean result = taskService.update(new LambdaUpdateWrapper<Task>()
+ .set(Task::getRobotCode, callbackParam.getRobotCode())
+ .set(Task::getSysTaskCode, callbackParam.getSysTaskCode())
+ .set(Task::getTaskSts, taskStsType.id)
+ .set(Task::getExcudeStatus, callbackParam.getStatus())
+ .set(Task::getTaskDesc, callbackParam.getMessage())
+ .eq(Task::getBarcode, callbackParam.getContainerCode())
+ .eq(Task::getTaskType, finalType)
+ .eq(Task::getTaskNo, callbackParam.getTaskCode()));
+ if (callbackParam.getEventType().equals(EssTaskStatus.TASK_EVENT_STATUS.event) && result) {
+ workService.completeTask(task.getId());
+ }
+ } else { //鍑哄簱浠诲姟
+ if (callbackParam.getEventType().equals(EssTaskStatus.TASK_EVENT_TOTE_LOAD.event)) { //涓婃姤鍙栫鐘舵��
+ if (task.getTaskType() == TaskStsType.WCS_EXECUTE_OUT.id) {
+ taskStsType = TaskStsType.WCS_EXECUTE_OUT_TOTE_LOAD;
+ } else {
+ String errMsg = "浠诲姟缂栧彿锛�" + task.getTaskNo() + "鐘舵�佷负涓嶅尮閰嶏紝" + "涓嶈兘鎵ц锛�" + TaskStsType.WCS_EXECUTE_OUT_TOTE_LOAD.desc + "浠诲姟";
+ log.error(errMsg);
+ throw new CoolException(errMsg);
+ }
+ } else if (callbackParam.getEventType().equals(EssTaskStatus.TASK_EVENT_TOTE_UNLOAD.event)) { //涓婃姤鏀剧鐘舵��
+ if (task.getTaskType() == TaskStsType.WCS_EXECUTE_OUT_TOTE_LOAD.id) {
+ taskStsType = TaskStsType.WCS_EXECUTE_OUT_TOTE_UNLOAD;
+ } else {
+ String errMsg = "浠诲姟缂栧彿锛�" + task.getTaskNo() + "鐘舵�佷负涓嶅尮閰嶏紝" + "涓嶈兘鎵ц锛�" + TaskStsType.WCS_EXECUTE_OUT_TOTE_UNLOAD.desc + "浠诲姟";
+ log.error(errMsg);
+ throw new CoolException(errMsg);
+ }
+ } else if (callbackParam.getEventType().equals(EssTaskStatus.TASK_EVENT_STATUS.event)) { //涓婃姤瀹屾垚鐘舵��
+ if (task.getTaskType() == TaskStsType.WCS_EXECUTE_OUT_TOTE_UNLOAD.id) {
+ taskStsType = TaskStsType.WCS_EXECUTE_OUT_TASK_DONE;
+ } else {
+ String errMsg = "浠诲姟缂栧彿锛�" + task.getTaskNo() + "鐘舵�佷负涓嶅尮閰嶏紝" + "涓嶈兘鎵ц锛�" + TaskStsType.WCS_EXECUTE_OUT_TASK_DONE.desc + "浠诲姟";
+ log.error(errMsg);
+ throw new CoolException(errMsg);
+ }
+ }
+
+ //鏇存柊鍑哄簱鐘舵�佸強鐩稿叧瀛楁
+ taskService.update(new LambdaUpdateWrapper<Task>()
+ .set(Task::getRobotCode, callbackParam.getRobotCode())
+ .set(Task::getSysTaskCode, callbackParam.getSysTaskCode())
+ .set(Task::getTaskSts, taskStsType.id)
+ .set(Task::getExcudeStatus, callbackParam.getStatus())
+ .set(Task::getTaskDesc, callbackParam.getMessage())
+ .eq(Task::getTaskType, finalType)
+ .eq(Task::getBarcode, callbackParam.getContainerCode())
+ .eq(Task::getTaskNo, callbackParam.getTaskCode()));
+
+// if (callbackParam.getEventType().equals(EssTaskStatus.TASK_EVENT_STATUS.event) && result) {
+//// workService.completeTask(task.getId());
+// }
+ }
+
+ });
+ }
+ }
}
--
Gitblit v1.9.1