From a2ef34a807b1f88ac9b18dae51adbf61ce821595 Mon Sep 17 00:00:00 2001
From: chen.lin <1442464845@qq.com>
Date: 星期四, 05 三月 2026 11:31:40 +0800
Subject: [PATCH] RCS对接优化
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskSchedules.java | 498 ++++++++++++++++++++++++++++++-------------------------
1 files changed, 273 insertions(+), 225 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 8966305..84c2299 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
@@ -8,7 +8,6 @@
import com.fasterxml.jackson.databind.cfg.CoercionAction;
import com.fasterxml.jackson.databind.cfg.CoercionInputShape;
import com.vincent.rsf.framework.common.Cools;
-import com.vincent.rsf.framework.common.DateUtils;
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.framework.exception.CoolException;
import com.vincent.rsf.server.api.config.RemotesInfoProperties;
@@ -105,10 +104,11 @@
/**
- * @param
- * @return
+ * 瀹屾垚鍏ュ簱锛屾洿鏂板簱浣嶆槑缁嗐�佺粍鎵樼姸鎬侊紝骞跺湪姝ょ粺涓�鎵ц 9.1 鍏�/鍑哄簱缁撴灉涓婃姤浜戜粨銆�
+ * 涓� RCS 鍥炶皟褰㈡垚闂幆锛歊CS 涓婃姤浠诲姟缁撴潫鍚庝粎灏嗕换鍔＄姸鎬佺疆涓� COMPLETE_IN锛堣 WcsServiceImpl.receiveExMsg锛夛紝
+ * 鏈畾鏃朵换鍔℃壂鎻� COMPLETE_IN 骞舵墽琛� complateInTask锛堝簱浣嶃�佺粍鎵樸��9.1 涓婃姤浜戜粨锛夈��
+ *
* @author Ryan
- * @description 瀹屾垚鍏ュ簱锛屾洿鏂板簱瀛�
* @time 2025/4/2 12:37
*/
@Scheduled(cron = "0/3 * * * * ?")
@@ -123,10 +123,12 @@
}
/**
+ * 瀹屾垚鍑哄簱浠诲姟锛屾洿鏂板簱浣�/鍑哄簱鍗曪紝骞跺湪姝ょ粺涓�鎵ц 9.1 鍏�/鍑哄簱缁撴灉涓婃姤浜戜粨銆�
+ * 涓� RCS 鍥炶皟褰㈡垚闂幆锛歊CS 涓婃姤 END 鍚庝粎灏嗗嚭搴撲换鍔＄姸鎬佺疆涓� COMPLETE_OUT锛堣 WcsServiceImpl.receiveExMsg锛夛紝
+ * 鏈畾鏃朵换鍔℃壂鎻� COMPLETE_OUT 骞舵墽琛� completeTask锛堟墸搴撲綅銆佹洿鏂板嚭搴撳崟銆�9.1 涓婃姤浜戜粨锛夈��
+ *
* @author Ryan
* @date 2025/5/20
- * @description: 瀹屾垚鍑哄簱浠诲姟锛屾洿鏂板簱瀛�
- * @version 1.0
*/
@Scheduled(cron = "0/5 * * * * ? ")
@Transactional(rollbackFor = Exception.class)
@@ -249,30 +251,39 @@
/**
* 闈炲厜鐢电珯鐐逛换鍔′笅鍙�
*/
- @Scheduled(cron = "0/55 * * * * ? ")
+ @Scheduled(cron = "0/35 * * * * ? ")
@Transactional(rollbackFor = Exception.class)
public void pubTaskToWcs() {
+ log.debug("瀹氭椂浠诲姟寮�濮嬫墽琛岋細浠诲姟涓嬪彂鍒癛CS");
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<Integer> list = Arrays.asList(
+ TaskType.TASK_TYPE_LOC_MOVE.type
+ ,TaskType.TASK_TYPE_OUT.type
+ ,TaskType.TASK_TYPE_EMPITY_OUT.type
+ ,TaskType.TASK_TYPE_CHECK_OUT.type
+ ,TaskType.TASK_TYPE_MERGE_OUT.type
+ ,TaskType.TASK_TYPE_PICK_AGAIN_OUT.type
+ ,TaskType.TASK_TYPE_IN.type
+ ,TaskType.TASK_TYPE_EMPITY_IN.type
+ ,TaskType.TASK_TYPE_CHECK_IN.type
+ ,TaskType.TASK_TYPE_MERGE_IN.type
+ ,TaskType.TASK_TYPE_PICK_IN.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));
+ log.debug("鏌ヨ鍒板緟涓嬪彂浠诲姟鏁伴噺锛歿}", tasks.size());
if (tasks.isEmpty()) {
+ log.debug("娌℃湁寰呬笅鍙戠殑浠诲姟锛屽畾鏃朵换鍔＄粨鏉�");
return;
}
- Config config = configService.getOne(new LambdaQueryWrapper<Config>().eq(Config::getFlag, GlobalConfigCode.ALLOW_PUB_TASK));
+ Config config = configService.getOne(new LambdaQueryWrapper<Config>().eq(Config::getFlag, GlobalConfigCode.AUTO_RUN_CHECK_ORDERS));
if (!Objects.isNull(config) && !Objects.isNull(config.getVal())) {
- Integer val = Integer.parseInt(config.getVal());
- if (val > 1) {
- List<Task> tasks1 = tasks.stream().sorted(Comparator.comparing(Task::getCreateTime)).collect(Collectors.toList());
- Task task = tasks1.stream().findFirst().get();
- if (DateUtils.diffToSeconds(task.getCreateTime(), new Date()) < val) {
- return;
- }
+ if (Boolean.parseBoolean(config.getVal())) {
+ log.info("閰嶇疆椤笰UTO_RUN_CHECK_ORDERS涓簍rue锛岃烦杩囦换鍔′笅鍙�");
+ return;
}
}
// for (Task task : tasks) {
@@ -287,7 +298,9 @@
// }
// }
/**涓嬪彂鏅�氱珯鐐逛换鍔★紝鎶ラ敊鍥炴粴锛屼笉鍐嶅線涓嬫墽琛�*/
- pubTaskToWcs(tasks);
+ log.debug("寮�濮嬩笅鍙憑}涓换鍔″埌RCS", tasks.size());
+ taskService.pubTaskToWcs(tasks);
+ log.debug("瀹氭椂浠诲姟鎵ц瀹屾垚锛氫换鍔′笅鍙戝埌RCS");
}
/**
@@ -353,7 +366,7 @@
}
/**涓嬪彂浠诲姟*/
try {
- pubTaskToWcs(tasks);
+ taskService.pubTaskToWcs(tasks);
} catch (Exception e) {
log.error("浠诲姟涓嬪彂澶辫触锛侊紒", e);
}
@@ -362,7 +375,7 @@
/**
* 姣忎簲绉掓牎楠屾繁搴撲綅鏄惁涓虹┖锛屽鏋滄祬搴撲綅鏈夎揣锛屽皢娴呭簱浣嶇Щ鑷虫繁搴撲綅
- *///TODO 鐢熸垚绉诲簱浠诲姟鍓嶏紝闇�瑕佹鏌ユ槸鍚︽湁浠诲姟鍓嶅線褰撳墠鎵樼洏
+ *///TODO 鐢熸垚绉诲簱浠诲姟鍓嶏紝闇�瑕佹鏌ユ槸鍚︽湁浠诲姟鍓嶅線褰撳墠鏂欑
// @Scheduled(cron = "0/35 * * * * ? ")
// @Transactional(rollbackFor = Exception.class)
// public void shallocToDeep() throws Exception {
@@ -388,165 +401,165 @@
*
* @param tasks
*/
- @Transactional(rollbackFor = Exception.class)
- public void pubTaskToWcs(List<Task> tasks) {
- WcsTaskParams taskParams = new WcsTaskParams();
- 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());
-
- 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 (!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)) {
- station.setUseStatus(LocStsType.LOC_STS_TYPE_R.type);
- if (!basStationService.updateById(station)) {
- throw new CoolException("绔欑偣鐘舵�佹洿鏂板け璐ワ紒锛�");
- }
- } else if (task.getTaskType() >= TaskType.TASK_TYPE_OUT.type) {
- station.setUseStatus(LocStsType.LOC_STS_TYPE_S.type);
- if (!basStationService.updateById(station)) {
- throw new CoolException("绔欑偣鐘舵�佹洿鏂板け璐ワ紒锛�");
- }
- }
- }
-
- /**绉诲簱鍙傛暟*/
- 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());
-
- 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));
- HttpHeaders headers = new HttpHeaders();
- headers.add("Content-Type", "application/json");
- headers.add("api-version", "v2.0");
- HttpEntity httpEntity = new HttpEntity(taskParams, headers);
- ResponseEntity<String> exchange = restTemplate.exchange(pubTakUrl, HttpMethod.POST, httpEntity, String.class);
- log.info("浠诲姟涓嬪彂鍚庯紝鍝嶅簲缁撴灉锛� {}", exchange);
- if (Objects.isNull(exchange.getBody())) {
- throw new CoolException("浠诲姟涓嬪彂澶辫触锛侊紒");
- } else {
- try {
- ObjectMapper objectMapper = new ObjectMapper();
- objectMapper.coercionConfigDefaults()
- .setCoercion(CoercionInputShape.EmptyString, CoercionAction.AsEmpty);
- CommonResponse result = objectMapper.readValue(exchange.getBody(), CommonResponse.class);
- if (result.getCode() == 200) {
- tasks.forEach(task -> {
-
- 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)) {
-
- BasStation curSta = basStationService.getOne(new LambdaQueryWrapper<BasStation>().eq(BasStation::getStationName, task.getOrgSite()));
- if (Objects.isNull(curSta)) {
- throw new CoolException("绔欑偣涓嶅瓨鍦紒锛�");
- }
-
- 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)) {
- BasStation curSta = basStationService.getOne(new LambdaQueryWrapper<BasStation>().eq(BasStation::getStationName, task.getTargSite()));
- if (Objects.isNull(curSta)) {
- throw new CoolException("绔欑偣涓嶅瓨鍦紒锛�");
- }
-
- 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 {
- log.error(JSONObject.toJSONString(result));
-// throw new CoolException("浠诲姟涓嬪彂澶辫触锛侊紒");
- }
- } catch (JsonProcessingException e) {
- throw new CoolException(e.getMessage());
- }
- }
-
- }
-
+// @Transactional(rollbackFor = Exception.class)
+// public void pubTaskToWcs(List<Task> tasks) {
+// WcsTaskParams taskParams = new WcsTaskParams();
+// 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());
+//
+// 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 (!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)) {
+// station.setUseStatus(LocStsType.LOC_STS_TYPE_R.type);
+// if (!basStationService.updateById(station)) {
+// throw new CoolException("绔欑偣鐘舵�佹洿鏂板け璐ワ紒锛�");
+// }
+// } else if (task.getTaskType() >= TaskType.TASK_TYPE_OUT.type) {
+// station.setUseStatus(LocStsType.LOC_STS_TYPE_S.type);
+// if (!basStationService.updateById(station)) {
+// throw new CoolException("绔欑偣鐘舵�佹洿鏂板け璐ワ紒锛�");
+// }
+// }
+// }
+//
+// /**绉诲簱鍙傛暟*/
+// 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());
+//
+// 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));
+// HttpHeaders headers = new HttpHeaders();
+// headers.add("Content-Type", "application/json");
+// headers.add("api-version", "v2.0");
+// HttpEntity httpEntity = new HttpEntity(taskParams, headers);
+// ResponseEntity<String> exchange = restTemplate.exchange(pubTakUrl, HttpMethod.POST, httpEntity, String.class);
+// log.info("浠诲姟涓嬪彂鍚庯紝鍝嶅簲缁撴灉锛� {}", exchange);
+// if (Objects.isNull(exchange.getBody())) {
+// throw new CoolException("浠诲姟涓嬪彂澶辫触锛侊紒");
+// } else {
+// try {
+// ObjectMapper objectMapper = new ObjectMapper();
+// objectMapper.coercionConfigDefaults()
+// .setCoercion(CoercionInputShape.EmptyString, CoercionAction.AsEmpty);
+// CommonResponse result = objectMapper.readValue(exchange.getBody(), CommonResponse.class);
+// if (result.getCode() == 200) {
+// tasks.forEach(task -> {
+//
+// 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)) {
+//
+// BasStation curSta = basStationService.getOne(new LambdaQueryWrapper<BasStation>().eq(BasStation::getStationName, task.getOrgSite()));
+// if (Objects.isNull(curSta)) {
+// throw new CoolException("绔欑偣涓嶅瓨鍦紒锛�");
+// }
+//
+// 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)) {
+// BasStation curSta = basStationService.getOne(new LambdaQueryWrapper<BasStation>().eq(BasStation::getStationName, task.getTargSite()));
+// if (Objects.isNull(curSta)) {
+// throw new CoolException("绔欑偣涓嶅瓨鍦紒锛�");
+// }
+//
+// 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 {
+// log.error(JSONObject.toJSONString(result));
+//// throw new CoolException("浠诲姟涓嬪彂澶辫触锛侊紒");
+// }
+// } catch (JsonProcessingException e) {
+// throw new CoolException(e.getMessage());
+// }
+// }
+//
+// }
+//
/**
* @param
@@ -569,6 +582,8 @@
} else {
queryWrapper.in(Task::getTaskStatus, TaskStsType.UPDATED_IN.id, TaskStsType.UPDATED_OUT.id);
}
+ queryWrapper.last("ORDER BY RAND() LIMIT 1");
+
List<Task> tasks = taskService.list(queryWrapper);
if (tasks.isEmpty()) {
return;
@@ -583,58 +598,92 @@
}
List<TaskItem> taskItems = taskItemService.list(new LambdaQueryWrapper<TaskItem>().eq(TaskItem::getTaskId, task.getId()));
+ // 涓婃姤ERP鏆傛椂娉ㄩ噴锛�/rsf-open-api/erp/report/order锛�
+ // if (task.getTaskType().equals(TaskType.TASK_TYPE_IN.type)) {
+ // for (TaskItem taskItem : taskItems) {
+ // if (Objects.isNull(taskItem.getOrderId())) {
+ // continue;
+ // }
+ // WkOrder order = asnOrderService.getById(taskItem.getOrderId());
+ // if (Objects.isNull(order)) {
+ // continue;
+ // }
+ // // 鍏ュ簱鍗曚换鍔℃槑缁嗕笂鎶ワ細浼樺厛鎸� orderItemId锛堝崟鎹槑缁咺D锛夋煡锛屽惁鍒欐寜 orderId+matnrId(+fieldsIndex) 鏌ワ紝纭繚鑳芥壘鍒板崟鎹槑缁�
+ // WkOrderItem wkOrderItem = null;
+ // if (taskItem.getOrderItemId() != null) {
+ // wkOrderItem = asnOrderItemService.getById(taskItem.getOrderItemId());
+ // }
+ // if (wkOrderItem == null) {
+ // LambdaQueryWrapper<WkOrderItem> qw = new LambdaQueryWrapper<WkOrderItem>()
+ // .eq(WkOrderItem::getOrderId, order.getId())
+ // .eq(WkOrderItem::getMatnrId, taskItem.getMatnrId());
+ // if (StringUtils.isNotBlank(taskItem.getFieldsIndex())) {
+ // qw.eq(WkOrderItem::getFieldsIndex, taskItem.getFieldsIndex());
+ // }
+ // wkOrderItem = asnOrderItemService.getOne(qw);
+ // }
+ // if (Objects.isNull(wkOrderItem)) {
+ // logger.warn("浠诲姟鍘嗗彶妗ｅ鐞嗭細鍗曟嵁鏄庣粏涓嶅瓨鍦ㄦ垨宸插畬鎴愶紝璺宠繃涓婃姤 - taskId={}, orderId={}, orderItemId={}, matnrId={}, fieldsIndex={}", task.getId(), order.getId(), taskItem.getOrderItemId(), taskItem.getMatnrId(), taskItem.getFieldsIndex());
+ // continue;
+ // }
+ // /**鍏ュ簱鍗曟槑缁嗕笂鎶�*/
+ // reportMsgService.reportOrderItem(wkOrderItem);
+ // }
+ // } else
if (task.getTaskType().equals(TaskType.TASK_TYPE_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);
- }
+ // 鍏ュ簱绫诲瀷浠呰浆鍘嗗彶锛屼笉涓婃姤ERP锛堝凡娉ㄩ噴锛�
} else if ((task.getTaskType() >= TaskType.TASK_TYPE_OUT.type && task.getTaskType() <= TaskType.TASK_TYPE_EMPITY_OUT.type)
|| task.getTaskType().equals(TaskType.TASK_TYPE_PICK_IN.type)) {
- /**鍒ゆ柇鍗曟嵁鏄惁瀹屾垚**/
- Set<Long> longSet = taskItems.stream().map(TaskItem::getSourceId).collect(Collectors.toSet());
- List<WaveOrderRela> waveOrderRelas = waveOrderRelaService.list(new LambdaQueryWrapper<WaveOrderRela>()
- .in(WaveOrderRela::getWaveId, longSet));
- if (Cools.isEmpty(waveOrderRelas)) {
- throw new CoolException("娉㈡瀵瑰簲鍏宠仈鍗曟湭鎵惧埌");
- }
- Set<Long> orderIds = waveOrderRelas.stream().map(WaveOrderRela::getOrderId).collect(Collectors.toSet());
- List<WkOrder> wkOrders = asnOrderService.listByIds(orderIds);
- if (wkOrders.isEmpty()) {
- throw new CoolException("鍗曟嵁涓嶅瓨鍦紒锛�");
- }
- wkOrders.forEach(order -> {
- //妫�鏌ュ崟鎹槸鍚﹀畬鎴�
- if (order.getAnfme().compareTo(order.getQty()) == 0) {
- order.setExceStatus(AsnExceStatus.OUT_STOCK_STATUS_TASK_DONE.val);
-// if (order.getType().equals(OrderType.ORDER_IN)) {
-// order.setExceStatus(AsnExceStatus.ASN_EXCE_STATUS_TASK_DONE.val);
-// } else {
-// order.setExceStatus(AsnExceStatus.OUT_STOCK_STATUS_TASK_DONE.val);
-// }
- if (!asnOrderService.updateById(order)) {
- throw new CoolException("鍑哄簱鍗曟洿鏂扮姸鎬佸け璐�");
+ /**鍒ゆ柇鍗曟嵁鏄惁瀹屾垚锛氭尝娆′笅鍙戙�佹寜鍗曚笅鍙戯紙鐐瑰嚮涓嬪彂浠诲姟锛夊畬鎴愬悗鍧囧皢鍑哄簱鍗曠疆涓哄畬缁�*/
+ Set<Long> orderIdsToDone = new HashSet<>();
+ if (task.getResource() != null && task.getResource().equals(TaskResouceType.TASK_RESOUCE_WAVE_TYPE.val)) {
+ Set<Long> longSet = taskItems.stream()
+ .map(TaskItem::getSourceId)
+ .filter(Objects::nonNull)
+ .collect(Collectors.toSet());
+ if (!longSet.isEmpty()) {
+ List<WaveOrderRela> waveOrderRelas = waveOrderRelaService.list(new LambdaQueryWrapper<WaveOrderRela>()
+ .in(WaveOrderRela::getWaveId, longSet));
+ if (!Cools.isEmpty(waveOrderRelas)) {
+ orderIdsToDone.addAll(waveOrderRelas.stream().map(WaveOrderRela::getOrderId).collect(Collectors.toSet()));
}
}
- });
+ } else if (task.getResource() != null && task.getResource().equals(TaskResouceType.TASK_RESOUCE_ORDER_TYPE.val)) {
+ // 鎸夊崟涓嬪彂锛氫换鍔℃槑缁� sourceId 涓哄嚭搴撳崟ID
+ Set<Long> ids = taskItems.stream()
+ .map(TaskItem::getSourceId)
+ .filter(Objects::nonNull)
+ .collect(Collectors.toSet());
+ orderIdsToDone.addAll(ids);
+ }
+ if (!orderIdsToDone.isEmpty()) {
+ List<WkOrder> wkOrders = asnOrderService.listByIds(orderIdsToDone);
+ if (!wkOrders.isEmpty()) {
+ Config allowChang = configService.getOne(new LambdaQueryWrapper<Config>().eq(Config::getFlag, GlobalConfigCode.ALLOW_OVER_CHANGE));
+ wkOrders.forEach(order -> {
+ if (order.getAnfme() == null) return;
+ boolean canDone = Boolean.TRUE.equals(allowChang != null && Boolean.parseBoolean(allowChang.getVal()))
+ ? (order.getQty() != null && order.getAnfme().compareTo(order.getQty()) <= 0)
+ : (order.getQty() != null && order.getAnfme().compareTo(order.getQty()) == 0);
+ if (canDone) {
+ order.setExceStatus(AsnExceStatus.OUT_STOCK_STATUS_TASK_DONE.val);
+ if (order.getQty() == null || order.getQty().compareTo(0.0) == 0) {
+ order.setQty(order.getWorkQty() != null ? order.getWorkQty() : 0.0);
+ }
+ if (!asnOrderService.updateById(order)) {
+ logger.error("鍑哄簱鍗曟洿鏂扮姸鎬佸け璐ャ�傝鍗旾D锛歿}锛岃鍗曠紪鐮侊細{}", order.getId(), order.getCode());
+ }
+ }
+ });
+ }
+ }
+
//鍑哄簱鍗曚笂鎶CS淇敼搴撲綅鐘舵��
try {
reportStationStatus(task);
} catch (Exception e) {
- throw new CoolException(e.getMessage());
+ logger.error("浠诲姟{}涓婃姤RCS淇敼搴撲綅鐘舵�佸け璐ャ�備换鍔＄紪鐮侊細{}", task.getId(), task.getTaskCode(), e);
+ // 涓嶆姏鍑哄紓甯革紝閬垮厤涓柇瀹氭椂浠诲姟
}
}
@@ -664,7 +713,6 @@
throw new CoolException("鍘熷浠诲姟鏄庣粏鍒犻櫎澶辫触锛侊紒");
}
}
-
});
}
--
Gitblit v1.9.1