Commit 97ca13640fc50f3bb3f12492b5b127170446d3da
1 parent
31d2fb01
解决循环依赖问题
Signed-off-by: TanYibin <5491541@qq.com>
Showing
3 changed files
with
6 additions
and
8 deletions
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/acs/controller/AcsController.java
... | ... | @@ -40,11 +40,11 @@ public class AcsController extends HuahengBaseController { |
40 | 40 | |
41 | 41 | // @PassApiAuthentication |
42 | 42 | // @ApiLogger(apiName = "API接口第三方Token校验测试", from = "TEST") |
43 | - @ResponseBody | |
44 | - @PostMapping(value = "/testTokenCheck") | |
45 | - public Result<?> testTokenCheck(@RequestBody Map<String, String> paramMap, HttpServletRequest request) { | |
46 | - return Result.ok(); | |
47 | - } | |
43 | +// @ResponseBody | |
44 | +// @PostMapping(value = "/testTokenCheck") | |
45 | +// public Result<?> testTokenCheck(@RequestBody Map<String, String> paramMap, HttpServletRequest request) { | |
46 | +// return Result.ok(); | |
47 | +// } | |
48 | 48 | |
49 | 49 | @PostMapping("/notifyAGVTask") |
50 | 50 | @ResponseBody |
... | ... |
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 |
79 | 79 | return result; |
80 | 80 | } |
81 | 81 | |
82 | - @Async("baseExecutor") | |
83 | 82 | @Override |
83 | + @Async("asyncPoolTaskExecutor") | |
84 | 84 | public void sendTaskToWcs(List<TaskHeader> taskHeaders, String warehouseCode, String zoneCode) { |
85 | 85 | String lockKey = warehouseCode + "_" + zoneCode; |
86 | 86 | handleMultiProcess("sendTaskToWcs", lockKey, 10, 300, new MultiProcessListener() { |
... | ... |
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 |
87 | 87 | private ITaskDetailService taskDetailService; |
88 | 88 | @Autowired |
89 | 89 | private IInventoryHeaderService inventoryHeaderService; |
90 | - @Resource | |
91 | - private IHuahengMultiHandlerService huahengMultiHandlerService; | |
92 | 90 | |
93 | 91 | /** |
94 | 92 | * 根据出库单详情,匹配到可用出库的库存详情 |
... | ... |