From 66623a098cb222e6ce2148b42ccc096c40081e8f Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 26 十二月 2024 18:35:36 +0800
Subject: [PATCH] Host打开不兼容问题修复
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/services/Impl/WcsApiServiceImpl.java | 21 +++---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/timer/TaskLogTimer.java | 87 +++++++++++-----------------
zy-asrs-wms/src/main/java/com/zy/asrs/wms/common/config/MybatisPlusConfig.java | 3
zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/controller/OutStockController.java | 7 +-
zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/controller/BaseController.java | 5 +
zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/controller/InStockController.java | 7 +-
zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/services/WcsApiService.java | 9 --
7 files changed, 60 insertions(+), 79 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/controller/InStockController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/controller/InStockController.java
index dbf995b..bbf315c 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/controller/InStockController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/controller/InStockController.java
@@ -4,6 +4,7 @@
import com.zy.asrs.wms.apis.wcs.entity.request.ContainerArrivedParam;
import com.zy.asrs.wms.apis.wcs.entity.request.TasksStatusCallbackParam;
import com.zy.asrs.wms.apis.wcs.services.WcsApiService;
+import com.zy.asrs.wms.system.controller.BaseController;
import io.netty.util.internal.StringUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
@@ -13,7 +14,7 @@
@RequestMapping("/in/stock/")
@RestController
-public class InStockController {
+public class InStockController extends BaseController {
@Autowired
private WcsApiService wcsApiService;
@@ -34,7 +35,7 @@
return R.error("杈撻�佺嚎鑺傜偣缂栫爜涓嶈兘涓虹┖锛侊紒");
}
- return wcsApiService.containerArrivedNotify(arrivedParam, "inStock");
+ return wcsApiService.containerArrivedNotify(arrivedParam, "inStock", getHostId());
}
@@ -53,7 +54,7 @@
if (StringUtil.isNullOrEmpty(callbackParam.getTaskCode())) {
return R.error("浠诲姟缂栫爜涓嶈兘涓虹┖锛侊紒");
}
- wcsApiService.receiveTaskStatus(callbackParam, "inStock");
+ wcsApiService.receiveTaskStatus(callbackParam, "inStock", getHostId());
} else {
return R.error("涓婃姤浜嬩欢绫诲瀷涓嶈兘涓虹┖锛侊紒");
}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/controller/OutStockController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/controller/OutStockController.java
index 46cfc43..d0e8a8a 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/controller/OutStockController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/controller/OutStockController.java
@@ -5,6 +5,7 @@
import com.zy.asrs.wms.apis.wcs.entity.request.ContainerArrivedParam;
import com.zy.asrs.wms.apis.wcs.entity.request.TasksStatusCallbackParam;
import com.zy.asrs.wms.apis.wcs.services.WcsApiService;
+import com.zy.asrs.wms.system.controller.BaseController;
import io.netty.util.internal.StringUtil;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -16,7 +17,7 @@
@Slf4j
@RestController
@RequestMapping("/out/stock/")
-public class OutStockController {
+public class OutStockController extends BaseController {
@Autowired
private WcsApiService wcsApiService;
@@ -35,7 +36,7 @@
if (StringUtil.isNullOrEmpty(callbackParam.getTaskCode())) {
return R.error("浠诲姟缂栫爜涓嶈兘涓虹┖锛侊紒");
}
- wcsApiService.receiveTaskStatus(callbackParam, "outStock");
+ wcsApiService.receiveTaskStatus(callbackParam, "outStock", getHostId());
} else {
return R.error("涓婃姤浜嬩欢绫诲瀷涓嶈兘涓虹┖锛侊紒");
}
@@ -58,7 +59,7 @@
return R.error("杈撻�佺嚎鑺傜偣缂栫爜涓嶈兘涓虹┖锛侊紒");
}
- return wcsApiService.containerArrivedNotify(arrivedParam, "outStock");
+ return wcsApiService.containerArrivedNotify(arrivedParam, "outStock", getHostId());
}
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 e59287e..30fc4f1 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
@@ -6,10 +6,8 @@
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;
import com.zy.asrs.wms.apis.wcs.services.WcsApiService;
import com.zy.asrs.wms.asrs.entity.Task;
-import com.zy.asrs.wms.asrs.entity.WaitPakin;
import com.zy.asrs.wms.asrs.entity.enums.TaskStsType;
import com.zy.asrs.wms.asrs.service.TaskService;
import com.zy.asrs.wms.asrs.service.WaitPakinService;
@@ -20,10 +18,7 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import java.util.ArrayList;
import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
@Slf4j
@Service
@@ -41,16 +36,18 @@
/**
* 瀹瑰櫒鍒拌揪鎺ユ敹
* 鏍规嵁ESS杩斿洖鐨勫鍣ㄧ紪鐮佷慨鏀逛换鍔℃。涓殑杈撻�佺嚎璧峰浣嶇疆鑺傜偣锛屽強浠诲姟妗ｆ墽琛岀姸鎬�
- * * 褰撳墠闂锛�
- * * //TODO 1. 鐩墠浠诲姟涓嬪彂鎺ュ彛娌熼�氫笅鏉ワ紝鏄渶瑕佺洰鏍囦綅缃殑锛岃繖閲屾垜浠彧鏄垰缁勬嫋瀹屾垚锛屽苟涓嶆槸閫氱煡娴佸姩锛屾病鏈夌洰鏍囦綅缃�
- * * //TODO 2. 鏂囨。涓婄殑鎼繍浠诲姟涓嬪彂鎸囩殑閮芥槸澶氫换鍔★紝澶氬鍣ㄦ惉杩愶紝鑰屼笉鏄垜浠渶瑕佺墿鏂欎俊鎭悓姝ュ姛鑳�
- * * //TODO 3. 娴佺▼璧颁笉閫氭殏鏃跺厛璺宠繃锛岀‘璁ゆ槸鍚﹂渶瑕乄MS瑙﹀彂鏂欑婊氬姩鑷虫壂鐮佸尯
+ * * 褰撳墠闂锛�
+ * * //TODO 1. 鐩墠浠诲姟涓嬪彂鎺ュ彛娌熼�氫笅鏉ワ紝鏄渶瑕佺洰鏍囦綅缃殑锛岃繖閲屾垜浠彧鏄垰缁勬嫋瀹屾垚锛屽苟涓嶆槸閫氱煡娴佸姩锛屾病鏈夌洰鏍囦綅缃�
+ * * //TODO 2. 鏂囨。涓婄殑鎼繍浠诲姟涓嬪彂鎸囩殑閮芥槸澶氫换鍔★紝澶氬鍣ㄦ惉杩愶紝鑰屼笉鏄垜浠渶瑕佺墿鏂欎俊鎭悓姝ュ姛鑳�
+ * * //TODO 3. 娴佺▼璧颁笉閫氭殏鏃跺厛璺宠繃锛岀‘璁ゆ槸鍚﹂渶瑕乄MS瑙﹀彂鏂欑婊氬姩鑷虫壂鐮佸尯
+ *
* @param arrivedParam
+ * @param hostId
* @return
*/
@Override
@Transactional(rollbackFor = Exception.class)
- public R containerArrivedNotify(ContainerArrivedParam arrivedParam, String taskType) {
+ public R containerArrivedNotify(ContainerArrivedParam arrivedParam, String taskType, Long hostId) {
List<Task> tasks = taskService.list(new LambdaQueryWrapper<Task>().eq(Task::getBarcode, arrivedParam.getContainerCode()));
if (Collections.isEmpty(tasks)) {
return R.error("浠诲姟涓嶅瓨鍦紒锛�");
@@ -75,7 +72,7 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public void receiveTaskStatus(TasksStatusCallbackParam callbackParam, String stockType) {
+ public void receiveTaskStatus(TasksStatusCallbackParam callbackParam, String stockType, Long hostId) {
List<Task> list = taskService.list(new LambdaQueryWrapper<Task>()
.eq(Task::getBarcode, callbackParam.getContainerCode())
.eq(Task::getTaskNo, callbackParam.getTaskCode()));
@@ -161,6 +158,8 @@
}
});
+ } else {
+ throw new CoolException("鏇存柊鍐呭涓嶅瓨鍦紒锛�");
}
}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/services/WcsApiService.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/services/WcsApiService.java
index cafed21..9d03266 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/services/WcsApiService.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/services/WcsApiService.java
@@ -2,17 +2,12 @@
import com.zy.asrs.framework.common.R;
import com.zy.asrs.wms.apis.wcs.entity.request.ContainerArrivedParam;
-import com.zy.asrs.wms.apis.wcs.entity.request.ConveyorStarParam;
import com.zy.asrs.wms.apis.wcs.entity.request.TasksStatusCallbackParam;
-import com.zy.asrs.wms.apis.wcs.entity.response.CommonReponse;
-import com.zy.asrs.wms.asrs.entity.WaitPakin;
-
-import java.util.List;
public interface WcsApiService {
- R containerArrivedNotify(ContainerArrivedParam arrivedParam, String taskType);
+ R containerArrivedNotify(ContainerArrivedParam arrivedParam, String taskType, Long hostId);
- void receiveTaskStatus(TasksStatusCallbackParam callbackParam, String stockType);
+ void receiveTaskStatus(TasksStatusCallbackParam callbackParam, String stockType, Long hostId);
}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/timer/TaskLogTimer.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/timer/TaskLogTimer.java
index db0edcf..62bdf73 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/timer/TaskLogTimer.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/timer/TaskLogTimer.java
@@ -73,63 +73,46 @@
if (taskDetls.isEmpty()) {
throw new CoolException("浠诲姟鏄庣粏涓嶅瓨鍦�");
- } else { //XXX 鍏堟洿鏂拌鍗曪紝鍚庡垹闄や换鍔℃槑缁�
- if (task.getTaskType() == 53L) {
- List<Long> waveIds = taskDetls.stream().map(TaskDetl::getWaveId).collect(Collectors.toList());
- List<Order> orders = orderService.list(new LambdaQueryWrapper<Order>().in(Order::getWaveId, waveIds));
- orders.forEach(order -> {
-
- });
- } else {
-
- }
-
-
-
+ } else { //TODO 鍏堟洿鏂拌鍗曪紝鍚庡垹闄や换鍔℃槑缁嗐�備换鍔′负53鏃讹紝闇�鏇存柊鏄庣粏銆�
+// if (task.getTaskType() == 53L) {
+// List<Long> waveIds = taskDetls.stream().map(TaskDetl::getWaveId).collect(Collectors.toList());
+// List<Order> orders = orderService.list(new LambdaQueryWrapper<Order>().in(Order::getWaveId, waveIds));
+// orders.forEach(order -> {
+//
+// });
+// } else {
//浠诲姟绫诲瀷涓�53锛屾牴鎹甒aveId淇敼璁㈠崟鏄庣粏
for (TaskDetl taskDetl : taskDetls) {
- if (task.getTaskType() == 53L) {
- List<Order> orders = orderService.list(new LambdaQueryWrapper<Order>().eq(Order::getWaveId, taskDetl.getWaveId()));
- orders.forEach(order -> {
- List<OrderDetl> detls = orderDetlService.list(new LambdaQueryWrapper<OrderDetl>().eq(OrderDetl::getOrderId, order.getId()));
- if (!detls.isEmpty()) {
- detls.forEach(detl -> {
- detl.setWorkQty(detl.getWorkQty() - taskDetl.getAnfme());//宸ヤ綔涓暟閲忓噺灏�
- detl.setQty(detl.getQty() + taskDetl.getAnfme());//宸插畬鎴愭暟閲忓鍔�
- detl.setUpdateTime(new Date());
- });
- }
- });
- } else {
- if (taskDetl.getDetlId() == null) {
- continue;
+ if (taskDetl.getDetlId() == null) {
+ continue;
+ }
+ OrderDetl orderDetl = orderDetlService.getById(taskDetl.getDetlId());
+ if (orderDetl == null) {
+ throw new CoolException("璁㈠崟鏄庣粏涓嶅瓨鍦�");
+ }
+ orderDetl.setWorkQty(orderDetl.getWorkQty() - taskDetl.getAnfme());//宸ヤ綔涓暟閲忓噺灏�
+ orderDetl.setQty(orderDetl.getQty() + taskDetl.getAnfme());//宸插畬鎴愭暟閲忓鍔�
+ orderDetl.setUpdateTime(new Date());
+ if (!orderDetlService.updateById(orderDetl)) {
+ throw new CoolException("鏇存柊璁㈠崟鏄庣粏澶辫触");
+ }
+ //妫�娴嬭鍗曟槸鍚﹀畬鎴�
+ boolean checkOrderComplete = orderService.checkOrderComplete(orderDetl.getOrderId());
+ if (checkOrderComplete) {
+ //璁㈠崟宸茬粡瀹屾垚
+ Order order = orderService.getById(orderDetl.getOrderId());
+ if (order == null) {
+ throw new CoolException("璁㈠崟涓嶅瓨鍦�");
}
- OrderDetl orderDetl = orderDetlService.getById(taskDetl.getDetlId());
- if (orderDetl == null) {
- throw new CoolException("璁㈠崟鏄庣粏涓嶅瓨鍦�");
+ order.setOrderSettle(OrderSettleType.COMPLETE.val());
+ order.setUpdateTime(new Date());
+ if (!orderService.updateById(order)) {
+ throw new CoolException("璁㈠崟鏇存柊澶辫触");
}
- orderDetl.setWorkQty(orderDetl.getWorkQty() - taskDetl.getAnfme());//宸ヤ綔涓暟閲忓噺灏�
- orderDetl.setQty(orderDetl.getQty() + taskDetl.getAnfme());//宸插畬鎴愭暟閲忓鍔�
- orderDetl.setUpdateTime(new Date());
- if (!orderDetlService.updateById(orderDetl)) {
- throw new CoolException("鏇存柊璁㈠崟鏄庣粏澶辫触");
- }
- //妫�娴嬭鍗曟槸鍚﹀畬鎴�
- boolean checkOrderComplete = orderService.checkOrderComplete(orderDetl.getOrderId());
- if (checkOrderComplete) {
- //璁㈠崟宸茬粡瀹屾垚
- Order order = orderService.getById(orderDetl.getOrderId());
- if (order == null) {
- throw new CoolException("璁㈠崟涓嶅瓨鍦�");
- }
- order.setOrderSettle(OrderSettleType.COMPLETE.val());
- order.setUpdateTime(new Date());
- if (!orderService.updateById(order)) {
- throw new CoolException("璁㈠崟鏇存柊澶辫触");
- }
- }
+
}
}
+// }
}
//鍒犻櫎浠诲姟鍘嗗彶妗ｆ
@@ -196,7 +179,7 @@
}
Dict dict = dictService.getOne(new LambdaQueryWrapper<Dict>().eq(Dict::getFlag, "taskLogDiffDays").eq(Dict::getStatus, 1));
- if(dict == null) {
+ if (dict == null) {
return;
}
for (Task task : list) {
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/common/config/MybatisPlusConfig.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/common/config/MybatisPlusConfig.java
index c12d3f5..cc9c658 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/common/config/MybatisPlusConfig.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/common/config/MybatisPlusConfig.java
@@ -93,7 +93,8 @@
} catch (Exception e) {
System.out.println(e.getMessage());
}
- return new NullValue();
+// return new NullValue();
+ return new LongValue(1);
}
@Bean
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/controller/BaseController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/controller/BaseController.java
index c3ba3ae..71506f9 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/controller/BaseController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/controller/BaseController.java
@@ -6,6 +6,7 @@
import com.zy.asrs.wms.system.service.UserLoginService;
import com.zy.asrs.wms.system.service.UserRoleService;
import com.zy.asrs.wms.system.service.UserService;
+import net.sf.jsqlparser.expression.LongValue;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.core.Authentication;
import org.springframework.security.core.context.SecurityContextHolder;
@@ -47,12 +48,12 @@
public Long getLoginUserId() {
User loginUser = getLoginUser();
- return loginUser == null ? null : loginUser.getId();
+ return loginUser == null ? 1 : loginUser.getId();
}
public Long getHostId() {
User loginUser = getLoginUser();
- return loginUser.getHostId();
+ return loginUser == null ? 1 : loginUser.getHostId();
}
public <T extends BaseParam> T buildParam(Map<String, Object> map, Class<T> clz) {
--
Gitblit v1.9.1