From d0b5833231bfc7f96aaa67cb77b81f57a58deb26 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 11 十一月 2025 14:41:08 +0800
Subject: [PATCH] 出库波次拣货功能优化
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskSchedules.java | 398 ++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 300 insertions(+), 98 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskSchedules.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskSchedules.java
index 8aed60a..e07d749 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskSchedules.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskSchedules.java
@@ -1,6 +1,5 @@
package com.vincent.rsf.server.manager.schedules;
-import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@@ -15,8 +14,10 @@
import com.vincent.rsf.server.api.entity.constant.RcsConstant;
import com.vincent.rsf.server.api.entity.params.TaskItemParam;
import com.vincent.rsf.server.api.entity.params.WcsTaskParams;
+import com.vincent.rsf.server.api.service.ReportMsgService;
import com.vincent.rsf.server.api.utils.LocUtils;
import com.vincent.rsf.server.common.constant.Constants;
+import com.vincent.rsf.server.manager.controller.params.LocSiteParams;
import com.vincent.rsf.server.manager.controller.params.LocToTaskParams;
import com.vincent.rsf.server.manager.enums.*;
import com.vincent.rsf.server.manager.entity.*;
@@ -85,12 +86,14 @@
private TransferOrderService transferOrderService;
@Autowired
private TransferService transferService;
-
@Autowired
private RestTemplate restTemplate;
-
@Autowired
private RemotesInfoProperties.RcsApi rcsApi;
+ @Autowired
+ private BasStationService basStationService;
+ @Autowired
+ private ReportMsgService reportMsgService;
/**
* @param
@@ -173,10 +176,10 @@
}
orderItems.forEach(orderItem -> {
- orderItem.setOrderId(order.getId()).setOrderCode(order.getCode()).setId(null);
- if (!asnOrderItemService.save(orderItem)) {
- throw new CoolException("鍏ュ簱鍗曟槑缁嗕繚瀛樺け璐ワ紒锛�");
- }
+ orderItem.setOrderId(order.getId()).setOrderCode(order.getCode()).setId(null);
+ if (!asnOrderItemService.save(orderItem)) {
+ throw new CoolException("鍏ュ簱鍗曟槑缁嗕繚瀛樺け璐ワ紒锛�");
+ }
});
Transfer transfer = transferService.getById(order.getPoId());
@@ -235,51 +238,103 @@
}
/**
- * 浠诲姟鑷姩涓嬪彂
- *
- * @throws Exception
+ * 闈炲厜鐢电珯鐐逛换鍔′笅鍙�
*/
@Scheduled(cron = "0/5 * * * * ? ")
+ @Transactional(rollbackFor = Exception.class)
+ public void pubTaskToWcs() {
+ Long loginUserId = SystemAuthUtils.getLoginUserId();
+ List<Integer> list = Arrays.asList(TaskType.TASK_TYPE_IN.type, TaskType.TASK_TYPE_OUT.type, TaskType.TASK_TYPE_LOC_MOVE.type, TaskType.TASK_TYPE_EMPITY_IN.type
+ , TaskType.TASK_TYPE_CHECK_IN.type, TaskType.TASK_TYPE_MERGE_IN.type, TaskType.TASK_TYPE_EMPITY_OUT.type, TaskType.TASK_TYPE_PICK_IN.type,
+ TaskType.TASK_TYPE_PICK_AGAIN_OUT.type, TaskType.TASK_TYPE_CHECK_OUT.type, TaskType.TASK_TYPE_MERGE_OUT.type);
+ List<Integer> integers = Arrays.asList(TaskStsType.GENERATE_IN.id, TaskStsType.GENERATE_OUT.id);
+ List<Task> tasks = taskService.list(new LambdaQueryWrapper<Task>()
+ .in(Task::getTaskType, list)
+ .in(Task::getTaskStatus, integers).last("limit 1")
+ .orderByDesc(Task::getSort));
+ for (Task task : tasks) {
+ /**绉诲簱涓嶅仛绔欑偣鎿嶄綔*/
+ if (!task.getTaskType().equals(TaskType.TASK_TYPE_LOC_MOVE.type)) {
+ BasStation station = basStationService.getOne(new LambdaQueryWrapper<BasStation>()
+ .eq(BasStation::getStationName,
+ task.getTaskStatus().equals(TaskStsType.GENERATE_IN.id) ? task.getOrgSite() : task.getTargSite()));
+ if (station.getType().equals(StationTypeEnum.STATION_TYPE_MUTI.type)) {
+ continue;
+ }
+ }
+ /**涓嬪彂鏅�氱珯鐐逛换鍔★紝鎶ラ敊鍥炴粴锛屼笉鍐嶅線涓嬫墽琛�*/
+ pubTaskToWcs(tasks);
+ }
+ }
+
+ /**
+ * @author Ryan
+ * @date 2025/9/4
+ * @description: 鍏夌數绔欑偣浠诲姟涓嬪彂
+ * @version 1.0
+ */
+// @Scheduled(cron = "0/5 * * * * ? ")
@Transactional(rollbackFor = Exception.class)
public void taskToWCS() throws Exception {
Long loginUserId = SystemAuthUtils.getLoginUserId();
List<Integer> list = Arrays.asList(TaskType.TASK_TYPE_IN.type, TaskType.TASK_TYPE_OUT.type, TaskType.TASK_TYPE_LOC_MOVE.type, TaskType.TASK_TYPE_EMPITY_IN.type
- ,TaskType.TASK_TYPE_CHECK_IN.type, TaskType.TASK_TYPE_MERGE_IN.type, TaskType.TASK_TYPE_EMPITY_OUT.type,
+ , TaskType.TASK_TYPE_CHECK_IN.type, TaskType.TASK_TYPE_MERGE_IN.type, TaskType.TASK_TYPE_EMPITY_OUT.type,
TaskType.TASK_TYPE_PICK_AGAIN_OUT.type, TaskType.TASK_TYPE_CHECK_OUT.type, TaskType.TASK_TYPE_MERGE_OUT.type);
List<Integer> integers = Arrays.asList(TaskStsType.GENERATE_IN.id, TaskStsType.GENERATE_OUT.id);
List<Task> tasks = taskService.list(new LambdaQueryWrapper<Task>()
.in(Task::getTaskType, list)
.in(Task::getTaskStatus, integers)
.orderByDesc(Task::getSort));
- for (Task task : tasks) {
-// Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getBarcode, task.getBarcode()));
-// if (Objects.isNull(loc)) {
-// continue;
-// }
-// //鍒ゆ柇鏄惁娣卞簱浣�
-// if (!LocUtils.isShallowLoc(loc.getCode())) {
-// //鑾峰彇娣卞簱浣嶅搴旂殑娴呭簱浣�
-// String shallowLoc = LocUtils.getShallowLoc(loc.getCode());
-// if (StringUtils.isBlank(shallowLoc)) {
-// continue;
-// }
-// Loc shalloc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getCode, shallowLoc));
-// if (Objects.isNull(shalloc) || !shalloc.getUseStatus().equals(LocStsType.LOC_STS_TYPE_F.type)) {
-// //濡傛灉娴呭簱浣嶄笉鍦ㄥ簱璺冲嚭寰幆
-// continue;
-// }
-// LocToTaskParams params = new LocToTaskParams();
-// params.setOrgLoc(shallowLoc).setType(TaskType.TASK_TYPE_LOC_MOVE.type + "");
-// //鐢熸垚绉诲簱浠诲姟
-// Task moveTask = locItemService.genMoveTask(params, loginUserId);
-// moveTask.setSort(!Objects.isNull(task.getSort()) ? task.getSort() + 1 : Constants.TASK_SORT_DEFAULT_VALUE + 1);
-// if (!taskService.updateById(moveTask)) {
-// throw new Exception("浠诲姟浼樺厛绾ф洿鏂板け璐ワ紒锛�");
-// }
-// }
- //TODO 璋冪敤涓嬪彂浠诲姟鎺ュ彛
- pubTaskToWcs(task);
+ List<Task> pubTasks = new ArrayList<>();
+
+ Config configs = configService.getOne(new LambdaQueryWrapper<Config>().eq(Config::getFlag, GlobalConfigCode.ALLOW_MOVE_TO_DEEP_LOC));
+ if (!Objects.isNull(configs) && Boolean.parseBoolean(configs.getVal())) {
+ for (Task task : tasks) {
+ /**绉诲簱涓嶅仛绔欑偣鎿嶄綔*/
+ //鍫嗗灈鏈轰换鍔★紝鏍规嵁娣辨祬搴撲綅鍋氱Щ搴撳姩浣�
+ if (!task.getTaskType().equals(TaskType.TASK_TYPE_LOC_MOVE.type)) {
+ BasStation station = basStationService.getOne(new LambdaQueryWrapper<BasStation>().eq(BasStation::getStationName,
+ task.getTaskStatus().equals(TaskStsType.GENERATE_IN.id) ? task.getOrgSite() : task.getTargSite()));
+ /**杩囨护鎺夋櫘閫氱珯鐐逛换鍔�*/
+ if (station.getType().equals(StationTypeEnum.STATION_TYPE_NORMAL.type)) {
+ continue;
+ }
+ Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getBarcode, task.getBarcode()));
+ if (Objects.isNull(loc)) {
+ continue;
+ }
+
+ //鍒ゆ柇鏄惁娣卞簱浣�
+ if (!LocUtils.isShallowLoc(loc.getCode())) {
+ //鑾峰彇娣卞簱浣嶅搴旂殑娴呭簱浣�
+ String shallowLoc = LocUtils.getShallowLoc(loc.getCode());
+ if (StringUtils.isBlank(shallowLoc)) {
+ continue;
+ }
+ Loc shalloc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getCode, shallowLoc));
+ if (Objects.isNull(shalloc) || !shalloc.getUseStatus().equals(LocStsType.LOC_STS_TYPE_F.type)) {
+ //濡傛灉娴呭簱浣嶄笉鍦ㄥ簱璺冲嚭寰幆
+ continue;
+ }
+ LocToTaskParams params = new LocToTaskParams();
+ params.setOrgLoc(shallowLoc).setType(TaskType.TASK_TYPE_LOC_MOVE.type + "");
+ //鐢熸垚绉诲簱浠诲姟
+ Task moveTask = locItemService.genMoveTask(params, loginUserId);
+ moveTask.setSort(!Objects.isNull(task.getSort()) ? task.getSort() + 1 : Constants.TASK_SORT_DEFAULT_VALUE + 1);
+ if (!taskService.updateById(moveTask)) {
+ throw new Exception("浠诲姟浼樺厛绾ф洿鏂板け璐ワ紒锛�");
+ }
+ }
+ }
+ }
}
+ /**涓嬪彂浠诲姟*/
+ try {
+ pubTaskToWcs(tasks);
+ } catch (Exception e) {
+ log.error("浠诲姟涓嬪彂澶辫触锛侊紒", e);
+ }
+
}
/**
@@ -307,50 +362,97 @@
/**
* 涓嬪彂浠诲姟鑷砏CS
- * @param task
+ *
+ * @param tasks
*/
@Transactional(rollbackFor = Exception.class)
- public void pubTaskToWcs(Task task) throws Exception{
+ public void pubTaskToWcs(List<Task> tasks) {
WcsTaskParams taskParams = new WcsTaskParams();
- TaskItemParam itemParam = new TaskItemParam();
- //浠诲姟绫诲瀷锛屼换鍔＄紪鐮�
- itemParam.setTaskType(RcsTaskType.getTypeDesc(task.getTaskType()))
- .setSeqNum(task.getTaskCode());
+ List<TaskItemParam> items = new ArrayList<>();
+ tasks.forEach(task -> {
+ TaskItemParam itemParam = new TaskItemParam();
+ //浠诲姟绫诲瀷锛屼换鍔＄紪鐮�
+ itemParam.setTaskType(RcsTaskType.getTypeDesc(task.getTaskType()))
+ .setSeqNum(task.getTaskCode());
+ //涓诲弬鏁�
+ taskParams.setBatch(task.getBarcode());
- //涓诲弬鏁�
- taskParams.setBatch(task.getBarcode());
+ BasStation station = null;
+ if (!task.getTaskType().equals(TaskType.TASK_TYPE_LOC_MOVE.type)) {
+ station = basStationService.getOne(new LambdaQueryWrapper<BasStation>().eq(BasStation::getStationName, task.getTargSite()));
+ if (Objects.isNull(station)) {
+ throw new CoolException("绔欑偣涓嶅瓨鍦紒锛�");
+ }
+ }
- if (task.getTaskType().equals(TaskType.TASK_TYPE_IN.type)
- || task.getTaskType().equals(TaskType.TASK_TYPE_MERGE_IN.type)
- || task.getTaskType().equals(TaskType.TASK_TYPE_EMPITY_IN.type)) {
- itemParam.setDestLoc(task.getTargLoc())
- .setOriSta(task.getOrgSite());
- } else if (task.getTaskType().equals(TaskType.TASK_TYPE_CHECK_IN.type) || task.getTaskType().equals(TaskType.TASK_TYPE_PICK_IN.type)) {
- itemParam.setDestLoc(task.getTargLoc())
- .setOriSta(task.getTargSite());
- } else if (task.getTaskType().equals(TaskType.TASK_TYPE_OUT.type)
- || task.getTaskType().equals(TaskType.TASK_TYPE_PICK_AGAIN_OUT.type)
- || task.getTaskType().equals(TaskType.TASK_TYPE_EMPITY_OUT.type)
- || task.getTaskType().equals(TaskType.TASK_TYPE_CHECK_OUT.type)
- || task.getTaskType().equals(TaskType.TASK_TYPE_MERGE_OUT.type)) {
+ /**鍒ゆ柇鏄惁鍏夌數绔欑偣锛岄潪鍏夊簵绔欑偣闇�绠℃帶绔欑偣鐘舵��*/
+ if (!Objects.isNull(station) && station.getType().equals(StationTypeEnum.STATION_TYPE_NORMAL.type)) {
+ if (task.getTaskType() <= TaskType.TASK_TYPE_CHECK_IN.type && !task.getTaskType().equals(TaskType.TASK_TYPE_LOC_MOVE.type)) {
+// if (!station.getUseStatus().equals(LocStsType.LOC_STS_TYPE_F.type)) {
+// throw new CoolException( "褰撳墠绔欑偣涓嶆槸F.鍦ㄥ簱鐘舵�佺姸鎬侊紒锛�");
+// }
+ station.setUseStatus(LocStsType.LOC_STS_TYPE_R.type);
+ if (!basStationService.updateById(station)) {
+ throw new CoolException("绔欑偣鐘舵�佹洿鏂板け璐ワ紒锛�");
+ }
+ } else if (task.getTaskType() >= TaskType.TASK_TYPE_OUT.type) {
+ if (!station.getUseStatus().equals(LocStsType.LOC_STS_TYPE_O.type)) {
+ throw new CoolException("鐩爣绔欑偣涓嶅O.绌洪棽鐘舵�侊紝鏃犳硶棰勭害鍑哄簱銆�");
+ }
+ station.setUseStatus(LocStsType.LOC_STS_TYPE_S.type);
+ if (!basStationService.updateById(station)) {
+ throw new CoolException("绔欑偣鐘舵�佹洿鏂板け璐ワ紒锛�");
+ }
+ }
+ }
- itemParam.setOriLoc(task.getOrgLoc())
- .setDestSta(task.getTargSite());
- } else if (task.getTaskType().equals(TaskType.TASK_TYPE_LOC_MOVE.type)) {
- itemParam.setOriLoc(task.getOrgLoc()).setDestLoc(task.getTargLoc());
- } else {
- itemParam.setOriSta(task.getOrgSite()).setDestSta(task.getTargSite());
- }
+ /**绉诲簱鍙傛暟*/
+ if (task.getTaskType().equals(TaskType.TASK_TYPE_LOC_MOVE.type)) {
+ itemParam.setOriLoc(task.getOrgLoc()).setDestLoc(task.getTargLoc());
+ } else if (task.getTaskType().equals(TaskType.TASK_TYPE_IN.type)
+ || task.getTaskType().equals(TaskType.TASK_TYPE_MERGE_IN.type)
+ || task.getTaskType().equals(TaskType.TASK_TYPE_EMPITY_IN.type)) {
+ /**鍏ㄦ澘鍏ュ簱鍙傛暟*/
+ itemParam.setDestLoc(task.getTargLoc())
+ .setOriSta(task.getOrgSite());
+ } else if (task.getTaskType().equals(TaskType.TASK_TYPE_CHECK_IN.type) || task.getTaskType().equals(TaskType.TASK_TYPE_PICK_IN.type)) {
+ /**鎷ｆ枡/鐩樼偣鍏ュ簱鍙傛暟*/
+ itemParam.setDestLoc(task.getTargLoc())
+ .setOriSta(task.getTargSite());
+ } else if (task.getTaskType().equals(TaskType.TASK_TYPE_OUT.type)
+ || task.getTaskType().equals(TaskType.TASK_TYPE_PICK_AGAIN_OUT.type)
+ || task.getTaskType().equals(TaskType.TASK_TYPE_EMPITY_OUT.type)
+ || task.getTaskType().equals(TaskType.TASK_TYPE_CHECK_OUT.type)
+ || task.getTaskType().equals(TaskType.TASK_TYPE_MERGE_OUT.type)) {
+ /**鍑哄簱鍙傛暟*/
+ itemParam.setOriLoc(task.getOrgLoc())
+ .setDestSta(task.getTargSite());
+ } else {
+ /**绔欑偣闂寸Щ搴撳弬鏁�*/
+ itemParam.setOriSta(task.getOrgSite()).setDestSta(task.getTargSite());
- List<TaskItemParam> items = Arrays.asList(itemParam);
-
+ BasStation curSta = basStationService.getOne(new LambdaQueryWrapper<BasStation>().eq(BasStation::getStationName, task.getOrgSite()));
+ if (Objects.isNull(curSta)) {
+ throw new CoolException("绔欑偣涓嶅瓨鍦紒锛�");
+ }
+ if (curSta.getType().equals(StationTypeEnum.STATION_TYPE_NORMAL.type)) {
+ if (!curSta.getUseStatus().equals(LocStsType.LOC_STS_TYPE_F.type)) {
+ throw new CoolException("褰撳墠绔欑偣涓嶆槸F.鍦ㄥ簱鐘舵�侊紒锛�");
+ }
+ }
+ if (station.getType().equals(StationTypeEnum.STATION_TYPE_NORMAL.type)) {
+ if (!station.getUseStatus().equals(LocStsType.LOC_STS_TYPE_O.type)) {
+ throw new CoolException("鐩爣绔欑偣涓嶆槸O.绌洪棽鐘舵�侊紒锛�");
+ }
+ }
+ }
+ items.add(itemParam);
+ });
taskParams.setTaskList(items);
-
/**浠诲姟涓嬪彂鎺ュ彛*/
String pubTakUrl = rcsApi.getHost() + ":" + rcsApi.getPort() + RcsConstant.pubTask;
-
/**RCS鍩虹閰嶇疆閾炬帴*/
- log.info("浠诲姟涓嬪彂锛岃姹傚湴鍧�锛� {}锛� 璇锋眰鍙傛暟锛� {}", pubTakUrl , JSONObject.toJSONString(taskParams));
+ log.info("浠诲姟涓嬪彂锛岃姹傚湴鍧�锛� {}锛� 璇锋眰鍙傛暟锛� {}", pubTakUrl, JSONObject.toJSONString(taskParams));
HttpHeaders headers = new HttpHeaders();
headers.add("Content-Type", "application/json");
headers.add("api-version", "v2.0");
@@ -360,34 +462,55 @@
if (Objects.isNull(exchange.getBody())) {
throw new CoolException("浠诲姟涓嬪彂澶辫触锛侊紒");
} else {
- ObjectMapper objectMapper = new ObjectMapper();
- objectMapper.coercionConfigDefaults()
- .setCoercion(CoercionInputShape.EmptyString, CoercionAction.AsEmpty);
try {
+ ObjectMapper objectMapper = new ObjectMapper();
+ objectMapper.coercionConfigDefaults()
+ .setCoercion(CoercionInputShape.EmptyString, CoercionAction.AsEmpty);
CommonResponse result = objectMapper.readValue(exchange.getBody(), CommonResponse.class);
if (result.getCode() == 200) {
- if (task.getTaskType().equals(TaskType.TASK_TYPE_IN.type)
- || task.getTaskType().equals(TaskType.TASK_TYPE_PICK_IN.type)
- || task.getTaskType().equals(TaskType.TASK_TYPE_CHECK_IN.type)
- || task.getTaskType().equals(TaskType.TASK_TYPE_EMPITY_IN.type)
- || task.getTaskType().equals(TaskType.TASK_TYPE_MERGE_IN.type)
- || task.getTaskType().equals(TaskType.TASK_TYPE_LOC_MOVE.type)) {
- if (!taskService.update(new LambdaUpdateWrapper<Task>().eq(Task::getTaskCode, task.getTaskCode())
- .set(Task::getTaskStatus, TaskStsType.WCS_EXECUTE_IN.id))) {
- throw new CoolException("浠诲姟鐘舵�佷慨鏀瑰け璐ワ紒锛�");
+ tasks.forEach(task -> {
+ BasStation curSta = basStationService.getOne(new LambdaQueryWrapper<BasStation>().eq(BasStation::getStationName, task.getOrgSite()));
+ if (Objects.isNull(curSta)) {
+ throw new CoolException("绔欑偣涓嶅瓨鍦紒锛�");
}
- } else if (task.getTaskType().equals(TaskType.TASK_TYPE_OUT.type)
- || task.getTaskType().equals(TaskType.TASK_TYPE_CHECK_OUT.type)
- || task.getTaskType().equals(TaskType.TASK_TYPE_MERGE_OUT.type)
- || task.getTaskType().equals(TaskType.TASK_TYPE_EMPITY_OUT.type)
- || task.getTaskType().equals(TaskType.TASK_TYPE_PICK_AGAIN_OUT.type)
- ) {
- if (!taskService.update(new LambdaUpdateWrapper<Task>().eq(Task::getTaskCode, task.getTaskCode())
- .set(Task::getTaskStatus, TaskStsType.WCS_EXECUTE_OUT.id))) {
- throw new CoolException("浠诲姟鐘舵�佷慨鏀瑰け璐ワ紒锛�");
+ if (task.getTaskType().equals(TaskType.TASK_TYPE_IN.type)
+ || task.getTaskType().equals(TaskType.TASK_TYPE_PICK_IN.type)
+ || task.getTaskType().equals(TaskType.TASK_TYPE_CHECK_IN.type)
+ || task.getTaskType().equals(TaskType.TASK_TYPE_EMPITY_IN.type)
+ || task.getTaskType().equals(TaskType.TASK_TYPE_MERGE_IN.type)
+ || task.getTaskType().equals(TaskType.TASK_TYPE_LOC_MOVE.type)) {
+ if (!taskService.update(new LambdaUpdateWrapper<Task>().eq(Task::getTaskCode, task.getTaskCode())
+ .set(Task::getTaskStatus, TaskStsType.WCS_EXECUTE_IN.id))) {
+ throw new CoolException("浠诲姟鐘舵�佷慨鏀瑰け璐ワ紒锛�");
+ }
+ /**鎺掗櫎绉诲簱鍔熻兘*/
+ if (!task.getTaskType().equals(TaskType.TASK_TYPE_LOC_MOVE.type)) {
+ /**濡傛灉鏄櫘閫氱珯鐐癸紝淇敼绔欑偣鐘舵�佷负鍑哄簱棰勭害*/
+ if (curSta.getType().equals(StationTypeEnum.STATION_TYPE_NORMAL.type)) {
+ curSta.setUseStatus(LocStsType.LOC_STS_TYPE_R.type);
+ if (!basStationService.updateById(curSta)) {
+ throw new CoolException("绔欑偣棰勭害澶辫触锛侊紒");
+ }
+ }
+ }
+ } else if (task.getTaskType().equals(TaskType.TASK_TYPE_OUT.type)
+ || task.getTaskType().equals(TaskType.TASK_TYPE_CHECK_OUT.type)
+ || task.getTaskType().equals(TaskType.TASK_TYPE_MERGE_OUT.type)
+ || task.getTaskType().equals(TaskType.TASK_TYPE_EMPITY_OUT.type)
+ || task.getTaskType().equals(TaskType.TASK_TYPE_PICK_AGAIN_OUT.type)) {
+ if (!taskService.update(new LambdaUpdateWrapper<Task>().eq(Task::getTaskCode, task.getTaskCode())
+ .set(Task::getTaskStatus, TaskStsType.WCS_EXECUTE_OUT.id))) {
+ throw new CoolException("浠诲姟鐘舵�佷慨鏀瑰け璐ワ紒锛�");
+ }
+ /**濡傛灉鏄櫘閫氱珯鐐癸紝淇敼绔欑偣鐘舵�佷负鍏ュ簱棰勭害*/
+ if (curSta.getType().equals(StationTypeEnum.STATION_TYPE_NORMAL.type)) {
+ curSta.setUseStatus(LocStsType.LOC_STS_TYPE_S.type);
+ if (!basStationService.updateById(curSta)) {
+ throw new CoolException("绔欑偣棰勭害澶辫触锛侊紒");
+ }
+ }
}
- }
-
+ });
} else {
throw new CoolException("浠诲姟涓嬪彂澶辫触锛侊紒");
}
@@ -428,12 +551,40 @@
tasks.forEach(task -> {
TaskLog taskLog = new TaskLog();
BeanUtils.copyProperties(task, taskLog);
- taskLog.setTaskId(task.getId())
- .setId(null);
+ taskLog.setTaskId(task.getId()).setId(null);
if (!taskLogService.save(taskLog)) {
throw new CoolException("浠诲姟鍘嗗彶妗ｄ繚瀛樺け璐ワ紒锛�");
}
List<TaskItem> taskItems = taskItemService.list(new LambdaQueryWrapper<TaskItem>().eq(TaskItem::getTaskId, task.getId()));
+ //鍏ュ簱鍗曟嵁鏄庣粏涓婃姤
+ if (task.getTaskType() <= TaskType.TASK_TYPE_CHECK_IN.type) {
+ for (TaskItem taskItem : taskItems) {
+ if (Objects.isNull(taskItem.getOrderId())) {
+ continue;
+ }
+ WkOrder order = asnOrderService.getById(taskItem.getOrderId());
+ if (Objects.isNull(order)) {
+ continue;
+ }
+ //鍏ュ簱鍗曚换鍔℃槑缁嗕笂鎶�
+ WkOrderItem wkOrderItem = asnOrderItemService.getOne(new LambdaQueryWrapper<WkOrderItem>()
+ .eq(WkOrderItem::getOrderId, order.getId())
+ .eq(WkOrderItem::getFieldsIndex, taskItem.getFieldsIndex()));
+ if (Objects.isNull(wkOrderItem)) {
+ throw new CoolException("鏁版嵁閿欒锛屽崟鎹槑缁嗕笉瀛樺湪鎴栧凡瀹屾垚锛侊紒");
+ }
+ /**鍏ュ簱鍗曟槑缁嗕笂鎶�*/
+ reportMsgService.reportOrderItem(wkOrderItem);
+ }
+ } else if (task.getTaskType() >= TaskType.TASK_TYPE_OUT.type && task.getTaskType() <= TaskType.TASK_TYPE_EMPITY_OUT.type) {
+ //鍑哄簱鍗曚笂鎶CS淇敼搴撲綅鐘舵��
+ try {
+ reportStationStatus(task);
+ } catch (Exception e) {
+ throw new CoolException(e.getMessage());
+ }
+ }
+
List<TaskItemLog> itemLogs = new ArrayList<>();
for (TaskItem item : taskItems) {
TaskItemLog itemLog = new TaskItemLog();
@@ -453,11 +604,62 @@
if (!taskItemLogService.saveBatch(itemLogs)) {
throw new CoolException("浠诲姟鏄庣粏鍘嗗彶妗ｄ繚瀛樺け璐ワ紒锛�");
}
-
if (!taskItemService.remove(new LambdaQueryWrapper<TaskItem>().eq(TaskItem::getTaskId, task.getId()))) {
throw new CoolException("鍘熷浠诲姟鏄庣粏鍒犻櫎澶辫触锛侊紒");
}
}
});
}
+
+
+ /**
+ * @author Ryan
+ * @date 2025/11/10
+ * @description: 涓婃姤绔欑偣鐘舵��
+ * @version 1.0
+ */
+ public CommonResponse reportStationStatus(Task task) {
+ if (Objects.isNull(task.getTargSite())) {
+ throw new CoolException("鐩爣绔欑偣涓嶈兘涓虹┖锛侊紒");
+ }
+ BasStation station = basStationService.getOne(new LambdaQueryWrapper<BasStation>().eq(BasStation::getStationName, task.getTargSite()));
+ if (Objects.isNull(station)) {
+ throw new CoolException("鏁版嵁閿欒锛岀洰鏍囩珯鐐逛笉瀛樺湪锛侊紒");
+ }
+ station.setUseStatus(LocStsType.LOC_STS_TYPE_O.type);
+
+ if (!basStationService.updateById(station)) {
+ throw new CoolException("绔欑偣鐘舵�佷慨鏀瑰け璐ワ紒锛�");
+ }
+
+ LocSiteParams locSiteParams = new LocSiteParams();
+ locSiteParams.setStatus(LocStsType.getLocSts(LocStsType.LOC_STS_TYPE_O.type))
+ .setType("site")
+ .setCode(station.getStationName());
+
+ /**WMS鍩虹閰嶇疆閾炬帴*/
+ String rcsUrl = rcsApi.getHost() + ":" + rcsApi.getPort() + RcsConstant.REPORT_SITE_STATUS;
+ log.info("涓婃姤宸插畬鎴愯鍗曪細{}锛� 璇锋眰鍙傛暟锛� {}", rcsUrl, JSONObject.toJSONString(locSiteParams));
+ HttpHeaders headers = new HttpHeaders();
+ headers.add("Content-Type", "application/json");
+ headers.add("api-version", "v2.0");
+
+ HttpEntity httpEntity = new HttpEntity(locSiteParams, headers);
+ ResponseEntity<String> exchange = restTemplate.exchange(rcsUrl, HttpMethod.POST, httpEntity, String.class);
+ log.info("涓婃姤宸插畬鎴愯鍗曪紝杩斿洖缁撴灉锛� {}", exchange);
+ if (Objects.isNull(exchange.getBody())) {
+ throw new CoolException("淇敼澶辫触锛侊紒");
+ } else {
+ ObjectMapper objectMapper = new ObjectMapper();
+ objectMapper.coercionConfigDefaults().setCoercion(CoercionInputShape.EmptyString, CoercionAction.AsEmpty);
+ try {
+ CommonResponse result = objectMapper.readValue(exchange.getBody(), CommonResponse.class);
+ return result;
+ } catch (JsonProcessingException e) {
+ throw new CoolException(e.getMessage());
+ }
+ }
+
+ }
+
}
--
Gitblit v1.9.1