From 97ca13640fc50f3bb3f12492b5b127170446d3da Mon Sep 17 00:00:00 2001
From: TanYibin <5491541@qq.com>
Date: Wed, 2 Aug 2023 08:15:01 +0800
Subject: [PATCH] 解决循环依赖问题
---
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/acs/controller/AcsController.java | 10 +++++-----
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/framework/service/impl/HuahengMultiHandlerServiceImpl.java | 2 +-
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/shipment/shipmentCombination/service/impl/ShipmentCombinationServiceImpl.java | 2 --
3 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/acs/controller/AcsController.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/acs/controller/AcsController.java
index 149f899..1373bad 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/acs/controller/AcsController.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/acs/controller/AcsController.java
@@ -40,11 +40,11 @@ public class AcsController extends HuahengBaseController {
// @PassApiAuthentication
// @ApiLogger(apiName = "API接口第三方Token校验测试", from = "TEST")
- @ResponseBody
- @PostMapping(value = "/testTokenCheck")
- public Result<?> testTokenCheck(@RequestBody Map<String, String> paramMap, HttpServletRequest request) {
- return Result.ok();
- }
+// @ResponseBody
+// @PostMapping(value = "/testTokenCheck")
+// public Result<?> testTokenCheck(@RequestBody Map<String, String> paramMap, HttpServletRequest request) {
+// return Result.ok();
+// }
@PostMapping("/notifyAGVTask")
@ResponseBody
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/framework/service/impl/HuahengMultiHandlerServiceImpl.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/framework/service/impl/HuahengMultiHandlerServiceImpl.java
index 44009fb..70c0c6d 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/framework/service/impl/HuahengMultiHandlerServiceImpl.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/framework/service/impl/HuahengMultiHandlerServiceImpl.java
@@ -79,8 +79,8 @@ public class HuahengMultiHandlerServiceImpl extends HuahengBaseController implem
return result;
}
- @Async("baseExecutor")
@Override
+ @Async("asyncPoolTaskExecutor")
public void sendTaskToWcs(List<TaskHeader> taskHeaders, String warehouseCode, String zoneCode) {
String lockKey = warehouseCode + "_" + zoneCode;
handleMultiProcess("sendTaskToWcs", lockKey, 10, 300, new MultiProcessListener() {
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/shipment/shipmentCombination/service/impl/ShipmentCombinationServiceImpl.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/shipment/shipmentCombination/service/impl/ShipmentCombinationServiceImpl.java
index f79b896..2dd07b9 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/shipment/shipmentCombination/service/impl/ShipmentCombinationServiceImpl.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/shipment/shipmentCombination/service/impl/ShipmentCombinationServiceImpl.java
@@ -87,8 +87,6 @@ public class ShipmentCombinationServiceImpl implements IShipmentCombinationServi
private ITaskDetailService taskDetailService;
@Autowired
private IInventoryHeaderService inventoryHeaderService;
- @Resource
- private IHuahengMultiHandlerService huahengMultiHandlerService;
/**
* 根据出库单详情，匹配到可用出库的库存详情
--
libgit2 0.22.2