From 08ddf90b4dea4a8de917bc6a76b1ad5c2b335d2e Mon Sep 17 00:00:00 2001
From: zc <zyzc>
Date: 星期六, 15 十一月 2025 15:51:48 +0800
Subject: [PATCH] 站点预约问题修复
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskSchedules.java | 55 +++++++++++++++++++++++--------------------------------
1 files changed, 23 insertions(+), 32 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 582c8af..5fbff6b 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
@@ -240,7 +240,7 @@
/**
* 闈炲厜鐢电珯鐐逛换鍔′笅鍙�
*/
- @Scheduled(cron = "0/5 * * * * ? ")
+ @Scheduled(cron = "0/25 * * * * ? ")
@Transactional(rollbackFor = Exception.class)
public void pubTaskToWcs() {
Long loginUserId = SystemAuthUtils.getLoginUserId();
@@ -388,17 +388,11 @@
/**鍒ゆ柇鏄惁鍏夌數绔欑偣锛岄潪鍏夊簵绔欑偣闇�绠℃帶绔欑偣鐘舵��*/
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("绔欑偣鐘舵�佹洿鏂板け璐ワ紒锛�");
@@ -512,7 +506,8 @@
}
});
} else {
- throw new CoolException("浠诲姟涓嬪彂澶辫触锛侊紒");
+ log.error(JSONObject.toJSONString(result));
+// throw new CoolException("浠诲姟涓嬪彂澶辫触锛侊紒");
}
} catch (JsonProcessingException e) {
throw new CoolException(e.getMessage());
@@ -558,27 +553,25 @@
List<TaskItem> taskItems = taskItemService.list(new LambdaQueryWrapper<TaskItem>().eq(TaskItem::getTaskId, task.getId()));
//鍏ュ簱鍗曟嵁鏄庣粏涓婃姤
- for (TaskItem taskItem : taskItems) {
- if (Objects.isNull(taskItem.getOrderId())) {
- continue;
+ 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);
}
- 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);
- }
-
- if (task.getTaskType() <= TaskType.TASK_TYPE_CHECK_IN.type) {
-
} else if (task.getTaskType() >= TaskType.TASK_TYPE_OUT.type && task.getTaskType() <= TaskType.TASK_TYPE_EMPITY_OUT.type) {
//鍑哄簱鍗曚笂鎶CS淇敼搴撲綅鐘舵��
try {
@@ -636,11 +629,9 @@
}
LocSiteParams locSiteParams = new LocSiteParams();
- locSiteParams
- .setStatus(LocStsType.getRcsLocSts(LocStsType.LOC_STS_TYPE_O.type))
+ locSiteParams.setStatus(LocStsType.getRcsLocSts(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));
@@ -651,6 +642,7 @@
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 {
@@ -663,7 +655,6 @@
throw new CoolException(e.getMessage());
}
}
-
}
}
--
Gitblit v1.9.1